Fixing Flight and Steward model attributes

core/src/main/java/cz/muni/fi/pa165/core/data/domain/Flight.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.OffsetDateTime;
+import java.util.Collection;
 import java.util.Objects;
 
 @Entity(name = "flights")
@@ -19,9 +20,8 @@ public class Flight extends DomainEntity {
     @Column(nullable = false)
     private OffsetDateTime arrivalTime;
 
-    @ManyToOne(fetch = FetchType.LAZY,
-            cascade = {CascadeType.PERSIST, CascadeType.MERGE})
-    private FlightSteward flightSteward;
+    @OneToMany(mappedBy = "flight")
+    private Collection<FlightSteward> flightStewards;
 
     @Override
     public boolean equals(Object o) {
@@ -34,11 +34,11 @@ public class Flight extends DomainEntity {
         return Objects.equals(getId(), flight.getId()) &&
                 Objects.equals(getDepartureTime(), flight.getDepartureTime()) &&
                 Objects.equals(getArrivalTime(), flight.getArrivalTime()) &&
-                Objects.equals(getFlightSteward(), flight.getFlightSteward());
+                Objects.equals(getFlightStewards(), flight.getFlightStewards());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getId(), getDepartureTime(), getArrivalTime(), getFlightSteward());
+        return Objects.hash(getId(), getDepartureTime(), getArrivalTime(), getFlightStewards());
     }
 }

core/src/main/java/cz/muni/fi/pa165/core/data/domain/FlightSteward.java

@@ -2,6 +2,7 @@ package cz.muni.fi.pa165.core.data.domain;
 
 import cz.muni.fi.pa165.core.data.domain.common.DomainEntity;
 import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,10 +18,12 @@ public class FlightSteward extends DomainEntity {
 
     private Long flightId;
 
+    @ManyToOne
     private Flight flight;
 
     private Long stewardId;
 
+    @ManyToOne
     private Steward steward;
 
     @Override

core/src/main/java/cz/muni/fi/pa165/core/data/domain/Steward.java

@@ -5,6 +5,7 @@ import jakarta.persistence.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Collection;
 import java.util.Objects;
 
 @Entity(name = "stewards")
@@ -18,9 +19,8 @@ public class Steward extends DomainEntity {
     @Column(nullable = false)
     private String lastName;
 
-    @ManyToOne(fetch = FetchType.LAZY,
-            cascade = {CascadeType.PERSIST, CascadeType.MERGE})
-    private FlightSteward flightSteward;
+    @OneToMany(mappedBy = "steward")
+    private Collection<FlightSteward> flightStewards;
 
     @Override
     public boolean equals(Object o) {
@@ -33,11 +33,11 @@ public class Steward extends DomainEntity {
         return Objects.equals(getId(), steward.getId()) &&
                 Objects.equals(getFirstName(), steward.getFirstName()) &&
                 Objects.equals(getLastName(), steward.getLastName()) &&
-                Objects.equals(getFlightSteward(), steward.getFlightSteward());
+                Objects.equals(getFlightStewards(), steward.getFlightStewards());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getId(), getFirstName(), getLastName(), getFlightSteward());
+        return Objects.hash(getId(), getFirstName(), getLastName(), getFlightStewards());
     }
 }

core/src/main/java/cz/muni/fi/pa165/core/facade/steward/StewardFacadeImpl.java

@@ -73,10 +73,10 @@ public class StewardFacadeImpl implements StewardFacade<Long> {
         flightSteward.setFlightId(flightId);
         flightSteward.setFlight(flightEntity);
 
-        flightEntity.setFlightSteward(flightSteward);
+        flightEntity.getFlightStewards().add(flightSteward);
         flightService.save(flightEntity);
 
-        stewardEntity.setFlightSteward(flightSteward);
+        stewardEntity.getFlightStewards().add(flightSteward);
         stewardService.save(stewardEntity);
 
         //TODO create DTO without nested members