Merge pull request #571 from rodekruis/feat.glofas_api

fix: fix seed comma error AB#6543
rodekruis · Mar 15, 2021 · 5498763 · 5498763
2 parents a75440d + 8868bc6
commit 5498763
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/services/API-service/src/api/glofas-station/glofas-station.entity.ts b/services/API-service/src/api/glofas-station/glofas-station.entity.ts
@@ -11,7 +11,7 @@ export class GlofasStationEntity {
   @Column()
   public stationCode: string;
 
-  @Column()
+  @Column({ nullable: true })
   public stationName: string;
 
   @Column({ nullable: true, type: 'real' })
@@ -29,6 +29,6 @@ export class GlofasStationEntity {
   @Column({ nullable: true, type: 'real' })
   public threshold20Year: string;
 
-  @Column()
+  @Column({ nullable: true })
   public geom: string;
 }
diff --git a/services/API-service/src/scripts/seed-glofas-station.ts b/services/API-service/src/scripts/seed-glofas-station.ts
@@ -68,9 +68,7 @@ export class SeedGlofasStation implements InterfaceScript {
               stationCode: station['station_code'],
               stationName: station['station_name'],
               triggerLevel:
-                station[country.glofasStationInput['triggerColName']] == ''
-                  ? null
-                  : station[country.glofasStationInput['triggerColName']],
+                station[country.glofasStationInput['triggerColName']],
               threshold2Year: station['2yr_threshold'],
               threshold5Year: station['5yr_threshold'],
               threshold10Year: station['10yr_threshold'],

diff --git a/services/API-service/src/scripts/seed-helper.ts b/services/API-service/src/scripts/seed-helper.ts
@@ -28,7 +28,12 @@ export class SeedHelper {
       stream
         .pipe(csv({ separator: separator }))
         .on('error', (error): void => reject(error))
-        .on('data', (row): number => parsedData.push(row))
+        .on('data', (row): number => {
+          Object.keys(row).forEach(key =>
+            row[key] === '' ? (row[key] = null) : row[key],
+          );
+          return parsedData.push(row);
+        })
         .on('end', (): void => {
           resolve(parsedData);
         });