Merge branch 'staging' into en-validations

airqo-platform · Jan 24, 2025 · b7def41 · b7def41
2 parents 66f1deb + f3cc1e8
commit b7def41
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 25 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-0a13d9f7-1737623111
+  tag: prod-19c3cb86-1737740810
 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-339ecca6-1737613974
+  tag: stage-742c85bf-1737740769
 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-0a13d9f7-1737623111
+    tag: prod-19c3cb86-1737740810
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-calibrate-api
-  tag: prod-0a13d9f7-1737623111
+  tag: prod-19c3cb86-1737740810
 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-0a13d9f7-1737623111
+  tag: prod-19c3cb86-1737740810
 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-0a13d9f7-1737623111
+  tag: prod-19c3cb86-1737740810
 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-0a13d9f7-1737623111
+  tag: prod-19c3cb86-1737740810
 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-0a13d9f7-1737623111
+  tag: prod-19c3cb86-1737740810
 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-0a13d9f7-1737623111
+  tag: prod-19c3cb86-1737740810
 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-0a13d9f7-1737623111
+  tag: prod-08366688-1737712174
 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-c2d0e20b-1737614024
+  tag: prod-19c3cb86-1737740810
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/workflows/values-stage.yaml b/k8s/workflows/values-stage.yaml
@@ -10,21 +10,21 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-stage-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-stage-redis
     containers: eu.gcr.io/airqo-250220/airqo-stage-workflows
-  tag: stage-0450c946-1737564945
+  tag: stage-49d537ea-1737733317
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
 resources:
   webserver:
     requests:
-      cpu: 50m
+      cpu: 125m
       memory: 1000Mi
     limits:
-      cpu: 100m
+      cpu: 500m
       memory: 1500Mi
   scheduler:
     requests:
-      cpu: 1500m
+      cpu: 500m
       memory: 1000Mi
     limits:
       cpu: 3000m
@@ -41,7 +41,7 @@ resources:
       cpu: 5m
       memory: 10Mi
     limits:
-      cpu: 50m
+      cpu: 100m
       memory: 50Mi
 affinity:
   nodeAffinity:

diff --git a/src/auth-service/controllers/user.controller.js b/src/auth-service/controllers/user.controller.js
@@ -12,9 +12,7 @@ const tokenUtil = require("@utils/token.util");
 const constants = require("@config/constants");
 const log4js = require("log4js");
 const UserModel = require("@models/User");
-const logger = log4js.getLogger(
-  `${constants.ENVIRONMENT} -- create-user-controller`
-);
+const logger = log4js.getLogger(`${constants.ENVIRONMENT} -- user controller`);
 
 function handleResponse({
   result,

diff --git a/src/auth-service/utils/common/mailer.js b/src/auth-service/utils/common/mailer.js
@@ -21,7 +21,8 @@ const processString = (inputString) => {
   return uppercasedString;
 };
 
-const projectRoot = path.join(__dirname, "..", "..", ".."); // Go three levels up
+const projectRoot = path.join(__dirname, "..", ".."); // Go two levels up
+// const projectRoot = "/usr/src/app";
 const imagePath = path.join(projectRoot, "config", "images");
 
 let attachments = [
@@ -788,7 +789,6 @@ const mailer = {
 
       const subscribedBccEmails = subscribedEmails.join(",");
       // bcc: subscribedBccEmails,
-      const imagePath = path.join(__dirname, "../config/images");
 
       let mailOptions = {};
       mailOptions = {
@@ -913,8 +913,6 @@ const mailer = {
 
       const subscribedBccEmails = subscribedEmails.join(",");
 
-      const imagePath = path.join(__dirname, "../config/images");
-
       let mailOptions = {};
       mailOptions = {
         from: {
@@ -1324,7 +1322,6 @@ const mailer = {
       if (!checkResult.success) {
         return checkResult;
       }
-      const imagePath = path.join(__dirname, "../config/images");
       const mailOptions = {
         from: {
           name: constants.EMAIL_NAME,

diff --git a/src/auth-service/utils/user.util.js b/src/auth-service/utils/user.util.js
@@ -26,7 +26,7 @@ const redisSetAsync = util.promisify(redis.set).bind(redis);
 const redisExpireAsync = util.promisify(redis.expire).bind(redis);
 const log4js = require("log4js");
 const GroupModel = require("@models/Group");
-const logger = log4js.getLogger(`${constants.ENVIRONMENT} -- create-user-util`);
+const logger = log4js.getLogger(`${constants.ENVIRONMENT} -- user util`);
 const { logObject, logText, HttpError } = require("@utils/shared");
 
 const {