fix: fix e2e tests

Author: JeromeBu

.gitignore

@@ -6,4 +6,4 @@ docker-data
 .dev
 .bruno
 dump*
-CLAUDE.md
+CLAUDE.md

api/src/rpc/createTestCaller.ts

@@ -8,13 +8,15 @@ import { Database } from "../core/adapters/dbApi/kysely/kysely.database";
 import { createPgDialect } from "../core/adapters/dbApi/kysely/kysely.dialect";
 import { getWikidataSoftware } from "../core/adapters/wikidata/getWikidataSoftware";
 import { getWikidataSoftwareOptions } from "../core/adapters/wikidata/getWikidataSoftwareOptions";
+import { Session } from "../core/ports/DbApiV2";
 import { ExternalDataOrigin } from "../core/ports/GetSoftwareExternalData";
 import { testPgUrl } from "../tools/test.helpers";
 import { createRouter } from "./router";
 import { UserWithId } from "../lib/ApiTypes";
 
 type TestCallerConfig = {
     currentUser: UserWithId | undefined;
+    db?: Kysely<Database>;
 };
 
 export const defaultUser: UserWithId = {
@@ -29,9 +31,9 @@ export const defaultUser: UserWithId = {
 
 export type ApiCaller = Awaited<ReturnType<typeof createTestCaller>>["apiCaller"];
 
-export const createTestCaller = async ({ currentUser }: TestCallerConfig = { currentUser: defaultUser }) => {
+export const createTestCaller = async ({ currentUser, db }: TestCallerConfig = { currentUser: defaultUser }) => {
+    const kyselyDb = db ?? new Kysely<Database>({ dialect: createPgDialect(testPgUrl) });
     const externalSoftwareDataOrigin: ExternalDataOrigin = "wikidata";
-    const kyselyDb = new Kysely<Database>({ dialect: createPgDialect(testPgUrl) });
 
     const { dbApi, useCases, uiConfig } = await bootstrapCore({
         "dbConfig": { dbKind: "kysely", kyselyDb },
@@ -62,5 +64,27 @@ export const createTestCaller = async ({ currentUser }: TestCallerConfig = { cur
         uiConfig
     });
 
+    if (currentUser) {
+        // creating the current user with an active session
+        const { declarations, ...rest } = currentUser;
+        await dbApi.user.add(rest);
+        const session: Session = {
+            id: "11111111-1111-1111-1111-111111111111",
+            state: "test-state",
+            redirectUrl: null,
+            userId: currentUser.id,
+            email: currentUser.email,
+            accessToken: "test-access-token",
+            refreshToken: "test-refresh-token",
+            idToken: "test-id-token",
+            expiresAt: new Date(Date.now() + 3600 * 1000), // 1 hour from now
+            createdAt: new Date(),
+            updatedAt: new Date(),
+            loggedOutAt: null
+        };
+        await dbApi.session.create(session);
+        await dbApi.session.update(session);
+    }
+
     return { apiCaller: router.createCaller({ currentUser }), kyselyDb };
 };

api/src/rpc/routes.e2e.test.ts

@@ -5,6 +5,7 @@
 import { Kysely } from "kysely";
 import { beforeAll, describe, expect, it } from "vitest";
 import { Database } from "../core/adapters/dbApi/kysely/kysely.database";
+import { createPgDialect } from "../core/adapters/dbApi/kysely/kysely.dialect";
 import { stripNullOrUndefinedValues } from "../core/adapters/dbApi/kysely/kysely.utils";
 import type { DbUser } from "../core/ports/DbApiV2";
 import type { InstanceFormData, Source } from "../core/usecases/readWriteSillData";
@@ -13,7 +14,8 @@ import {
     createInstanceFormData,
     createSoftwareFormData,
     expectToEqual,
-    expectToMatchObject
+    expectToMatchObject,
+    testPgUrl
 } from "../tools/test.helpers";
 import { ApiCaller, createTestCaller, defaultUser } from "./createTestCaller";
 
@@ -96,7 +98,7 @@ describe("RPC e2e tests", () => {
         let user: DbUser;
 
         beforeAll(async () => {
-            ({ apiCaller, kyselyDb } = await createTestCaller());
+            kyselyDb = new Kysely<Database>({ dialect: createPgDialect(testPgUrl) });
             await kyselyDb.deleteFrom("software_referents").execute();
             await kyselyDb.deleteFrom("software_users").execute();
             await kyselyDb.deleteFrom("instances").execute();
@@ -106,11 +108,13 @@ describe("RPC e2e tests", () => {
             await kyselyDb.deleteFrom("sources").execute();
 
             await kyselyDb.insertInto("sources").values(mainSource).executeTakeFirst();
+
+            ({ apiCaller, kyselyDb } = await createTestCaller({ db: kyselyDb, currentUser: defaultUser }));
         });
 
         it("gets the list of users, which is initially empty", async () => {
             const { users } = await apiCaller.getUsers();
-            expect(users).toHaveLength(0);
+            expect(users).toHaveLength(1);
         });
 
         it("adds a new software", async () => {
@@ -128,7 +132,7 @@ describe("RPC e2e tests", () => {
             expectToMatchObject(user, {
                 id: expect.any(Number),
                 email: defaultUser.email,
-                organization: null
+                organization: defaultUser.organization
             });
 
             const softwareRows = await getSoftwareRows();
@@ -174,7 +178,7 @@ describe("RPC e2e tests", () => {
             expect(users).toHaveLength(1);
             expectToMatchObject(users[0], {
                 "email": defaultUser.email,
-                "organization": null
+                "organization": defaultUser.organization
             });
         });