Merge pull request #4010 from airqo-platform/staging

move to production
airqo-platform · Dec 5, 2024 · a7e2441 · a7e2441
2 parents 1c7e9a8 + 73463ae
commit a7e2441
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 10 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-b52e8933-1733336119
+  tag: prod-1c7e9a8e-1733346549
 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-b52e8933-1733336119
+  tag: prod-1c7e9a8e-1733346549
 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-b52e8933-1733336119
+  tag: prod-1c7e9a8e-1733346549
 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-b52e8933-1733336119
+  tag: prod-1c7e9a8e-1733346549
 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-b52e8933-1733336119
+  tag: prod-1c7e9a8e-1733346549
 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-b52e8933-1733336119
+  tag: prod-1c7e9a8e-1733346549
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/auth-service/controllers/create-network.js b/src/auth-service/controllers/create-network.js
@@ -719,6 +719,7 @@ const createNetwork = {
         return res.status(status).json({
           success: true,
           message: result.message,
+          total_assigned_users: result.totalCount,
           assigned_users: result.data,
         });
       } else if (result.success === false) {
@@ -770,6 +771,7 @@ const createNetwork = {
         return res.status(status).json({
           success: true,
           message: result.message,
+          total_available_users: result.totalCount,
           available_users: result.data,
         });
       } else if (result.success === false) {

diff --git a/src/auth-service/models/User.js b/src/auth-service/models/User.js
@@ -740,6 +740,8 @@ UserSchema.statics = {
         delete filter.category;
       }
       logObject("the filter being used", filter);
+      const totalCount = await this.countDocuments(filter).exec();
+
       const response = await this.aggregate()
         .match(filter)
         .lookup({
@@ -907,21 +909,23 @@ UserSchema.statics = {
         .project(inclusionProjection)
         .project(exclusionProjection)
         .sort({ createdAt: -1 })
-        .skip(skip ? skip : 0)
-        .limit(limit ? limit : parseInt(constants.DEFAULT_LIMIT))
+        .skip(skip ? parseInt(skip) : 0)
+        .limit(limit ? parseInt(limit) : parseInt(constants.DEFAULT_LIMIT))
         .allowDiskUse(true);
       if (!isEmpty(response)) {
         return {
           success: true,
           message: "successfully retrieved the user details",
           data: response,
+          totalCount,
           status: httpStatus.OK,
         };
       } else if (isEmpty(response)) {
         return {
           success: true,
           message: "no users exist",
           data: [],
+          totalCount,
           status: httpStatus.OK,
         };
       }

diff --git a/src/auth-service/utils/create-network.js b/src/auth-service/utils/create-network.js
@@ -1021,7 +1021,7 @@ const createNetwork = {
   },
   listAvailableUsers: async (request, next) => {
     try {
-      const { tenant } = request.query;
+      const { tenant, skip, limit } = request.query;
       const { net_id } = request.params;
       const network = await NetworkModel(tenant).findById(net_id);
       if (!network) {
@@ -1040,6 +1040,8 @@ const createNetwork = {
       let responseFromListAvailableUsers = await UserModel(tenant).list(
         {
           filter,
+          skip,
+          limit,
         },
         next
       );
@@ -1061,7 +1063,7 @@ const createNetwork = {
   },
   listAssignedUsers: async (request, next) => {
     try {
-      const { tenant } = request.query;
+      const { tenant, skip, limit } = request.query;
       const { net_id } = request.params;
 
       const network = await NetworkModel(tenant).findById(net_id);
@@ -1082,6 +1084,8 @@ const createNetwork = {
       let responseFromListAssignedUsers = await UserModel(tenant).list(
         {
           filter,
+          skip,
+          limit,
         },
         next
       );