fix: process every-time-returning migrations AB#23790

rodekruis · Sep 25, 2023 · 9be6f3d · 9be6f3d
1 parent 62fc0a0
commit 9be6f3d
Show file tree

Hide file tree

Showing 8 changed files with 855 additions and 11 deletions.
diff --git a/services/API-service/migration/1695634749175-fix-issues.ts b/services/API-service/migration/1695634749175-fix-issues.ts
diff --git a/services/API-service/src/api/admin-area/admin-area.entity.ts b/services/API-service/src/api/admin-area/admin-area.entity.ts
@@ -7,6 +7,7 @@ import {
   JoinColumn,
   OneToMany,
   Index,
+  MultiPolygon,
 } from 'typeorm';
 import { CountryEntity } from '../country/country.entity';
 import { EventPlaceCodeEntity } from '../event/event-place-code.entity';
@@ -43,8 +44,12 @@ export class AdminAreaEntity {
   public placeCodeParent: string;
 
   @ApiProperty()
-  @Column('geometry', { nullable: true })
-  public geom: string;
+  @Column('geometry', {
+    spatialFeatureType: 'MultiPolygon',
+    srid: 4326,
+    nullable: true,
+  })
+  public geom: MultiPolygon;
 
   @OneToMany(
     (): typeof EventPlaceCodeEntity => EventPlaceCodeEntity,

diff --git a/services/API-service/src/api/country/country-disaster.entity.ts b/services/API-service/src/api/country/country-disaster.entity.ts
@@ -38,7 +38,6 @@ export class CountryDisasterSettingsEntity {
   @ApiProperty({ example: [1, 2, 3, 4] })
   @Column('int', {
     array: true,
-    default: (): string => 'array[]::int[]',
   })
   public adminLevels: AdminLevel[];
 

diff --git a/services/API-service/src/api/country/country.entity.ts b/services/API-service/src/api/country/country.entity.ts
@@ -72,7 +72,10 @@ export class CountryEntity {
       coordinates: [],
     },
   })
-  @Column('geometry')
+  @Column('geometry', {
+    spatialFeatureType: 'Polygon',
+    srid: 4326,
+  })
   public countryBoundingBox: BoundingBox;
 
   @ApiProperty({ example: new Date() })

diff --git a/services/API-service/src/api/lines-data/lines-data-views.entity.ts b/services/API-service/src/api/lines-data/lines-data-views.entity.ts
@@ -9,7 +9,7 @@ const getViewQuery = (type: LinesDataEnum) => {
       .select([
         `line."referenceId",line.geom${
           type === LinesDataEnum.roads
-            ? `line.attributes->>'highway' as "roadType"`
+            ? `,line.attributes->>'highway' as "highway"`
             : ''
         }`,
       ])

diff --git a/services/API-service/src/api/lines-data/lines-data.entity.ts b/services/API-service/src/api/lines-data/lines-data.entity.ts
@@ -1,4 +1,10 @@
-import { Entity, PrimaryGeneratedColumn, Column, Index } from 'typeorm';
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  Index,
+  Geometry,
+} from 'typeorm';
 
 export enum LinesDataEnum {
   roads = 'roads',
@@ -23,6 +29,10 @@ export class LinesDataEntity {
   public attributes: JSON;
 
   @Index({ spatial: true })
-  @Column('geometry', { nullable: true })
-  public geom: string;
+  @Column('geometry', {
+    spatialFeatureType: 'GeometryCollection',
+    srid: 4326,
+    nullable: true,
+  })
+  public geom: Geometry;
 }
diff --git a/services/API-service/src/api/lines-data/lines-data.service.ts b/services/API-service/src/api/lines-data/lines-data.service.ts
@@ -53,7 +53,8 @@ export class LinesDataService {
         referenceId: line.fid || null,
         linesDataCategory: linesDataCategory,
         attributes: JSON.parse(JSON.stringify(pointAttributes)),
-        geom: (): string => `ST_GeomFromText('${line.wkt}')`,
+        geom: (): string => `st_geomfromtext(
+          'GEOMETRYCOLLECTION(${line.wkt})')`,
       };
     });
     await this.linesDataRepository.save(dataArray, { chunk: 100 });

diff --git a/services/API-service/src/api/metadata/indicator-metadata.entity.ts b/services/API-service/src/api/metadata/indicator-metadata.entity.ts
@@ -28,8 +28,8 @@ export class IndicatorMetadataEntity {
   @Column()
   public weightedAvg: boolean;
 
-  @ApiProperty({ example: 'total_houses', nullable: true })
-  @Column()
+  @ApiProperty({ example: 'total_houses' })
+  @Column({ nullable: true })
   public weightVar: string;
 
   @ApiProperty({ example: 'yes' })