Améliore le calcul du matériel restant

CHANGELOG.md

@@ -4,6 +4,9 @@ Tous les changements notables sur le projet sont documentés dans ce fichier.
 
 Ce projet adhère au principe du [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.12.0 (unreleased)
+- Améliore le calcul du matériel restant dans les événements.
+
 ## 0.11.0 (2021-01-14)
 
 - Met à jour les dépendances du projet.

client/src/components/EventMissingMaterials/index.js

@@ -23,13 +23,7 @@ export default {
 
     getMissingCount(missingMaterial) {
       const { quantity } = missingMaterial.pivot;
-
-      const missing = Math.min(
-        Math.abs(missingMaterial.remaining_quantity),
-        quantity,
-      );
-
-      return { quantity, missing };
+      return { quantity, missing: missingMaterial.missing_quantity };
     },
 
     displayError(error) {

server/src/App/Models/Event.php

@@ -221,12 +221,20 @@ public function getMissingMaterials(int $id): ?array
         $eventMaterials = (new Material())->recalcQuantitiesForPeriod(
             $event->materials,
             $event->start_date,
-            $event->end_date
+            $event->end_date,
+            $id
         );
 
-        $missingMaterials = array_filter($eventMaterials, function ($eventMaterial) {
-            return $eventMaterial['remaining_quantity'] < 0;
-        });
+        $missingMaterials = [];
+        foreach ($eventMaterials as $material) {
+            $material['missing_quantity'] = $material['pivot']['quantity'] - $material['remaining_quantity'];
+            $material['missing_quantity'] = min($material['missing_quantity'], $material['pivot']['quantity']);
+            if ($material['missing_quantity'] <= 0) {
+                continue;
+            }
+
+            $missingMaterials[] = $material;
+        }
 
         return empty($missingMaterials) ? null : array_values($missingMaterials);
     }

server/src/App/Models/Material.php

@@ -263,7 +263,7 @@ public function recalcQuantitiesForPeriod(
             }
 
             $remainingQuantity = (int)$material['stock_quantity'] - (int)$material['out_of_order_quantity'];
-            $material['remaining_quantity'] = $remainingQuantity - max($quantityPerPeriod);
+            $material['remaining_quantity'] = max($remainingQuantity - max($quantityPerPeriod), 0);
         }
 
         return $data;

server/tests/endpoints/EventsTest.php

@@ -728,7 +728,8 @@ public function testGetMissingMaterials()
                 'sub_category_id'       => 2,
                 'rental_price'          => 25.5,
                 'stock_quantity'        => 2,
-                'remaining_quantity'    => -1,
+                'remaining_quantity'    => 0,
+                'missing_quantity'      => 1,
                 'out_of_order_quantity' => null,
                 'replacement_price'     => 349.9,
                 'is_hidden_on_bill'     => false,

server/tests/models/EventTest.php

@@ -81,9 +81,10 @@ public function testGetMissingMaterials(): void
 
         // - Get missing materials of event #1
         $result = $this->model->getMissingMaterials(1);
+        $this->assertNotNull($result);
         $this->assertCount(1, $result);
         $this->assertEquals('DBXPA2', $result[0]['reference']);
-        $this->assertEquals(-1, $result[0]['remaining_quantity']);
+        $this->assertEquals(1, $result[0]['missing_quantity']);
     }
 
     public function testGetParks(): void

server/tests/models/MaterialTest.php

@@ -82,7 +82,7 @@ public function testRecalcQuantitiesForPeriod(): void
         $data = $getData();
         $result = $this->model->recalcQuantitiesForPeriod($data, '2018-12-15', '2018-12-20');
         $this->assertCount(7, $result);
-        foreach ([0, -1, 20, 1, 20] as $index => $expected) {
+        foreach ([0, 0, 20, 1, 20] as $index => $expected) {
             $this->assertEquals($expected, $result[$index]['remaining_quantity']);
         }