#129 : merge applicationCategories and remove categories

codegouvfr · Jan 17, 2025 · 5c9fff0 · 5c9fff0
1 parent 31bdfb9
commit 5c9fff0
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 63 deletions.
diff --git a/api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts b/api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts
@@ -191,7 +191,9 @@ export const createPgSoftwareRepository = (db: Kysely<Database>): SoftwareReposi
                         parentWikidataSoftware: parentExternalData,
                         keywords: software?.keywords ?? softwareExternalData?.keywords ?? [],
                         programmingLanguages: softwareExternalData?.programmingLanguages ?? [],
-                        applicationCategories: softwareExternalData?.applicationCategories ?? []
+                        applicationCategories: software.categories.concat(
+                            softwareExternalData?.applicationCategories ?? []
+                        )
                     });
                 }),
         getById: getBySoftwareId,
@@ -285,7 +287,9 @@ export const createPgSoftwareRepository = (db: Kysely<Database>): SoftwareReposi
                                 software.comptoirDuLibreSoftware?.providers.length ?? 0,
                             testUrl: testUrls[0]?.url,
                             parentWikidataSoftware: parentExternalData ?? undefined,
-                            applicationCategories: softwareExternalData?.applicationCategories ?? [],
+                            applicationCategories: software.categories.concat(
+                                softwareExternalData?.applicationCategories ?? []
+                            ),
                             programmingLanguages: softwareExternalData?.programmingLanguages ?? []
                         });
                     }
@@ -547,6 +551,6 @@ const makeGetSoftwareById =
                     testUrl: testUrls[0]?.url,
                     parentWikidataSoftware: parentExternalData,
                     programmingLanguages: softwareExternalData?.programmingLanguages ?? [],
-                    applicationCategories: softwareExternalData?.applicationCategories ?? []
+                    applicationCategories: software.categories.concat(softwareExternalData?.applicationCategories ?? [])
                 });
             });
diff --git a/web/src/core/adapter/sillApiMock.ts b/web/src/core/adapter/sillApiMock.ts
@@ -98,7 +98,7 @@ export const sillApi: SillApi = {
             "testUrl": undefined,
             "addedTime": Date.now(),
             "updateTime": Date.now(),
-            "categories": [],
+            "applicationCategories": [],
             "prerogatives": {
                 "doRespectRgaa": false,
                 "isFromFrenchPublicServices": formData.isFromFrenchPublicService,
@@ -111,8 +111,7 @@ export const sillApi: SillApi = {
             },
             "keywords": [],
             "annuaireCnllServiceProviders": [],
-            "programmingLanguages": ["c++"],
-            "applicationCategories": []
+            "programmingLanguages": ["c++"]
         };
 
         softwares.push(software);
@@ -154,7 +153,7 @@ export const sillApi: SillApi = {
                 "testUrl": undefined,
                 "addedTime": Date.now(),
                 "updateTime": Date.now(),
-                "categories": [],
+                "applicationCategories": [],
                 "prerogatives": {
                     "doRespectRgaa": false,
                     "isFromFrenchPublicServices": formData.isFromFrenchPublicService,
@@ -168,7 +167,6 @@ export const sillApi: SillApi = {
                 },
                 "keywords": [],
                 "annuaireCnllServiceProviders": [],
-                "applicationCategories": [],
                 "programmingLanguages": []
             })
         };
@@ -326,7 +324,7 @@ const softwares = [
         "addedTime": 1670416144,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["messaging"],
+        "applicationCategories": ["messaging"],
         "softwareType": {
             "type": "cloud"
         },
@@ -341,7 +339,6 @@ const softwares = [
             "DINUM": { "referentCount": 2, "userCount": 43 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -387,7 +384,7 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["traitement de texte"],
+        "applicationCategories": ["traitement de texte"],
         "prerogatives": {
             "doRespectRgaa": true,
             "isFromFrenchPublicServices": true,
@@ -407,7 +404,6 @@ const softwares = [
             "CA du Puy-en-Velay": { "referentCount": 1, "userCount": 0 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -453,7 +449,7 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud", "software"],
+        "applicationCategories": ["cloud", "software"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
@@ -465,7 +461,6 @@ const softwares = [
             "DINUM": { "referentCount": 2, "userCount": 43 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -514,15 +509,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["player"],
+        "applicationCategories": ["player"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -570,7 +564,7 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
@@ -582,7 +576,6 @@ const softwares = [
             "DINUM": { "referentCount": 2, "userCount": 43 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -645,7 +638,7 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
@@ -657,7 +650,6 @@ const softwares = [
             "DINUM": { "referentCount": 2, "userCount": 43 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -702,7 +694,7 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
@@ -713,7 +705,6 @@ const softwares = [
             "DINUM": { "referentCount": 2, "userCount": 43 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -763,7 +754,7 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
@@ -784,7 +775,6 @@ const softwares = [
             "DINUM": { "referentCount": 2, "userCount": 43 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -823,7 +813,7 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "softwareType": {
             "type": "stack"
         },
@@ -836,7 +826,6 @@ const softwares = [
             "CA du Puy-en-Velay": { "referentCount": 0, "userCount": 1 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -875,7 +864,7 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
@@ -887,7 +876,6 @@ const softwares = [
             "DINUM": { "referentCount": 2, "userCount": 43 }
         },
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -927,15 +915,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -975,15 +962,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -1023,15 +1009,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -1071,15 +1056,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -1119,15 +1103,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -1167,15 +1150,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -1215,15 +1197,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     }),
     id<ApiTypes.Software>({
@@ -1263,15 +1244,14 @@ const softwares = [
         "addedTime": 1674739365178,
         "updateTime": 1674739365178,
         "dereferencing": undefined,
-        "categories": ["cloud"],
+        "applicationCategories": ["cloud"],
         "prerogatives": {
             "doRespectRgaa": false,
             "isFromFrenchPublicServices": false,
             "isPresentInSupportContract": false
         },
         "userAndReferentCountByOrganization": {},
         "keywords": [],
-        "applicationCategories": [],
         "programmingLanguages": []
     })
 ];