diff --git a/src/main/java/com/zufar/onlinestore/reservation/dto/ReservationDto.java b/src/main/java/com/zufar/onlinestore/reservation/dto/ReservationDto.java index 593b5977..98ea58c9 100644 --- a/src/main/java/com/zufar/onlinestore/reservation/dto/ReservationDto.java +++ b/src/main/java/com/zufar/onlinestore/reservation/dto/ReservationDto.java @@ -8,6 +8,7 @@ import java.time.Instant; public record ReservationDto( + @NotNull(message = "ReservationId is the mandatory attribute") Integer reservationId, @@ -17,8 +18,8 @@ public record ReservationDto( @NotNull(message = "ReservedQuantity is the mandatory attribute") Integer reservedQuantity, - @NotNull(message = "CreatedAt is the mandatory attribute") @Past + @NotNull(message = "CreatedAt is the mandatory attribute") Instant createdAt, @NotBlank(message = "Status is the mandatory attribute") diff --git a/src/main/java/com/zufar/onlinestore/reservation/entity/Reservation.java b/src/main/java/com/zufar/onlinestore/reservation/entity/Reservation.java index ca458450..6fbb344f 100644 --- a/src/main/java/com/zufar/onlinestore/reservation/entity/Reservation.java +++ b/src/main/java/com/zufar/onlinestore/reservation/entity/Reservation.java @@ -44,10 +44,12 @@ public class Reservation { private ReservationStatus status; @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Reservation that = (Reservation) o; + public boolean equals(Object object) { + if (this == object) + return true; + if (object == null || getClass() != object.getClass()) + return false; + Reservation that = (Reservation) object; return reservationId.equals(that.reservationId) && productId.equals(that.productId); } diff --git a/src/main/java/com/zufar/onlinestore/reservation/entity/ReservationStatus.java b/src/main/java/com/zufar/onlinestore/reservation/entity/ReservationStatus.java index e0d18f33..e80e7073 100644 --- a/src/main/java/com/zufar/onlinestore/reservation/entity/ReservationStatus.java +++ b/src/main/java/com/zufar/onlinestore/reservation/entity/ReservationStatus.java @@ -1,5 +1,7 @@ package com.zufar.onlinestore.reservation.entity; public enum ReservationStatus { - CREATED, CONFIRMED, CANCELLED + CREATED, + CONFIRMED, + CANCELLED } \ No newline at end of file