Test

.github/workflows/deploy-to-kubernetes.yml

@@ -70,10 +70,10 @@ jobs:
 
       - name: Install kubectl
         run: |
-          curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /usr/share/keyrings/kubernetes-archive-keyring.gpg
-          echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list
+          curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key | sudo gpg --dearmor -o --no-tty /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+          echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.28/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
           sudo apt-get update
-          sudo apt-get install -y kubectl
+          sudo apt install -y kubectl
 
       - name: Config kubectl
         run: |

.github/workflows/testing-api.yml

@@ -105,6 +105,28 @@ jobs:
         working-directory: api
         run: yarn test:integration
 
+  testing-api-unit:
+    name: Unit Tests
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Use Node.js 18.16
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18.16'
+
+      - name: Install API dependencies
+        working-directory: api
+        run: yarn install
+
+      - name: Run API tests + coverage
+        working-directory: api
+        run: yarn test:unit
+
 #      - name: Generate API coverage artifact
 #        uses: actions/upload-artifact@v2
 #        with:

.github/workflows/testing-client.yml

@@ -16,6 +16,7 @@ jobs:
     name: Running client tests
     runs-on: ubuntu-22.04
     timeout-minutes: 30
+    if: ${{ github.ref_name != 'test'  }}
     strategy:
       fail-fast: false
     defaults:

api/config/custom-environment-variables.json

@@ -72,5 +72,11 @@
     "email": {
       "sendGridApiKey": "SENDGRID_API_KEY"
     }
+  },
+  "eudr": {
+    "apiKey": "CARTO_API_KEY",
+    "baseUrl": "CARTO_BASE_URL",
+    "credentials": "EUDR_CREDENTIALS",
+    "dataset": "EUDR_DATASET"
   }
 }

api/config/default.json

@@ -81,5 +81,11 @@
     "email": {
       "sendGridApiKey": null
     }
+  },
+  "eudr": {
+    "apiKey": null,
+    "baseUrl": "null",
+    "credentials": null,
+    "dataset": null
   }
 }

api/config/test.json

@@ -46,5 +46,11 @@
     "email": {
       "sendGridApiKey": "SG.forSomeReasonSendGridApiKeysNeedToStartWithSG."
     }
+  },
+  "eudr": {
+    "apiKey": null,
+    "baseUrl": "null",
+    "credentials": null,
+    "dataset": "test_dataset"
   }
 }

api/package.json

@@ -20,12 +20,14 @@
     "test:cov": "node --expose-gc ./node_modules/.bin/jest --config test/jest-config.json --coverage --forceExit",
     "test:debug": "node --inspect-brk --expose-gc -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --config test/jest-config.json --detectOpenHandles --forceExit",
     "test:integration": "node --expose-gc ./node_modules/.bin/jest --config test/jest-config.json --forceExit -i test/integration/",
+    "test:unit": "node --expose-gc ./node_modules/.bin/jest --config test/jest-config.json --forceExit -i test/unit/",
     "test:e2e": "NODE_OPTIONS=\"--max-old-space-size=6144\" node --expose-gc ./node_modules/.bin/jest --config test/jest-config.json --logHeapUsage --forceExit -i test/e2e/"
   },
   "engines": {
     "node": "^18.16"
   },
   "dependencies": {
+    "@google-cloud/bigquery": "^7.5.0",
     "@googlemaps/google-maps-services-js": "~3.3.2",
     "@json2csv/node": "^7.0.1",
     "@nestjs/axios": "^3.0.0",
@@ -69,6 +71,7 @@
     "swagger-ui-express": "~4.6.0",
     "typeorm": "0.3.11",
     "uuid": "~9.0.0",
+    "wellknown": "^0.5.0",
     "xlsx": "~0.18.5",
     "yargs": "^17.3.1"
   },
@@ -85,6 +88,7 @@
     "@types/config": "^3.3.0",
     "@types/express": "^4.17.13",
     "@types/faker": "^6.6.9",
+    "@types/geojson": "^7946.0.14",
     "@types/jest": "^29.5.3",
     "@types/jsonapi-serializer": "^3.6.5",
     "@types/lodash": "^4.14.177",

api/src/app.module.ts

@@ -39,6 +39,7 @@ import { AuthorizationService } from 'modules/authorization/authorization.servic
 import { TasksService } from 'modules/tasks/tasks.service';
 import { NotificationsModule } from 'modules/notifications/notifications.module';
 import { ReportsModule } from 'modules/reports/reports.module';
+import { EudrModule } from 'modules/eudr-alerts/eudr.module';
 
 const queueConfig: any = config.get('queue');
 
@@ -84,6 +85,7 @@ const queueConfig: any = config.get('queue');
     AuthorizationModule,
     NotificationsModule,
     ReportsModule,
+    EudrModule,
   ],
   providers: [
     {

api/src/create-swagger-specification.ts

@@ -0,0 +1,35 @@
+import * as fs from 'fs';
+import * as crypto from 'crypto';
+import * as process from 'process';
+
+function hashContent(content: string): string {
+  return crypto.createHash('sha256').update(content).digest('hex');
+}
+
+const active: boolean = false;
+
+export async function createOrUpdateSwaggerSpec(document: any): Promise<void> {
+  if (active && process.env.NODE_ENV == 'development') {
+    const documentString: string = JSON.stringify(document);
+    const currentHash: string = hashContent(documentString);
+
+    const specPath: string = './swagger-spec.json';
+    if (fs.existsSync(specPath)) {
+      const existingSpec: string = fs.readFileSync(specPath, 'utf8');
+      const existingHash: string = hashContent(existingSpec);
+
+      if (currentHash !== existingHash) {
+        console.log('Swagger spec has changed. Updating...');
+        fs.writeFileSync(specPath, documentString);
+      } else {
+        console.log('No changes in Swagger spec.');
+      }
+    } else {
+      console.log('Swagger spec does not exist. Creating...');
+      fs.writeFileSync(specPath, documentString);
+    }
+  } else {
+    console.log('Swagger spec update is not active.');
+    return;
+  }
+}

api/src/guards/sensitive-info.guard.ts

@@ -18,6 +18,15 @@ export class SensitiveInfoGuard implements NestInterceptor {
     context: ExecutionContext,
     next: CallHandler<any>,
   ): Observable<any> {
+    const request = context.switchToHttp().getRequest();
+    if (this.dataComesFromAStreamEndpoint(request.url)) {
+      return next.handle();
+    }
+
     return next.handle().pipe(map((data: any) => instanceToPlain(data)));
   }
+
+  dataComesFromAStreamEndpoint(url: string): boolean {
+    return url.includes('eudr');
+  }
 }

api/src/main.ts

@@ -8,6 +8,7 @@ import * as compression from 'compression';
 import { JwtAuthGuard } from 'guards/jwt-auth.guard';
 import { useContainer } from 'class-validator';
 import { SensitiveInfoGuard } from 'guards/sensitive-info.guard';
+import { createOrUpdateSwaggerSpec } from 'create-swagger-specification';
 
 async function bootstrap(): Promise<void> {
   const logger: Logger = new Logger('bootstrap');
@@ -35,6 +36,8 @@ async function bootstrap(): Promise<void> {
   );
   SwaggerModule.setup('/swagger', app, swaggerDocument);
 
+  await createOrUpdateSwaggerSpec(swaggerDocument);
+
   app.useGlobalPipes(
     new ValidationPipe({
       forbidUnknownValues: true,

api/src/modules/admin-regions/admin-regions.controller.ts

@@ -38,7 +38,10 @@ import { CreateAdminRegionDto } from 'modules/admin-regions/dto/create.admin-reg
 import { UpdateAdminRegionDto } from 'modules/admin-regions/dto/update.admin-region.dto';
 import { PaginationMeta } from 'utils/app-base.service';
 import { ApiOkTreeResponse } from 'decorators/api-tree-response.decorator';
-import { GetAdminRegionTreeWithOptionsDto } from 'modules/admin-regions/dto/get-admin-region-tree-with-options.dto';
+import {
+  GetAdminRegionTreeWithOptionsDto,
+  GetEUDRAdminRegions,
+} from 'modules/admin-regions/dto/get-admin-region-tree-with-options.dto';
 import { SetScenarioIdsInterceptor } from 'modules/impact/set-scenario-ids.interceptor';
 
 @Controller(`/api/v1/admin-regions`)

api/src/modules/admin-regions/admin-regions.service.ts

@@ -217,10 +217,6 @@ export class AdminRegionsService extends AppBaseService<
     return this.findTreesWithOptions({ depth: adminRegionTreeOptions.depth });
   }
 
-  async getAdminRegionByIds(ids: string[]): Promise<AdminRegion[]> {
-    return this.adminRegionRepository.findByIds(ids);
-  }
-
   /**
    * @description: Returns an array of all children of given Admin Region's Ids with optional parameters
    * @param {string[]} adminRegionIds - The IDs of the admin regions.

api/src/modules/admin-regions/dto/get-admin-region-tree-with-options.dto.ts

@@ -1,6 +1,9 @@
 import { IsBoolean, IsNumber, IsOptional, IsUUID } from 'class-validator';
-import { ApiPropertyOptional } from '@nestjs/swagger';
-import { CommonFiltersDto } from 'utils/base.query-builder';
+import { ApiPropertyOptional, OmitType } from '@nestjs/swagger';
+import {
+  CommonEUDRFiltersDTO,
+  CommonFiltersDto,
+} from 'utils/base.query-builder';
 import { Type } from 'class-transformer';
 
 export class GetAdminRegionTreeWithOptionsDto extends CommonFiltersDto {
@@ -24,3 +27,7 @@ export class GetAdminRegionTreeWithOptionsDto extends CommonFiltersDto {
   @IsUUID('4')
   scenarioId?: string;
 }
+
+export class GetEUDRAdminRegions extends CommonEUDRFiltersDTO {
+  withSourcingLocations!: boolean;
+}