feat: ORCA-1117 bulk add repairs (#1779)

* chore: Add initial add repairs window

* chore: further changes to repairs modal

* chore: Add validation and other UI changes

* chore: Update bulk repairs API

* chore: Update frontend DTOs to support bulk add repairs

* chore: Hook up backend API calls for adding repairs

* chore: Fix validation and tests

* chore: Further test fixes

* chore: Add more test coverage

Author: diego-oxd

admin/backend/src/resource-asset/dto/resource-asset-repair.dto.ts

@@ -175,15 +175,46 @@ export class RecreationAssetRepairDto extends BaseRecreationAssetRepairDto {
 
 export class RepairChange {
   @ApiProperty({
-    description: 'Cost of the repair',
+    description: 'Estimated cost of the repair',
     example: 1000.0,
   })
   @IsNumber()
   @IsNotEmpty()
-  repair_cost: number;
+  estimated_repair_cost: number;
+
+  @ApiPropertyOptional({
+    description: 'Actual cost of the repair, once known',
+    example: 950.0,
+    type: Number,
+    nullable: true,
+  })
+  @IsNumber()
+  @IsOptional()
+  actual_repair_cost?: number;
+
+  @ApiPropertyOptional({
+    description: 'Trail station where the repaired segment starts',
+    example: '49.232423, -128.334343',
+    type: String,
+    nullable: true,
+  })
+  @IsString()
+  @IsOptional()
+  station_start?: string;
+
+  @ApiPropertyOptional({
+    description: 'Trail station where the repaired segment ends',
+    example: '49.234561, -128.331872',
+    type: String,
+    nullable: true,
+  })
+  @IsString()
+  @IsOptional()
+  station_end?: string;
 
   @ApiProperty({
     description: 'Array of asset IDs to which this repair change applies',
+    type: [Number],
     example: [1, 2, 3],
   })
   @IsArray()
@@ -201,19 +232,23 @@ export class RecreationAssetBulkRepairDto {
   @IsNotEmpty()
   recreation_remed_repair_code: string;
 
-  @ApiProperty({
+  @ApiPropertyOptional({
     description: 'Date when the repairs were completed',
     example: '2023-10-01',
+    type: String,
+    nullable: true,
   })
   @IsDateString()
   @IsOptional()
   completed_date?: string;
 
   @ApiProperty({
     description: 'Array of repair changes to be applied across multiple assets',
+    type: [RepairChange],
     example: [
       {
-        repair_cost: 1000.0,
+        estimated_repair_cost: 1000.0,
+        actual_repair_cost: 950.0,
         asset_ids: [1, 2, 3],
       },
     ],

admin/backend/src/resource-asset/service/resource-asset.service.ts

@@ -485,8 +485,11 @@ export class RecreationAssetService {
       change.asset_ids.map((assetId) => ({
         asset_id: BigInt(assetId),
         recreation_remed_repair_code: dto.recreation_remed_repair_code,
-        actual_repair_cost: change.repair_cost,
+        estimated_repair_cost: change.estimated_repair_cost,
+        actual_repair_cost: change.actual_repair_cost ?? null,
         repair_completed_date: completedDate,
+        trail_segment_start: change.station_start ?? null,
+        trail_segment_end: change.station_end ?? null,
       })),
     );
 

admin/backend/test/resource-asset/dto/resource-asset-repair.dto.spec.ts

@@ -232,41 +232,82 @@ describe('Recreation Asset Repair DTOs', () => {
   describe('RepairChange', () => {
     it('should validate a valid RepairChange object', async () => {
       const validChange = {
-        repair_cost: 1000.0,
+        estimated_repair_cost: 1000.0,
+        actual_repair_cost: 950.0,
+        station_start: '49.232423, -128.334343',
+        station_end: '49.234561, -128.331872',
         asset_ids: [1, 2, 3],
       };
 
       const { errors } = await validateDto(RepairChange, validChange);
       expect(errors.length).toBe(0);
     });
 
-    it('should fail when repair_cost is missing or not a number', async () => {
+    it('should validate successfully without the optional actual cost and stations', async () => {
+      const minimalChange = {
+        estimated_repair_cost: 1000.0,
+        asset_ids: [1, 2, 3],
+      };
+
+      const { errors } = await validateDto(RepairChange, minimalChange);
+      expect(errors.length).toBe(0);
+    });
+
+    it('should fail when estimated_repair_cost is missing or not a number', async () => {
       const invalidCost = {
-        repair_cost: 'invalid',
+        estimated_repair_cost: 'invalid',
         asset_ids: [1, 2],
       };
 
       const { errors } = await validateDto(RepairChange, invalidCost);
 
       const properties = errors.map((e) => e.property);
-      expect(properties).toContain('repair_cost');
+      expect(properties).toContain('estimated_repair_cost');
     });
 
-    it('should fail when repair_cost is null or empty', async () => {
+    it('should fail when estimated_repair_cost is null or empty', async () => {
       const emptyCost = {
-        repair_cost: null,
+        estimated_repair_cost: null,
         asset_ids: [1, 2],
       };
 
       const { errors } = await validateDto(RepairChange, emptyCost);
 
       const properties = errors.map((e) => e.property);
-      expect(properties).toContain('repair_cost');
+      expect(properties).toContain('estimated_repair_cost');
+    });
+
+    it('should fail when actual_repair_cost is provided but not a number', async () => {
+      const invalidActualCost = {
+        estimated_repair_cost: 500,
+        actual_repair_cost: 'invalid',
+        asset_ids: [1, 2],
+      };
+
+      const { errors } = await validateDto(RepairChange, invalidActualCost);
+
+      const properties = errors.map((e) => e.property);
+      expect(properties).toContain('actual_repair_cost');
+    });
+
+    it('should fail when station_start or station_end are provided but not strings', async () => {
+      const invalidStations = {
+        estimated_repair_cost: 500,
+        station_start: 123,
+        station_end: 456,
+        asset_ids: [1, 2],
+      };
+
+      const { errors } = await validateDto(RepairChange, invalidStations);
+
+      const properties = errors.map((e) => e.property);
+      expect(properties).toContain('station_start');
+      expect(properties).toContain('station_end');
     });
 
     it('should fail when asset_ids is not an array or contains non-integer values', async () => {
       const invalidAssetIds = {
-        repair_cost: 500,
+        estimated_repair_cost: 500,
         asset_ids: ['abc', 2],
       };
 
@@ -278,7 +319,7 @@ describe('Recreation Asset Repair DTOs', () => {
 
     it('should fail when asset_ids is not an array type', async () => {
       const nonArrayAssetIds = {
-        repair_cost: 500,
+        estimated_repair_cost: 500,
         asset_ids: '1, 2, 3',
       };
 
@@ -296,7 +337,8 @@ describe('Recreation Asset Repair DTOs', () => {
         completed_date: '2023-10-01',
         changes: [
           {
-            repair_cost: 1000.0,
+            estimated_repair_cost: 1000.0,
+            actual_repair_cost: 950.0,
             asset_ids: [1, 2, 3],
           },
         ],
@@ -314,7 +356,7 @@ describe('Recreation Asset Repair DTOs', () => {
         recreation_remed_repair_code: 'CL',
         changes: [
           {
-            repair_cost: 500.0,
+            estimated_repair_cost: 500.0,
             asset_ids: [10],
           },
         ],
@@ -378,7 +420,7 @@ describe('Recreation Asset Repair DTOs', () => {
         recreation_remed_repair_code: 'CL',
         changes: [
           {
-            repair_cost: 'invalid-cost',
+            estimated_repair_cost: 'invalid-cost',
             asset_ids: ['invalid-id'],
           },
         ],

admin/backend/test/resource-asset/resource-asset.controller.spec.ts

@@ -309,7 +309,8 @@ describe('RecreationAssetController', () => {
         changes: [
           {
             asset_ids: [1, 2],
-            repair_cost: 300,
+            estimated_repair_cost: 350,
+            actual_repair_cost: 300,
           },
         ],
       };

admin/backend/test/resource-asset/service/resource-asset.service.spec.ts

@@ -1330,7 +1330,10 @@ describe('RecreationAssetService', () => {
         changes: [
           {
             asset_ids: [1, 2],
-            repair_cost: 250,
+            estimated_repair_cost: 300,
+            actual_repair_cost: 250,
+            station_start: '49.232423, -128.334343',
+            station_end: '49.234561, -128.331872',
           },
         ],
       };
@@ -1345,20 +1348,26 @@ describe('RecreationAssetService', () => {
           {
             asset_id: 1n,
             recreation_remed_repair_code: 'BULK_REPAIR',
+            estimated_repair_cost: 300,
             actual_repair_cost: 250,
             repair_completed_date: new Date('2023-11-15'),
+            trail_segment_start: '49.232423, -128.334343',
+            trail_segment_end: '49.234561, -128.331872',
           },
           {
             asset_id: 2n,
             recreation_remed_repair_code: 'BULK_REPAIR',
+            estimated_repair_cost: 300,
             actual_repair_cost: 250,
             repair_completed_date: new Date('2023-11-15'),
+            trail_segment_start: '49.232423, -128.334343',
+            trail_segment_end: '49.234561, -128.331872',
           },
         ],
       });
     });
 
-    it('should handle null completed_date during bulk upsert', async () => {
+    it('should handle null completed_date, actual cost, and stations during bulk insert', async () => {
       prismaMock.recreation_asset.count.mockResolvedValue(1);
 
       const dto = {
@@ -1367,7 +1376,7 @@ describe('RecreationAssetService', () => {
         changes: [
           {
             asset_ids: [1],
-            repair_cost: 100,
+            estimated_repair_cost: 100,
           },
         ],
       };
@@ -1381,8 +1390,11 @@ describe('RecreationAssetService', () => {
           {
             asset_id: 1n,
             recreation_remed_repair_code: 'BULK_REPAIR',
-            actual_repair_cost: 100,
+            estimated_repair_cost: 100,
+            actual_repair_cost: null,
             repair_completed_date: null,
+            trail_segment_start: null,
+            trail_segment_end: null,
           },
         ],
       });

admin/frontend/src/components/form/CurrencyInputField.tsx

@@ -18,13 +18,13 @@ export interface CurrencyInputFieldProps<TFieldValues extends FieldValues> {
   disabled?: boolean;
 }
 
-interface CurrencyInputProps {
+export interface CurrencyInputProps {
   value: number | undefined;
   onChange: (value: number | undefined) => void;
-  onBlur: () => void;
-  placeholder: string;
-  isInvalid: boolean;
-  disabled: boolean;
+  onBlur?: () => void;
+  placeholder?: string;
+  isInvalid?: boolean;
+  disabled?: boolean;
 }
 
 const isValidCurrencyInput = (input: string): boolean => {
@@ -35,13 +35,13 @@ const formatCurrency = (value: number): string => {
   return value.toFixed(2);
 };
 
-const CurrencyInput = ({
+export const CurrencyInput = ({
   value,
   onChange,
   onBlur,
-  placeholder,
-  isInvalid,
-  disabled,
+  placeholder = '0.00',
+  isInvalid = false,
+  disabled = false,
 }: CurrencyInputProps) => {
   const [displayValue, setDisplayValue] = useState<string>(() => {
     if (value === undefined || value === null) return '';
@@ -70,7 +70,7 @@ const CurrencyInput = ({
   };
 
   const handleBlur = () => {
-    onBlur();
+    onBlur?.();
 
     if (!displayValue || displayValue === '.') {
       setDisplayValue('');

admin/frontend/src/components/form/index.ts

@@ -2,7 +2,8 @@ export { TextField } from './TextField';
 export { SelectField } from './SelectField';
 export { CheckboxDropdownField } from './CheckboxDropdownField';
 export { DateInputField } from './DateInputField';
-export { CurrencyInputField } from './CurrencyInputField';
+export { CurrencyInputField, CurrencyInput } from './CurrencyInputField';
+export type { CurrencyInputProps } from './CurrencyInputField';
 export * from './GroupedMultiSelectField';
 export { RichTextEditor } from './rich-text-editor';
 export { MultiSelectField } from './MultiSelectField';