use buffer type instead of multer, move Country entity

Vizzuality · Oct 6, 2024 · f44647c · f44647c
1 parent 82fb9ca
commit f44647c
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 47 deletions.
diff --git a/api/src/modules/config/app-config.service.ts b/api/src/modules/config/app-config.service.ts
@@ -4,6 +4,8 @@ import { COMMON_DATABASE_ENTITIES } from '@shared/entities/database.entities';
 import { TOKEN_TYPE_ENUM } from '@shared/schemas/auth/token-type.schema';
 import { JwtConfigHandler } from '@api/modules/config/auth-config.handler';
 import { ApiEventsEntity } from '@api/modules/api-events/api-events.entity';
+import { BaseData } from '@api/modules/model/base-data.entity';
+import { Country } from '@api/modules/model/entities/country.entity';
 
 export type JWTConfig = {
   secret: string;
@@ -30,7 +32,12 @@ export class ApiConfigService {
       username: this.configService.get('DB_USERNAME'),
       password: this.configService.get('DB_PASSWORD'),
       database: this.configService.get('DB_NAME'),
-      entities: [...COMMON_DATABASE_ENTITIES, ApiEventsEntity],
+      entities: [
+        ...COMMON_DATABASE_ENTITIES,
+        ApiEventsEntity,
+        Country,
+        BaseData,
+      ],
       synchronize: true,
       ssl: this.isProduction()
         ? { require: true, rejectUnauthorized: false }

diff --git a/api/src/modules/import/import.controller.ts b/api/src/modules/import/import.controller.ts
@@ -18,6 +18,6 @@ export class ImportController {
   @RequiredRoles(ROLES.ADMIN)
   @UseInterceptors(FileInterceptor('file'))
   async uploadFile(@UploadXlsm() file: Express.Multer.File): Promise<any> {
-    return this.service.import(file);
+    return this.service.import(file.buffer);
   }
 }
diff --git a/api/src/modules/import/import.service.ts b/api/src/modules/import/import.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@nestjs/common';
-//import { Multer } from 'multer';
 import { XlsxParser } from '@api/modules/import/services/xlsx.parser';
 import { EntityPreprocessor } from '@api/modules/import/services/entity.preprocessor';
 import { BaseDataRepository } from '@api/modules/model/base-data.repository';
@@ -12,10 +11,10 @@ export class ImportService {
     private readonly preprocessor: EntityPreprocessor,
   ) {}
 
-  async import(file: Express.Multer.File) {
+  async import(fileBuffer: Buffer) {
     let data;
     try {
-      data = await this.xlsxParser.parseExcel<any>(file.buffer);
+      data = await this.xlsxParser.parseExcel<any>(fileBuffer);
       const dbEntities = this.preprocessor.toDbEntities(data);
 
       const dbResult = await this.repo.insertData(dbEntities);

diff --git a/api/src/modules/import/services/entity.preprocessor.ts b/api/src/modules/import/services/entity.preprocessor.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { Country } from '@shared/entities/countries/country.entity';
 import { BaseData } from '@api/modules/model/base-data.entity';
+import { Country } from '@api/modules/model/entities/country.entity';
 
 export type ParsedDBEntities = {
   countries: Country[];

diff --git a/api/src/modules/model/base-data.entity.ts b/api/src/modules/model/base-data.entity.ts
@@ -5,7 +5,7 @@ import {
   ManyToOne,
   JoinColumn,
 } from 'typeorm';
-import { Country } from '@shared/entities/countries/country.entity';
+import { Country } from '@api/modules/model/entities/country.entity';
 
 export enum ECOSYSTEM {
   MANGROVE = 'Mangrove',

diff --git a/api/src/modules/model/base-data.repository.ts b/api/src/modules/model/base-data.repository.ts
@@ -1,9 +1,9 @@
 import { DataSource, Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
-import { Country } from '@shared/entities/countries/country.entity';
 
 import { ParsedDBEntities } from '@api/modules/import/services/entity.preprocessor';
 import { BaseData } from '@api/modules/model/base-data.entity';
+import { Country } from '@api/modules/model/entities/country.entity';
 
 @Injectable()
 export class BaseDataRepository extends Repository<BaseData> {

diff --git a/api/src/modules/model/entities/country.entity.ts b/api/src/modules/model/entities/country.entity.ts
@@ -0,0 +1,37 @@
+import { Column, Entity, PrimaryColumn } from 'typeorm';
+
+export enum CONTINENTS {
+  AFRICA = 'Africa',
+  ASIA = 'Asia',
+  EUROPE = 'Europe',
+  EUROPE_AND_ASIA = 'Europe/Asia',
+  NORTH_AMERICA = 'North America',
+  OCEANIA = 'Oceania',
+  SOUTH_AMERICA = 'South America',
+  ANTARCTICA = 'Antarctica',
+}
+
+@Entity('countries')
+export class Country {
+  @PrimaryColumn({ name: 'country_code', length: 3 })
+  countryCode: string;
+
+  @Column({ length: 100 })
+  country: string;
+
+  // TODO: Right now the dataset contains null values for continents, but not sure if this is correct
+  @Column({ type: 'enum', enum: CONTINENTS, nullable: true })
+  continent: CONTINENTS;
+
+  @Column({ name: 'region_1', length: 50, nullable: true })
+  region1?: string;
+
+  @Column({ name: 'region_2', length: 50, nullable: true })
+  region2?: string;
+
+  @Column({ name: 'numeric_code', length: 3, nullable: true })
+  numericCode?: string;
+
+  @Column({ name: 'hdi', type: 'int', nullable: true })
+  hdi?: number;
+}
diff --git a/shared/entities/countries/country.entity.ts b/shared/entities/countries/country.entity.ts
diff --git a/shared/entities/database.entities.ts b/shared/entities/database.entities.ts
@@ -1,4 +1,3 @@
 import { User } from "@shared/entities/users/user.entity";
-import { Country } from "@shared/entities/countries/country.entity";
 
-export const COMMON_DATABASE_ENTITIES = [User, Country];
+export const COMMON_DATABASE_ENTITIES = [User];