ajout des labels de categories en retour de recherche, quand on arriv…

…e à mapper
betagouv · Oct 29, 2024 · a5f97a8 · a5f97a8
1 parent 6458bbe
commit a5f97a8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/domain/bibliotheque_services/recherche/categorieRecherche.ts b/src/domain/bibliotheque_services/recherche/categorieRecherche.ts
@@ -85,8 +85,8 @@ export class CategorieRechercheManager {
     any_transport: 'Tout mode de déplacement',
   };
 
-  public static getLabel(cat: CategorieRecherche): string {
-    return CategorieRechercheManager.labels[cat];
+  public static getLabel(cat: string): string {
+    return CategorieRechercheManager.labels[cat] || cat;
   }
 
   public static isDefault(cat: CategorieRecherche): boolean {

diff --git a/src/domain/bibliotheque_services/recherche/resultatRecherche.ts b/src/domain/bibliotheque_services/recherche/resultatRecherche.ts
@@ -61,6 +61,7 @@ export class ResultatRecherche {
   description_more?: string;
   phone?: string;
   categories?: string[];
+  categories_labels?: string[];
   openhours_more_infos?: string;
   open_hours?: OpenHour[];
 
@@ -82,7 +83,6 @@ export class ResultatRecherche {
     this.temps_prepa_min = res.temps_prepa_min;
     this.distance_metres = res.distance_metres;
     this.impact_carbone_kg = res.impact_carbone_kg;
-
     this.est_favoris = false;
     this.nombre_favoris = 0;
     this.emoji = res.emoji;

diff --git a/src/infrastructure/api/types/rechercheServices/resultatRecherchAPI.ts b/src/infrastructure/api/types/rechercheServices/resultatRecherchAPI.ts
@@ -2,6 +2,10 @@ import { ApiProperty } from '@nestjs/swagger';
 import { ResultatRecherche } from '../../../../domain/bibliotheque_services/recherche/resultatRecherche';
 import { Day } from '../../../../domain/bibliotheque_services/types/days';
 import { FruitLegume } from '../../../service/fruits/fruitEtLegumesServiceManager';
+import {
+  CategorieRecherche,
+  CategorieRechercheManager,
+} from '../../../../domain/bibliotheque_services/recherche/categorieRecherche';
 
 export class OpenHourAPI {
   @ApiProperty({ enum: Day }) jour: Day;
@@ -42,6 +46,7 @@ export class ResultatRechercheAPI {
   @ApiProperty() description_more: string;
   @ApiProperty() phone: string;
   @ApiProperty() categories: string[];
+  @ApiProperty() categories_labels: string[];
   @ApiProperty() openhours_more_infos: string;
   @ApiProperty({ type: [OpenHourAPI] }) open_hours: OpenHourAPI[];
   @ApiProperty() longitude: number;
@@ -71,13 +76,16 @@ export class ResultatRechercheAPI {
       description: res.description,
       description_more: res.description_more,
       phone: res.phone,
-      categories: res.categories,
+      categories: res.categories ? res.categories : [],
       openhours_more_infos: res.openhours_more_infos,
       open_hours: res.open_hours,
       latitude: res.latitude,
       longitude: res.longitude,
       ingredients: res.ingredients,
       etapes_recette: res.etapes_recette,
+      categories_labels: res.categories
+        ? res.categories.map((c) => CategorieRechercheManager.getLabel(c))
+        : [],
     };
   }
 }

diff --git a/test/integration/api/recherchServices.controller.int-spec.ts b/test/integration/api/recherchServices.controller.int-spec.ts
@@ -149,6 +149,7 @@ describe('RechercheServices (API test)', () => {
       impact_carbone_kg: 1,
       image_url: 'https://',
       categories: ['a'],
+      categories_labels: ['a'],
       commitment: 'hahaha',
       description: 'description',
       description_more: 'description more',
@@ -305,6 +306,7 @@ describe('RechercheServices (API test)', () => {
       description_more: 'plus de description',
       phone: '061294875272',
       categories: [],
+      categories_labels: [],
       openhours_more_infos: 'sauf le mardi',
       open_hours: [{ jour: 'lundi', heures: '10h-18h' }],
       latitude: 40,