feature/new immersion offer page

back/src/_testBuilders/establishmentAggregate.test.helpers.ts

@@ -1,4 +1,4 @@
-import { Builder, RomeCode, SearchImmersionResultDto } from "shared";
+import { Builder, RomeCode, SearchResultDto } from "shared";
 import { UuidV4Generator } from "../adapters/secondary/core/UuidGeneratorImplementations";
 import { TEST_ROME_LABEL } from "../adapters/secondary/immersionOffer/InMemoryEstablishmentAggregateRepository";
 import { ContactEntity } from "../domain/immersionOffer/entities/ContactEntity";
@@ -125,7 +125,7 @@ export const establishmentAggregateToSearchResultByRome = (
   establishmentAggregate: EstablishmentAggregate,
   romeCode: RomeCode,
   distance_m?: number,
-): SearchImmersionResultDto => ({
+): SearchResultDto => ({
   rome: romeCode,
   naf: establishmentAggregate.establishment.nafDto.code,
   nafLabel: establishmentAggregate.establishment.nafDto.nomenclature,

back/src/adapters/primary/config/createUseCases.ts

@@ -60,9 +60,9 @@ import { ContactEstablishment } from "../../../domain/immersionOffer/useCases/Co
 import { DeleteEstablishment } from "../../../domain/immersionOffer/useCases/DeleteEstablishment";
 import { AddExchangeToDiscussionAndTransferEmail } from "../../../domain/immersionOffer/useCases/discussions/AddExchangeToDiscussionAndTransferEmail";
 import { EditFormEstablishment } from "../../../domain/immersionOffer/useCases/EditFormEstablishment";
-import { GetSearchImmersionResultBySiretAndRome } from "../../../domain/immersionOffer/useCases/GetImmersionOfferById";
-import { GetSearchImmersionResultBySiretAndAppellationCode } from "../../../domain/immersionOffer/useCases/GetImmersionOfferBySiretAndAppellationCode";
 import { GetOffersByGroupSlug } from "../../../domain/immersionOffer/useCases/GetOffersByGroupSlug";
+import { GetSearchResultBySiretAndRome } from "../../../domain/immersionOffer/useCases/GetSearchResultById";
+import { GetSearchResultBySiretAndAppellationCode } from "../../../domain/immersionOffer/useCases/GetSearchResultBySiretAndAppellationCode";
 import { InsertEstablishmentAggregateFromForm } from "../../../domain/immersionOffer/useCases/InsertEstablishmentAggregateFromFormEstablishement";
 import { NotifyConfirmationEstablishmentCreated } from "../../../domain/immersionOffer/useCases/notifications/NotifyConfirmationEstablishmentCreated";
 import { NotifyContactRequest } from "../../../domain/immersionOffer/useCases/notifications/NotifyContactRequest";
@@ -251,10 +251,11 @@ export const createUseCases = (
         uuidGenerator,
       ),
       getOffersByGroupSlug: new GetOffersByGroupSlug(uowPerformer),
-      getSearchImmersionResultBySiretAndAppellationCode:
-        new GetSearchImmersionResultBySiretAndAppellationCode(uowPerformer),
-      getSearchImmersionResultBySiretAndRome:
-        new GetSearchImmersionResultBySiretAndRome(uowPerformer),
+      getSearchResultBySiretAndAppellationCode:
+        new GetSearchResultBySiretAndAppellationCode(uowPerformer),
+      getSearchImmersionResultBySiretAndRome: new GetSearchResultBySiretAndRome(
+        uowPerformer,
+      ),
 
       addFormEstablishment,
 

back/src/adapters/primary/routers/DtoAndSchemas/v0/input/FormEstablishmentPublicV0.schema.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import {
   addressWithPostalCodeSchema,
-  appellationSchema,
+  appellationCodeSchema,
   emailSchema,
   nafSchema,
   NotEmptyArray,
@@ -41,7 +41,7 @@ type ProfessionDtoPublicV0 = {
 
 const professionSchemaPublicV0: z.Schema<ProfessionDtoPublicV0> = z.object({
   romeCodeMetier: romeCodeSchema,
-  romeCodeAppellation: appellationSchema.optional(),
+  romeCodeAppellation: appellationCodeSchema.optional(),
   description: zTrimmedString,
 });
 

back/src/adapters/primary/routers/DtoAndSchemas/v0/input/SearchImmersionRequestPublicV0.dto.ts

@@ -1,4 +1,4 @@
-import { GeoPositionDto, RomeCode, SearchImmersionParamsDto } from "shared";
+import { GeoPositionDto, RomeCode, SearchQueryParamsDto } from "shared";
 
 export type SearchImmersionRequestPublicV0 = {
   rome?: RomeCode;
@@ -8,7 +8,7 @@ export type SearchImmersionRequestPublicV0 = {
 
 export const searchImmersionRequestPublicV0ToDomain = (
   publicV0: SearchImmersionRequestPublicV0,
-): SearchImmersionParamsDto => {
+): SearchQueryParamsDto => {
   const { location, distance_km, ...rest } = publicV0;
   return {
     ...rest,

back/src/adapters/primary/routers/DtoAndSchemas/v0/output/SearchImmersionResultPublicV0.dto.ts

@@ -2,10 +2,10 @@ import {
   addressDtoToString,
   GeoPositionDto,
   RomeCode,
-  SearchImmersionResultDto,
+  SearchResultDto,
   SiretDto,
 } from "shared";
-import { GetSearchImmersionResultBySiretAndRomePayload } from "../../../../../../domain/immersionOffer/useCases/GetImmersionOfferById";
+import { GetSearchResultBySiretAndRomePayload } from "../../../../../../domain/immersionOffer/useCases/GetSearchResultById";
 
 export type LegacyImmersionOfferId = `${SiretDto}-${RomeCode}`;
 
@@ -16,7 +16,7 @@ export const toLegacyImmersionOfferId = (
 
 export const toGetSearchImmersionResultBySiretAndRomePayload = (
   id: LegacyImmersionOfferId,
-): GetSearchImmersionResultBySiretAndRomePayload => {
+): GetSearchResultBySiretAndRomePayload => {
   const [siret, rome] = id.split("-");
   return {
     rome,
@@ -42,7 +42,7 @@ export type SearchImmersionResultPublicV0 = {
 };
 
 export const domainToSearchImmersionResultPublicV0 = (
-  domain: SearchImmersionResultDto,
+  domain: SearchResultDto,
 ): SearchImmersionResultPublicV0 => {
   const { appellations, position, website, additionalInformation, ...rest } =
     domain;

back/src/adapters/primary/routers/DtoAndSchemas/v1/input/SearchImmersionRequestPublicV1.schema.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import {
-  appellationSchema,
+  appellationCodeSchema,
   romeCodeSchema,
   siretSchema,
   zToBoolean,
@@ -11,7 +11,7 @@ import { SearchImmersionRequestPublicV1 } from "./SearchImmersionRequestPublicV1
 export const searchImmersionRequestPublicV1Schema: z.Schema<SearchImmersionRequestPublicV1> =
   z.object({
     rome: romeCodeSchema.optional(),
-    appellationCode: appellationSchema.optional(),
+    appellationCode: appellationCodeSchema.optional(),
     siret: siretSchema.optional(),
     latitude: zToNumber,
     longitude: zToNumber,

back/src/adapters/primary/routers/DtoAndSchemas/v1/input/SearchImmersionRequestPublicV1dto.ts

@@ -1,8 +1,4 @@
-import {
-  AppellationCode,
-  RomeCode,
-  SearchImmersionQueryParamsDto,
-} from "shared";
+import { AppellationCode, RomeCode, SearchQueryParamsDto } from "shared";
 
 type SearchSortedBy = "distance" | "date";
 
@@ -19,7 +15,7 @@ export type SearchImmersionRequestPublicV1 = {
 
 export const searchImmersionRequestPublicV1ToDomain = (
   publicV1: SearchImmersionRequestPublicV1,
-): SearchImmersionQueryParamsDto => {
+): SearchQueryParamsDto => {
   const { distance_km, ...rest } = publicV1;
   return {
     ...rest,

back/src/adapters/primary/routers/DtoAndSchemas/v1/output/SearchImmersionResultPublicV1.dto.ts

@@ -2,7 +2,7 @@ import {
   addressDtoToString,
   GeoPositionDto,
   RomeCode,
-  SearchImmersionResultDto,
+  SearchResultDto,
   SiretDto,
 } from "shared";
 import { ContactMethod } from "../../../../../../domain/immersionOffer/entities/ContactEntity";
@@ -29,7 +29,7 @@ export type SearchImmersionResultPublicV1 = {
 export const domainToSearchImmersionResultPublicV1 = ({
   appellations,
   ...domain
-}: SearchImmersionResultDto): SearchImmersionResultPublicV1 => ({
+}: SearchResultDto): SearchImmersionResultPublicV1 => ({
   ...domain,
   appellationLabels: appellations.map(
     (appellation) => appellation.appellationLabel,

back/src/adapters/primary/routers/DtoAndSchemas/v2/input/SearchImmersionRequestPublicV2.dto.ts

@@ -1,8 +1,4 @@
-import {
-  AppellationCode,
-  RomeCode,
-  SearchImmersionQueryParamsDto,
-} from "shared";
+import { AppellationCode, RomeCode, SearchQueryParamsDto } from "shared";
 
 type SearchSortedBy = "distance" | "date";
 
@@ -18,4 +14,4 @@ export type SearchImmersionRequestPublicV2 = {
 
 export const searchImmersionRequestPublicV2ToDomain = (
   publicV2: SearchImmersionRequestPublicV2,
-): SearchImmersionQueryParamsDto => publicV2;
+): SearchQueryParamsDto => publicV2;

back/src/adapters/primary/routers/DtoAndSchemas/v2/input/SearchImmersionRequestPublicV2.schema.ts

@@ -1,10 +1,15 @@
 import { z } from "zod";
-import { appellationSchema, siretSchema, zToBoolean, zToNumber } from "shared";
+import {
+  appellationCodeSchema,
+  siretSchema,
+  zToBoolean,
+  zToNumber,
+} from "shared";
 import { SearchImmersionRequestPublicV2 } from "./SearchImmersionRequestPublicV2.dto";
 
 export const searchImmersionRequestPublicV2Schema: z.Schema<SearchImmersionRequestPublicV2> =
   z.object({
-    appellationCode: appellationSchema.optional(),
+    appellationCode: appellationCodeSchema.optional(),
     siret: siretSchema.optional(),
     latitude: zToNumber,
     longitude: zToNumber,

back/src/adapters/primary/routers/DtoAndSchemas/v2/output/SearchImmersionResultPublicV2.dto.ts

@@ -3,7 +3,7 @@ import {
   AppellationDto,
   GeoPositionDto,
   RomeCode,
-  SearchImmersionResultDto,
+  SearchResultDto,
   SiretDto,
 } from "shared";
 import { ContactMethod } from "../../../../../../domain/immersionOffer/entities/ContactEntity";
@@ -27,5 +27,5 @@ export type SearchImmersionResultPublicV2 = {
 };
 
 export const domainToSearchImmersionResultPublicV2 = (
-  searchImmersionResult: SearchImmersionResultDto,
+  searchImmersionResult: SearchResultDto,
 ): SearchImmersionResultPublicV2 => searchImmersionResult;

back/src/adapters/primary/routers/apiKeyAuthRouter/createApiKeyAuthRouter.v1.ts

@@ -89,7 +89,7 @@ export const createApiKeyAuthRouterV1 = (deps: AppDependencies) => {
           });
 
         return domainToSearchImmersionResultPublicV1(
-          await deps.useCases.getSearchImmersionResultBySiretAndAppellationCode.execute(
+          await deps.useCases.getSearchResultBySiretAndAppellationCode.execute(
             {
               siret: req.params.siret,
               appellationCode,

back/src/adapters/primary/routers/apiKeyAuthRouter/createApiKeyAuthRouter.v2.ts

@@ -46,7 +46,7 @@ export const createApiKeyAuthRouterV2 = (deps: AppDependencies) => {
     sendHttpResponseForApiV2(req, res, async () => {
       if (!req.apiConsumer?.isAuthorized) throw new ForbiddenError();
       return domainToSearchImmersionResultPublicV2(
-        await deps.useCases.getSearchImmersionResultBySiretAndAppellationCode.execute(
+        await deps.useCases.getSearchResultBySiretAndAppellationCode.execute(
           req.params,
           req.apiConsumer,
         ),

back/src/adapters/primary/routers/apiKeyAuthRouter/createOpenApiV2.ts

@@ -1,4 +1,4 @@
-import { SearchImmersionResultDto } from "shared";
+import { SearchResultDto } from "shared";
 import { createOpenApiGenerator } from "shared-routes/openapi";
 import { ContactEstablishmentPublicV2Dto } from "../DtoAndSchemas/v2/input/ContactEstablishmentPublicV2.dto";
 import { publicApiV2Routes } from "./publicApiV2.routes";
@@ -33,7 +33,7 @@ const contactInPersonExample: ContactEstablishmentPublicV2Dto = {
   contactMode: "IN_PERSON",
 };
 
-const searchImmersionResult: SearchImmersionResultDto = {
+const searchImmersionResult: SearchResultDto = {
   additionalInformation: "Some additionnal information",
   address: {
     departmentCode: "75",

back/src/adapters/primary/routers/apiKeyAuthRouter/publicApiV2.routes.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
 import {
   httpErrorSchema,
-  searchImmersionResultSchema,
-  searchImmersionsSchema,
+  searchResultSchema,
+  searchResultsSchema,
   withAuthorizationHeaders,
 } from "shared";
 import { defineRoute, defineRoutes } from "shared-routes";
@@ -16,7 +16,7 @@ export const publicApiV2Routes = defineRoutes({
     url: "/v2/offers/:siret/:appellationCode",
     ...withAuthorizationHeaders,
     responses: {
-      200: searchImmersionResultSchema,
+      200: searchResultSchema,
       400: httpErrorSchema,
       401: httpErrorSchema,
       403: httpErrorSchema,
@@ -29,7 +29,7 @@ export const publicApiV2Routes = defineRoutes({
     queryParamsSchema: searchImmersionRequestPublicV2Schema,
     ...withAuthorizationHeaders,
     responses: {
-      200: searchImmersionsSchema,
+      200: searchResultsSchema,
       400: httpErrorSchema,
       401: httpErrorSchema,
       403: httpErrorSchema,

back/src/adapters/primary/routers/establishment/contactEstablishment.e2e.test.ts

@@ -2,8 +2,8 @@ import {
   ContactEstablishmentRequestDto,
   expectArraysToMatch,
   expectToEqual,
-  SearchImmersionRoutes,
   searchImmersionRoutes,
+  SearchRoutes,
 } from "shared";
 import { HttpClient } from "shared-routes";
 import { createSupertestSharedClient } from "shared-routes/supertest";
@@ -38,7 +38,7 @@ describe(`${searchImmersionRoutes.contactEstablishment.method} ${searchImmersion
   let gateways: InMemoryGateways;
   let eventCrawler: BasicEventCrawler;
   let inMemoryUow: InMemoryUnitOfWork;
-  let sharedRequest: HttpClient<SearchImmersionRoutes>;
+  let sharedRequest: HttpClient<SearchRoutes>;
 
   beforeEach(async () => {
     const testAppAndDeps = await buildTestApp();