[TM-2411] Form data moved to v3

apps/dashboard-service/src/dashboard/dashboard-query.builder.ts

@@ -6,7 +6,7 @@ import { Project } from "@terramatch-microservices/database/entities";
 import { mapLandscapeCodesToNames } from "@terramatch-microservices/database/constants";
 import { InternalServerErrorException } from "@nestjs/common";
 
-export class DashboardProjectsQueryBuilder<T extends Model<T> = Project> {
+export class DashboardProjectsQueryBuilder<T extends Model = Project> {
   protected findOptions: FindOptions<Attributes<T>> = {
     order: ["id"]
   };

apps/dashboard-service/src/dashboard/dto/total-section-header.service.spec.ts

@@ -61,7 +61,7 @@ describe("TotalSectionHeaderService - filters", () => {
 
   it("should apply basic filters in DashboardProjectsQueryBuilder", async () => {
     const filters: DashboardQueryDto = {
-      organisationType: ["org-uuid-1"],
+      organisationType: ["non-profit-organization"],
       country: "BJ",
       programmes: ["terrafund"],
       projectUuid: "uuid",

apps/dashboard-service/src/dashboard/processors/dashboard-entity-processor.spec.ts

@@ -69,16 +69,4 @@ describe("DashboardEntityProcessor", () => {
     expect(result[1].id).toBe("uuid-2");
     expect(result[1].dto).toBeInstanceOf(MockLightDto);
   });
-
-  it("should process multiple models into full DTOs", async () => {
-    const models: TestModel[] = [{ uuid: "uuid-1" }, { uuid: "uuid-2" }];
-
-    const result = await processor.getFullDtos(models);
-
-    expect(result).toHaveLength(2);
-    expect(result[0].id).toBe("uuid-1");
-    expect(result[0].dto).toBeInstanceOf(MockFullDto);
-    expect(result[1].id).toBe("uuid-2");
-    expect(result[1].dto).toBeInstanceOf(MockFullDto);
-  });
 });

apps/dashboard-service/src/dashboard/processors/dashboard-entity-processor.ts

@@ -30,14 +30,6 @@ export abstract class DashboardEntityProcessor<ModelType, LightDto, FullDto> {
     return results;
   }
 
-  async getFullDtos(models: ModelType[]): Promise<DtoResult<FullDto>[]> {
-    const results: DtoResult<FullDto>[] = [];
-    for (const model of models) {
-      results.push(await this.getFullDto(model));
-    }
-    return results;
-  }
-
   protected getCacheService(): CacheService {
     return this.cacheService;
   }

apps/dashboard-service/src/dashboard/total-section-header.controller.spec.ts

@@ -4,14 +4,18 @@ import { CacheService } from "./dto/cache.service";
 import { DashboardQueryDto } from "./dto/dashboard-query.dto";
 import { serialize } from "@terramatch-microservices/common/util/testing";
 
-jest.mock("@terramatch-microservices/database/entities", () => ({
-  DelayedJob: {
-    create: jest.fn().mockResolvedValue({
-      id: 1,
-      uuid: "fake-uuid"
-    })
-  }
-}));
+jest.mock("@terramatch-microservices/database/entities", () => {
+  const original = jest.requireActual("@terramatch-microservices/database/entities");
+  return {
+    ...original,
+    DelayedJob: {
+      create: jest.fn().mockResolvedValue({
+        id: 1,
+        uuid: "fake-uuid"
+      })
+    }
+  };
+});
 
 describe("TotalSectionHeaderController", () => {
   let controller: TotalSectionHeaderController;

apps/entity-service/src/app.module.ts

@@ -9,7 +9,6 @@ import { EntitiesController } from "./entities/entities.controller";
 import { EntityAssociationsController } from "./entities/entity-associations.controller";
 import { HealthModule } from "@terramatch-microservices/common/health/health.module";
 import { FilesController } from "./entities/files.controller";
-import { FileUploadService } from "./file/file-upload.service";
 import { ProjectPitchesController } from "./entities/project-pitches.controller";
 import { ProjectPitchService } from "./entities/project-pitch.service";
 import { TasksController } from "./entities/tasks.controller";
@@ -24,6 +23,12 @@ import { OptionLabelsController } from "./forms/option-labels.controller";
 import { LinkedFieldsController } from "./forms/linked-fields.controller";
 import { FormsController } from "./forms/forms.controller";
 import { FormsService } from "./forms/forms.service";
+import { FormDataController } from "./entities/form-data.controller";
+import { FormDataService } from "./entities/form-data.service";
+import { UpdateRequestsController } from "./entities/update-requests.controller";
+import { ApplicationsController } from "./applications/applications.controller";
+import { SubmissionsController } from "./forms/submissions.controller";
+import { FundingProgrammesController } from "./fundingProgrammes/funding-programmes.controller";
 
 @Module({
   imports: [SentryModule.forRoot(), CommonModule, HealthModule],
@@ -39,10 +44,15 @@ import { FormsService } from "./forms/forms.service";
     DemographicsController,
     DisturbancesController,
     EntitiesController,
+    FormDataController, // must be before entity association controller.
+    UpdateRequestsController, // must be before entity association controller.
     EntityAssociationsController,
-    OptionLabelsController,
-    LinkedFieldsController,
-    FormsController
+    OptionLabelsController, // must be before forms controller
+    LinkedFieldsController, // must be before forms controller
+    SubmissionsController, // must be before forms controller
+    FormsController,
+    ApplicationsController,
+    FundingProgrammesController
   ],
   providers: [
     {
@@ -51,13 +61,13 @@ import { FormsService } from "./forms/forms.service";
     },
     EntitiesService,
     TreeService,
-    FileUploadService,
     ProjectPitchService,
     ImpactStoryService,
     TasksService,
     DemographicService,
     DisturbanceService,
-    FormsService
+    FormsService,
+    FormDataService
   ]
 })
 export class AppModule {}