move to production

k8s/auth-service/values-prod.yaml

@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-auth-api
-  tag: prod-5db8187c-1728710778
+  tag: prod-b8c3716f-1728774045
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

k8s/auth-service/values-stage.yaml

@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-auth-api
-  tag: stage-b011b24b-1728773951
+  tag: stage-827e462a-1728941910
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

k8s/device-registry/values-prod.yaml

@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
-  tag: prod-a07ee9b6-1728734777
+  tag: prod-b8c3716f-1728774045
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

k8s/exceedance/values-prod-airqo.yaml

@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
-  tag: prod-a07ee9b6-1728734777
+  tag: prod-b8c3716f-1728774045
 nameOverride: ''
 fullnameOverride: ''

k8s/exceedance/values-prod-kcca.yaml

@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
-  tag: prod-a07ee9b6-1728734777
+  tag: prod-b8c3716f-1728774045
 nameOverride: ''
 fullnameOverride: ''

k8s/predict/values-prod.yaml

@@ -7,7 +7,7 @@ images:
     predictJob: eu.gcr.io/airqo-250220/airqo-predict-job
     trainJob: eu.gcr.io/airqo-250220/airqo-train-job
     predictPlaces: eu.gcr.io/airqo-250220/airqo-predict-places-air-quality
-  tag: prod-a07ee9b6-1728734777
+  tag: prod-b8c3716f-1728774045
 api:
   name: airqo-prediction-api
   label: prediction-api

k8s/spatial/values-prod.yaml

@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-spatial-api
-  tag: prod-a07ee9b6-1728734777
+  tag: prod-b8c3716f-1728774045
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

k8s/workflows/values-prod.yaml

@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-redis
     containers: eu.gcr.io/airqo-250220/airqo-workflows
-  tag: prod-a07ee9b6-1728734777
+  tag: prod-b8c3716f-1728774045
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

src/auth-service/bin/jobs/preferences-update-job.js

@@ -1,6 +1,7 @@
 const cron = require("node-cron");
 const UserModel = require("@models/User");
 const PreferenceModel = require("@models/Preference");
+const SelectedSiteModel = require("@models/SelectedSite");
 const constants = require("@config/constants");
 const log4js = require("log4js");
 const { logText, logObject } = require("@utils/log");
@@ -9,9 +10,7 @@ const logger = log4js.getLogger(
 );
 const stringify = require("@utils/stringify");
 const isEmpty = require("is-empty");
-
-// Predefined array of 4 site IDs
-const defaultSiteIds = constants.SELECTED_SITES;
+const BATCH_SIZE = 100;
 
 // Default preference object
 const defaultPreference = {
@@ -28,17 +27,53 @@ const defaultPreference = {
     unitValue: 14,
     unit: "day",
   },
-  airqloud_id: constants.DEFAULT_AIRQLOUD,
-  grid_id: constants.DEFAULT_GRID,
-  network_id: constants.DEFAULT_NETWORK,
-  group_id: constants.DEFAULT_GROUP,
+  airqloud_id: constants.DEFAULT_AIRQLOUD || "NA",
+  grid_id: constants.DEFAULT_GRID || "NA",
+  network_id: constants.DEFAULT_NETWORK || "NA",
+  group_id: constants.DEFAULT_GROUP || "NA",
 };
 
-const updatePreferences = async () => {
+// Function to get selected sites based on the specified method
+const getSelectedSites = async (method = "featured") => {
   try {
-    const batchSize = 100;
+    let selectedSites;
+    if (method === "featured") {
+      selectedSites = await SelectedSiteModel("airqo")
+        .find({ isFeatured: true })
+        .sort({ createdAt: -1 })
+        .limit(4)
+        .lean();
+    } else {
+      selectedSites = await SelectedSiteModel("airqo")
+        .find()
+        .sort({ createdAt: -1 })
+        .limit(4)
+        .lean();
+    }
+    const modifiedSelectedSites = selectedSites.map((site) => ({
+      ...site,
+      _id: site.site_id || null,
+    }));
+    return modifiedSelectedSites;
+  } catch (error) {
+    logger.error(`🐛🐛 Error fetching selected sites: ${stringify(error)}`);
+    return [];
+  }
+};
+
+const updatePreferences = async (siteSelectionMethod = "featured") => {
+  try {
+    const batchSize = BATCH_SIZE;
     let skip = 0;
 
+    // Fetch selected sites data
+    const selectedSites = await getSelectedSites(siteSelectionMethod);
+
+    if (isEmpty(selectedSites) || selectedSites.length < 4) {
+      logger.error("🐛🐛 No selected sites found. Aborting preference update.");
+      return;
+    }
+
     while (true) {
       const users = await UserModel("airqo")
         .find()
@@ -59,16 +94,11 @@ const updatePreferences = async () => {
         .lean();
 
       const preferencesMap = new Map();
+
       preferences.forEach((pref) => {
         preferencesMap.set(pref.user_id.toString(), pref);
       });
 
-      // Initialize selected_sites data
-      const selectedSitesData = defaultSiteIds.map((siteId) => ({
-        _id: siteId,
-        createdAt: new Date(),
-      }));
-
       for (const user of users) {
         const userIdStr = user._id.toString();
         const preference = preferencesMap.get(userIdStr);
@@ -79,11 +109,11 @@ const updatePreferences = async () => {
             .create({
               ...defaultPreference,
               user_id: user._id,
-              selected_sites: selectedSitesData,
+              selected_sites: selectedSites,
             })
             .catch((error) => {
               logger.error(
-                `Failed to create preference for user ${userIdStr}: ${stringify(
+                `🐛🐛 Failed to create preference for user ${userIdStr}: ${stringify(
                   error
                 )}`
               );
@@ -96,14 +126,14 @@ const updatePreferences = async () => {
               {
                 $set: {
                   ...defaultPreference,
-                  selected_sites: selectedSitesData,
+                  selected_sites: selectedSites,
                 },
               },
               { new: true }
             )
             .catch((error) => {
               logger.error(
-                `Failed to update preference for user ${userIdStr}: ${stringify(
+                `🐛🐛 Failed to update preference for user ${userIdStr}: ${stringify(
                   error
                 )}`
               );
@@ -120,7 +150,7 @@ const updatePreferences = async () => {
 };
 
 const schedule = "30 * * * *"; // At minute 30 of every hour
-cron.schedule(schedule, updatePreferences, {
+cron.schedule(schedule, () => updatePreferences("featured"), {
   scheduled: true,
   timezone: "Africa/Nairobi",
 });

src/auth-service/bin/jobs/test/ut_active-status-job.js

@@ -0,0 +1,162 @@
+require("module-alias/register");
+const sinon = require("sinon");
+const chai = require("chai");
+const expect = chai.expect;
+const sinonChai = require("sinon-chai");
+
+describe("checkStatus", () => {
+  let UserModel;
+
+  beforeEach(() => {
+    // Set up mocks
+    UserModel = sinon.mock(UserModel);
+
+    sinon.stub(UserModel.prototype, "find").resolves(
+      [
+        {
+          _id: "user1",
+          lastLogin: new Date("2023-01-01T00:00:00Z"),
+          isActive: true,
+        },
+        {
+          _id: "user2",
+          lastLogin: new Date("2023-02-01T00:00:00Z"),
+          isActive: true,
+        },
+        { _id: "user3", lastLogin: null, isActive: true },
+        {
+          _id: "user4",
+          lastLogin: new Date("2023-03-01T00:00:00Z"),
+          isActive: false,
+        },
+        {
+          _id: "user5",
+          lastLogin: new Date("2023-04-01T00:00:00Z"),
+          isActive: true,
+        },
+      ].slice(0, 100)
+    );
+
+    sinon
+      .stub(UserModel.prototype, "updateMany")
+      .resolves({ modifiedCount: 5 });
+
+    sinon.stub(console, "error");
+    sinon.stub(stringify, "default").returns(JSON.stringify({}));
+  });
+
+  afterEach(() => {
+    // Restore mocks
+    UserModel.restore();
+    console.error.restore();
+    stringify.default.restore();
+  });
+
+  describe("successful execution", () => {
+    it("should mark inactive users and log results", async () => {
+      await checkStatus();
+
+      expect(UserModel.prototype.find).to.have.been.calledThrice;
+      expect(UserModel.prototype.updateMany).to.have.been.calledWith(
+        { _id: { $in: ["user1", "user2", "user3"] } },
+        { isActive: false }
+      );
+      expect(console.error).to.not.have.been.called;
+    });
+  });
+
+  describe("no inactive users found", () => {
+    it("should not update any users when no inactive users are found", async () => {
+      sinon.stub(UserModel.prototype, "find").resolves(
+        [
+          {
+            _id: "user1",
+            lastLogin: new Date("2023-05-01T00:00:00Z"),
+            isActive: true,
+          },
+          {
+            _id: "user2",
+            lastLogin: new Date("2023-06-01T00:00:00Z"),
+            isActive: true,
+          },
+        ].slice(0, 100)
+      );
+
+      await checkStatus();
+
+      expect(UserModel.prototype.updateMany).to.not.have.been.called;
+    });
+  });
+
+  describe("inactive threshold exceeded", () => {
+    it("should mark users inactive based on last login time", async () => {
+      sinon.stub(Date.now, "bind").returns(1697865600000); // Current timestamp
+      sinon.stub(UserModel.prototype, "find").resolves(
+        [
+          {
+            _id: "user1",
+            lastLogin: new Date("2023-01-01T00:00:00Z"),
+            isActive: true,
+          },
+          {
+            _id: "user2",
+            lastLogin: new Date("2023-02-01T00:00:00Z"),
+            isActive: true,
+          },
+          { _id: "user3", lastLogin: null, isActive: true },
+          {
+            _id: "user4",
+            lastLogin: new Date("2023-03-01T00:00:00Z"),
+            isActive: true,
+          },
+        ].slice(0, 100)
+      );
+
+      await checkStatus();
+
+      expect(UserModel.prototype.updateMany).to.have.been.calledWith(
+        { _id: { $in: ["user1", "user2", "user3"] } },
+        { isActive: false }
+      );
+    });
+  });
+
+  describe("internal server error", () => {
+    it("should log internal server error when executing the function fails", async () => {
+      sinon.stub(UserModel.prototype, "find").throws(new Error("Test error"));
+
+      await checkStatus();
+
+      expect(console.error).to.have.been.calledWith(
+        `Internal Server Error --- Test error`
+      );
+    });
+  });
+
+  describe("isActive false users", () => {
+    it("should skip already inactive users", async () => {
+      sinon.stub(UserModel.prototype, "find").resolves(
+        [
+          {
+            _id: "user1",
+            lastLogin: new Date("2023-01-01T00:00:00Z"),
+            isActive: false,
+          },
+          {
+            _id: "user2",
+            lastLogin: new Date("2023-02-01T00:00:00Z"),
+            isActive: true,
+          },
+          { _id: "user3", lastLogin: null, isActive: true },
+        ].slice(0, 100)
+      );
+
+      await checkStatus();
+
+      expect(UserModel.prototype.updateMany).to.have.been.calledWith(
+        { _id: { $in: ["user2", "user3"] } },
+        { isActive: false }
+      );
+    });
+  });
+});