Merge commit 'ed9fb3c2ba35be2d113a7d298d8afb548af5d6da'

.gitignore

@@ -5,4 +5,5 @@ coverage/
 keys/*
 !/**/.gitkeep.idea
 .idea
-.vscode/*.log
+.vscode/*.log
+.aider*

package.json

@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@appquality/tryber-database": "^0.41.1",
+    "@appquality/tryber-database": "^0.41.9",
     "@appquality/wp-auth": "^1.0.7",
     "@googlemaps/google-maps-services-js": "^3.3.7",
     "@sendgrid/mail": "^7.6.0",

src/features/db/class/PreselectionFormFields.ts

@@ -14,6 +14,7 @@ type PreselectionFormFieldsType = {
     | "address"
     | `cuf_${number}`;
   options: string;
+  invalid_options: string;
   question: string;
   priority: number;
 };
@@ -26,6 +27,7 @@ class PreselectionFormFieldsObject {
   options: PreselectionFormFieldsType["options"];
   question: PreselectionFormFieldsType["question"];
   priority: PreselectionFormFieldsType["priority"];
+  invalid_options: PreselectionFormFieldsType["invalid_options"];
 
   constructor(item: PreselectionFormFieldsType) {
     this.id = item.id;
@@ -35,6 +37,7 @@ class PreselectionFormFieldsObject {
     this.options = item.options;
     this.question = item.question;
     this.priority = item.priority;
+    this.invalid_options = item.invalid_options;
   }
 
   public getOptions(): string[] | number[] {
@@ -63,6 +66,7 @@ class Table extends Database<{
             "options",
             "question",
             "priority",
+            "invalid_options",
           ],
     });
   }

src/routes/campaigns/campaignId/candidates/_get/CandidateDevices.ts

@@ -5,7 +5,11 @@ class CandidateDevices implements CandidateData {
   private campaignId: number;
   private candidateIds: number[];
   private filters?: { os?: string[] };
-  private show: "onlyAccepted" | "onlyCandidates" | "all" = "all";
+  private show:
+    | "onlyAccepted"
+    | "onlyCandidates"
+    | "all"
+    | "candidatesAndExcluded" = "all";
 
   private _devices:
     | {
@@ -36,7 +40,7 @@ class CandidateDevices implements CandidateData {
     campaignId: number;
     candidateIds: number[];
     filters?: { os?: string[] };
-    show: "onlyAccepted" | "onlyCandidates" | "all";
+    show: "onlyAccepted" | "onlyCandidates" | "all" | "candidatesAndExcluded";
   }) {
     this.candidateIds = candidateIds;
     this.filters = filters;

src/routes/campaigns/campaignId/candidates/_get/Candidates.ts

@@ -2,13 +2,17 @@ import { tryber } from "@src/features/database";
 
 class Candidates {
   private campaign_id: number;
-  private show: "onlyAccepted" | "onlyCandidates" | "all" = "all";
+  private show:
+    | "onlyAccepted"
+    | "onlyCandidates"
+    | "all"
+    | "candidatesAndExcluded" = "all";
   constructor({
     campaign_id,
     show,
   }: {
     campaign_id: number;
-    show: "onlyAccepted" | "onlyCandidates" | "all";
+    show: "onlyAccepted" | "onlyCandidates" | "all" | "candidatesAndExcluded";
   }) {
     this.campaign_id = campaign_id;
     this.show = show;
@@ -29,7 +33,8 @@ class Candidates {
       .select(
         tryber.ref("id").withSchema("wp_appq_evd_profile"),
         "name",
-        "surname"
+        "surname",
+        "accepted"
       )
       .where("campaign_id", this.campaign_id)
       .where("name", "<>", "Deleted User")
@@ -40,9 +45,19 @@ class Candidates {
       query.where("accepted", 1);
     } else if (this.show === "onlyCandidates") {
       query.where("accepted", 0);
+    } else if (this.show === "candidatesAndExcluded") {
+      query.whereIn("accepted", [0, -1]);
     }
 
-    return await query;
+    return (await query).map((candidate) => ({
+      ...candidate,
+      status:
+        candidate.accepted === 1
+          ? ("selected" as const)
+          : candidate.accepted === 0
+          ? ("candidate" as const)
+          : ("excluded" as const),
+    }));
   }
 }
 

src/routes/campaigns/campaignId/candidates/_get/index.ts

@@ -286,6 +286,7 @@ export default class RouteItem extends UserRoute<{
           age: candidate.age,
           questions: candidate.questions,
           levels: candidate.levels,
+          status: candidate.status,
         };
       }),
       size: candidates.length,

src/routes/campaigns/campaignId/candidates/_get/show.spec.ts

@@ -25,23 +25,25 @@ describe("GET /campaigns/:campaignId/candidates - show ", () => {
       surname: "pluto",
       education_id: 1,
       employment_id: 1,
+      birth_date: "1999-01-01",
+      total_exp_pts: 90,
+      sex: 0,
     };
     await tryber.tables.WpAppqEvdProfile.do().insert([
       {
         ...profile,
         id: 1,
         wp_user_id: 1,
-        birth_date: "2000-01-01",
-        total_exp_pts: 100,
-        sex: 1,
       },
       {
         ...profile,
         id: 2,
         wp_user_id: 2,
-        birth_date: "1999-01-01",
-        total_exp_pts: 90,
-        sex: 0,
+      },
+      {
+        ...profile,
+        id: 3,
+        wp_user_id: 3,
       },
     ]);
 
@@ -55,6 +57,11 @@ describe("GET /campaigns/:campaignId/candidates - show ", () => {
         user_id: 1,
         accepted: 0,
       },
+      {
+        ...candidate,
+        user_id: 3,
+        accepted: -1,
+      },
     ]);
     await tryber.tables.WpCrowdAppqHasCandidate.do().insert([
       {
@@ -90,6 +97,11 @@ describe("GET /campaigns/:campaignId/candidates - show ", () => {
         id: 3,
         id_profile: 2,
       },
+      {
+        ...device,
+        id: 4,
+        id_profile: 3,
+      },
     ]);
 
     await tryber.tables.WpAppqEvdPlatform.do().insert({
@@ -145,7 +157,7 @@ describe("GET /campaigns/:campaignId/candidates - show ", () => {
       .get("/campaigns/1/candidates?show=all")
       .set("authorization", `Bearer tester olp {"appq_tester_selection":true}`);
     expect(response.body).toHaveProperty("results");
-    expect(response.body.results).toHaveLength(2);
+    expect(response.body.results).toHaveLength(3);
     expect(response.body.results).toEqual(
       expect.arrayContaining([
         expect.objectContaining({
@@ -154,6 +166,33 @@ describe("GET /campaigns/:campaignId/candidates - show ", () => {
         expect.objectContaining({
           id: 2,
         }),
+        expect.objectContaining({
+          id: 3,
+        }),
+      ])
+    );
+  });
+
+  it("Should return acceptance status", async () => {
+    const response = await request(app)
+      .get("/campaigns/1/candidates?show=all")
+      .set("authorization", `Bearer tester olp {"appq_tester_selection":true}`);
+    expect(response.body).toHaveProperty("results");
+    expect(response.body.results).toHaveLength(3);
+    expect(response.body.results).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: 1,
+          status: "candidate",
+        }),
+        expect.objectContaining({
+          id: 2,
+          status: "selected",
+        }),
+        expect.objectContaining({
+          id: 3,
+          status: "excluded",
+        }),
       ])
     );
   });
@@ -168,4 +207,21 @@ describe("GET /campaigns/:campaignId/candidates - show ", () => {
     expect(response.body.results[0].devices).toHaveLength(1);
     expect(response.body.results[0].devices[0]).toHaveProperty("id", 3);
   });
+  it("Should show candidates and excluded if candidatesAndExcluded", async () => {
+    const response = await request(app)
+      .get("/campaigns/1/candidates?show=candidatesAndExcluded")
+      .set("authorization", `Bearer tester olp {"appq_tester_selection":true}`);
+    expect(response.body).toHaveProperty("results");
+    expect(response.body.results).toHaveLength(2);
+    expect(response.body.results).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: 1,
+        }),
+        expect.objectContaining({
+          id: 3,
+        }),
+      ])
+    );
+  });
 });