Merge branch 'staging' into en-validations

airqo-platform · Jan 23, 2025 · 66f1deb · 66f1deb
2 parents 89449a6 + 9a8185f
commit 66f1deb
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 36 deletions.
diff --git a/k8s/auth-service/values-prod.yaml b/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-935f8b4f-1737611429
+  tag: prod-0a13d9f7-1737623111
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/auth-service/values-stage.yaml b/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-71798256-1737611386
+  tag: stage-339ecca6-1737613974
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/calibrate/values-prod.yaml b/k8s/calibrate/values-prod.yaml
@@ -6,11 +6,11 @@ app:
 initContainer:
   image:
     repository: eu.gcr.io/airqo-250220/airqo-calibrate-pickle-file
-    tag: prod-4368f7b7-1737564990
+    tag: prod-0a13d9f7-1737623111
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-calibrate-api
-  tag: prod-4368f7b7-1737564990
+  tag: prod-0a13d9f7-1737623111
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/device-registry/values-prod.yaml b/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-5400c99e-1737527075
+  tag: prod-0a13d9f7-1737623111
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/device-registry/values-stage.yaml b/k8s/device-registry/values-stage.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-device-registry-api
-  tag: stage-db46fe65-1737478850
+  tag: stage-93c17fda-1737622823
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/exceedance/values-prod-airqo.yaml b/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-935f8b4f-1737611429
+  tag: prod-0a13d9f7-1737623111
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/exceedance/values-prod-kcca.yaml b/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-935f8b4f-1737611429
+  tag: prod-0a13d9f7-1737623111
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/incentives/values-prod.yaml b/k8s/incentives/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-incentives-api
-  tag: prod-935f8b4f-1737611429
+  tag: prod-0a13d9f7-1737623111
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/predict/values-prod.yaml b/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-4368f7b7-1737564990
+  tag: prod-0a13d9f7-1737623111
 api:
   name: airqo-prediction-api
   label: prediction-api

diff --git a/k8s/spatial/values-prod.yaml b/k8s/spatial/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-spatial-api
-  tag: prod-4368f7b7-1737564990
+  tag: prod-0a13d9f7-1737623111
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/workflows/values-prod.yaml b/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-4368f7b7-1737564990
+  tag: prod-c2d0e20b-1737614024
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/auth-service/utils/common/mailer.js b/src/auth-service/utils/common/mailer.js
@@ -21,7 +21,7 @@ const processString = (inputString) => {
   return uppercasedString;
 };
 
-const projectRoot = path.join(__dirname, "..", ".."); // Go two levels up
+const projectRoot = path.join(__dirname, "..", "..", ".."); // Go three levels up
 const imagePath = path.join(projectRoot, "config", "images");
 
 let attachments = [

diff --git a/src/device-registry/utils/common/generate-filter.js b/src/device-registry/utils/common/generate-filter.js
@@ -1210,7 +1210,6 @@ const generateFilter = {
       parish,
       site_id,
       category,
-      site_category,
       path,
       site_codes,
       _id,
@@ -1261,11 +1260,7 @@ const generateFilter = {
     }
 
     if (category) {
-      filter["category"] = category;
-    }
-
-    if (site_category) {
-      filter["site_category"] = site_category;
+      filter["site_category.category"] = category;
     }
 
     if (!isEmpty(path) && path === "public" && isEmpty(site_id)) {

diff --git a/src/device-registry/validators/site.validators.js b/src/device-registry/validators/site.validators.js
@@ -191,23 +191,7 @@ const validateSiteQueryParams = oneOf([
         .notEmpty()
         .withMessage("the category should not be empty if provided")
         .bail()
-        .trim()
-        .toLowerCase()
-        .isIn(["bam", "lowcost", "gas"])
-        .withMessage(
-          "the category value is not among the expected ones which include: lowcost, gas and bam"
-        ),
-      query("site_category")
-        .optional()
-        .notEmpty()
-        .withMessage("the site_category should not be empty if provided")
-        .bail()
-        .trim()
-        .toLowerCase()
-        .isIn(["category", "search_radius", "tags"])
-        .withMessage(
-          "the site_category value is not among the expected ones which include: category, search_radius, tags"
-        ),
+        .trim(),
       query("last_active_before")
         .optional()
         .notEmpty()