Enhance production job handling in DirectorWorker: Implemented a limit on the number of concurrent production jobs per branch to a maximum of two. Updated SQL query for fetching finished productions to aggregate quality ratings correctly and ensure unique results per production ID. Improved comments for clarity on the logic and SQL structure.

src/worker/produce.rs

@@ -29,33 +29,55 @@ struct StockInfo {
 }
 
 // SQL-Queries analog zur C++-Implementierung
+// Wichtig: Pro `production.id` darf hier **genau eine Zeile** zurückkommen.
+// Durch die Joins auf Director/Knowledge kann es sonst zu Mehrfachzeilen mit
+// unterschiedlicher berechneter Qualität kommen. Deshalb wird die Qualität
+// über MAX() aggregiert und nach `production_id` gruppiert.
 const QUERY_GET_FINISHED_PRODUCTIONS: &str = r#"
-    SELECT DISTINCT
-        p.id AS production_id,
+    SELECT
+        p.id              AS production_id,
         p.branch_id,
         p.product_id,
         p.quantity,
         p.start_timestamp,
         pr.production_time,
-        k.character_id,
-        CASE
-            WHEN k2.id IS NOT NULL
-            THEN (k.knowledge * 2 + k2.knowledge) / 3
-            ELSE k.knowledge
-        END AS quality,
+        -- Aggregierte Qualitätsbewertung pro Produktion
+        MAX(
+            CASE
+                WHEN k2.id IS NOT NULL
+                THEN (k.knowledge * 2 + k2.knowledge) / 3
+                ELSE k.knowledge
+            END
+        ) AS quality,
         br.region_id,
         br.falukant_user_id AS user_id
     FROM falukant_data.production p
-    JOIN falukant_type.product pr ON p.product_id = pr.id
-    JOIN falukant_data.branch br ON p.branch_id = br.id
-    JOIN falukant_data.character c ON c.user_id = br.falukant_user_id
-    JOIN falukant_data.knowledge k ON p.product_id = k.product_id AND k.character_id = c.id
-    JOIN falukant_data.stock s ON s.branch_id = br.id
-    LEFT JOIN falukant_data.director d ON d.employer_user_id = c.user_id
+    JOIN falukant_type.product pr
+      ON p.product_id = pr.id
+    JOIN falukant_data.branch br
+      ON p.branch_id = br.id
+    JOIN falukant_data.character c
+      ON c.user_id = br.falukant_user_id
+    JOIN falukant_data.knowledge k
+      ON p.product_id = k.product_id
+     AND k.character_id = c.id
+    JOIN falukant_data.stock s
+      ON s.branch_id = br.id
+    LEFT JOIN falukant_data.director d
+      ON d.employer_user_id = c.user_id
     LEFT JOIN falukant_data.knowledge k2
-        ON k2.character_id = d.director_character_id
-       AND k2.product_id = p.product_id
+      ON k2.character_id = d.director_character_id
+     AND k2.product_id   = p.product_id
     WHERE p.start_timestamp + INTERVAL '1 minute' * pr.production_time <= NOW()
+    GROUP BY
+        p.id,
+        p.branch_id,
+        p.product_id,
+        p.quantity,
+        p.start_timestamp,
+        pr.production_time,
+        br.region_id,
+        br.falukant_user_id
     ORDER BY p.start_timestamp;
 "#;