Merge branch 'staging' into update/Integration-iqair-devices

Updates from airqo staging

Author: NicholasTurner23

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-a7e2441e-1733386719
+  tag: prod-a3cb024a-1733435812
 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-73463ae7-1733386665
+  tag: stage-95dea6dd-1733435752
 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-a7e2441e-1733386719
+  tag: prod-a3cb024a-1733435812
 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-a7e2441e-1733386719
+  tag: prod-a3cb024a-1733435812
 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-a7e2441e-1733386719
+  tag: prod-a3cb024a-1733435812
 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-a7e2441e-1733386719
+  tag: prod-a3cb024a-1733435812
 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-a7e2441e-1733386719
+  tag: prod-a3cb024a-1733435812
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

k8s/workflows/values-stage.yaml

@@ -10,7 +10,7 @@ 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-76ff52fe-1733336066
+  tag: stage-635379ef-1733407940
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

src/auth-service/utils/create-network.js

@@ -1032,7 +1032,10 @@ const createNetwork = {
         );
       }
 
+      const usersFilter = generateFilter.users(request, next);
+
       const filter = {
+        ...usersFilter,
         "network_roles.network": { $ne: net_id },
         category: "networks",
       };
@@ -1076,7 +1079,10 @@ const createNetwork = {
         );
       }
 
+      const usersFilter = generateFilter.users(request, next);
+
       const filter = {
+        ...usersFilter,
         "network_roles.network": net_id,
         category: "networks",
       };