diff --git a/apps/entity-service/src/app.module.ts b/apps/entity-service/src/app.module.ts index d2baceb7..990c1edb 100644 --- a/apps/entity-service/src/app.module.ts +++ b/apps/entity-service/src/app.module.ts @@ -14,16 +14,13 @@ import { ProjectPitchesController } from "./entities/project-pitches.controller" import { ProjectPitchService } from "./entities/project-pitch.service"; import { TasksController } from "./entities/tasks.controller"; import { TasksService } from "./entities/tasks.service"; -import { BoundingBoxController } from "./bounding-boxes/bounding-box.controller"; -import { BoundingBoxService } from "./bounding-boxes/bounding-box.service"; -import { DataApiModule } from "@terramatch-microservices/data-api"; import { DemographicsController } from "./entities/demographics.controller"; import { DemographicService } from "./entities/demographic.service"; import { ImpactStoriesController } from "./entities/impact-stories.controller"; import { ImpactStoryService } from "./entities/impact-story.service"; @Module({ - imports: [SentryModule.forRoot(), CommonModule, HealthModule, DataApiModule], + imports: [SentryModule.forRoot(), CommonModule, HealthModule], // Note: Any controller that provides a path under the entities namespace ("entities/v3/something") // needs to be provided in this list before EntitiesController, or it will be superseded by the // wildcard route on EntitiesController. @@ -33,7 +30,6 @@ import { ImpactStoryService } from "./entities/impact-story.service"; TasksController, FileUploadController, TreesController, - BoundingBoxController, DemographicsController, EntitiesController, EntityAssociationsController @@ -48,7 +44,6 @@ import { ImpactStoryService } from "./entities/impact-story.service"; FileUploadService, ProjectPitchService, ImpactStoryService, - BoundingBoxService, TasksService, DemographicService ] diff --git a/apps/research-service/src/app.module.ts b/apps/research-service/src/app.module.ts index a6b1f8c0..08f407ac 100644 --- a/apps/research-service/src/app.module.ts +++ b/apps/research-service/src/app.module.ts @@ -5,16 +5,20 @@ import { SitePolygonsService } from "./site-polygons/site-polygons.service"; import { APP_FILTER } from "@nestjs/core"; import { SentryGlobalFilter, SentryModule } from "@sentry/nestjs/setup"; import { HealthModule } from "@terramatch-microservices/common/health/health.module"; +import { BoundingBoxController } from "./bounding-boxes/bounding-box.controller"; +import { BoundingBoxService } from "./bounding-boxes/bounding-box.service"; +import { DataApiModule } from "@terramatch-microservices/data-api"; @Module({ - imports: [SentryModule.forRoot(), CommonModule, HealthModule], - controllers: [SitePolygonsController], + imports: [SentryModule.forRoot(), CommonModule, HealthModule, DataApiModule], + controllers: [SitePolygonsController, BoundingBoxController], providers: [ { provide: APP_FILTER, useClass: SentryGlobalFilter }, - SitePolygonsService + SitePolygonsService, + BoundingBoxService ] }) export class AppModule {} diff --git a/apps/entity-service/src/bounding-boxes/bounding-box.controller.spec.ts b/apps/research-service/src/bounding-boxes/bounding-box.controller.spec.ts similarity index 100% rename from apps/entity-service/src/bounding-boxes/bounding-box.controller.spec.ts rename to apps/research-service/src/bounding-boxes/bounding-box.controller.spec.ts diff --git a/apps/entity-service/src/bounding-boxes/bounding-box.controller.ts b/apps/research-service/src/bounding-boxes/bounding-box.controller.ts similarity index 100% rename from apps/entity-service/src/bounding-boxes/bounding-box.controller.ts rename to apps/research-service/src/bounding-boxes/bounding-box.controller.ts diff --git a/apps/entity-service/src/bounding-boxes/bounding-box.service.spec.ts b/apps/research-service/src/bounding-boxes/bounding-box.service.spec.ts similarity index 100% rename from apps/entity-service/src/bounding-boxes/bounding-box.service.spec.ts rename to apps/research-service/src/bounding-boxes/bounding-box.service.spec.ts diff --git a/apps/entity-service/src/bounding-boxes/bounding-box.service.ts b/apps/research-service/src/bounding-boxes/bounding-box.service.ts similarity index 100% rename from apps/entity-service/src/bounding-boxes/bounding-box.service.ts rename to apps/research-service/src/bounding-boxes/bounding-box.service.ts diff --git a/apps/entity-service/src/bounding-boxes/dto/bounding-box-query.dto.ts b/apps/research-service/src/bounding-boxes/dto/bounding-box-query.dto.ts similarity index 100% rename from apps/entity-service/src/bounding-boxes/dto/bounding-box-query.dto.ts rename to apps/research-service/src/bounding-boxes/dto/bounding-box-query.dto.ts diff --git a/apps/entity-service/src/bounding-boxes/dto/bounding-box.dto.ts b/apps/research-service/src/bounding-boxes/dto/bounding-box.dto.ts similarity index 100% rename from apps/entity-service/src/bounding-boxes/dto/bounding-box.dto.ts rename to apps/research-service/src/bounding-boxes/dto/bounding-box.dto.ts diff --git a/cdk/api-gateway/lib/api-gateway-stack.ts b/cdk/api-gateway/lib/api-gateway-stack.ts index a0603b7b..099e6f00 100644 --- a/cdk/api-gateway/lib/api-gateway-stack.ts +++ b/cdk/api-gateway/lib/api-gateway-stack.ts @@ -18,8 +18,8 @@ import * as process from "node:process"; const V3_SERVICES = { "user-service": ["auth", "users"], "job-service": ["jobs"], - "entity-service": ["entities", "trees", "boundingBoxes"], - "research-service": ["research"], + "entity-service": ["entities", "trees"], + "research-service": ["research", "boundingBoxes"], "dashboard-service": ["dashboard"], "unified-database-service": ["unified-database"] };