decouple country service from project service

Vizzuality · Oct 28, 2024 · 9e3f411 · 9e3f411
1 parent a9e5dc6
commit 9e3f411
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/api/src/modules/projects/projects.controller.ts b/api/src/modules/projects/projects.controller.ts
@@ -3,10 +3,15 @@ import { tsRestHandler, TsRestHandler } from '@ts-rest/nest';
 import { ControllerResponse } from '@api/types/controller-response.type';
 import { projectsContract } from '@shared/contracts/projects.contract';
 import { ProjectsService } from '@api/modules/projects/projects.service';
+import { CountriesService } from '@api/modules/countries/countries.service';
+import { CountryWithNoGeometry } from '@shared/entities/country.entity';
 
 @Controller()
 export class ProjectsController {
-  constructor(private readonly projectsService: ProjectsService) {}
+  constructor(
+    private readonly projectsService: ProjectsService,
+    private readonly countryService: CountriesService,
+  ) {}
 
   @TsRestHandler(projectsContract.getProjects)
   async getProjects(): ControllerResponse {
@@ -19,8 +24,19 @@ export class ProjectsController {
   @TsRestHandler(projectsContract.getProjectCountries)
   async getProjectCountries(): ControllerResponse {
     return tsRestHandler(projectsContract.getProjectCountries, async () => {
-      const data = await this.projectsService.getProjectCountries();
-      return { body: { data }, status: HttpStatus.OK };
+      const projectCountryCodes = await this.projectsService.projectRepository
+        .find()
+        .then((projects) => projects.map((p) => p.countryCode));
+      const [countries] = await this.countryService.findAll({
+        filter: { code: projectCountryCodes },
+        omitFields: ['geometry'],
+        disablePagination: true,
+      });
+
+      return {
+        body: { data: countries as CountryWithNoGeometry[] },
+        status: HttpStatus.OK,
+      };
     });
   }
 

diff --git a/api/src/modules/projects/projects.service.ts b/api/src/modules/projects/projects.service.ts
@@ -3,8 +3,6 @@ import { AppBaseService } from '@api/utils/app-base.service';
 import { Project } from '@shared/entities/projects.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { CountryWithNoGeometry } from '@shared/entities/country.entity';
-import { CountriesService } from '@api/modules/countries/countries.service';
 
 @Injectable()
 export class ProjectsService extends AppBaseService<
@@ -15,22 +13,8 @@ export class ProjectsService extends AppBaseService<
 > {
   constructor(
     @InjectRepository(Project)
-    private readonly projectRepository: Repository<Project>,
-    private readonly countryService: CountriesService,
+    public readonly projectRepository: Repository<Project>,
   ) {
     super(projectRepository, 'project', 'projects');
   }
-
-  async getProjectCountries(): Promise<CountryWithNoGeometry[]> {
-    const projects = await this.projectRepository.find();
-
-    const countryCodes = projects.map((p) => p.countryCode);
-    const [countries] = await this.countryService.findAll({
-      filter: { code: countryCodes },
-      omitFields: ['geometry'],
-      disablePagination: true,
-    });
-
-    return countries as CountryWithNoGeometry[];
-  }
 }