fix: fix cnll providers

Author: JeromeBu

api/package.json

@@ -18,6 +18,7 @@
         "start": "yarn db:up && dotenv -e ../.env -- node dist/src/entrypoints/start-api.js",
         "job:import": "dotenv -e ../.env -- node dist/src/entrypoints/import.js",
         "job:import-from-inner-identifiers": "dotenv -e ../.env -- node dist/src/entrypoints/import-from-inner-identifiers.js",
+        "job:import-cnll-sill-only": "dotenv -e ../.env -- node dist/src/entrypoints/import-cnll-sill-only-script.js",
         "job:update": "dotenv -e ../.env -- node dist/src/entrypoints/update.js",
         "update-then-wait": "./update-then-wait.sh",
         "_format": "prettier \"**/*.{ts,tsx,json,md}\"",

api/src/core/adapters/CNLL/getExternalData.ts

@@ -32,11 +32,21 @@ export const getCNLLSoftwareExternalData: GetSoftwareExternalData = memoize(
 );
 
 const cnllProviderToCMProdivers = (provider: CnllPrestatairesSill.Prestataire): SchemaOrganization => {
+    const cnllId = provider.url.split("/").at(-1) ?? provider.nom;
+
     return {
         "@type": "Organization" as const,
         name: provider.nom,
-        url: provider.url ?? undefined,
         identifiers: [
+            ...(provider.url
+                ? [
+                      identifersUtils.makeCNLLIdentifier({
+                          cNNLId: cnllId,
+                          url: provider.url,
+                          additionalType: "Organization"
+                      })
+                  ]
+                : []),
             identifersUtils.makeSIRENIdentifier({
                 SIREN: provider.siren,
                 additionalType: "Organization"
@@ -71,5 +81,5 @@ const formatCNLLProvidersToExternalData = (
             cNNLId: cnllProdivers.sill_id.toString()
         })
     ],
-    providers: cnllProdivers.prestataires.map(prodiver => cnllProviderToCMProdivers(prodiver))
+    providers: cnllProdivers.prestataires.map(cnllProviderToCMProdivers)
 });

api/src/core/adapters/comptoirDuLibre/getCDLExternalData.ts

@@ -107,6 +107,6 @@ const formatCDLSoftwareToExternalData = (
                   ]
                 : [])
         ],
-        providers: cdlSoftwareItem.providers.map(prodiver => cdlProviderToCMProdivers(prodiver))
+        providers: cdlSoftwareItem.providers.map(cdlProviderToCMProdivers)
     };
 };

api/src/core/adapters/wikidata/getWikidataSoftware.ts

@@ -350,6 +350,8 @@ export async function fetchEntity(wikidataId: string): Promise<{ entity: Wikidat
 
     const entity = Object.values(json["entities"])[0] as WikidataEntity;
 
+    console.info(`   -> fetched wiki soft : ${entity.aliases.en?.[0]?.value || entity.aliases.fr?.[0]?.value}`);
+
     return { entity };
 }
 

api/src/entrypoints/import-cnll-sill-only-script.ts

@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: 2021-2025 DINUM <[email protected]>
+// SPDX-FileCopyrightText: 2024-2025 Université Grenoble Alpes
+// SPDX-License-Identifier: MIT
+
+// Note this is temporary script, to use as long CNLL doesn't have a proper API providing their own identifiers
+// Do not use this script outside of the main SILL application
+
+import { Kysely } from "kysely";
+import { getDbApiAndInitializeCache } from "../core/adapters/dbApi/kysely/createPgDbApi";
+import { Database } from "../core/adapters/dbApi/kysely/kysely.database";
+import { createPgDialect } from "../core/adapters/dbApi/kysely/kysely.dialect";
+import { env } from "../env";
+import { importCnllSillOnly } from "../rpc/import-cnll-sill-only";
+
+const kyselyDb = new Kysely<Database>({ dialect: createPgDialect(env.databaseUrl) });
+
+const { dbApi } = getDbApiAndInitializeCache({
+    "dbKind": "kysely",
+    "kyselyDb": kyselyDb
+});
+
+importCnllSillOnly(dbApi)
+    .then(() => console.log("Import CNLL (SILL only script) - Done"))
+    .catch(console.error);

api/src/rpc/import-cnll-sill-only.ts

@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: 2021-2025 DINUM <[email protected]>
+// SPDX-FileCopyrightText: 2024-2025 Université Grenoble Alpes
+// SPDX-License-Identifier: MIT
+
+// Note this is temporary script, to use as long CNLL doesn't have a proper API providing their own identifiers
+// Do not use this script outside of the main SILL application
+
+import { getCnllPrestatairesSill } from "../core/adapters/getCnllPrestatairesSill";
+import { DbApiV2 } from "../core/ports/DbApiV2";
+
+export const importCnllSillOnly = async (dbApi: DbApiV2): Promise<void> => {
+    const cnllSource = await dbApi.source.getByName({ name: "cnll" });
+
+    if (!cnllSource || cnllSource.kind !== "CNLL") {
+        console.warn(`This source if not compatible with CNLL Adapter : ${JSON.stringify(cnllSource, null, 2)}`);
+        return;
+    }
+
+    const cnllProviders = await getCnllPrestatairesSill();
+
+    const toInsert = cnllProviders.map(provider => ({
+        sourceSlug: cnllSource.slug,
+        externalId: provider.sill_id.toString(),
+        softwareId: provider.sill_id
+    }));
+
+    await dbApi.softwareExternalData.saveIds(toInsert);
+};

api/update-then-wait.sh

@@ -16,6 +16,8 @@ START_DATETIME=$(date "+%Y-%m-%d %H:%M:%S")
 
 echo "Starting update at ${START_DATETIME}"
 # Run the update command
+yarn job:import-from-inner-identifiers
+yarn job:import-cnll-sill-only
 yarn job:update
 
 END_DATETIME=$(date "+%Y-%m-%d %H:%M:%S")

web/index.html

@@ -15,7 +15,7 @@
     <link rel="shortcut icon" href="/dsfr/favicon/favicon.ico" type="image/x-icon" />
     <link rel="manifest" href="/dsfr/favicon/manifest.webmanifest" crossorigin="use-credentials" />
 
-    <link rel="stylesheet" href="/dsfr/utility/icons/icons.min.css?hash=bdc4ebf9" />
+    <link rel="stylesheet" href="/dsfr/utility/icons/icons.min.css?hash=a1396dfb" />
     <link rel="stylesheet" href="/dsfr/dsfr.min.css" />
 
     %VITE_HEAD%