Merge branch 'main' into feat/orca-1117-bulk-add-repairs

Author: diego-oxd

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

@@ -158,6 +158,30 @@ export class BaseRecreationAssetDto {
   @IsDateString()
   @IsOptional()
   installation_date?: string | null;
+
+  @ApiPropertyOptional({
+    description: 'Point geometry type code, if this asset has a location',
+    example: 'PT',
+    nullable: true,
+  })
+  @IsOptional()
+  geometry_type_code?: string | null;
+
+  @ApiPropertyOptional({
+    description: 'Latitude in WGS84 (derived from recreation_asset_geom)',
+    example: 49.94212,
+    nullable: true,
+  })
+  @IsOptional()
+  latitude?: number | null;
+
+  @ApiPropertyOptional({
+    description: 'Longitude in WGS84 (derived from recreation_asset_geom)',
+    example: -123.03604,
+    nullable: true,
+  })
+  @IsOptional()
+  longitude?: number | null;
 }
 
 /**
@@ -199,33 +223,6 @@ export class RecreationAssetDto extends BaseRecreationAssetDto {
   @IsOptional()
   updated_at?: Date | string | null;
 
-  @ApiPropertyOptional({
-    description: 'Point geometry type code, if this asset has a location',
-    example: 'PT',
-    type: String,
-    nullable: true,
-  })
-  @IsOptional()
-  geometry_type_code?: string | null;
-
-  @ApiPropertyOptional({
-    description: 'Latitude in WGS84 (derived from recreation_asset_geom)',
-    example: 49.94212,
-    type: Number,
-    nullable: true,
-  })
-  @IsOptional()
-  latitude?: number | null;
-
-  @ApiPropertyOptional({
-    description: 'Longitude in WGS84 (derived from recreation_asset_geom)',
-    example: -123.03604,
-    type: Number,
-    nullable: true,
-  })
-  @IsOptional()
-  longitude?: number | null;
-
   @ApiProperty({
     description: 'List of repairs associated with this asset',
     type: [RecreationAssetRepairDto],

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

@@ -96,6 +96,15 @@ export class RecreationAssetService {
       },
     });
 
+    if (dto.geometry_type_code && dto.latitude && dto.longitude) {
+      await this.upsertAssetGeometry(
+        Number(created.asset_id),
+        dto.geometry_type_code,
+        dto.latitude,
+        dto.longitude,
+      );
+    }
+
     return this.mapAssetToDto(created);
   }
 
@@ -250,6 +259,15 @@ export class RecreationAssetService {
       data,
     });
 
+    if (dto.geometry_type_code && dto.latitude && dto.longitude) {
+      await this.upsertAssetGeometry(
+        Number(updated.asset_id),
+        dto.geometry_type_code,
+        dto.latitude,
+        dto.longitude,
+      );
+    }
+
     return this.mapAssetToDto(updated);
   }
 
@@ -614,4 +632,32 @@ export class RecreationAssetService {
       updated_at: record.updated_at ? record.updated_at.toISOString() : null,
     };
   }
+
+  /**
+   * Upsert geometry info for an Asset.
+   */
+  async upsertAssetGeometry(
+    asset_id: number,
+    geometry_type_code: string,
+    latitude: number,
+    longitude: number,
+  ): Promise<void> {
+    // SRID 4326 represents standard WGS 84 (GPS latitude/longitude)
+    await this.prisma.$executeRaw`
+    INSERT INTO rst.recreation_asset_geom
+      (asset_id, geometry_type_code, geometry, created_at, updated_at)
+    VALUES (
+      ${asset_id},
+      ${geometry_type_code},
+      ST_SetSRID(ST_MakePoint(${longitude}, ${latitude}), 4326),
+      now(),
+      now()
+    )
+    ON CONFLICT (asset_id) DO UPDATE
+    SET
+      geometry_type_code = EXCLUDED.geometry_type_code,
+      geometry = EXCLUDED.geometry,
+      updated_at = now();
+  `;
+  }
 }

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

@@ -35,6 +35,7 @@ describe('RecreationAssetService', () => {
     };
     $transaction: ReturnType<typeof vi.fn>;
     $queryRawTyped: ReturnType<typeof vi.fn>;
+    $executeRaw: ReturnType<typeof vi.fn>;
   };
 
   beforeEach(async () => {
@@ -66,6 +67,7 @@ describe('RecreationAssetService', () => {
       },
       $transaction: vi.fn((cb) => cb(prismaMock)),
       $queryRawTyped: vi.fn().mockResolvedValue([]),
+      $executeRaw: vi.fn(),
     };
 
     const module: TestingModule = await Test.createTestingModule({
@@ -290,6 +292,66 @@ describe('RecreationAssetService', () => {
 
       expect(result.installation_date).toBeNull();
     });
+
+    it('should create an asset with geometry object', async () => {
+      (
+        prismaMock.$executeRaw as unknown as ReturnType<typeof vi.fn>
+      ).mockResolvedValue(undefined);
+      vi.spyOn(service, 'findAssetCodeById').mockResolvedValue({
+        asset_code: 10,
+        description: 'Test Code',
+      });
+
+      prismaMock.recreation_asset.create.mockResolvedValue({
+        asset_id: 101n,
+        parent_id: null,
+        asset_tag: null,
+        rec_resource_id: 'REC-1',
+        asset_code: 10,
+        asset_name: null,
+        asset_comment: null,
+        legacy_structure_id: null,
+        asset_length: null,
+        asset_width: null,
+        asset_area: null,
+        actual_value: null,
+        default_value: null,
+        installation_date: null,
+        geometry_type_code: null,
+        latitude: null,
+        longitude: null,
+      });
+
+      const dto = {
+        asset_code: 10,
+        rec_resource_id: 'REC-1',
+        geometry_type_code: 'P',
+        latitude: 50.281403,
+        longitude: -125.648533,
+      };
+
+      await service.createAsset(dto);
+
+      expect(prismaMock.$executeRaw).toHaveBeenCalled();
+
+      expect(prismaMock.recreation_asset.create).toHaveBeenCalledWith({
+        data: {
+          parent_id: null,
+          asset_tag: null,
+          rec_resource_id: 'REC-1',
+          asset_code: 10,
+          asset_name: null,
+          asset_comment: null,
+          legacy_structure_id: null,
+          asset_length: null,
+          asset_width: null,
+          asset_area: null,
+          actual_value: null,
+          default_value: null,
+          installation_date: null,
+        },
+      });
+    });
   });
 
   describe('RecreationAssetService - findAllAssets', () => {
@@ -826,6 +888,55 @@ describe('RecreationAssetService', () => {
       expect(result.installation_date).toBe('2023-05-15');
     });
 
+    it('should update an asset with geometry object', async () => {
+      (
+        prismaMock.$executeRaw as unknown as ReturnType<typeof vi.fn>
+      ).mockResolvedValue(undefined);
+      prismaMock.recreation_asset.findUnique.mockResolvedValue({
+        asset_id: 1n,
+      });
+
+      prismaMock.recreation_asset.update.mockResolvedValue({
+        asset_id: 1n,
+        parent_id: null,
+        asset_tag: null,
+        rec_resource_id: 'REC-1',
+        asset_code: 10,
+        asset_name: null,
+        asset_comment: null,
+        legacy_structure_id: null,
+        asset_length: null,
+        asset_width: null,
+        asset_area: null,
+        actual_value: null,
+        default_value: null,
+        installation_date: null,
+        geometry_type_code: null,
+        latitude: null,
+        longitude: null,
+      });
+
+      const dto = {
+        asset_code: 10,
+        rec_resource_id: 'REC-1',
+        geometry_type_code: 'P',
+        latitude: 50.281403,
+        longitude: -125.648533,
+      };
+
+      await service.updateAsset(1, dto);
+
+      expect(prismaMock.$executeRaw).toHaveBeenCalled();
+
+      expect(prismaMock.recreation_asset.update).toHaveBeenCalledWith({
+        where: { asset_id: 1n },
+        data: {
+          rec_resource_id: 'REC-1',
+          asset_code: 10,
+        },
+      });
+    });
+
     it('should handle updating parent_id as number and clearing installation_date', async () => {
       prismaMock.recreation_asset.findUnique.mockResolvedValue({
         asset_id: 1n,