Fix flights duplication

common-library/src/main/java/project/vilsoncake/common/repositories/ScheduledFlightNotificationDatabaseProvider.java

@@ -17,8 +17,9 @@ public class ScheduledFlightNotificationDatabaseProvider {
 
   private final ScheduledFlightNotificationRepository scheduledFlightNotificationRepository;
 
-  public boolean isNotificationSent(String flightId) {
-    return scheduledFlightNotificationRepository.existsByScheduledFlightId(flightId);
+  public boolean isNotificationSent(String flightId, UserEntity userEntity) {
+    return scheduledFlightNotificationRepository.existsByScheduledFlightIdAndUserId(
+        flightId, userEntity.getId());
   }
 
   public List<ScheduledFlightNotificationEntity> findActiveForEligibleUsers() {

common-library/src/main/java/project/vilsoncake/common/repositories/ScheduledFlightNotificationRepository.java

@@ -13,7 +13,7 @@
 public interface ScheduledFlightNotificationRepository
     extends JpaRepository<ScheduledFlightNotificationEntity, UUID> {
 
-  boolean existsByScheduledFlightId(String scheduledFlightId);
+  boolean existsByScheduledFlightIdAndUserId(String scheduledFlightId, UUID userId);
 
   @Query(
       """

flightradar-api-lambdas/get_scheduled_flights_lambda.py

@@ -74,8 +74,16 @@ def get_filtered_flights_for_airport(code: str, aircraft_filter_codes: list[str]
             total_filtered_arrivals_count += len(raw_filtered_arrivals)
             total_flights.extend([vars(ScheduledFlight.create_from_raw_flight(flight, converted_aircraft_images)) for flight in raw_filtered_arrivals])
 
+    seen = set()
+    unique_flights = []
+    for flight in total_flights:
+        key = (flight['row_id'], flight['scheduled_departure_time'])
+        if key not in seen:
+            seen.add(key)
+            unique_flights.append(flight)
+
     return {
         'arrivals_count': total_arrivals_count,
-        'filtered_arrivals_count': total_filtered_arrivals_count,
-        'flights': total_flights
+        'filtered_arrivals_count': len(unique_flights),
+        'flights': unique_flights
     }

flights-notification-lambda/src/main/java/project/vilsoncake/flightsnotificationlambda/services/ScheduledFlightsNotificationSender.java

@@ -42,7 +42,7 @@ public class ScheduledFlightsNotificationSender {
   public void notifyScheduledFlights(UserEntity user, AirportResponse airportResponse) {
     List<ScheduledFlight> scheduledFlights = airportResponse.getFlights();
     List<ScheduledFlight> unnotifiedScheduledFlights =
-        getUnnotifiedScheduledFlights(scheduledFlights);
+        getUnnotifiedScheduledFlights(scheduledFlights, user);
 
     if (unnotifiedScheduledFlights.isEmpty()) {
       return;
@@ -167,13 +167,15 @@ private String buildScheduledFlightMessage(
         getValueOrUnknown(formattedScheduledArrivalTime));
   }
 
-  private List<ScheduledFlight> getUnnotifiedScheduledFlights(List<ScheduledFlight> flights) {
+  private List<ScheduledFlight> getUnnotifiedScheduledFlights(
+      List<ScheduledFlight> flights, UserEntity user) {
     return flights.stream()
         .filter(
             flight ->
                 !scheduledFlightNotificationDatabaseProvider.isNotificationSent(
                     ScheduledFlightEntity.constructId(
-                        flight.getRowId(), flight.getScheduledDepartureTime())))
+                        flight.getRowId(), flight.getScheduledDepartureTime()),
+                    user))
         .toList();
   }
 }