From 61bdf1e0488670f6a30537e21ae0e7d86f4fd30e Mon Sep 17 00:00:00 2001 From: j-weissen Date: Sun, 26 Nov 2023 18:04:24 +0100 Subject: [PATCH] awawa --- .../jweissen/aeticket/dto/response/CartEventResponseDto.java | 2 +- src/main/java/me/jweissen/aeticket/model/Cart.java | 2 +- .../me/jweissen/aeticket/repository/CartEntryRepository.java | 2 +- src/main/java/me/jweissen/aeticket/service/CartService.java | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/jweissen/aeticket/dto/response/CartEventResponseDto.java b/src/main/java/me/jweissen/aeticket/dto/response/CartEventResponseDto.java index fcb7711..d748d40 100644 --- a/src/main/java/me/jweissen/aeticket/dto/response/CartEventResponseDto.java +++ b/src/main/java/me/jweissen/aeticket/dto/response/CartEventResponseDto.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; public record CartEventResponseDto( - int id, + Long id, String name, Date from, Date to, diff --git a/src/main/java/me/jweissen/aeticket/model/Cart.java b/src/main/java/me/jweissen/aeticket/model/Cart.java index 93f4897..1d2f913 100644 --- a/src/main/java/me/jweissen/aeticket/model/Cart.java +++ b/src/main/java/me/jweissen/aeticket/model/Cart.java @@ -13,7 +13,7 @@ import java.util.List; public class Cart { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; + private Long id; @OneToMany(mappedBy = "cart") @JoinColumn(nullable = false) diff --git a/src/main/java/me/jweissen/aeticket/repository/CartEntryRepository.java b/src/main/java/me/jweissen/aeticket/repository/CartEntryRepository.java index 92d3b6c..acfd913 100644 --- a/src/main/java/me/jweissen/aeticket/repository/CartEntryRepository.java +++ b/src/main/java/me/jweissen/aeticket/repository/CartEntryRepository.java @@ -9,5 +9,5 @@ import java.util.List; public interface CartEntryRepository extends JpaRepository { @Query("SELECT ce FROM CartEntry ce WHERE ce.cart.id = :cartId AND ce.category.event.id = :eventId") - List getByCartAndEvent(@Param("cartId") Integer cartId, @Param("eventId") Integer eventId); + List getByCartAndEvent(@Param("cartId") Long cartId, @Param("eventId") Long eventId); } diff --git a/src/main/java/me/jweissen/aeticket/service/CartService.java b/src/main/java/me/jweissen/aeticket/service/CartService.java index 07dd156..792f5d9 100644 --- a/src/main/java/me/jweissen/aeticket/service/CartService.java +++ b/src/main/java/me/jweissen/aeticket/service/CartService.java @@ -20,7 +20,9 @@ public class CartService { } public List toDto(Cart cart) { - List distinctEvents = cart.getCartEntries().stream().map(entry -> entry.getCategory().getEvent()).distinct().toList(); + List distinctEvents = cart.getCartEntries().stream().map( + entry -> entry.getCategory().getEvent() + ).distinct().toList(); return distinctEvents.stream().map(event -> new CartEventResponseDto( event.getId(),