fix integration tests

codegouvfr · Jul 26, 2024 · 3873994 · 3873994
1 parent 72a5b92
commit 3873994
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 22 deletions.
diff --git a/api/package.json b/api/package.json
@@ -61,7 +61,6 @@
         "jwt-simple": "^0.5.6",
         "keycloak-backend": "^2.0.1",
         "keycloakify": "^9.6.7",
-        "kysely-ctl": "^0.8.7",
         "memoizee": "^0.4.15",
         "node-fetch": "^2.6.7",
         "prettier": "^2.8.2",

diff --git a/api/src/core/adapters/dbApi/kysely/pgDbApi.integration.test.ts b/api/src/core/adapters/dbApi/kysely/pgDbApi.integration.test.ts
@@ -14,13 +14,14 @@ const agent = {
     organization: "test-orga"
 };
 const externalId = "external-id-111";
+const similarExternalId = "external-id-222";
 const softwareFormData: SoftwareFormData = {
     comptoirDuLibreId: 50,
     doRespectRgaa: true,
-    externalId: "external-id-111",
+    externalId,
     isFromFrenchPublicService: false,
     isPresentInSupportContract: true,
-    similarSoftwareExternalDataIds: [externalId],
+    similarSoftwareExternalDataIds: [similarExternalId],
     softwareDescription: "Super software",
     softwareKeywords: ["bob", "l'éponge"],
     softwareLicense: "MIT",
@@ -54,6 +55,21 @@ const softwareExternalData: SoftwareExternalData = {
     license: "MIT"
 };
 
+const similarSoftwareExternalData: SoftwareExternalData = {
+    externalId: similarExternalId,
+    externalDataOrigin: "wikidata",
+    developers: [{ name: "Bobby", id: "similar-bob" }],
+    label: { en: "Some similar software" },
+    description: { en: "Some similar software description" },
+    isLibreSoftware: true,
+    logoUrl: "https://example.com/similar-logo.png",
+    framaLibreId: "",
+    websiteUrl: "https://example.similar.com",
+    sourceUrl: "https://example.similar.com/source",
+    documentationUrl: "https://example.similar.com/documentation",
+    license: "MIT"
+};
+
 const db = new Kysely<Database>({ dialect: createPgDialect("postgresql://sill:pg_password@localhost:5433/sill") });
 
 describe("pgDbApi", () => {
@@ -133,13 +149,10 @@ describe("pgDbApi", () => {
                 similarSoftwares: [
                     {
                         externalDataOrigin: "wikidata",
-                        externalId: "external-id-222",
-                        label: {
-                            en: "Some software",
-                            fr: "Un logiciel"
-                        },
-                        description: "Some software description for similar software",
-                        isLibreSoftware: softwareExternalData.isLibreSoftware,
+                        externalId: similarSoftwareExternalData.externalId,
+                        label: similarSoftwareExternalData.label,
+                        description: similarSoftwareExternalData.description,
+                        isLibreSoftware: similarSoftwareExternalData.isLibreSoftware,
                         isInSill: false
                     }
                 ],
@@ -324,18 +337,14 @@ describe("pgDbApi", () => {
     const insertSoftwareExternalDataAndSoftware = async () => {
         await db
             .insertInto("software_external_datas")
-            .values({
-                ...softwareExternalData,
-                developers: JSON.stringify(softwareExternalData.developers),
-                label: JSON.stringify(softwareExternalData.label),
-                description: JSON.stringify(softwareExternalData.description),
-                isLibreSoftware: softwareExternalData.isLibreSoftware,
-                framaLibreId: softwareExternalData.framaLibreId,
-                websiteUrl: softwareExternalData.websiteUrl,
-                sourceUrl: softwareExternalData.sourceUrl,
-                documentationUrl: softwareExternalData.documentationUrl,
-                license: softwareExternalData.license
-            })
+            .values(
+                [softwareExternalData, similarSoftwareExternalData].map(softExtData => ({
+                    ...softExtData,
+                    developers: JSON.stringify(softExtData.developers),
+                    label: JSON.stringify(softExtData.label),
+                    description: JSON.stringify(softExtData.description)
+                }))
+            )
             .execute();
 
         await dbApi.software.create({