From f04993d5dede6297d47f3f8a0cfa33f0ec8d17d3 Mon Sep 17 00:00:00 2001
From: Davide Bizzi <davide.bizzi@unguess.io>
Date: Fri, 8 Nov 2024 15:46:44 +0100
Subject: [PATCH 01/18] feat: Reset results on candidature

---
 package.json                                  |  2 +-
 .../_post/createCandidature/index.ts          |  1 +
 .../campaignId/candidates/_post/index.spec.ts | 36 ++++++++++++++++++-
 yarn.lock                                     |  8 ++---
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 59926bcce..648ea0ccd 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@appquality/tryber-database": "^0.41.10",
+    "@appquality/tryber-database": "^0.42.0",
     "@appquality/wp-auth": "^1.0.7",
     "@googlemaps/google-maps-services-js": "^3.3.7",
     "@sendgrid/mail": "^7.6.0",
diff --git a/src/routes/campaigns/campaignId/candidates/_post/createCandidature/index.ts b/src/routes/campaigns/campaignId/candidates/_post/createCandidature/index.ts
index 21a37df4a..7c9d5f987 100644
--- a/src/routes/campaigns/campaignId/candidates/_post/createCandidature/index.ts
+++ b/src/routes/campaigns/campaignId/candidates/_post/createCandidature/index.ts
@@ -16,6 +16,7 @@ export default async (
         accepted: 1,
         selected_device: selectedDevice,
         accepted_date: tryber.fn.now(),
+        results: 0,
       })
       .where("user_id", wpId)
       .where("campaign_id", campaignId);
diff --git a/src/routes/campaigns/campaignId/candidates/_post/index.spec.ts b/src/routes/campaigns/campaignId/candidates/_post/index.spec.ts
index de4bedbd3..f6edbcb9b 100644
--- a/src/routes/campaigns/campaignId/candidates/_post/index.spec.ts
+++ b/src/routes/campaigns/campaignId/candidates/_post/index.spec.ts
@@ -1,6 +1,6 @@
 import app from "@src/app";
-import request from "supertest";
 import { tryber } from "@src/features/database";
+import request from "supertest";
 const profile = {
   id: 1,
   wp_user_id: 1,
@@ -58,6 +58,7 @@ const authorizedPostCandidate = async ({
     .send({ tester_id: tester, device })
     .set("authorization", `Bearer tester olp {"appq_tester_selection":[1]}`);
 };
+
 const authorizedPostMultiCandidate = async (
   list: {
     tester: number;
@@ -197,6 +198,39 @@ describe("POST /campaigns/{campaignId}/candidates", () => {
   });
 });
 
+describe("POST /campaigns/{campaignId}/candidates - user deselected", () => {
+  beforeEach(async () => {
+    await tryber.tables.WpAppqEvdProfile.do().insert([
+      { ...profile, id: 100, wp_user_id: 100 },
+    ]);
+    await tryber.tables.WpCrowdAppqHasCandidate.do().insert({
+      user_id: 100,
+      campaign_id: 1,
+      accepted: 0,
+      results: -1,
+    });
+  });
+  afterEach(async () => {
+    await tryber.tables.WpAppqEvdProfile.do().delete().where({ id: 100 });
+    await tryber.tables.WpCrowdAppqHasCandidate.do()
+      .delete()
+      .where({ user_id: 100 });
+  });
+
+  it("Should select with results=0 if user is deselected", async () => {
+    await authorizedPostCandidate({ tester: 100 });
+    const candidature = await getCandidature({ tester: 100, campaign: 1 });
+    expect(candidature).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          user_id: 100,
+          results: 0,
+        }),
+      ])
+    );
+  });
+});
+
 describe("POST /campaigns/{campaignId}/candidates?device=random when user has not devices", () => {
   it("Should candidate the user on success with selected_device=0", async () => {
     const beforeCandidature = await getCandidature({ tester: 1, campaign: 1 });
diff --git a/yarn.lock b/yarn.lock
index 5feafab2d..ef5864dd9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,10 +28,10 @@
     "@babel/parser" "^7.22.5"
     "@babel/traverse" "^7.22.5"
 
-"@appquality/tryber-database@^0.41.10":
-  version "0.41.10"
-  resolved "https://registry.yarnpkg.com/@appquality/tryber-database/-/tryber-database-0.41.10.tgz#b66fd5d5c9874cbc960f50e278682b1a3cd1f2a0"
-  integrity sha512-HSYe/wpQsD3A8D+ip+6pTL2bEJfwUb3hj2rDrh+LJ2eCSMdIBwNHA67fjlNEtIgUcB/BIokWOi2z+UqIhtaVTQ==
+"@appquality/tryber-database@^0.42.0":
+  version "0.42.0"
+  resolved "https://registry.npmjs.org/@appquality/tryber-database/-/tryber-database-0.42.0.tgz#4b517d52f61e666e8730c505070db50c0e922940"
+  integrity sha512-Knxhw6aHWF1d7QnVLiXVkQOPN7pm4uG99pgAtaGZjyhpVBij9BcIZnMFDPxSWO7IHY+JWLfa9PJFjco4SbGG8Q==
   dependencies:
     better-sqlite3 "^8.1.0"
     knex "^2.5.1"

From 72e2ebb694d75ebdc0a28f605d82c98f4fb6357d Mon Sep 17 00:00:00 2001
From: Davide Bizzi <davide.bizzi@unguess.io>
Date: Fri, 8 Nov 2024 15:48:25 +0100
Subject: [PATCH 02/18] rework: Use on duplicate key update for candidature

---
 .../_post/createCandidature/index.ts          | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/routes/campaigns/campaignId/candidates/_post/createCandidature/index.ts b/src/routes/campaigns/campaignId/candidates/_post/createCandidature/index.ts
index 7c9d5f987..d615a37bf 100644
--- a/src/routes/campaigns/campaignId/candidates/_post/createCandidature/index.ts
+++ b/src/routes/campaigns/campaignId/candidates/_post/createCandidature/index.ts
@@ -5,23 +5,8 @@ export default async (
   campaignId: number,
   selectedDevice: number
 ) => {
-  const isCandidate = await tryber.tables.WpCrowdAppqHasCandidate.do()
-    .select()
-    .where("user_id", wpId)
-    .where("campaign_id", campaignId);
-
-  if (isCandidate.length) {
-    await tryber.tables.WpCrowdAppqHasCandidate.do()
-      .update({
-        accepted: 1,
-        selected_device: selectedDevice,
-        accepted_date: tryber.fn.now(),
-        results: 0,
-      })
-      .where("user_id", wpId)
-      .where("campaign_id", campaignId);
-  } else {
-    await tryber.tables.WpCrowdAppqHasCandidate.do().insert({
+  await tryber.tables.WpCrowdAppqHasCandidate.do()
+    .insert({
       user_id: wpId,
       campaign_id: campaignId,
       accepted: 1,
@@ -30,8 +15,15 @@ export default async (
       selected_device: selectedDevice,
       group_id: 1,
       accepted_date: tryber.fn.now(),
+    })
+    .onConflict(["user_id", "campaign_id"])
+    .merge({
+      accepted: 1,
+      selected_device: selectedDevice,
+      accepted_date: tryber.fn.now(),
+      results: 0,
     });
-  }
+
   return {
     wordpress_id: wpId,
     campaign_id: campaignId,

From 357466192cfa455aa525a2e6f168da3b0e717198 Mon Sep 17 00:00:00 2001
From: "it@app-quality.com" <it@app-quality.com>
Date: Mon, 14 Oct 2024 10:23:02 +0200
Subject: [PATCH 03/18] Modified 2 files

---
 .stoplight/styleguide.json | 89 ++++++++++++++++++++++++++++++--------
 src/reference/openapi.yml  | 81 +++++++++++++++++-----------------
 2 files changed, 111 insertions(+), 59 deletions(-)

diff --git a/.stoplight/styleguide.json b/.stoplight/styleguide.json
index 9da2bc295..fca135622 100644
--- a/.stoplight/styleguide.json
+++ b/.stoplight/styleguide.json
@@ -13,25 +13,9 @@
   ],
   "aliases": {},
   "rules": {},
-  "extendedStyleguides": [
-    {
-      "id": "cHJqOjEyMzU4Ng",
-      "name": "Stoplight Style Guide",
-      "slug": "stoplight-style-guide",
-      "workspace": {
-        "slug": "apistylebook",
-        "name": "API Stylebook"
-      },
-      "icon": "robot",
-      "color": "#3898ff",
-      "description": "Default rules for Stoplight projects",
-      "latestRelease": {
-        "release": 31
-      }
-    }
-  ],
   "inheritedRules": [
     {
+      "id": "ev_7eYY_fvMC93DmNzqEa",
       "given": [
         "#API_Contact"
       ],
@@ -46,6 +30,7 @@
       "message": "Contact object should have \"url\"."
     },
     {
+      "id": "aHOnvrUi0BMNBQUPLXPYO",
       "given": [
         "#API_Contact"
       ],
@@ -60,6 +45,7 @@
       "message": "Contact object should have \"email\""
     },
     {
+      "id": "rpuLynhbduRhXu-4Z9HUe",
       "given": [
         "#API_Document"
       ],
@@ -74,6 +60,7 @@
       "message": "Info object should have \"contact\" object."
     },
     {
+      "id": "M_L3UJTUZsN8K4RmUlNUW",
       "given": [
         "#API_Document"
       ],
@@ -88,6 +75,7 @@
       "message": "Info object should have \"description\" object."
     },
     {
+      "id": "FLyyqhfcGuyYb08kPF3Fo",
       "given": [
         "#API_Document"
       ],
@@ -102,6 +90,7 @@
       "message": "Info object should have \"license\" object."
     },
     {
+      "id": "Do9d2t_iEl15N8JY8h7gY",
       "given": [
         "#API_License"
       ],
@@ -116,6 +105,7 @@
       "message": "License object should include \"url\"."
     },
     {
+      "id": "mB0C1J_eJEA3KSXM7zTIO",
       "given": [
         "#All_Markdown"
       ],
@@ -132,6 +122,7 @@
       "message": "Markdown descriptions must not have \"eval(\"."
     },
     {
+      "id": "O9hO4N0qjeqmils9MQ3mW",
       "given": [
         "#All_Markdown"
       ],
@@ -148,6 +139,7 @@
       "message": "Markdown descriptions must not have \"<script>\" tags."
     },
     {
+      "id": "f6-dedC9nawz334DqNAPO",
       "given": [
         "#API_Tags"
       ],
@@ -164,6 +156,7 @@
       "message": "OpenAPI object should have alphabetical \"tags\"."
     },
     {
+      "id": "mtAq5rj7YLT6nvgdvStdb",
       "given": [
         "#API_Tags"
       ],
@@ -183,6 +176,7 @@
       "message": "OpenAPI object should have non-empty \"tags\" array."
     },
     {
+      "id": "O6JC9y0de0CtbM_qFk8zO",
       "given": [
         "#Operation_Object"
       ],
@@ -197,6 +191,7 @@
       "message": "Operation \"description\" should be present and non-empty string."
     },
     {
+      "id": "FFhYkYd7qP4KY9POBDSSc",
       "given": [
         "#Operation_Object"
       ],
@@ -211,6 +206,7 @@
       "message": "Operation should have \"operationId\"."
     },
     {
+      "id": "o_GsySmjNb90ow8lEiiRi",
       "given": [
         "#Operation_Object"
       ],
@@ -228,6 +224,7 @@
       "message": "OperationId should not have characters that are invalid when used in URL."
     },
     {
+      "id": "SPPvVnLS66MvH3CTVdZFT",
       "given": [
         "#API_Tags"
       ],
@@ -244,6 +241,7 @@
       "message": "Operation should not have more than a single tag."
     },
     {
+      "id": "Y6v-Nqjsci75J18s1lEoN",
       "given": [
         "#Operation_Object"
       ],
@@ -262,6 +260,7 @@
       "message": "Operation should have non-empty \"tags\" array."
     },
     {
+      "id": "45p0KQo3aLJ7glvqz8vIi",
       "given": [
         "#Path_Item"
       ],
@@ -279,6 +278,7 @@
       "message": "Path parameter declarations must not be empty, ex.\"/given/{}\" is invalid."
     },
     {
+      "id": "rL_VpAC9yyNR8SawnZ4xE",
       "given": [
         "#API_Contact"
       ],
@@ -293,6 +293,7 @@
       "message": "Contact object should have \"name\""
     },
     {
+      "id": "C4tkMPYWNXr3tXZVK7N6Z",
       "given": [
         "#Path_Object"
       ],
@@ -310,6 +311,7 @@
       "message": "Path should not end with slash."
     },
     {
+      "id": "V9DckEW5SzfKaD2ugN4sX",
       "given": [
         "#Path_Object"
       ],
@@ -327,6 +329,7 @@
       "message": "Path should not include query string."
     },
     {
+      "id": "h8l8gHNa6iulbOPQ6kdxp",
       "given": [
         "#API_Tags_Item"
       ],
@@ -341,6 +344,7 @@
       "message": "Tag object should have \"description\"."
     },
     {
+      "id": "nH3jwMipJyn88kY9b9aKc",
       "given": [
         "#API_Server"
       ],
@@ -364,6 +368,7 @@
       "message": "Server should be present."
     },
     {
+      "id": "GnnxuOGph1ysBZAhBkfUK",
       "given": [
         "#API_Server_URL"
       ],
@@ -380,6 +385,7 @@
       "message": "Server URL should not have trailing slash"
     },
     {
+      "id": "cooWZIFBodL_Kyy6C4roA",
       "given": [
         "#Operation_Object"
       ],
@@ -394,6 +400,7 @@
       "message": "Operation should have at least one \"2xx\" or \"3xx\" response."
     },
     {
+      "id": "cdG5RAWk0rjDOKXk0v6la",
       "given": [
         "#API_Document"
       ],
@@ -407,6 +414,7 @@
       "message": "{{error}}"
     },
     {
+      "id": "cC5keemb61FA-C7V3P9we",
       "given": [
         "#Operation_Object"
       ],
@@ -421,6 +429,7 @@
       "message": "Operation parameters are unique and non-repeating."
     },
     {
+      "id": "j7BNznKEm1G7E_3fUIsnd",
       "given": [
         "#All_Enum"
       ],
@@ -434,6 +443,7 @@
       "message": "{{error}}"
     },
     {
+      "id": "u-uvs5_kTw_Y8ZVa0l--c",
       "given": [
         "#API_Document"
       ],
@@ -450,6 +460,7 @@
       ]
     },
     {
+      "id": "qzX3Nw2mF89lwoOKJbRPW",
       "given": [
         "#API_Document"
       ],
@@ -466,6 +477,7 @@
       ]
     },
     {
+      "id": "KxXG4vkuPbBYcwR2ZfmV3",
       "given": [
         "#API_Document"
       ],
@@ -482,6 +494,7 @@
       ]
     },
     {
+      "id": "fMpRo7Y4f72C6Sgzo6qfx",
       "given": [
         "#API_Document"
       ],
@@ -495,6 +508,7 @@
       "message": "Every operation must have unique operationId"
     },
     {
+      "id": "JOkLvmRy_ImC9qh6g4_9w",
       "given": [
         "#Operation_Object"
       ],
@@ -511,6 +525,7 @@
       ]
     },
     {
+      "id": "2_D_oG4NDlhBuGrU2-a_n",
       "given": [
         "#API_Document"
       ],
@@ -524,6 +539,7 @@
       "message": "Operation tags must be defined in global tags"
     },
     {
+      "id": "u4O1hf96nPCcda2nTYIQM",
       "given": [
         "#All_Ref"
       ],
@@ -541,6 +557,7 @@
       ]
     },
     {
+      "id": "E6IXxWhDWjgQ42unu14VU",
       "given": [
         "#API_Document"
       ],
@@ -562,6 +579,7 @@
       ]
     },
     {
+      "id": "ok6uBxGKd8cn3nX7Wdv9v",
       "given": [
         "#API_Document"
       ],
@@ -584,6 +602,7 @@
       ]
     },
     {
+      "id": "by-DqnlUWq0bOZSM3a1jL",
       "given": [
         "#All_Enum"
       ],
@@ -604,6 +623,7 @@
       "message": "{{error}}"
     },
     {
+      "id": "GR_0m99DOJWHrF4M4-O3O",
       "given": [
         "#API_Document"
       ],
@@ -631,6 +651,7 @@
       ]
     },
     {
+      "id": "TYViRWydm9LHjLno6YZ9Q",
       "given": [
         "#API_Document"
       ],
@@ -648,6 +669,7 @@
       ]
     },
     {
+      "id": "IKkACGbAVlO8rKB06sONd",
       "given": [
         "#API_Server_URL"
       ],
@@ -663,6 +685,7 @@
       "message": "Server URL must not point at example.com."
     },
     {
+      "id": "-LJh4CyO35xWIkMzd1Wp-",
       "given": [
         "#Request_Parameter_All"
       ],
@@ -676,6 +699,7 @@
       "message": "Parameter objects must have \"description\"."
     },
     {
+      "id": "cmoHt9sTfV5GOngaz3sTh",
       "given": [
         "#API_Document_RecursiveSearch"
       ],
@@ -693,6 +717,7 @@
       ]
     },
     {
+      "id": "MU0yRBTAo4K4-Xa9qfFbw",
       "given": [
         "#API_Document_RecursiveSearch"
       ],
@@ -710,6 +735,7 @@
       ]
     },
     {
+      "id": "0m62BkwYb6T6HIDqe6E1A",
       "given": [
         "#All_Example"
       ],
@@ -732,6 +758,7 @@
       ]
     },
     {
+      "id": "NtnHOqY8nyq2Vs027ohn-",
       "given": [
         "#All_Example_Schema"
       ],
@@ -753,6 +780,7 @@
       ]
     },
     {
+      "id": "a442JHGl4ggjPkKH1yD_D",
       "given": [
         "#All_Example_Schema"
       ],
@@ -774,6 +802,7 @@
       ]
     },
     {
+      "id": "DEIJ5uDh52nIACtNjQ1Gx",
       "given": [
         "#All_Example_Media"
       ],
@@ -795,6 +824,7 @@
       ]
     },
     {
+      "id": "t-YZbDDNgEzvcefPQIFwl",
       "given": [
         "#All_Example_Media"
       ],
@@ -818,6 +848,7 @@
   ],
   "inheritedTargets": [
     {
+      "id": "RL70cbIeJy4izdBOlir_A",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "The complete API specification document. This can be used to target any part of the OpenAPI document using **field**.\n\n*Use this if you don't find specific targets that cater to your usecase.* ",
       "name": "API_Document",
@@ -837,6 +868,7 @@
       ]
     },
     {
+      "id": "rSff4wCqd8cGkbdEKUYd7",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "The top level description in an API document",
       "name": "API_Description",
@@ -856,6 +888,7 @@
       ]
     },
     {
+      "id": "mN8hFLg3X8GvAsWoWVEZj",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "The complete operation object. Use it in combo with field object.",
       "name": "Operation_Object",
@@ -875,6 +908,7 @@
       ]
     },
     {
+      "id": "O2pPkrtA5A5uYGWUyTjwL",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "Responses for all operations including get, put, post, delete, options, head, patch, trace.",
       "name": "Operation_Responses",
@@ -894,6 +928,7 @@
       ]
     },
     {
+      "id": "jsOD3ihNOslGUIdvSMe-w",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "name": "Path_Item",
       "targets": [
@@ -912,6 +947,7 @@
       ]
     },
     {
+      "id": "Kvn-6CLfje3-ROEmaxw9x",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "The top level description in an API document",
       "name": "API_Contact",
@@ -931,6 +967,7 @@
       ]
     },
     {
+      "id": "MbCncz1P_WG2_0hM1DGgT",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "The top level description in an API document",
       "name": "API_License",
@@ -950,6 +987,7 @@
       ]
     },
     {
+      "id": "_9JvjKb1boK1eeqLeswVi",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All markdown descriptions across the document.",
       "name": "All_Markdown",
@@ -969,6 +1007,7 @@
       ]
     },
     {
+      "id": "rEjtuB5WNdTD3fIj4Gsmx",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "Tags on an API object",
       "name": "API_Tags",
@@ -988,6 +1027,7 @@
       ]
     },
     {
+      "id": "GZ0iTSIOMgsJNuzS1wA81",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "API hosts defined in the API specification",
       "name": "API_Server",
@@ -1007,6 +1047,7 @@
       ]
     },
     {
+      "id": "0498k_1iMg59_I9RrJ7xS",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All responses (object) in an API",
       "name": "Response_All_Object",
@@ -1050,6 +1091,7 @@
       ]
     },
     {
+      "id": "NS1_5M9GeNuMVN_1sA5W2",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "API host urls defined in the API specification",
       "name": "API_Server_URL",
@@ -1069,6 +1111,7 @@
       ]
     },
     {
+      "id": "5mZk0VeDrbZlIN4k8vbye",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All references throughout the API",
       "name": "All_Ref",
@@ -1088,6 +1131,7 @@
       ]
     },
     {
+      "id": "ZUkdEr_rm1hhKPHWhuDUn",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All references throughout the API",
       "name": "All_Enum",
@@ -1107,6 +1151,7 @@
       ]
     },
     {
+      "id": "DEUYNdHw63x7KMHQ2pPPG",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All request parameters",
       "name": "Request_Parameter_All",
@@ -1126,6 +1171,7 @@
       ]
     },
     {
+      "id": "fClW5clJdaZ4eaHtQkQXW",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All request query parameters",
       "name": "Request_Parameter_Query",
@@ -1145,6 +1191,7 @@
       ]
     },
     {
+      "id": "lh_s9Kf_5OJGVzgGmXamE",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All request header parameters",
       "name": "Request_Parameter_Header",
@@ -1164,6 +1211,7 @@
       ]
     },
     {
+      "id": "GRtW1pp-28ZsoShCzboUN",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All request cookie parameters",
       "name": "Request_Parameter_Cookie",
@@ -1183,6 +1231,7 @@
       ]
     },
     {
+      "id": "0UYsLizW1NhY0_G7TQ7PY",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All request path parameters",
       "name": "Request_Parameter_Path",
@@ -1202,6 +1251,7 @@
       ]
     },
     {
+      "id": "iU8zt7S-gWumhzysdizN5",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "Path object. Usually used to target the Path key e.g. `/users/{userId}`",
       "name": "Path_Object",
@@ -1221,6 +1271,7 @@
       ]
     },
     {
+      "id": "WSOZasvLiUDC8Y7cQ5kAo",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All examples for schemas",
       "name": "All_Example_Schema",
@@ -1270,6 +1321,7 @@
       ]
     },
     {
+      "id": "fEwnCEoARitQfJWiIywdr",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "The complete API specification document. This can be used to target any part of the OpenAPI document using **field**.\n\n*Use this if you don't find specific targets that cater to your usecase.* ",
       "name": "API_Document_RecursiveSearch",
@@ -1289,6 +1341,7 @@
       ]
     },
     {
+      "id": "Dnju6DiE5QBEnTk_F--ue",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All examples across the API document",
       "name": "All_Example",
@@ -1338,6 +1391,7 @@
       ]
     },
     {
+      "id": "bXrv5p7yvOGAf6ByoLvGT",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "All examples for schemas",
       "name": "All_Example_Media",
@@ -1369,6 +1423,7 @@
       ]
     },
     {
+      "id": "YAwaJBHOTI28BWpBCgYv6",
       "extendedFrom": "cHJqOjEyMzU4Ng@31",
       "description": "Tags on an API object",
       "name": "API_Tags_Item",
diff --git a/src/reference/openapi.yml b/src/reference/openapi.yml
index 970b3c769..2e68a24a4 100644
--- a/src/reference/openapi.yml
+++ b/src/reference/openapi.yml
@@ -9530,6 +9530,18 @@ paths:
             application/json:
               schema:
                 type: object
+                required:
+                  - id
+                  - title
+                  - startDate
+                  - endDate
+                  - closeDate
+                  - customer
+                  - project
+                  - testType
+                  - deviceList
+                  - csm
+                  - phase
                 properties:
                   id:
                     type: integer
@@ -9586,14 +9598,14 @@ paths:
                     type: array
                     items:
                       type: object
+                      required:
+                        - id
+                        - name
                       properties:
                         id:
                           type: integer
                         name:
                           type: string
-                      required:
-                        - id
-                        - name
                   csm:
                     type: object
                     required:
@@ -9611,16 +9623,20 @@ paths:
                       properties:
                         role:
                           type: object
+                          required:
+                            - id
+                            - name
                           properties:
                             id:
                               type: integer
                             name:
                               type: string
+                        user:
+                          type: object
                           required:
                             - id
                             - name
-                        user:
-                          type: object
+                            - surname
                           properties:
                             id:
                               type: integer
@@ -9628,10 +9644,6 @@ paths:
                               type: string
                             surname:
                               type: string
-                          required:
-                            - id
-                            - name
-                            - surname
                   description:
                     type: string
                   productLink:
@@ -9661,36 +9673,33 @@ paths:
                     type: array
                     items:
                       type: object
+                      required:
+                        - name
                       properties:
-                        id:
-                          type: integer
                         name:
                           type: string
-                      required:
-                        - id
-                        - name
                   browsers:
                     type: array
                     items:
                       type: object
+                      required:
+                        - id
+                        - name
                       properties:
                         id:
                           type: integer
                         name:
                           type: string
-                      required:
-                        - id
-                        - name
                   productType:
                     type: object
+                    required:
+                      - id
+                      - name
                     properties:
                       id:
                         type: number
                       name:
                         type: string
-                    required:
-                      - id
-                      - name
                   phase:
                     type: object
                     required:
@@ -9703,18 +9712,6 @@ paths:
                         type: string
                   notes:
                     type: string
-                required:
-                  - id
-                  - title
-                  - startDate
-                  - endDate
-                  - closeDate
-                  - customer
-                  - project
-                  - testType
-                  - deviceList
-                  - csm
-                  - phase
               examples:
                 Example 1:
                   value:
@@ -10888,6 +10885,12 @@ components:
           browsers:
             - 0
           productType: 0
+      required:
+        - project
+        - testType
+        - title
+        - startDate
+        - deviceList
       properties:
         project:
           type: integer
@@ -10921,14 +10924,14 @@ components:
           type: array
           items:
             type: object
+            required:
+              - role
+              - user
             properties:
               role:
                 type: integer
               user:
                 type: integer
-            required:
-              - role
-              - user
         description:
           type: string
         productLink:
@@ -10955,7 +10958,7 @@ components:
         languages:
           type: array
           items:
-            type: integer
+            type: string
         browsers:
           type: array
           items:
@@ -10964,12 +10967,6 @@ components:
           type: integer
         notes:
           type: string
-      required:
-        - project
-        - testType
-        - title
-        - startDate
-        - deviceList
     PreselectionQuestionSimple:
       title: PreselectionQuestionSimple
       x-stoplight:

From ad4d97ea79d118b644c7b48088c9474cd3f6eeb1 Mon Sep 17 00:00:00 2001
From: "it@app-quality.com" <it@app-quality.com>
Date: Tue, 15 Oct 2024 17:28:36 +0200
Subject: [PATCH 04/18] Modified src/reference/openapi.yml

---
 src/reference/openapi.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/reference/openapi.yml b/src/reference/openapi.yml
index 2e68a24a4..055ed8c2c 100644
--- a/src/reference/openapi.yml
+++ b/src/reference/openapi.yml
@@ -8080,14 +8080,11 @@ paths:
             application/json:
               schema:
                 type: object
+                required:
+                  - name
                 properties:
-                  id:
-                    type: string
                   name:
                     type: string
-                required:
-                  - id
-                  - name
               examples: {}
         '403':
           $ref: '#/components/responses/NotAuthorized'
@@ -8099,8 +8096,10 @@ paths:
             schema:
               type: object
               properties:
-                languageId:
-                  type: integer
+                language_name:
+                  type: string
+                  x-stoplight:
+                    id: 622sxvqfac5ym
       tags:
         - User
       description: Add one of the languages to your profile
@@ -8117,8 +8116,6 @@ paths:
                 items:
                   type: object
                   properties:
-                    id:
-                      type: integer
                     name:
                       type: string
         '403':
@@ -8129,7 +8126,7 @@ paths:
             schema:
               type: array
               items:
-                type: integer
+                type: string
             examples:
               Example 1:
                 value:

From 4b78d7a8844bc02b4e6f860bd22228d9144cd27d Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Tue, 15 Oct 2024 18:21:16 +0200
Subject: [PATCH 05/18] (wip) refactor: Update language usage in campaign
 dossier data and user languages

---
 src/features/db/class/Campaigns.ts            | 14 ++++++--
 src/routes/dossiers/_post/creation.spec.ts    |  9 +++--
 src/routes/dossiers/_post/index.ts            | 10 +++++-
 .../dossiers/campaignId/_get/index.spec.ts    |  7 ++--
 src/routes/dossiers/campaignId/_get/index.ts  | 13 ++++++--
 src/routes/dossiers/campaignId/_put/index.ts  |  3 +-
 .../dossiers/campaignId/_put/update.spec.ts   | 15 +++++----
 .../me/campaigns/_get/UserTargetChecker.ts    |  8 ++---
 src/routes/users/me/campaigns/_get/index.ts   |  6 ++--
 .../users/me/campaigns/_get/target.spec.ts    | 17 +++-------
 .../users/me/languages/_put/index.spec.ts     | 10 +++---
 src/routes/users/me/languages/_put/index.ts   | 33 ++++++++++---------
 .../users/me/languages/_put/useBasicData.ts   |  4 +--
 src/schema.ts                                 |  9 ++---
 14 files changed, 89 insertions(+), 69 deletions(-)

diff --git a/src/features/db/class/Campaigns.ts b/src/features/db/class/Campaigns.ts
index f41b150bb..4a361ced9 100644
--- a/src/features/db/class/Campaigns.ts
+++ b/src/features/db/class/Campaigns.ts
@@ -60,7 +60,7 @@ class CampaignObject {
   }
 
   private async getTargetRules() {
-    const allowedLanguages =
+    /* const allowedLanguages =
       await tryber.tables.CampaignDossierDataLanguages.do()
         .select("campaign_id", "language_id")
         .join(
@@ -68,6 +68,16 @@ class CampaignObject {
           "campaign_dossier_data.id",
           "campaign_dossier_data_languages.campaign_dossier_data_id"
         )
+        .where("campaign_dossier_data.campaign_id", this.id); */
+
+    const allowedLanguages =
+      await tryber.tables.CampaignDossierDataLanguages.do()
+        .select("campaign_id", "language_name")
+        .join(
+          "campaign_dossier_data",
+          "campaign_dossier_data.id",
+          "campaign_dossier_data_languages.campaign_dossier_data_id"
+        )
         .where("campaign_dossier_data.campaign_id", this.id);
 
     const allowedCountries =
@@ -80,7 +90,7 @@ class CampaignObject {
         )
         .where("campaign_dossier_data.campaign_id", this.id);
     return {
-      languages: allowedLanguages.map((l) => l.language_id),
+      languages: allowedLanguages.map((l) => l.language_name),
       countries: allowedCountries.map((c) => c.country_code),
     };
   }
diff --git a/src/routes/dossiers/_post/creation.spec.ts b/src/routes/dossiers/_post/creation.spec.ts
index 83a8ea8de..b48a3eab8 100644
--- a/src/routes/dossiers/_post/creation.spec.ts
+++ b/src/routes/dossiers/_post/creation.spec.ts
@@ -88,13 +88,13 @@ describe("Route POST /dossiers", () => {
       },
     ]);
 
-    await tryber.tables.WpAppqLang.do().insert([
+    /* await tryber.tables.WpAppqLang.do().insert([
       {
         id: 1,
         display_name: "Test Language",
         lang_code: "te-ST",
       },
-    ]);
+    ]);*/
   });
 
   afterAll(async () => {
@@ -632,7 +632,7 @@ describe("Route POST /dossiers", () => {
       .set("authorization", "Bearer admin")
       .send({
         ...baseRequest,
-        languages: [1],
+        languages: ["English"],
       });
 
     expect(response.status).toBe(201);
@@ -648,8 +648,7 @@ describe("Route POST /dossiers", () => {
     expect(getResponse.body).toHaveProperty("languages");
     expect(getResponse.body.languages).toHaveLength(1);
     expect(getResponse.body.languages[0]).toEqual({
-      id: 1,
-      name: "Test Language",
+      name: "English",
     });
   });
 
diff --git a/src/routes/dossiers/_post/index.ts b/src/routes/dossiers/_post/index.ts
index 175518eec..30877bbed 100644
--- a/src/routes/dossiers/_post/index.ts
+++ b/src/routes/dossiers/_post/index.ts
@@ -246,6 +246,13 @@ export default class RouteItem extends UserRoute<{
       .insert({
         title: this.getBody().title.tester,
         platform_id: 0,
+        /* start_date:
+          this.getBody().startDate?.toString().slice(0, 19).replace("T", " ") ||
+          "",
+        end_date:
+          this.getEndDate()?.toString().slice(0, 19).replace("T", " ") || "",
+        close_date:
+          this.getCloseDate()?.toString().slice(0, 19).replace("T", " ") || "",*/
         start_date: this.getBody().startDate,
         end_date: this.getEndDate(),
         close_date: this.getCloseDate(),
@@ -330,7 +337,8 @@ export default class RouteItem extends UserRoute<{
       await tryber.tables.CampaignDossierDataLanguages.do().insert(
         languages.map((language) => ({
           campaign_dossier_data_id: dossierId,
-          language_id: language,
+          language_id: -1,
+          language_name: language,
         }))
       );
     }
diff --git a/src/routes/dossiers/campaignId/_get/index.spec.ts b/src/routes/dossiers/campaignId/_get/index.spec.ts
index 1d225916d..976cb17e9 100644
--- a/src/routes/dossiers/campaignId/_get/index.spec.ts
+++ b/src/routes/dossiers/campaignId/_get/index.spec.ts
@@ -328,10 +328,12 @@ describe("Route GET /dossiers/:id", () => {
         {
           campaign_dossier_data_id: 100,
           language_id: 1,
+          language_name: "English",
         },
         {
           campaign_dossier_data_id: 100,
           language_id: 2,
+          language_name: "Arabic",
         },
       ]);
 
@@ -476,10 +478,9 @@ describe("Route GET /dossiers/:id", () => {
       expect(response.body.languages).toHaveLength(2);
       expect(response.body.languages).toEqual(
         expect.arrayContaining([
-          { id: 1, name: "English" },
+          { name: "English" },
           {
-            id: 2,
-            name: "Italiano",
+            name: "Arabic",
           },
         ])
       );
diff --git a/src/routes/dossiers/campaignId/_get/index.ts b/src/routes/dossiers/campaignId/_get/index.ts
index 9ab2876a4..8ed23fab0 100644
--- a/src/routes/dossiers/campaignId/_get/index.ts
+++ b/src/routes/dossiers/campaignId/_get/index.ts
@@ -157,6 +157,13 @@ export default class RouteItem extends UserRoute<{
       : [];
 
     const targetLanguages = dossierData
+      ? await tryber.tables.CampaignDossierDataLanguages.do()
+          .select("language_id")
+          .select("language_name")
+          .where("campaign_dossier_data_id", dossierData.dossier_id)
+      : [];
+
+    /*  const targetLanguagesQuery1 = dossierData
       ? await tryber.tables.CampaignDossierDataLanguages.do()
           .join(
             "wp_appq_lang",
@@ -165,9 +172,12 @@ export default class RouteItem extends UserRoute<{
           )
           .select("language_id")
           .select("display_name")
+          .select("language_name")
           .where("campaign_dossier_data_id", dossierData.dossier_id)
       : [];
 
+    console.log("targetLanguages", targetLanguages);
+*/
     const targetBrowsers = dossierData
       ? await tryber.tables.CampaignDossierDataBrowsers.do()
           .join(
@@ -310,8 +320,7 @@ export default class RouteItem extends UserRoute<{
         }),
         ...(this.campaign.languages.length > 0 && {
           languages: this.campaign.languages?.map((item) => ({
-            id: item.language_id,
-            name: item.display_name,
+            name: item.language_name,
           })),
         }),
         ...(this.campaign.browsers.length > 0 && {
diff --git a/src/routes/dossiers/campaignId/_put/index.ts b/src/routes/dossiers/campaignId/_put/index.ts
index eb5a0abcb..b0719ce90 100644
--- a/src/routes/dossiers/campaignId/_put/index.ts
+++ b/src/routes/dossiers/campaignId/_put/index.ts
@@ -228,7 +228,8 @@ export default class RouteItem extends UserRoute<{
     await tryber.tables.CampaignDossierDataLanguages.do().insert(
       languages.map((lang) => ({
         campaign_dossier_data_id: dossierId,
-        language_id: lang,
+        language_id: -1,
+        language_name: lang,
       }))
     );
   }
diff --git a/src/routes/dossiers/campaignId/_put/update.spec.ts b/src/routes/dossiers/campaignId/_put/update.spec.ts
index c9b55f1ec..be9f9d4d5 100644
--- a/src/routes/dossiers/campaignId/_put/update.spec.ts
+++ b/src/routes/dossiers/campaignId/_put/update.spec.ts
@@ -91,10 +91,10 @@ describe("Route POST /dossiers", () => {
       },
     ]);
 
-    await tryber.tables.WpAppqLang.do().insert([
+    /* await tryber.tables.WpAppqLang.do().insert([
       { id: 1, display_name: "Test Language", lang_code: "TL" },
       { id: 2, display_name: "Other Language", lang_code: "OL" },
-    ]);
+    ]); */
 
     await tryber.tables.Browsers.do().insert([
       { id: 1, name: "Test Browser" },
@@ -429,7 +429,11 @@ describe("Route POST /dossiers", () => {
       ]);
 
       await tryber.tables.CampaignDossierDataLanguages.do().insert([
-        { campaign_dossier_data_id: 1, language_id: 2 },
+        {
+          campaign_dossier_data_id: 1,
+          language_id: 2,
+          language_name: "Afrikaans",
+        },
       ]);
       await tryber.tables.CampaignDossierDataBrowsers.do().insert([
         { campaign_dossier_data_id: 1, browser_id: 2 },
@@ -620,7 +624,7 @@ describe("Route POST /dossiers", () => {
         .set("authorization", "Bearer admin")
         .send({
           ...baseRequest,
-          languages: [1],
+          languages: ["Afrikaans"],
         });
 
       const responseGet = await request(app)
@@ -631,8 +635,7 @@ describe("Route POST /dossiers", () => {
       expect(responseGet.body).toHaveProperty("languages");
       expect(responseGet.body.languages).toHaveLength(1);
       expect(responseGet.body.languages[0]).toEqual({
-        id: 1,
-        name: "Test Language",
+        name: "Afrikaans",
       });
     });
 
diff --git a/src/routes/users/me/campaigns/_get/UserTargetChecker.ts b/src/routes/users/me/campaigns/_get/UserTargetChecker.ts
index e11e5e896..81a7aff3b 100644
--- a/src/routes/users/me/campaigns/_get/UserTargetChecker.ts
+++ b/src/routes/users/me/campaigns/_get/UserTargetChecker.ts
@@ -4,7 +4,7 @@ import countryList from "i18n-iso-countries";
 export class UserTargetChecker {
   private testerId: number;
 
-  private userLanguages: number[] = [];
+  private userLanguages: string[] = [];
   private userCountry: string = "";
 
   constructor({ testerId }: { testerId: number }) {
@@ -19,9 +19,9 @@ export class UserTargetChecker {
 
   private async initUserLanguages() {
     this.userLanguages = await tryber.tables.WpAppqProfileHasLang.do()
-      .select("language_id")
+      .select("language_name")
       .where("profile_id", this.testerId)
-      .then((res) => res.map((r) => r.language_id));
+      .then((res) => res.map((r) => r.language_name));
   }
 
   private async initUserCountries() {
@@ -34,7 +34,7 @@ export class UserTargetChecker {
     this.userCountry = countryCode || "";
   }
 
-  inTarget(targetRules: { languages?: number[]; countries?: string[] }) {
+  inTarget(targetRules: { languages?: string[]; countries?: string[] }) {
     if (Object.keys(targetRules).length === 0) return true;
     const { languages, countries } = targetRules;
 
diff --git a/src/routes/users/me/campaigns/_get/index.ts b/src/routes/users/me/campaigns/_get/index.ts
index bd5b997d7..03cc9ddb1 100644
--- a/src/routes/users/me/campaigns/_get/index.ts
+++ b/src/routes/users/me/campaigns/_get/index.ts
@@ -357,7 +357,7 @@ class RouteItem extends UserRoute<{
 
     const allowedLanguages =
       await tryber.tables.CampaignDossierDataLanguages.do()
-        .select("campaign_id", "language_id")
+        .select("campaign_id", "language_name")
         .join(
           "campaign_dossier_data",
           "campaign_dossier_data.id",
@@ -386,7 +386,7 @@ class RouteItem extends UserRoute<{
 
       const languages = allowedLanguages
         .filter((l) => l.campaign_id === campaign.id)
-        .map((l) => l.language_id);
+        .map((l) => l.language_name);
       const countries = allowedCountries
         .filter((l) => l.campaign_id === campaign.id)
         .map((l) => l.country_code);
@@ -468,7 +468,7 @@ class RouteItem extends UserRoute<{
   private async filterByTargetRules<T>(
     campaigns: (T & {
       targetRules?: {
-        languages?: number[];
+        languages?: string[];
         countries?: string[];
       };
     })[]
diff --git a/src/routes/users/me/campaigns/_get/target.spec.ts b/src/routes/users/me/campaigns/_get/target.spec.ts
index 56cef49d2..e443d9f42 100644
--- a/src/routes/users/me/campaigns/_get/target.spec.ts
+++ b/src/routes/users/me/campaigns/_get/target.spec.ts
@@ -53,25 +53,13 @@ describe("GET /users/me/campaigns - target", () => {
     await tryber.tables.CampaignDossierDataLanguages.do().insert({
       campaign_dossier_data_id: 1,
       language_id: 1,
+      language_name: "English",
     });
 
     await tryber.tables.CampaignDossierDataCountries.do().insert({
       campaign_dossier_data_id: 1,
       country_code: "IT",
     });
-
-    await tryber.tables.WpAppqLang.do().insert([
-      {
-        id: 1,
-        display_name: "English",
-        lang_code: "en",
-      },
-      {
-        id: 2,
-        display_name: "Italian",
-        lang_code: "it",
-      },
-    ]);
   });
 
   afterAll(async () => {
@@ -94,6 +82,7 @@ describe("GET /users/me/campaigns - target", () => {
       await tryber.tables.WpAppqProfileHasLang.do().insert({
         profile_id: 1,
         language_id: 1,
+        language_name: "English",
       });
     });
     afterAll(async () => {
@@ -123,6 +112,7 @@ describe("GET /users/me/campaigns - target", () => {
       await tryber.tables.WpAppqProfileHasLang.do().insert({
         profile_id: 1,
         language_id: 2,
+        language_name: "Arabic",
       });
     });
     afterAll(async () => {
@@ -150,6 +140,7 @@ describe("GET /users/me/campaigns - target", () => {
       await tryber.tables.WpAppqProfileHasLang.do().insert({
         profile_id: 1,
         language_id: 2,
+        language_name: "Afrikaans",
       });
     });
     afterAll(async () => {
diff --git a/src/routes/users/me/languages/_put/index.spec.ts b/src/routes/users/me/languages/_put/index.spec.ts
index 316b94e1d..3cada7b36 100644
--- a/src/routes/users/me/languages/_put/index.spec.ts
+++ b/src/routes/users/me/languages/_put/index.spec.ts
@@ -18,7 +18,7 @@ describe("Route PUT /users/me/languages/", () => {
       .expect(404);
   });
 
-  it("Should return 404 if languages does not exist", async () => {
+  /*it("Should return 404 if languages does not exist", async () => {
     const response = await request(app)
       .put("/users/me/languages/")
       .send([3, 69])
@@ -29,21 +29,21 @@ describe("Route PUT /users/me/languages/", () => {
       id: 1,
       message: "Bad request: lang_id not found.",
     });
-  });
+  });*/
 
   it("Should return 200 if user is logged", async () => {
     const response = await request(app)
       .put("/users/me/languages/")
-      .send([3, 5])
+      .send(["English", "Arabic"])
       .set("Authorization", "Bearer tester");
     expect(response.status).toBe(200);
     expect(response.body).toEqual(
       expect.arrayContaining([
         expect.objectContaining({
-          id: 3,
+          name: "English",
         }),
         expect.objectContaining({
-          id: 5,
+          name: "Arabic",
         }),
       ])
     );
diff --git a/src/routes/users/me/languages/_put/index.ts b/src/routes/users/me/languages/_put/index.ts
index 60d76cdf7..b404772f0 100644
--- a/src/routes/users/me/languages/_put/index.ts
+++ b/src/routes/users/me/languages/_put/index.ts
@@ -8,7 +8,7 @@ export default class UserLanguagesRoute extends UserRoute<{
   response: StoplightOperations["put-users-me-languages"]["responses"]["200"]["content"]["application/json"];
   body: StoplightOperations["put-users-me-languages"]["requestBody"]["content"]["application/json"];
 }> {
-  private languages: number[] | undefined;
+  private languages: string[] | undefined;
 
   private constructor(configuration: RouteClassConfiguration) {
     super(configuration);
@@ -18,7 +18,7 @@ export default class UserLanguagesRoute extends UserRoute<{
     }
   }
 
-  protected async filter() {
+  /* protected async filter() {
     if (await this.desiredLanguagesDoesNotExist()) return false;
     return true;
   }
@@ -26,7 +26,7 @@ export default class UserLanguagesRoute extends UserRoute<{
   protected async desiredLanguagesDoesNotExist() {
     if (!this.languages) return false;
 
-    const availableLanguagesIds = await this.getAvailableLanguages();
+   const availableLanguagesIds = await this.getAvailableLanguages();
 
     const everyLanguageExists = this.languages.every((nl) =>
       availableLanguagesIds.includes(nl)
@@ -39,14 +39,19 @@ export default class UserLanguagesRoute extends UserRoute<{
 
     return false;
   }
+    */
 
   protected async prepare() {
     await this.insertNewLanguages();
 
-    this.setSuccess(200, await this.getUserLanguages());
+    const userLanguages = await this.getUserLanguages();
+    this.setSuccess(
+      200,
+      userLanguages.map((lang) => ({ name: lang.language_name }))
+    );
   }
 
-  protected async getAvailableLanguages() {
+  /* protected async getAvailableLanguages() {
     const languages = await tryber.tables.WpAppqLang.do().select(
       "id",
       tryber.ref("display_name").withSchema("wp_appq_lang").as("name")
@@ -54,19 +59,11 @@ export default class UserLanguagesRoute extends UserRoute<{
 
     if (!languages.length) throw Error("No languages");
     return languages.map((l) => l.id);
-  }
+  }*/
 
   protected async getUserLanguages() {
     const testerLanguages = await tryber.tables.WpAppqProfileHasLang.do()
-      .select(
-        tryber.ref("id").withSchema("wp_appq_lang").as("id"),
-        tryber.ref("display_name").withSchema("wp_appq_lang").as("name")
-      )
-      .join(
-        "wp_appq_lang",
-        "wp_appq_lang.id",
-        "wp_appq_profile_has_lang.language_id"
-      )
+      .select("language_name")
       .where({ profile_id: this.getTesterId() });
 
     return testerLanguages;
@@ -77,7 +74,11 @@ export default class UserLanguagesRoute extends UserRoute<{
     if (!this.languages || !this.languages.length) return undefined;
 
     const values = this.languages.map((nl) => {
-      return { language_id: nl, profile_id: this.getTesterId() };
+      return {
+        language_id: -1,
+        language_name: nl,
+        profile_id: this.getTesterId(),
+      };
     });
 
     await tryber.tables.WpAppqProfileHasLang.do().insert(values);
diff --git a/src/routes/users/me/languages/_put/useBasicData.ts b/src/routes/users/me/languages/_put/useBasicData.ts
index 481217e8c..3b2d5035b 100644
--- a/src/routes/users/me/languages/_put/useBasicData.ts
+++ b/src/routes/users/me/languages/_put/useBasicData.ts
@@ -20,13 +20,13 @@ const useBasicData = () => {
       user_email: "tester@example.com",
       user_pass: "pass",
     });
-    await tryber.tables.WpAppqLang.do().insert([
+    /*await tryber.tables.WpAppqLang.do().insert([
       { id: 1, display_name: "Italiano", lang_code: "it" },
       { id: 2, display_name: "English", lang_code: "en" },
       { id: 3, display_name: "Itialian (Sicilian)", lang_code: "it-sc" },
       { id: 4, display_name: "Arabic", lang_code: "ar" },
       { id: 5, display_name: "Hindi", lang_code: "hi" },
-    ]);
+    ]);*/
   });
   afterAll(async () => {
     await tryber.tables.WpAppqEvdProfile.do().delete();
diff --git a/src/schema.ts b/src/schema.ts
index 6c729f4a7..cbf8ebc13 100644
--- a/src/schema.ts
+++ b/src/schema.ts
@@ -936,7 +936,7 @@ export interface components {
         cap?: number;
       };
       countries?: components["schemas"]["CountryCode"][];
-      languages?: number[];
+      languages?: string[];
       browsers?: number[];
       productType?: number;
       notes?: string;
@@ -3772,7 +3772,6 @@ export interface operations {
       200: {
         content: {
           "application/json": {
-            id?: number;
             name?: string;
           }[];
         };
@@ -3781,7 +3780,7 @@ export interface operations {
     };
     requestBody: {
       content: {
-        "application/json": number[];
+        "application/json": string[];
       };
     };
   };
@@ -3792,7 +3791,6 @@ export interface operations {
       201: {
         content: {
           "application/json": {
-            id: string;
             name: string;
           };
         };
@@ -3802,7 +3800,7 @@ export interface operations {
     requestBody: {
       content: {
         "application/json": {
-          languageId?: number;
+          language_name?: string;
         };
       };
     };
@@ -4209,7 +4207,6 @@ export interface operations {
             };
             countries?: components["schemas"]["CountryCode"][];
             languages?: {
-              id: number;
               name: string;
             }[];
             browsers?: {

From 8a479c894ac45c5f74c9cf3ea78ef3d93ca1178c Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Wed, 16 Oct 2024 10:21:43 +0200
Subject: [PATCH 06/18] removed x-stoplight

---
 src/reference/openapi.yml | 44 ---------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/src/reference/openapi.yml b/src/reference/openapi.yml
index 055ed8c2c..e0f111025 100644
--- a/src/reference/openapi.yml
+++ b/src/reference/openapi.yml
@@ -1250,8 +1250,6 @@ paths:
                                     type: string
                             status:
                               type: string
-                              x-stoplight:
-                                id: 3f1wy22lgngzn
                               enum:
                                 - candidate
                                 - excluded
@@ -6938,12 +6936,8 @@ paths:
                     - properties:
                         question:
                           type: string
-                          x-stoplight:
-                            id: ir6xgrpexauf5
                         short_name:
                           type: string
-                          x-stoplight:
-                            id: bl9s0k131fjp4
                         value:
                           oneOf:
                             - type: integer
@@ -6971,42 +6965,28 @@ paths:
                       required:
                         - question
                         - id
-                    - x-stoplight:
-                        id: 76ya1n62vrxoj
                       oneOf:
                         - properties:
                             type:
                               $ref: '#/components/schemas/PreselectionQuestionSimple'
                           required:
                             - type
-                        - x-stoplight:
-                            id: age6qie67x6dt
                           properties:
                             type:
                               $ref: '#/components/schemas/PreselectionQuestionMultiple'
                             options:
                               type: array
-                              x-stoplight:
-                                id: 3eqfw8hp0j217
                               items:
-                                x-stoplight:
-                                  id: u67gsrnn8bhvb
                                 type: string
                           required:
                             - type
                             - options
-                        - x-stoplight:
-                            id: v6nzvavd1bbnh
                           properties:
                             type:
                               $ref: '#/components/schemas/PreselectionQuestionCuf'
                             options:
                               type: array
-                              x-stoplight:
-                                id: ilyb6ci3tao5c
                               items:
-                                x-stoplight:
-                                  id: 511phg4idvt3g
                                 type: number
                           required:
                             - type
@@ -8098,8 +8078,6 @@ paths:
               properties:
                 language_name:
                   type: string
-                  x-stoplight:
-                    id: 622sxvqfac5ym
       tags:
         - User
       description: Add one of the languages to your profile
@@ -10568,21 +10546,13 @@ components:
                   $ref: '#/components/schemas/PreselectionQuestionMultiple'
                 options:
                   type: array
-                  x-stoplight:
-                    id: xdbut0hjezieh
                   items:
-                    x-stoplight:
-                      id: cln0chyj7s107
                     type: object
                     properties:
                       value:
                         type: string
-                        x-stoplight:
-                          id: ifhnncm4ap0l8
                       isInvalid:
                         type: boolean
-                        x-stoplight:
-                          id: 6imsh5mbep30d
                     required:
                       - value
               required:
@@ -10592,21 +10562,13 @@ components:
                   $ref: '#/components/schemas/PreselectionQuestionCuf'
                 options:
                   type: array
-                  x-stoplight:
-                    id: 98p0edyoy9t49
                   items:
-                    x-stoplight:
-                      id: lri0oems0d8by
                     type: object
                     properties:
                       value:
                         type: number
-                        x-stoplight:
-                          id: hrwvvg2r2jm4v
                       isInvalid:
                         type: boolean
-                        x-stoplight:
-                          id: wiocd6n2pq0z5
                     required:
                       - value
               required:
@@ -10966,8 +10928,6 @@ components:
           type: string
     PreselectionQuestionSimple:
       title: PreselectionQuestionSimple
-      x-stoplight:
-        id: huxuwdbvi0pep
       type: string
       enum:
         - gender
@@ -10976,8 +10936,6 @@ components:
         - address
     PreselectionQuestionMultiple:
       title: PreselectionQuestionMultiple
-      x-stoplight:
-        id: op7khbr8grgql
       type: string
       enum:
         - multiselect
@@ -10985,8 +10943,6 @@ components:
         - radio
     PreselectionQuestionCuf:
       title: PreselectionQuestionCuf
-      x-stoplight:
-        id: 5diemuprwjolx
       type: string
       pattern: '^cuf_[0-9]*$'
   securitySchemes:

From 1a3bfb5af87967696e3df50f09cedf907d234009 Mon Sep 17 00:00:00 2001
From: "it@app-quality.com" <it@app-quality.com>
Date: Wed, 16 Oct 2024 11:25:08 +0200
Subject: [PATCH 07/18] Modified src/reference/openapi.yml

---
 src/reference/openapi.yml | 74 ++++++++++++++++++++++++++++++---------
 1 file changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/reference/openapi.yml b/src/reference/openapi.yml
index e0f111025..26c2649d1 100644
--- a/src/reference/openapi.yml
+++ b/src/reference/openapi.yml
@@ -1250,6 +1250,8 @@ paths:
                                     type: string
                             status:
                               type: string
+                              x-stoplight:
+                                id: 3f1wy22lgngzn
                               enum:
                                 - candidate
                                 - excluded
@@ -5362,6 +5364,8 @@ paths:
                     wp_user_id: 0
                     role: string
                     is_verified: true
+                required:
+                  - id
                 properties:
                   username:
                     type: string
@@ -5394,29 +5398,27 @@ paths:
                     type: number
                   booty:
                     type: object
+                    required:
+                      - gross
                     properties:
                       net:
                         $ref: '#/components/schemas/Currency'
                       gross:
                         $ref: '#/components/schemas/Currency'
-                    required:
-                      - gross
                   pending_booty:
                     type: object
+                    required:
+                      - gross
                     properties:
                       net:
                         $ref: '#/components/schemas/Currency'
                       gross:
                         $ref: '#/components/schemas/Currency'
-                    required:
-                      - gross
                   languages:
                     type: array
                     items:
                       type: object
                       properties:
-                        id:
-                          type: integer
                         name:
                           type: string
                   onboarding_completed:
@@ -5434,24 +5436,24 @@ paths:
                     type: string
                   education:
                     type: object
+                    required:
+                      - id
+                      - name
                     properties:
                       id:
                         type: number
                       name:
                         type: string
+                  profession:
+                    type: object
                     required:
                       - id
                       - name
-                  profession:
-                    type: object
                     properties:
                       id:
                         type: number
                       name:
                         type: string
-                    required:
-                      - id
-                      - name
                   certifications:
                     oneOf:
                       - type: array
@@ -5470,16 +5472,14 @@ paths:
                     type: number
                   booty_threshold:
                     type: object
+                    required:
+                      - value
+                      - isOver
                     properties:
                       value:
                         type: number
                       isOver:
                         type: boolean
-                    required:
-                      - value
-                      - isOver
-                required:
-                  - id
               examples:
                 booty_net:
                   value:
@@ -6936,8 +6936,12 @@ paths:
                     - properties:
                         question:
                           type: string
+                          x-stoplight:
+                            id: ir6xgrpexauf5
                         short_name:
                           type: string
+                          x-stoplight:
+                            id: bl9s0k131fjp4
                         value:
                           oneOf:
                             - type: integer
@@ -6965,28 +6969,42 @@ paths:
                       required:
                         - question
                         - id
+                    - x-stoplight:
+                        id: 76ya1n62vrxoj
                       oneOf:
                         - properties:
                             type:
                               $ref: '#/components/schemas/PreselectionQuestionSimple'
                           required:
                             - type
+                        - x-stoplight:
+                            id: age6qie67x6dt
                           properties:
                             type:
                               $ref: '#/components/schemas/PreselectionQuestionMultiple'
                             options:
                               type: array
+                              x-stoplight:
+                                id: 3eqfw8hp0j217
                               items:
+                                x-stoplight:
+                                  id: u67gsrnn8bhvb
                                 type: string
                           required:
                             - type
                             - options
+                        - x-stoplight:
+                            id: v6nzvavd1bbnh
                           properties:
                             type:
                               $ref: '#/components/schemas/PreselectionQuestionCuf'
                             options:
                               type: array
+                              x-stoplight:
+                                id: ilyb6ci3tao5c
                               items:
+                                x-stoplight:
+                                  id: 511phg4idvt3g
                                 type: number
                           required:
                             - type
@@ -8078,6 +8096,8 @@ paths:
               properties:
                 language_name:
                   type: string
+                  x-stoplight:
+                    id: 622sxvqfac5ym
       tags:
         - User
       description: Add one of the languages to your profile
@@ -10546,13 +10566,21 @@ components:
                   $ref: '#/components/schemas/PreselectionQuestionMultiple'
                 options:
                   type: array
+                  x-stoplight:
+                    id: xdbut0hjezieh
                   items:
+                    x-stoplight:
+                      id: cln0chyj7s107
                     type: object
                     properties:
                       value:
                         type: string
+                        x-stoplight:
+                          id: ifhnncm4ap0l8
                       isInvalid:
                         type: boolean
+                        x-stoplight:
+                          id: 6imsh5mbep30d
                     required:
                       - value
               required:
@@ -10562,13 +10590,21 @@ components:
                   $ref: '#/components/schemas/PreselectionQuestionCuf'
                 options:
                   type: array
+                  x-stoplight:
+                    id: 98p0edyoy9t49
                   items:
+                    x-stoplight:
+                      id: lri0oems0d8by
                     type: object
                     properties:
                       value:
                         type: number
+                        x-stoplight:
+                          id: hrwvvg2r2jm4v
                       isInvalid:
                         type: boolean
+                        x-stoplight:
+                          id: wiocd6n2pq0z5
                     required:
                       - value
               required:
@@ -10928,6 +10964,8 @@ components:
           type: string
     PreselectionQuestionSimple:
       title: PreselectionQuestionSimple
+      x-stoplight:
+        id: huxuwdbvi0pep
       type: string
       enum:
         - gender
@@ -10936,6 +10974,8 @@ components:
         - address
     PreselectionQuestionMultiple:
       title: PreselectionQuestionMultiple
+      x-stoplight:
+        id: op7khbr8grgql
       type: string
       enum:
         - multiselect
@@ -10943,6 +10983,8 @@ components:
         - radio
     PreselectionQuestionCuf:
       title: PreselectionQuestionCuf
+      x-stoplight:
+        id: 5diemuprwjolx
       type: string
       pattern: '^cuf_[0-9]*$'
   securitySchemes:

From 4e2f3b576fa6fe72ef4e986f95b49539456c0f1d Mon Sep 17 00:00:00 2001
From: "it@app-quality.com" <it@app-quality.com>
Date: Wed, 16 Oct 2024 12:00:57 +0200
Subject: [PATCH 08/18] Modified src/reference/openapi.yml

---
 src/reference/openapi.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/reference/openapi.yml b/src/reference/openapi.yml
index 26c2649d1..a1f5cf73b 100644
--- a/src/reference/openapi.yml
+++ b/src/reference/openapi.yml
@@ -5421,6 +5421,10 @@ paths:
                       properties:
                         name:
                           type: string
+                        id:
+                          type: number
+                          x-stoplight:
+                            id: v3xokd8t6zodk
                   onboarding_completed:
                     type: boolean
                   additional:

From 6f4ccc4b628c8c2383f83772082b0b13693206b5 Mon Sep 17 00:00:00 2001
From: "it@app-quality.com" <it@app-quality.com>
Date: Wed, 16 Oct 2024 12:06:45 +0200
Subject: [PATCH 09/18] Modified src/reference/openapi.yml

---
 src/reference/openapi.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/reference/openapi.yml b/src/reference/openapi.yml
index a1f5cf73b..26c2649d1 100644
--- a/src/reference/openapi.yml
+++ b/src/reference/openapi.yml
@@ -5421,10 +5421,6 @@ paths:
                       properties:
                         name:
                           type: string
-                        id:
-                          type: number
-                          x-stoplight:
-                            id: v3xokd8t6zodk
                   onboarding_completed:
                     type: boolean
                   additional:

From 86935bb46fcac4e66ae3bf1a8456854913660523 Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Wed, 16 Oct 2024 12:10:24 +0200
Subject: [PATCH 10/18] removed id

---
 src/schema.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/schema.ts b/src/schema.ts
index cbf8ebc13..6b62cd674 100644
--- a/src/schema.ts
+++ b/src/schema.ts
@@ -2863,7 +2863,6 @@ export interface operations {
               gross: components["schemas"]["Currency"];
             };
             languages?: {
-              id?: number;
               name?: string;
             }[];
             onboarding_completed?: boolean;

From 61113e591dacd628243c880d9a2743ecbccebd45 Mon Sep 17 00:00:00 2001
From: sinatragianpaolo <gianpaolosinatra@gmail.com>
Date: Wed, 16 Oct 2024 12:15:34 +0200
Subject: [PATCH 11/18] Refactor openapi.yml to remove x-stoplight IDs

---
 src/reference/openapi.yml | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/src/reference/openapi.yml b/src/reference/openapi.yml
index 26c2649d1..e5feddf93 100644
--- a/src/reference/openapi.yml
+++ b/src/reference/openapi.yml
@@ -1250,8 +1250,6 @@ paths:
                                     type: string
                             status:
                               type: string
-                              x-stoplight:
-                                id: 3f1wy22lgngzn
                               enum:
                                 - candidate
                                 - excluded
@@ -6936,12 +6934,8 @@ paths:
                     - properties:
                         question:
                           type: string
-                          x-stoplight:
-                            id: ir6xgrpexauf5
                         short_name:
                           type: string
-                          x-stoplight:
-                            id: bl9s0k131fjp4
                         value:
                           oneOf:
                             - type: integer
@@ -6984,11 +6978,7 @@ paths:
                               $ref: '#/components/schemas/PreselectionQuestionMultiple'
                             options:
                               type: array
-                              x-stoplight:
-                                id: 3eqfw8hp0j217
                               items:
-                                x-stoplight:
-                                  id: u67gsrnn8bhvb
                                 type: string
                           required:
                             - type
@@ -7000,11 +6990,7 @@ paths:
                               $ref: '#/components/schemas/PreselectionQuestionCuf'
                             options:
                               type: array
-                              x-stoplight:
-                                id: ilyb6ci3tao5c
                               items:
-                                x-stoplight:
-                                  id: 511phg4idvt3g
                                 type: number
                           required:
                             - type
@@ -8096,8 +8082,6 @@ paths:
               properties:
                 language_name:
                   type: string
-                  x-stoplight:
-                    id: 622sxvqfac5ym
       tags:
         - User
       description: Add one of the languages to your profile
@@ -10566,21 +10550,13 @@ components:
                   $ref: '#/components/schemas/PreselectionQuestionMultiple'
                 options:
                   type: array
-                  x-stoplight:
-                    id: xdbut0hjezieh
                   items:
-                    x-stoplight:
-                      id: cln0chyj7s107
                     type: object
                     properties:
                       value:
                         type: string
-                        x-stoplight:
-                          id: ifhnncm4ap0l8
                       isInvalid:
                         type: boolean
-                        x-stoplight:
-                          id: 6imsh5mbep30d
                     required:
                       - value
               required:
@@ -10590,21 +10566,13 @@ components:
                   $ref: '#/components/schemas/PreselectionQuestionCuf'
                 options:
                   type: array
-                  x-stoplight:
-                    id: 98p0edyoy9t49
                   items:
-                    x-stoplight:
-                      id: lri0oems0d8by
                     type: object
                     properties:
                       value:
                         type: number
-                        x-stoplight:
-                          id: hrwvvg2r2jm4v
                       isInvalid:
                         type: boolean
-                        x-stoplight:
-                          id: wiocd6n2pq0z5
                     required:
                       - value
               required:
@@ -10964,8 +10932,6 @@ components:
           type: string
     PreselectionQuestionSimple:
       title: PreselectionQuestionSimple
-      x-stoplight:
-        id: huxuwdbvi0pep
       type: string
       enum:
         - gender
@@ -10974,8 +10940,6 @@ components:
         - address
     PreselectionQuestionMultiple:
       title: PreselectionQuestionMultiple
-      x-stoplight:
-        id: op7khbr8grgql
       type: string
       enum:
         - multiselect
@@ -10983,8 +10947,6 @@ components:
         - radio
     PreselectionQuestionCuf:
       title: PreselectionQuestionCuf
-      x-stoplight:
-        id: 5diemuprwjolx
       type: string
       pattern: '^cuf_[0-9]*$'
   securitySchemes:

From 1b7a399a40d78b974f063a9ef773bb0199ae3f75 Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Wed, 16 Oct 2024 12:28:51 +0200
Subject: [PATCH 12/18] test: fixed tests

---
 .../me/campaigns/campaignId/forms/_get/visibility.spec.ts      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/routes/users/me/campaigns/campaignId/forms/_get/visibility.spec.ts b/src/routes/users/me/campaigns/campaignId/forms/_get/visibility.spec.ts
index 69a49be05..b560d26ad 100644
--- a/src/routes/users/me/campaigns/campaignId/forms/_get/visibility.spec.ts
+++ b/src/routes/users/me/campaigns/campaignId/forms/_get/visibility.spec.ts
@@ -17,6 +17,7 @@ describe("GET users/me/campaigns/:campaignId/forms - logged user", () => {
     await tryber.tables.WpAppqProfileHasLang.do().insert({
       profile_id: 1,
       language_id: 1,
+      language_name: "Italian",
     });
   });
   afterAll(async () => {
@@ -163,6 +164,7 @@ describe("GET users/me/campaigns/:campaignId/forms - logged user", () => {
         await tryber.tables.CampaignDossierDataLanguages.do().insert({
           campaign_dossier_data_id: 1,
           language_id: 1,
+          language_name: "Italian",
         });
         await tryber.tables.CampaignDossierDataCountries.do().insert({
           campaign_dossier_data_id: 1,
@@ -185,6 +187,7 @@ describe("GET users/me/campaigns/:campaignId/forms - logged user", () => {
         await tryber.tables.CampaignDossierDataLanguages.do().insert({
           campaign_dossier_data_id: 1,
           language_id: 19,
+          language_name: "Afrikaans",
         });
         await tryber.tables.CampaignDossierDataCountries.do().insert({
           campaign_dossier_data_id: 1,

From affc59691b34b6edfcef7b9864706b1671839e98 Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Wed, 16 Oct 2024 12:32:15 +0200
Subject: [PATCH 13/18] test: fixed tests

---
 src/routes/users/me/_patch/index.spec.ts | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/routes/users/me/_patch/index.spec.ts b/src/routes/users/me/_patch/index.spec.ts
index 5a2092e94..77301131b 100644
--- a/src/routes/users/me/_patch/index.spec.ts
+++ b/src/routes/users/me/_patch/index.spec.ts
@@ -9,14 +9,13 @@ import CustomUserFieldsData from "@src/__mocks__/mockedDb/customUserFieldsData";
 import CustomUserFieldExtras from "@src/__mocks__/mockedDb/customUserFieldsExtra";
 import { data as educationsList } from "@src/__mocks__/mockedDb/educationList";
 import { data as employmentsList } from "@src/__mocks__/mockedDb/employmentList";
-import { data as languagesList } from "@src/__mocks__/mockedDb/languageList";
 import Profile from "@src/__mocks__/mockedDb/profile";
 import { data as testerCertifications } from "@src/__mocks__/mockedDb/testerCertification";
-import { data as testerLanguages } from "@src/__mocks__/mockedDb/testerLanguage";
 import WpOptions from "@src/__mocks__/mockedDb/wp_options";
 import WpUsers from "@src/__mocks__/mockedDb/wp_users";
 import request from "supertest";
 import { CheckPassword, HashPassword } from "wordpress-hash-node";
+import { tryber } from "@src/features/database";
 
 describe("Route PATCH users-me", () => {
   beforeAll(async () => {
@@ -46,8 +45,12 @@ describe("Route PATCH users-me", () => {
       });
       await employmentsList.employment1({ display_name: "UNGUESS Tester" });
       await educationsList.education1({ display_name: "Phd" });
-      await languagesList.lenguage1({ display_name: "Sicilian" });
-      await testerLanguages.assignLanguage();
+      await tryber.tables.WpAppqProfileHasLang.do().insert({
+        profile_id: 1,
+        language_id: 1,
+        language_name: "English",
+      });
+
       //insert cuf_text
       await CustomUserFields.insert({
         name: "Username Tetris",
@@ -114,8 +117,7 @@ describe("Route PATCH users-me", () => {
     await testerCertifications.drop();
     await employmentsList.drop();
     await educationsList.drop();
-    await languagesList.drop();
-    await testerLanguages.drop();
+    await tryber.tables.WpAppqProfileHasLang.do().delete();
     await CustomUserFields.clear();
     await CustomUserFieldsData.clear();
     await CustomUserFieldExtras.clear();
@@ -206,8 +208,11 @@ describe("Route PATCH users-me accepted fields", () => {
       });
       await educationsList.education1({ display_name: "Phd" });
       await educationsList.education1({ id: 2, display_name: "Phd Professor" });
-      await languagesList.lenguage1({ display_name: "Sicilian" });
-      await testerLanguages.assignLanguage();
+      await tryber.tables.WpAppqProfileHasLang.do().insert({
+        profile_id: 1,
+        language_id: 1,
+        language_name: "English",
+      });
       //insert cuf_text
       await CustomUserFields.insert({
         name: "Username Tetris",
@@ -274,8 +279,7 @@ describe("Route PATCH users-me accepted fields", () => {
     await testerCertifications.drop();
     await employmentsList.drop();
     await educationsList.drop();
-    await languagesList.drop();
-    await testerLanguages.drop();
+    await tryber.tables.WpAppqProfileHasLang.do().delete();
     await CustomUserFields.clear();
     await CustomUserFieldsData.clear();
     await CustomUserFieldExtras.clear();

From 96f318d0871815b3c11923e6828e1ce5ecb6f9b5 Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Wed, 16 Oct 2024 12:40:39 +0200
Subject: [PATCH 14/18] refactor: fixed tests and code to use new language_name
 column

---
 .../users/me/_get/__tests__/index.spec.ts     | 25 ++++++-----------
 src/routes/users/me/_get/getLanguagesData.ts  | 27 +++++--------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/src/routes/users/me/_get/__tests__/index.spec.ts b/src/routes/users/me/_get/__tests__/index.spec.ts
index a0c224518..96d0f6207 100644
--- a/src/routes/users/me/_get/__tests__/index.spec.ts
+++ b/src/routes/users/me/_get/__tests__/index.spec.ts
@@ -6,13 +6,12 @@ import CustomUserFieldsData from "@src/__mocks__/mockedDb/customUserFieldsData";
 import CustomUserFieldsExtras from "@src/__mocks__/mockedDb/customUserFieldsExtra";
 import { data as educationListData } from "@src/__mocks__/mockedDb/educationList";
 import { data as employmentListData } from "@src/__mocks__/mockedDb/employmentList";
-import { data as languageListData } from "@src/__mocks__/mockedDb/languageList";
 import Profile from "@src/__mocks__/mockedDb/profile";
 import { data as testerCertificationData } from "@src/__mocks__/mockedDb/testerCertification";
-import { data as testerLanguageData } from "@src/__mocks__/mockedDb/testerLanguage";
 import WpOptions from "@src/__mocks__/mockedDb/wp_options";
 import WpUsers from "@src/__mocks__/mockedDb/wp_users";
 import app from "@src/app";
+import { tryber } from "@src/features/database";
 import sqlite3 from "@src/features/sqlite";
 import request from "supertest";
 
@@ -77,14 +76,7 @@ const education1 = {
   id: 1,
   display_name: "Phd",
 };
-const lang1 = {
-  id: 1,
-  display_name: "Italian",
-};
-const testerFullLang1 = {
-  profile_id: testerFull.id,
-  language_id: lang1.id,
-};
+
 const cufText = {
   //cuf
   id: 1,
@@ -223,8 +215,11 @@ describe("Route GET users-me-full-fields", () => {
     );
     await employmentListData.employment1(employment1);
     await sqlite3.insert("wp_appq_education", education1);
-    await languageListData.lenguage1(lang1);
-    await sqlite3.insert("wp_appq_profile_has_lang", testerFullLang1);
+    await tryber.tables.WpAppqProfileHasLang.do().insert({
+      language_id: 1,
+      language_name: "Italian",
+      profile_id: testerFull.id,
+    });
     //insert cuf_text
     await CustomUserFields.insert(cufText);
     await sqlite3.insert("wp_appq_custom_user_field_data", cufTextVal);
@@ -258,8 +253,6 @@ describe("Route GET users-me-full-fields", () => {
       await testerCertificationData.drop();
       await employmentListData.drop();
       await educationListData.drop();
-      await languageListData.drop();
-      await testerLanguageData.drop();
       await CustomUserFields.clear();
       await CustomUserFieldsData.clear();
       await CustomUserFieldsExtras.clear();
@@ -334,15 +327,13 @@ describe("Route GET users-me-full-fields", () => {
     expect(response.body).toHaveProperty("languages");
     expect(response.body).toHaveProperty("role");
     expect(response.body.languages[0]).toMatchObject({
-      id: lang1.id,
-      name: lang1.display_name,
+      name: "Italian",
     });
     expect(Array.isArray(response.body.languages)).toBe(true);
     const langs = response.body
       .languages as StoplightOperations["get-users-me"]["responses"]["200"]["content"]["application/json"]["languages"];
     if (Array.isArray(langs)) {
       langs.forEach((l) => {
-        expect(l).toHaveProperty("id");
         expect(l).toHaveProperty("name");
       });
     }
diff --git a/src/routes/users/me/_get/getLanguagesData.ts b/src/routes/users/me/_get/getLanguagesData.ts
index fe1ab9ea8..0e749ab66 100644
--- a/src/routes/users/me/_get/getLanguagesData.ts
+++ b/src/routes/users/me/_get/getLanguagesData.ts
@@ -1,25 +1,12 @@
+import { tryber } from "@src/features/database";
 import * as db from "@src/features/db";
 
 export default async (id: string) => {
-  let sql = `SELECT l.display_name as language, l.id as id
-               FROM wp_appq_profile_has_lang pl
-                   JOIN wp_appq_evd_profile p
-               on pl.profile_id = p.id
-                   JOIN wp_appq_lang l ON (pl.language_id = l.id)
-               WHERE wp_user_id = ?;
-    ;
-    `;
+  const result = await tryber.tables.WpAppqProfileHasLang.do()
+    .select("language_name")
+    .where("profile_id", id);
 
-  return db
-    .query(db.format(sql, [id]))
-    .then((data) => {
-      if (!data.length) return Promise.reject(Error("Invalid language data"));
-      return {
-        languages: data.map((l: { id: string; language: string }) => ({
-          id: l.id,
-          name: l.language,
-        })),
-      };
-    })
-    .catch((e) => Promise.reject(Error(e)));
+  if (!result.length) return Promise.reject(Error("Invalid language data"));
+
+  return { languages: result.map((l) => ({ name: l.language_name })) };
 };

From 7651c6050dfb4cadfa4caf73323fd3780da56eac Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Thu, 17 Oct 2024 18:38:25 +0200
Subject: [PATCH 15/18] refactor: removed old code

---
 src/features/db/class/Campaigns.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/features/db/class/Campaigns.ts b/src/features/db/class/Campaigns.ts
index 4a361ced9..b895ac90f 100644
--- a/src/features/db/class/Campaigns.ts
+++ b/src/features/db/class/Campaigns.ts
@@ -60,16 +60,6 @@ class CampaignObject {
   }
 
   private async getTargetRules() {
-    /* const allowedLanguages =
-      await tryber.tables.CampaignDossierDataLanguages.do()
-        .select("campaign_id", "language_id")
-        .join(
-          "campaign_dossier_data",
-          "campaign_dossier_data.id",
-          "campaign_dossier_data_languages.campaign_dossier_data_id"
-        )
-        .where("campaign_dossier_data.campaign_id", this.id); */
-
     const allowedLanguages =
       await tryber.tables.CampaignDossierDataLanguages.do()
         .select("campaign_id", "language_name")

From 2e3574373e0d2b097660d05a36f7cc22e38a4693 Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Thu, 17 Oct 2024 18:40:01 +0200
Subject: [PATCH 16/18] refactor: update query to use wp_user_id

---
 src/routes/users/me/_get/getLanguagesData.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/routes/users/me/_get/getLanguagesData.ts b/src/routes/users/me/_get/getLanguagesData.ts
index 0e749ab66..bbceaa1c0 100644
--- a/src/routes/users/me/_get/getLanguagesData.ts
+++ b/src/routes/users/me/_get/getLanguagesData.ts
@@ -4,7 +4,12 @@ import * as db from "@src/features/db";
 export default async (id: string) => {
   const result = await tryber.tables.WpAppqProfileHasLang.do()
     .select("language_name")
-    .where("profile_id", id);
+    .join(
+      "wp_appq_evd_profile",
+      "wp_appq_profile_has_lang.profile_id",
+      "wp_appq_evd_profile.id"
+    )
+    .where("wp_appq_evd_profile.wp_user_id", id);
 
   if (!result.length) return Promise.reject(Error("Invalid language data"));
 

From 35b0dda075e6ce2f108a301e9e899deab104a65e Mon Sep 17 00:00:00 2001
From: Kariamos <minucci9292@gmail.com>
Date: Fri, 25 Oct 2024 11:22:08 +0200
Subject: [PATCH 17/18] refactor: Remove commented out code

---
 .../users/me/languages/_put/index.spec.ts     | 13 --------
 src/routes/users/me/languages/_put/index.ts   | 33 -------------------
 .../users/me/languages/_put/useBasicData.ts   |  7 ----
 3 files changed, 53 deletions(-)

diff --git a/src/routes/users/me/languages/_put/index.spec.ts b/src/routes/users/me/languages/_put/index.spec.ts
index 3cada7b36..c0c64d139 100644
--- a/src/routes/users/me/languages/_put/index.spec.ts
+++ b/src/routes/users/me/languages/_put/index.spec.ts
@@ -18,19 +18,6 @@ describe("Route PUT /users/me/languages/", () => {
       .expect(404);
   });
 
-  /*it("Should return 404 if languages does not exist", async () => {
-    const response = await request(app)
-      .put("/users/me/languages/")
-      .send([3, 69])
-      .set("Authorization", "Bearer tester");
-    expect(response.status).toBe(404);
-    expect(response.body).toEqual({
-      element: "element",
-      id: 1,
-      message: "Bad request: lang_id not found.",
-    });
-  });*/
-
   it("Should return 200 if user is logged", async () => {
     const response = await request(app)
       .put("/users/me/languages/")
diff --git a/src/routes/users/me/languages/_put/index.ts b/src/routes/users/me/languages/_put/index.ts
index b404772f0..9d8dbcce3 100644
--- a/src/routes/users/me/languages/_put/index.ts
+++ b/src/routes/users/me/languages/_put/index.ts
@@ -18,29 +18,6 @@ export default class UserLanguagesRoute extends UserRoute<{
     }
   }
 
-  /* protected async filter() {
-    if (await this.desiredLanguagesDoesNotExist()) return false;
-    return true;
-  }
-
-  protected async desiredLanguagesDoesNotExist() {
-    if (!this.languages) return false;
-
-   const availableLanguagesIds = await this.getAvailableLanguages();
-
-    const everyLanguageExists = this.languages.every((nl) =>
-      availableLanguagesIds.includes(nl)
-    );
-
-    if (!everyLanguageExists) {
-      this.setError(404, new OpenapiError(`Bad request: lang_id not found.`));
-      return true;
-    }
-
-    return false;
-  }
-    */
-
   protected async prepare() {
     await this.insertNewLanguages();
 
@@ -51,16 +28,6 @@ export default class UserLanguagesRoute extends UserRoute<{
     );
   }
 
-  /* protected async getAvailableLanguages() {
-    const languages = await tryber.tables.WpAppqLang.do().select(
-      "id",
-      tryber.ref("display_name").withSchema("wp_appq_lang").as("name")
-    );
-
-    if (!languages.length) throw Error("No languages");
-    return languages.map((l) => l.id);
-  }*/
-
   protected async getUserLanguages() {
     const testerLanguages = await tryber.tables.WpAppqProfileHasLang.do()
       .select("language_name")
diff --git a/src/routes/users/me/languages/_put/useBasicData.ts b/src/routes/users/me/languages/_put/useBasicData.ts
index 3b2d5035b..b3f657ab2 100644
--- a/src/routes/users/me/languages/_put/useBasicData.ts
+++ b/src/routes/users/me/languages/_put/useBasicData.ts
@@ -20,13 +20,6 @@ const useBasicData = () => {
       user_email: "tester@example.com",
       user_pass: "pass",
     });
-    /*await tryber.tables.WpAppqLang.do().insert([
-      { id: 1, display_name: "Italiano", lang_code: "it" },
-      { id: 2, display_name: "English", lang_code: "en" },
-      { id: 3, display_name: "Itialian (Sicilian)", lang_code: "it-sc" },
-      { id: 4, display_name: "Arabic", lang_code: "ar" },
-      { id: 5, display_name: "Hindi", lang_code: "hi" },
-    ]);*/
   });
   afterAll(async () => {
     await tryber.tables.WpAppqEvdProfile.do().delete();

From 509ea9d00c7fcaca327e8b729e614fce0af2b23b Mon Sep 17 00:00:00 2001
From: Davide Bizzi <davide.bizzi@unguess.io>
Date: Wed, 20 Nov 2024 09:58:04 +0100
Subject: [PATCH 18/18] chore: update @appquality/tryber-database to version
 0.42.2

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 648ea0ccd..c11f8825d 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@appquality/tryber-database": "^0.42.0",
+    "@appquality/tryber-database": "^0.42.2",
     "@appquality/wp-auth": "^1.0.7",
     "@googlemaps/google-maps-services-js": "^3.3.7",
     "@sendgrid/mail": "^7.6.0",
diff --git a/yarn.lock b/yarn.lock
index ef5864dd9..2de2c23cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,10 +28,10 @@
     "@babel/parser" "^7.22.5"
     "@babel/traverse" "^7.22.5"
 
-"@appquality/tryber-database@^0.42.0":
-  version "0.42.0"
-  resolved "https://registry.npmjs.org/@appquality/tryber-database/-/tryber-database-0.42.0.tgz#4b517d52f61e666e8730c505070db50c0e922940"
-  integrity sha512-Knxhw6aHWF1d7QnVLiXVkQOPN7pm4uG99pgAtaGZjyhpVBij9BcIZnMFDPxSWO7IHY+JWLfa9PJFjco4SbGG8Q==
+"@appquality/tryber-database@^0.42.2":
+  version "0.42.2"
+  resolved "https://registry.npmjs.org/@appquality/tryber-database/-/tryber-database-0.42.2.tgz#2b541c89657a64c223ca354578e388670f21b59a"
+  integrity sha512-zYQb6Pjpm7+TDxndiXReeQV0ROZqSLDvEc1YRz4AQZUuYGR2o+x8QBNhKfx4ixn0H2o+XbaGl8jB0U1oEkXftQ==
   dependencies:
     better-sqlite3 "^8.1.0"
     knex "^2.5.1"