fix: CSV unloading policy (#211)

Author: jmccollum-woolpert

application/frontend/src/app/core/services/csv.service.spec.ts

@@ -20,7 +20,7 @@ import { provideMockStore } from '@ngrx/store/testing';
 import { selectMapApiKey } from '../selectors/config.selectors';
 import { CsvService } from './csv.service';
 import { parse, unparse } from 'papaparse';
-import { EXPERIMENTAL_API_FIELDS_VEHICLES } from '../models';
+import { EXPERIMENTAL_API_FIELDS_VEHICLES, UnloadingPolicy } from '../models';
 import { GeocodingService } from './geocoding.service';
 
 describe('CsvService', () => {
@@ -263,6 +263,74 @@ describe('CsvService', () => {
       expect(result[0].errors.length).toBe(0);
       expect(result[1].errors.length).toBe(1);
     });
+
+    it('should parse unloading policies provided by name', () => {
+      const vehicles = [
+        {
+          label: 'test vehicle 1',
+          unloadingPolicy: 'UNLOADING_POLICY_UNSPECIFIED',
+        },
+        {
+          label: 'test vehicle 2',
+          unloadingPolicy: 'FIRST_IN_FIRST_OUT',
+        },
+        {
+          label: 'test vehicle 3',
+          unloadingPolicy: 'LAST_IN_FIRST_OUT',
+        },
+        {
+          label: 'test vehicle 4',
+        },
+      ];
+      const testVehicleMapping = {
+        Label: 'label',
+        UnloadingPolicy: 'unloadingPolicy',
+      };
+      const result = service.csvToVehicles(vehicles, testVehicleMapping);
+      expect(result.length).toBe(4);
+      expect(result[0].errors.length).toBe(0);
+      expect(result[1].errors.length).toBe(0);
+      expect(result[2].errors.length).toBe(0);
+      expect(result[3].errors.length).toBe(0);
+      expect(result[0].vehicle.unloadingPolicy).toBe(UnloadingPolicy.UNLOADING_POLICY_UNSPECIFIED);
+      expect(result[1].vehicle.unloadingPolicy).toBe(UnloadingPolicy.FIRST_IN_FIRST_OUT);
+      expect(result[2].vehicle.unloadingPolicy).toBe(UnloadingPolicy.LAST_IN_FIRST_OUT);
+      expect(result[3].vehicle.unloadingPolicy).toBeUndefined();
+    });
+
+    it('should parse unloading policies provided by value', () => {
+      const vehicles = [
+        {
+          label: 'test vehicle 1',
+          unloadingPolicy: '0',
+        },
+        {
+          label: 'test vehicle 2',
+          unloadingPolicy: '1',
+        },
+        {
+          label: 'test vehicle 3',
+          unloadingPolicy: '2',
+        },
+        {
+          label: 'test vehicle 4',
+        },
+      ];
+      const testVehicleMapping = {
+        Label: 'label',
+        UnloadingPolicy: 'unloadingPolicy',
+      };
+      const result = service.csvToVehicles(vehicles, testVehicleMapping);
+      expect(result.length).toBe(4);
+      expect(result[0].errors.length).toBe(0);
+      expect(result[1].errors.length).toBe(0);
+      expect(result[2].errors.length).toBe(0);
+      expect(result[3].errors.length).toBe(0);
+      expect(result[0].vehicle.unloadingPolicy).toBe(UnloadingPolicy.UNLOADING_POLICY_UNSPECIFIED);
+      expect(result[1].vehicle.unloadingPolicy).toBe(UnloadingPolicy.LAST_IN_FIRST_OUT);
+      expect(result[2].vehicle.unloadingPolicy).toBe(UnloadingPolicy.FIRST_IN_FIRST_OUT);
+      expect(result[3].vehicle.unloadingPolicy).toBeUndefined();
+    });
   });
 
   describe('Validate geocoding', () => {

application/frontend/src/app/core/services/csv.service.ts

@@ -28,6 +28,7 @@ import {
   IShipment,
   IVehicle,
   TravelMode,
+  UnloadingPolicy,
   ValidationErrorResponse,
 } from '../models';
 import { FileService } from './file.service';
@@ -272,7 +273,13 @@ export class CsvService {
           mapping,
           this.parseTravelMode
         ),
-        ...this.mapKeyToModelValue('unloadingPolicy', 'UnloadingPolicy', vehicle, mapping),
+        ...this.mapKeyToModelValue(
+          'unloadingPolicy',
+          'UnloadingPolicy',
+          vehicle,
+          mapping,
+          this.parseUnloadingPolicy
+        ),
         ...this.mapKeyToModelValue('startWaypoint', 'StartWaypoint', vehicle, mapping),
         ...this.mapKeyToModelValue('endWaypoint', 'EndWaypoint', vehicle, mapping),
         ...this.mapKeyToModelValue('costPerHour', 'CostPerHour', vehicle, mapping, parseFloat),
@@ -648,6 +655,18 @@ export class CsvService {
     return { seconds: value };
   }
 
+  private parseUnloadingPolicy(value: any): UnloadingPolicy {
+    let finalValue = UnloadingPolicy.UNLOADING_POLICY_UNSPECIFIED;
+
+    Object.keys(UnloadingPolicy).forEach((key) => {
+      if (key === value || UnloadingPolicy[key] === parseInt(value)) {
+        finalValue = UnloadingPolicy[key];
+      }
+    });
+
+    return finalValue;
+  }
+
   private commaSeparatedStringToIntArray(value: string): number[] {
     return value.split(',').map((entry) => parseInt(entry, 10));
   }

application/frontend/src/app/routes-chart/components/base-routes-row/base-routes-row.component.ts

@@ -29,7 +29,6 @@ import {
   ShipmentRoute,
   Timeline,
   Vehicle,
-  PointOfInterestClick,
   ChangedVisits,
 } from 'src/app/core/models';
 import { formatLongTime } from 'src/app/util';

application/frontend/src/app/routes-chart/containers/routes-row/routes-row.component.spec.ts

@@ -22,7 +22,6 @@ import { provideMockStore } from '@ngrx/store/testing';
 import Long from 'long';
 import {
   PointOfInterest,
-  PointOfInterestClick,
   ShipmentRoute,
   Timeline,
   ChangedVisits,
@@ -51,6 +50,7 @@ class MockBaseRoutesRowComponent {
   @Input() route: ShipmentRoute;
   @Input() vehicle: Vehicle;
   @Input() shipmentCount: number;
+  @Input() selected = false;
   @Input() timeline: Timeline;
   @Input() duration: [Long, Long];
   @Input() availability: [Long, Long];

application/frontend/src/app/shared/components/load-demands-metrics/load-demands-metrics.component.spec.ts

@@ -2,13 +2,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LoadDemandsMetricsComponent } from './load-demands-metrics.component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MaterialModule } from 'src/app/material';
+import { MatIconRegistry } from '@angular/material/icon';
+import { FakeMatIconRegistry } from 'src/test/material-fakes';
 
 describe('LoadDemandsMetricsComponent', () => {
   let component: LoadDemandsMetricsComponent;
   let fixture: ComponentFixture<LoadDemandsMetricsComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [MaterialModule],
       declarations: [LoadDemandsMetricsComponent],
       providers: [
         { provide: MatDialogRef, useValue: {} },
@@ -55,7 +59,9 @@ describe('LoadDemandsMetricsComponent', () => {
           },
         },
       ],
-    }).compileComponents();
+    })
+      .overrideProvider(MatIconRegistry, { useFactory: () => new FakeMatIconRegistry() })
+      .compileComponents();
 
     fixture = TestBed.createComponent(LoadDemandsMetricsComponent);
     component = fixture.componentInstance;