Merge pull request #419 from AppQuality/develop

fix(target): update age handling to support multiple age ranges and a…

Author: d-beezee

src/routes/users/me/campaigns/_get/UserTargetChecker.ts

@@ -89,7 +89,7 @@ export class UserTargetChecker {
     countries?: string[];
     provinces?: string[];
     cufs?: { id: number; values: (string | number)[] }[];
-    age?: { min?: number; max?: number };
+    age?: { min?: number; max?: number }[];
     genders?: number[];
   }) {
     if (Object.keys(targetRules).length === 0) return true;
@@ -132,8 +132,17 @@ export class UserTargetChecker {
       }
     }
 
-    if (age && age.max && age.min) {
-      if (this.userAge < age.min || this.userAge > age.max) return false;
+    if (age && age.length) {
+      if (
+        !age.some((ageRule) => {
+          if (!ageRule.min && !ageRule.max) return true;
+          const min = ageRule.min ?? -Infinity;
+          const max = ageRule.max ?? Infinity;
+          return this.userAge >= min && this.userAge <= max;
+        })
+      ) {
+        return false;
+      }
     }
 
     if (genders && !genders.includes(this.userGender)) {

src/routes/users/me/campaigns/_get/index.ts

@@ -429,8 +429,13 @@ class RouteItem extends UserRoute<{
         campaignsWithTarget.map((c) => c.id)
       );
 
-    const ageMap = new Map(
-      allowedAges.map((a) => [a.campaign_id, { min: a.min, max: a.max }])
+    const ages = allowedAges.reduce(
+      (acc: Record<number, { min: number; max: number }[]>, cur) => {
+        if (!acc[cur.campaign_id]) acc[cur.campaign_id] = [];
+        acc[cur.campaign_id].push({ min: cur.min, max: cur.max });
+        return acc;
+      },
+      {}
     );
 
     return campaigns.map((campaign) => {
@@ -453,7 +458,7 @@ class RouteItem extends UserRoute<{
           return acc;
         }, {});
 
-      const age = ageMap.get(campaign.id) || { min: 0, max: 999 };
+      const age = campaign.id in ages ? ages[campaign.id] : undefined;
 
       const genders =
         allowedGenders.length > 0
@@ -557,7 +562,7 @@ class RouteItem extends UserRoute<{
         countries?: string[];
         provinces?: string[];
         cufs?: { id: number; values: (string | number)[] }[];
-        age?: { min?: number; max?: number };
+        age?: { min?: number; max?: number }[];
         genders?: number[];
       };
     })[]

src/routes/users/me/campaigns/_get/target.spec.ts

@@ -332,23 +332,48 @@ describe("GET /users/me/campaigns - target", () => {
 
   describe("Target by age", () => {
     beforeAll(async () => {
-      await tryber.tables.WpAppqEvdProfile.do().insert({
-        id: 1,
-        wp_user_id: 1,
-        email: "",
-        education_id: 1,
-        employment_id: 1,
-        country: "Italy",
-        birth_date: "2000-01-01",
-      });
+      await tryber.tables.CampaignDossierDataAge.do().insert([
+        {
+          campaign_dossier_data_id: 1,
+          min: 20,
+          max: 27,
+        },
+        {
+          campaign_dossier_data_id: 1,
+          min: 29,
+          max: 30,
+        },
+        {
+          campaign_dossier_data_id: 1,
+          min: 50,
+          max: 60,
+        },
+      ]);
     });
     afterAll(async () => {
-      await tryber.tables.WpAppqEvdProfile.do().delete();
+      await tryber.tables.CampaignDossierDataAge.do().delete();
     });
     describe("Tester with right age value", () => {
-      beforeAll(async () => {});
+      beforeAll(async () => {
+        const today = new Date();
+        const birthDate = new Date(
+          today.getFullYear() - 29,
+          today.getMonth(),
+          today.getDate() - 1
+        );
+        const birthDateString = birthDate.toISOString().split("T")[0];
+        await tryber.tables.WpAppqEvdProfile.do().insert({
+          id: 1,
+          wp_user_id: 1,
+          email: "",
+          education_id: 1,
+          employment_id: 1,
+          country: "Italy",
+          birth_date: birthDateString,
+        });
+      });
       afterAll(async () => {
-        await tryber.tables.CampaignDossierDataAge.do().delete();
+        await tryber.tables.WpAppqEvdProfile.do().delete();
       });
 
       it("Should show the campaign", async () => {
@@ -361,14 +386,25 @@ describe("GET /users/me/campaigns - target", () => {
 
     describe("Tester with wrong age value", () => {
       beforeAll(async () => {
-        await tryber.tables.CampaignDossierDataAge.do().insert({
-          campaign_dossier_data_id: 1,
-          max: 200,
-          min: 100,
+        const today = new Date();
+        const birthDate = new Date(
+          today.getFullYear() - 100,
+          today.getMonth(),
+          today.getDate() - 1
+        );
+        const birthDateString = birthDate.toISOString().split("T")[0];
+        await tryber.tables.WpAppqEvdProfile.do().insert({
+          id: 1,
+          wp_user_id: 1,
+          email: "",
+          education_id: 1,
+          employment_id: 1,
+          country: "Italy",
+          birth_date: birthDateString,
         });
       });
       afterAll(async () => {
-        await tryber.tables.CampaignDossierDataAge.do().delete();
+        await tryber.tables.WpAppqEvdProfile.do().delete();
       });
 
       it("Should not show the campaign", async () => {
@@ -378,14 +414,6 @@ describe("GET /users/me/campaigns - target", () => {
         expect(response.status).toBe(404);
       });
     });
-    describe("Campaign without required age value", () => {
-      it("Should show the campaign", async () => {
-        const response = await request(app)
-          .get("/users/me/campaigns")
-          .set("Authorization", "Bearer tester");
-        expect(response.status).toBe(200);
-      });
-    });
   });
 
   describe("Target by gender", () => {