Merge pull request #4086 from airqo-platform/staging

move to production
airqo-platform · Dec 14, 2024 · df7f117 · df7f117
2 parents 20ed8da + fc3fb22
commit df7f117
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/k8s/analytics/values-prod.yaml b/k8s/analytics/values-prod.yaml
@@ -8,7 +8,7 @@ images:
     celeryWorker: eu.gcr.io/airqo-250220/airqo-analytics-celery-worker
     reportJob: eu.gcr.io/airqo-250220/airqo-analytics-report-job
     devicesSummaryJob: eu.gcr.io/airqo-250220/airqo-analytics-devices-summary-job
-  tag: prod-40a3081d-1734171941
+  tag: prod-20ed8dab-1734173555
 api:
   name: airqo-analytics-api
   label: analytics-api

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-40a3081d-1734171941
+  tag: prod-20ed8dab-1734173555
 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-2c219406-1734171902
+  tag: stage-a9e01103-1734211833
 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-c54fd122-1734091882
+  tag: stage-f271745f-1734173473
 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-40a3081d-1734171941
+  tag: prod-20ed8dab-1734173555
 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-40a3081d-1734171941
+  tag: prod-20ed8dab-1734173555
 nameOverride: ''
 fullnameOverride: ''
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-40a3081d-1734171941
+  tag: prod-20ed8dab-1734173555
 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-40a3081d-1734171941
+  tag: prod-20ed8dab-1734173555
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/website/values-prod.yaml b/k8s/website/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-website-api
-  tag: prod-40a3081d-1734171941
+  tag: prod-20ed8dab-1734173555
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/auth-service/bin/jobs/preferences-log-job.js b/src/auth-service/bin/jobs/preferences-log-job.js
@@ -77,12 +77,16 @@ const logUserPreferences = async () => {
         100
       ).toFixed(2);
 
-      logger.info(
-        `💔💔 Total count of users without Customised Locations in the default group: ${totalCountWithoutSelectedSites}, which is ${percentageWithoutSelectedSites}% of processed users.`
-      );
+      if (totalCountWithoutSelectedSites > 0) {
+        logger.info(
+          `💔💔 Total count of users without Customised Locations in the default group: ${totalCountWithoutSelectedSites}, which is ${percentageWithoutSelectedSites}% of processed users.`
+        );
+      } else {
+        logger.info(`😎🎉✅ All users have Customised Locations.`);
+      }
     } else {
       logger.info(
-        `😎🎉✅ No users processed or all users have Customised Locations.`
+        `🤔🤔 No users processed or no users belong to the default group.`
       );
     }
   } catch (error) {