From 9e6b99555826a50bebe4b8474fd5712eee564f0d Mon Sep 17 00:00:00 2001 From: Maxime Naulleau Date: Fri, 6 Dec 2024 20:26:12 +0100 Subject: [PATCH] Change the files context service url in config and change rule accordion label --- .../gateways/services/http-report-file-service.ts | 2 -- apps/api/src/shared-kernel/adapters/primary/nestjs/env.ts | 8 ++++---- .../adapters/primary/zod/api-config-schema.ts | 1 - .../reports/core-logic/builders/ReportVMRules.builder.ts | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/api/src/reports-context/adapters/secondary/gateways/services/http-report-file-service.ts b/apps/api/src/reports-context/adapters/secondary/gateways/services/http-report-file-service.ts index b68830b0..5d533850 100644 --- a/apps/api/src/reports-context/adapters/secondary/gateways/services/http-report-file-service.ts +++ b/apps/api/src/reports-context/adapters/secondary/gateways/services/http-report-file-service.ts @@ -15,8 +15,6 @@ export class HttpReportFileService implements ReportFileService { this.fileServiceUrl = new URL( this.apiConfig.contextServices.filesContext.baseUrl, ); - this.fileServiceUrl.port = - this.apiConfig.contextServices.filesContext.port.toString(); } async uploadFile( diff --git a/apps/api/src/shared-kernel/adapters/primary/nestjs/env.ts b/apps/api/src/shared-kernel/adapters/primary/nestjs/env.ts index d62f9925..ce67d989 100644 --- a/apps/api/src/shared-kernel/adapters/primary/nestjs/env.ts +++ b/apps/api/src/shared-kernel/adapters/primary/nestjs/env.ts @@ -10,8 +10,9 @@ export const apiConfig: ProdApiConfig = { }, contextServices: { filesContext: { - baseUrl: 'http://localhost', - port: 3000, + // The DNS will resolve this url to a private IP. + // APP env variable is set by scalingo. + baseUrl: `http://${process.env.APP}.osc-secnum-fr1.scalingo.io`, }, }, s3: { @@ -43,8 +44,7 @@ export const defaultApiConfig = { }, contextServices: { filesContext: { - baseUrl: 'http://localhost', - port: 3000, + baseUrl: 'http://localhost:3000', }, }, s3: { diff --git a/apps/api/src/shared-kernel/adapters/primary/zod/api-config-schema.ts b/apps/api/src/shared-kernel/adapters/primary/zod/api-config-schema.ts index a038d952..868bd8c3 100644 --- a/apps/api/src/shared-kernel/adapters/primary/zod/api-config-schema.ts +++ b/apps/api/src/shared-kernel/adapters/primary/zod/api-config-schema.ts @@ -5,7 +5,6 @@ const commonBaseSchema = z.object({ contextServices: z.object({ filesContext: z.object({ baseUrl: z.string(), - port: z.number(), }), }), }); diff --git a/apps/webapp/src/reports/core-logic/builders/ReportVMRules.builder.ts b/apps/webapp/src/reports/core-logic/builders/ReportVMRules.builder.ts index 30cf2460..e20ba42a 100644 --- a/apps/webapp/src/reports/core-logic/builders/ReportVMRules.builder.ts +++ b/apps/webapp/src/reports/core-logic/builders/ReportVMRules.builder.ts @@ -85,7 +85,7 @@ export const getReportAccordionLabel = ( case NominationFile.RuleGroup.STATUTORY: return "Autres règles statutaires"; case NominationFile.RuleGroup.QUALITATIVE: - return "Autres règles qualitatives"; + return "Autres éléments qualitatifs"; default: { const _exhaustiveCheck: never = group; console.info(_exhaustiveCheck);