Merge pull request #2974 from airqo-platform/staging

move to production
airqo-platform · Jan 25, 2024 · 35d6bb6 · 35d6bb6
2 parents fbde767 + 2a16288
commit 35d6bb6
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 21 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-945a7c20-1706186550
+  tag: prod-fbde7678-1706187832
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/data-proxy/values-prod.yaml b/k8s/data-proxy/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-data-proxy-api
-  tag: prod-945a7c20-1706186550
+  tag: prod-fbde7678-1706187832
 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-945a7c20-1706186550
+  tag: prod-fbde7678-1706187832
 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-f551267d-1706186500
+  tag: stage-0fe0737d-1706187786
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/gp-model/values-prod.yaml b/k8s/gp-model/values-prod.yaml
@@ -6,7 +6,7 @@ app:
   namespace: production
   configMap: env-gp-model-production
 images:
-  tag: prod-945a7c20-1706186550
+  tag: prod-fbde7678-1706187832
   repositories:
     cronJob: eu.gcr.io/airqo-250220/airqo-gp-model-job
     brokerConsumer: eu.gcr.io/airqo-250220/airqo-gp-model-broker-consumer

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-945a7c20-1706186550
+  tag: prod-fbde7678-1706187832
 api:
   name: airqo-prediction-api
   label: prediction-api

diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml
@@ -9,7 +9,7 @@ images:
   repositories:
     initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
     containers: eu.gcr.io/airqo-250220/airqo-workflows
-  tag: prod-945a7c20-1706186550
+  tag: prod-fbde7678-1706187832
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/device-registry/config/global/db-projections.js b/src/device-registry/config/global/db-projections.js
@@ -625,6 +625,11 @@ const dbProjections = {
         grid_tags: 0,
         grid_codes: 0,
         centers: 0,
+        "sites.latitude": 0,
+        "sites.longitude": 0,
+        "sites.generated_name": 0,
+        "sites.bearing_in_radians": 0,
+        "sites.approximate_distance_in_km": 0,
       });
     }
     if (category === "public") {

diff --git a/src/device-registry/controllers/create-cohort.js b/src/device-registry/controllers/create-cohort.js
@@ -579,7 +579,7 @@ const createCohort = {
             : { message: "Internal Server Error" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -635,7 +635,7 @@ const createCohort = {
             : { message: "Internal Server Error" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(

diff --git a/src/device-registry/controllers/create-grid.js b/src/device-registry/controllers/create-grid.js
@@ -303,7 +303,7 @@ const createGrid = {
             : { message: "Internal Server Error" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -417,7 +417,7 @@ const createGrid = {
             : { message: "Internal Server Error" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -578,7 +578,7 @@ const createGrid = {
             : { message: "Internal Server Error" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -632,7 +632,7 @@ const createGrid = {
             : { message: "Internal Server Error" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -687,7 +687,7 @@ const createGrid = {
             : { message: "Internal Server Error" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -743,7 +743,7 @@ const createGrid = {
             : { message: "Internal Server Error" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(

diff --git a/src/device-registry/controllers/create-location.js b/src/device-registry/controllers/create-location.js
@@ -82,7 +82,7 @@ const createLocation = {
           errors: result.errors ? result.errors : { message: "" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -135,7 +135,7 @@ const createLocation = {
           errors: result.errors ? result.errors : { message: "" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -188,7 +188,7 @@ const createLocation = {
           errors: result.errors ? result.errors : { message: "" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -242,7 +242,7 @@ const createLocation = {
           errors: result.errors ? result.errors : { message: "" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -295,7 +295,7 @@ const createLocation = {
           errors: result.errors ? result.errors : { message: "" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(
@@ -348,7 +348,7 @@ const createLocation = {
           errors: result.errors ? result.errors : { message: "" },
         });
       }
-    } catch (errors) {
+    } catch (error) {
       logger.error(`🐛🐛 Internal Server Error ${error.message}`);
       next(
         new HttpError(