#129 : fix api test

codegouvfr · Jan 14, 2025 · 5e695b5 · 5e695b5
1 parent a8e7a2b
commit 5e695b5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts b/api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts
@@ -193,7 +193,8 @@ export const createPgSoftwareRepository = (db: Kysely<Database>): SoftwareReposi
                         programmingLanguages: softwareExternalData?.programmingLanguages ?? [],
                         applicationCategories: software.categories.concat(
                             softwareExternalData?.applicationCategories ?? []
-                        )
+                        ),
+                        categories: undefined // merged in applicationCategories, set to undefined to remove it
                     });
                 }),
         getById: getBySoftwareId,
@@ -290,6 +291,7 @@ export const createPgSoftwareRepository = (db: Kysely<Database>): SoftwareReposi
                             applicationCategories: software.categories.concat(
                                 softwareExternalData?.applicationCategories ?? []
                             ),
+                            categories: undefined, // merged in applicationCategories, set to undefined to remove it
                             programmingLanguages: softwareExternalData?.programmingLanguages ?? []
                         });
                     }
@@ -511,6 +513,12 @@ const getUserAndReferentCountByOrganizationBySoftwareId = async (
     );
 };
 
+const filterDuplicate = (array: any[]) => {
+    return array.filter(function (item: any, pos: number) {
+        return array.indexOf(item) == pos;
+    });
+};
+
 const makeGetSoftwareById =
     (db: Kysely<Database>) =>
     async (softwareId: number): Promise<Software | undefined> =>
@@ -551,6 +559,9 @@ const makeGetSoftwareById =
                     testUrl: testUrls[0]?.url,
                     parentWikidataSoftware: parentExternalData,
                     programmingLanguages: softwareExternalData?.programmingLanguages ?? [],
-                    applicationCategories: software.categories.concat(softwareExternalData?.applicationCategories ?? [])
+                    applicationCategories: filterDuplicate(
+                        software.categories.concat(softwareExternalData?.applicationCategories ?? [])
+                    ),
+                    categories: undefined // merged in applicationCategories, set to undefined to remove it
                 });
             });
diff --git a/api/src/core/adapters/dbApi/kysely/pgDbApi.integration.test.ts b/api/src/core/adapters/dbApi/kysely/pgDbApi.integration.test.ts
@@ -166,7 +166,6 @@ describe("pgDbApi", () => {
                     authorName: dev.name,
                     authorUrl: `https://www.wikidata.org/wiki/${dev.id}`
                 })),
-                categories: [],
                 codeRepositoryUrl: softwareExternalData.sourceUrl,
                 comptoirDuLibreId: 50,
                 comptoirDuLibreServiceProviderCount: 0,

diff --git a/api/src/core/usecases/readWriteSillData/types.ts b/api/src/core/usecases/readWriteSillData/types.ts
@@ -34,7 +34,7 @@ export type Software = {
               lastRecommendedVersion?: string;
           }
         | undefined;
-    categories: string[];
+    applicationCategories: string[];
     prerogatives: Prerogatives;
     userAndReferentCountByOrganization: Record<string, { userCount: number; referentCount: number }>;
     authors: {
@@ -62,7 +62,6 @@ export type Software = {
     similarSoftwares: Software.SimilarSoftware[];
     keywords: string[];
     programmingLanguages: string[];
-    applicationCategories: string[];
 };
 
 export namespace Software {