remove organisation from keycloak, and use the one stored in agents table

api/scripts/compile-data.ts

@@ -7,7 +7,6 @@ import { env } from "../src/env";
 (async () => {
     const kyselyDb = new Kysely<Database>({ dialect: createPgDialect(env.databaseUrl) });
     const { useCases } = await bootstrapCore({
-        "keycloakUserApiParams": undefined,
         "dbConfig": {
             "dbKind": "kysely",
             "kyselyDb": kyselyDb

api/src/core/adapters/dbApi/in-memory/createInMemoryAgentRepository.ts

@@ -30,7 +30,11 @@ export const createInMemoryAgentRepository = (): {
             },
             getAll: () => {
                 throw new Error("Not implemented");
-            }
+            },
+            getAllOrganizations: () => {
+                throw new Error("Not implemented");
+            },
+            countAll: async () => agents.length
         },
         testHelpers: {
             setAgents: (newAgents: DbAgentWithId[]) => {

api/src/core/adapters/dbApi/kysely/createPgAgentRepository.ts

@@ -37,7 +37,22 @@ export const createPgAgentRepository = (db: Kysely<Database>): AgentRepository =
                     about: about ?? undefined,
                     declarations: [...usersDeclarations, ...referentsDeclarations]
                 }))
-            )
+            ),
+    countAll: () =>
+        db
+            .selectFrom("agents")
+            .select(qb => qb.fn.countAll<number>().as("count"))
+            .executeTakeFirstOrThrow()
+            .then(({ count }) => +count),
+    getAllOrganizations: () =>
+        db
+            .selectFrom("agents")
+            .where("organization", "is not", null)
+            .groupBy("organization")
+            .orderBy("organization")
+            .select(({ ref }) => ref("organization").$castTo<string>().as("organization"))
+            .execute()
+            .then(results => results.map(({ organization }) => organization))
 });
 
 const makeGetAgentBuilder = (db: Kysely<Database>) =>

api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts

@@ -446,7 +446,7 @@ const makeGetSoftwareBuilder = (db: Kysely<Database>) =>
         ]);
 
 type CountForOrganisationAndSoftwareId = {
-    organization: string;
+    organization: string | null;
     softwareId: number;
     type: "user" | "referent";
     count: string;
@@ -490,16 +490,19 @@ const getUserAndReferentCountByOrganizationBySoftwareId = async (
         .execute();
 
     return [...softwareReferentCountBySoftwareId, ...softwareUserCountBySoftwareId].reduce(
-        (acc, { organization, softwareId, type, count }): UserAndReferentCountByOrganizationBySoftwareId => ({
-            ...acc,
-            [softwareId]: {
-                ...(acc[softwareId] ?? {}),
-                [organization]: {
-                    ...(acc[softwareId]?.[organization] ?? defaultCount),
-                    [type]: +count
+        (acc, { organization, softwareId, type, count }): UserAndReferentCountByOrganizationBySoftwareId => {
+            const orga = organization ?? "NO_ORGANIZATION";
+            return {
+                ...acc,
+                [softwareId]: {
+                    ...(acc[softwareId] ?? {}),
+                    [orga]: {
+                        ...(acc[softwareId]?.[orga] ?? defaultCount),
+                        [type]: +count
+                    }
                 }
-            }
-        }),
+            };
+        },
         {} as UserAndReferentCountByOrganizationBySoftwareId
     );
 };

api/src/core/adapters/dbApi/kysely/kysely.database.ts

@@ -14,7 +14,7 @@ export type Database = {
 type AgentsTable = {
     id: Generated<number>;
     email: string;
-    organization: string;
+    organization: string | null;
     about: string | null;
     isPublic: boolean;
 };

api/src/core/adapters/dbApi/kysely/migrations/1733923587668_make-organization-nullable-for-agent.ts

@@ -0,0 +1,15 @@
+import type { Kysely } from "kysely";
+
+export async function up(db: Kysely<any>): Promise<void> {
+    await db.schema
+        .alterTable("agents")
+        .alterColumn("organization", ac => ac.dropNotNull())
+        .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+    await db.schema
+        .alterTable("agents")
+        .alterColumn("organization", ac => ac.setNotNull())
+        .execute();
+}

api/src/core/bootstrap.ts

@@ -1,5 +1,4 @@
 import { Kysely } from "kysely";
-import { createObjectThatThrowsIfAccessed } from "../tools/createObjectThatThrowsIfAccessed";
 import { comptoirDuLibreApi } from "./adapters/comptoirDuLibreApi";
 import { createKyselyPgDbApi } from "./adapters/dbApi/kysely/createPgDbApi";
 import { Database } from "./adapters/dbApi/kysely/kysely.database";
@@ -10,13 +9,11 @@ import { createGetSoftwareLatestVersion } from "./adapters/getSoftwareLatestVers
 import { getWikidataSoftware } from "./adapters/wikidata/getWikidataSoftware";
 import { getWikidataSoftwareOptions } from "./adapters/wikidata/getWikidataSoftwareOptions";
 import { halAdapter } from "./adapters/hal";
-import { createKeycloakUserApi, type KeycloakUserApiParams } from "./adapters/userApi";
 import type { ComptoirDuLibreApi } from "./ports/ComptoirDuLibreApi";
 import { DbApiV2 } from "./ports/DbApiV2";
 import type { ExternalDataOrigin, GetSoftwareExternalData } from "./ports/GetSoftwareExternalData";
 import type { GetSoftwareExternalDataOptions } from "./ports/GetSoftwareExternalDataOptions";
 import type { GetSoftwareLatestVersion } from "./ports/GetSoftwareLatestVersion";
-import type { UserApi } from "./ports/UserApi";
 import { UseCases } from "./usecases";
 import { makeGetAgent } from "./usecases/getAgent";
 import { makeGetSoftwareFormAutoFillDataFromExternalAndOtherSources } from "./usecases/getSoftwareFormAutoFillDataFromExternalAndOtherSources";
@@ -28,7 +25,6 @@ type DbConfig = PgDbConfig;
 
 type ParamsOfBootstrapCore = {
     dbConfig: DbConfig;
-    keycloakUserApiParams: KeycloakUserApiParams | undefined;
     githubPersonalAccessTokenForApiRateLimit: string;
     doPerPerformPeriodicalCompilation: boolean;
     doPerformCacheInitialization: boolean;
@@ -41,7 +37,6 @@ type ParamsOfBootstrapCore = {
 export type Context = {
     paramsOfBootstrapCore: ParamsOfBootstrapCore;
     dbApi: DbApiV2;
-    userApi: UserApi;
     comptoirDuLibreApi: ComptoirDuLibreApi;
     getSoftwareExternalData: GetSoftwareExternalData;
     getSoftwareLatestVersion: GetSoftwareLatestVersion;
@@ -63,10 +58,8 @@ export async function bootstrapCore(
 ): Promise<{ dbApi: DbApiV2; context: Context; useCases: UseCases }> {
     const {
         dbConfig,
-        keycloakUserApiParams,
         githubPersonalAccessTokenForApiRateLimit,
         doPerPerformPeriodicalCompilation,
-        doPerformCacheInitialization,
         externalSoftwareDataOrigin,
         initializeSoftwareFromSource,
         botAgentEmail,
@@ -81,20 +74,9 @@ export async function bootstrapCore(
 
     const { dbApi } = getDbApiAndInitializeCache(dbConfig);
 
-    const { userApi, initializeUserApiCache } =
-        keycloakUserApiParams === undefined
-            ? {
-                  "userApi": createObjectThatThrowsIfAccessed<Context["userApi"]>({
-                      "debugMessage": "No Keycloak server"
-                  }),
-                  "initializeUserApiCache": async () => {}
-              }
-            : createKeycloakUserApi(keycloakUserApiParams);
-
     const context: Context = {
         "paramsOfBootstrapCore": params,
         dbApi,
-        userApi,
         comptoirDuLibreApi,
         getSoftwareExternalData,
         getSoftwareLatestVersion
@@ -114,11 +96,6 @@ export async function bootstrapCore(
         getAgent: makeGetAgent({ agentRepository: dbApi.agent })
     };
 
-    if (doPerformCacheInitialization) {
-        console.log("Performing user cache initialization...");
-        await initializeUserApiCache();
-    }
-
     if (initializeSoftwareFromSource) {
         if (!botAgentEmail) throw new Error("No bot agent email provided");
         if (externalSoftwareDataOrigin === "HAL") {

api/src/core/ports/DbApiV2.ts

@@ -86,7 +86,7 @@ export interface InstanceRepository {
 export type DbAgent = {
     id: number;
     email: string;
-    organization: string;
+    organization: string | null;
     about: string | undefined;
     isPublic: boolean;
 };
@@ -99,6 +99,8 @@ export interface AgentRepository {
     remove: (agentId: number) => Promise<void>;
     getByEmail: (email: string) => Promise<AgentWithId | undefined>;
     getAll: () => Promise<AgentWithId[]>;
+    countAll: () => Promise<number>;
+    getAllOrganizations: () => Promise<string[]>;
 }
 
 export interface SoftwareReferentRepository {

api/src/core/usecases/getAgent.ts

@@ -22,7 +22,7 @@ export const makeGetAgent =
             if (currentUser.email === email) {
                 const agentWithoutId = {
                     email: currentUser.email,
-                    organization: currentUser.organization,
+                    organization: null,
                     about: "",
                     isPublic: false
                 };