Merge pull request #8 from Prithvi333/prem2

updated entity

entities/Booking.java

@@ -1,51 +1,68 @@
-package com.masaiproject.tripManagement.entities;
+//package com.masaiproject.tripManagement.entities;
+//
+//import com.fasterxml.jackson.annotation.JsonIgnore;
+//import com.fasterxml.jackson.annotation.JsonSetter;
+//import jakarta.persistence.*;
+//import jakarta.validation.constraints.NotBlank;
+//import jakarta.validation.constraints.NotEmpty;
+//import jakarta.validation.constraints.NotNull;
+//import lombok.AllArgsConstructor;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//import org.springframework.data.annotation.CreatedDate;
+//
+//import java.time.LocalDate;
+//import java.util.List;
+//
+//
+//@Entity
+//@Inheritance(strategy = InheritanceType.JOINED)
+//@NoArgsConstructor
+//@AllArgsConstructor
+//@Data
+//public class Booking {
+//
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private Integer bookingId;
+//
+//    @NotNull(message = "booking type is important")
+//    private String bookingType;
+//
+//
+//    private String description;
+//
+//    @NotNull(message = "give any booking title")
+//    private String bookingTitle;
+//
+//    @CreatedDate
+//    private LocalDate bookingDate;
+//
+//
+//    @NotNull(message = "choose the package")
+//    @NotBlank(message = "choose the package")
+//    private String packageName;
+//
+//    @NotNull(message = "mention the number of person that will be in this trip")
+//    private Integer number_Of_Person;
+//
+//
+////    @OneToOne(cascade = CascadeType.ALL)
+////    private Package aPackage;
+//
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.*;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.CreatedDate;
-
-import java.time.LocalDate;
-
-
-@Entity
-@Inheritance(strategy = InheritanceType.JOINED)
-@NoArgsConstructor
-@AllArgsConstructor
-public class Booking {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer bookingId;
-
-    @NotNull(message = "booking type is important")
-    private String bookingType;
-
-
-    private String description;
-
-    @NotNull(message = "give any booking title")
-    private String bookingTitle;
-
-    @CreatedDate
-    private LocalDate bookingDate;
-
-    @NotNull(message = "mention the number of person that will be in this trip")
-    @NotBlank(message = "mention the number of person that will be in this trip")
-    private Integer number_Of_Person;
-
-    @NotNull(message = "you have to choose a package")
-    @NotEmpty(message = "you have to choose a package")
-    @OneToOne(cascade = CascadeType.ALL)
-    private Package aPackage;
-
-
-
-
-
-
-}
+import jakarta.persistence.OneToMany;
+
+//@OneToMany(cascade = CascadeType.ALL)
+//    @JsonIgnore
+//    private List<PaymentDetails> payment;
+////
+////    @JoinColumn(name = "customer_id")
+////    @ManyToOne(cascade = CascadeType.ALL)
+////    @JsonIgnore
+////    private Customer customerBooking;
+//
+//
+//
+//}

entities/Customer.java

@@ -64,12 +64,15 @@ public class Customer {
     private String email;
 
 
-    @OneToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "booking_id")
-//    @JsonIgnore
-    private Booking booking;
+    @OneToMany(cascade = CascadeType.ALL,mappedBy = "customerBooking",fetch = FetchType.EAGER)
+    @JsonIgnore
+    private List<HotelBooking> hotelBookings;
+
+    @OneToMany(cascade = CascadeType.ALL,mappedBy = "customer",fetch = FetchType.EAGER)
+    @JsonIgnore
+    private List<PackageBooking> packageBookings;
 
     @JsonIgnore
-    @OneToMany(cascade = CascadeType.ALL,mappedBy = "customer")
+    @OneToMany(cascade = CascadeType.ALL,mappedBy = "customerFeedback")
     private List<Feedback> feedback ;
 }

entities/Destination.java

@@ -24,7 +24,6 @@ public class Destination {
     @NotNull(message = "Please provide the destination name")
     private String name;
 
-    @NotBlank(message = "Please choose  desEnvironment")
     @NotNull(message = "Please choose desEnvironment")
     private DesEnvironment desEnvironment;
 

entities/Feedback.java

@@ -33,5 +33,5 @@ public class Feedback {
 
     @ManyToOne()
     @JoinColumn(name = "customer_id")
-    private Customer customer;
+    private Customer customerFeedback;
 }

entities/HotelBooking.java

@@ -2,15 +2,59 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+
+import java.time.LocalDate;
+import java.util.List;
 
 @Entity
-@PrimaryKeyJoinColumn(name = "hotel_booking_id")
-public class HotelBooking extends Booking{
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HotelBooking{
+
+//    @JsonIgnore
+//    @OneToOne(cascade = CascadeType.ALL,mappedBy = "booking")
+//    private Customer customer;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer bookingId;
+
+    @NotNull(message = "booking type is important")
+    private String bookingType;
+
+
+    private String description;
+
+    @NotNull(message = "give any booking title")
+    private String bookingTitle;
 
+    @CreatedDate
+    private LocalDate bookingDate;
+
+
+    @NotNull(message = "choose the package")
+    @NotBlank(message = "choose the package")
+    private String packageName;
+
+    @NotNull(message = "mention the number of person that will be in this trip")
+    private Integer number_Of_Person;
+
+    @JoinColumn(name = "customer_id")
+    @ManyToOne(cascade = CascadeType.ALL)
     @JsonIgnore
-    @OneToOne(cascade = CascadeType.ALL,mappedBy = "booking")
-    private Customer customer;
+    private Customer customerBooking;
+
 
+    @OneToMany(cascade = CascadeType.ALL)
+    @JsonIgnore
+    private List<PaymentDetails> payment;
 
     @OneToOne(cascade = CascadeType.ALL)
     private Hotel hotel;

entities/HotelType.java

@@ -2,5 +2,5 @@
 
 public enum HotelType {
 
-    ONE_STAR,TWO_STAR,THREE_STAR,FOUR_STAR,FIVE_START
+    ONE_STAR,TWO_STAR,THREE_STAR,FOUR_STAR,FIVE_STAR
 }

entities/Package.java

@@ -1,5 +1,6 @@
 package com.masaiproject.tripManagement.entities;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -25,7 +26,6 @@ public class Package {
     @Size(min = 4,message = "min 4 is required")
     private String packageName;
 
-    @NotBlank(message = "Please provide the hotel type")
     @NotNull(message = "Please provide the hotel type")
     private HotelType hotelType;
 
@@ -34,7 +34,7 @@ public class Package {
     private String daysAndNight;
 
 
-    @NotBlank(message = "Please provide the package season")
+
     @NotNull(message = "Please provide the package season")
     private Season packageSeason;
 
@@ -53,13 +53,14 @@ public class Package {
     private String packageDescription4;
     private String packageDescription5;
 
-    @NotBlank(message = "please provide package cost")
-    private double packageCost;
-
+    @NotNull(message = "please provide package cost")
+    private Double packageCost;
 
-    @Embedded
-    private PaymentDetails payment;
+    @JsonIgnore
+    @OneToMany(cascade = CascadeType.ALL,mappedBy = "aPackage")
+    private List<PackageBooking> bookingList;
 
+    @JsonIgnore
     @ManyToMany(cascade = CascadeType.ALL)
     private List<Hotel> hotels;
 

entities/PackageBooking.java

@@ -2,17 +2,56 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+
+import java.time.LocalDate;
+import java.util.List;
 
 @Entity
-@PrimaryKeyJoinColumn (name = "package_booking_id")
-public class PackageBooking extends Booking{
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PackageBooking{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer bookingId;
+
+    @NotNull(message = "booking type is important")
+    private String bookingType;
+
+
+    private String description;
+
+    @NotNull(message = "give any booking title")
+    private String bookingTitle;
+
+    @CreatedDate
+    private LocalDate bookingDate;
+
+
+    @NotNull(message = "choose the package")
+    @NotBlank(message = "choose the package")
+    private String packageName;
+
+    @NotNull(message = "mention the number of person that will be in this trip")
+    private Integer number_Of_Person;
 
     @JsonIgnore
-    @OneToOne(cascade = CascadeType.ALL,mappedBy = "booking")
+    @ManyToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "customer_id")
     private Customer customer;
 
+    @OneToMany(cascade = CascadeType.ALL)
+    @JsonIgnore
+    private List<PaymentDetails> payment;
 
-    @OneToOne(cascade = CascadeType.ALL)
+    @ManyToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "package_id")
     private Package aPackage;
 

entities/PaymentDetails.java

@@ -1,20 +1,37 @@
 package com.masaiproject.tripManagement.entities;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.aspectj.bridge.Message;
 
-@Embeddable
+import java.math.BigDecimal;
+
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class PaymentDetails {
 
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer paymentId;
 
+    @NotNull(message = "type can not be null")
     private PaymentType paymentType;
 
-    private double paymentMoney;
+    private PaymentStatus paymentStatus;
+
+//    @Column(name = "payment_money", columnDefinition = "DECIMAL(10, 2) DEFAULT 0.0")
+
+    @NotNull(message = "money can not be null")
+    private BigDecimal paymentMoney ;
+
+    private Integer bookingId;
 
 
 }

entities/PaymentStatus.java

@@ -0,0 +1,6 @@
+package com.masaiproject.tripManagement.entities;
+
+public enum PaymentStatus {
+
+    PENDING,FAILED,COMPLETED
+}