FIX: Metabase URL

package.json

@@ -30,7 +30,7 @@
     "@nestjs/microservices": "^8.4.3",
     "@nestjs/platform-express": "^8.4.3",
     "@nestjs/swagger": "^5.2.1",
-    "@victorradael/protospack": "^1.5.9",
+    "@victorradael/protospack": "^1.6.1",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
     "helmet": "^5.0.2",

src/clients/pipelines/client.service.ts

@@ -191,13 +191,13 @@ export class PipelinesClientService implements OnModuleInit {
         .subscribe({
           next(x) {
             const statusArray = x.status.sort((a, b) => {
-              if (Date.parse(a.updated_at) < Date.parse(b.updated_at)) {
+              if (a.id < b.id) {
                 return 1;
               } else {
                 return -1;
               }
             });
-            resolve(statusArray);
+            resolve({ status: statusArray });
           },
           error(err) {
             console.log('Observable Error');

src/modules/catalog/catalog.service.ts

@@ -6,12 +6,14 @@ class CatalogService {
       body.info.customer.toLowerCase() === 'dadosfera'
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/all/`,
-    );
-    console.log(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/all/`,
-    );
+
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/all/`);
+
     return data;
   }
 
@@ -21,9 +23,12 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data_apps/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data_apps/`);
     return data;
   }
 
@@ -33,9 +38,15 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data_apps/${id}/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/data_apps/${id}/`,
     );
+
     return data;
   }
 
@@ -45,8 +56,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/dashboard-metabase/`,
+      `${nimbusUrl}/api/catalog/dashboard-metabase/`,
     );
     return data;
   }
@@ -57,13 +73,19 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/dashboard-metabase/${id}`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
 
-    const [, path] = data.iframe_url.split('.dadosfera');
-    const host = `https://metabase-${body.info.customer.toLowerCase()}.dadosfera.ai`;
-    data.iframe_url = host + path;
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/dashboard-metabase/${id}`,
+    );
+    console.log(data);
+
+    // const [, path] = data.iframe_url.split('.dadosfera');
+    // const host = `httpss://metabase-${body.info.customer.toLowerCase()}.dadosfera.ai`;
+    // data.iframe_url = host + path;
 
     return data;
   }
@@ -74,8 +96,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-metadata/`,
+      `${nimbusUrl}/api/catalog/table-metadata/`,
     );
     return data;
   }
@@ -86,8 +113,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-metadata/`,
+      `${nimbusUrl}/api/catalog/table-metadata/`,
       { params: params },
     );
     return data;
@@ -99,8 +131,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-metadata/${id}`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/table-metadata/${id}`,
     );
     return data;
   }
@@ -111,8 +148,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/column-metadata/`,
+      `${nimbusUrl}/api/catalog/column-metadata/`,
       { params: params },
     );
     return data;
@@ -124,8 +166,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/column-metadata/${id}/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/column-metadata/${id}/`,
     );
     return data;
   }
@@ -136,10 +183,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-preview/`,
-      { params: params },
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-preview/`, {
+      params: params,
+    });
     return data;
   }
 
@@ -149,9 +200,12 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-status/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-status/`);
     return data;
   }
 
@@ -161,8 +215,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-description/`,
+      `${nimbusUrl}/api/catalog/data-description/`,
     );
     return data;
   }
@@ -173,9 +232,12 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-docs/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-docs/`);
     return data;
   }
 
@@ -185,9 +247,12 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-rating/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-rating/`);
     return data;
   }
 
@@ -197,8 +262,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.post(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-rating/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/data-rating/`,
       body,
     );
     return data;
@@ -209,8 +279,14 @@ class CatalogService {
       body.info.customer.toLowerCase() === 'dadosfera'
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
+
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/summary-rating/${id}`,
+      `${nimbusUrl}/api/catalog/summary-rating/${id}`,
     );
     return data;
   }
@@ -221,9 +297,12 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-comment/`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-comment/`);
     return data;
   }
 
@@ -233,8 +312,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.post(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-comment/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/data-comment/`,
       body,
     );
     return data;
@@ -246,10 +330,14 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/data-review/`,
-      { params: params },
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-review/`, {
+      params: params,
+    });
     return data;
   }
 
@@ -259,10 +347,12 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.post(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/tags/`,
-      body,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/tags/`, body);
     return data;
   }
 
@@ -272,10 +362,12 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/tags/`,
-      body,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/tags/`, body);
     return data;
   }
 
@@ -285,8 +377,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-tags/`,
+      `${nimbusUrl}/api/catalog/table-tags/`,
       body,
     );
     return data;
@@ -298,9 +395,12 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/tags/${id}`,
-    );
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(`${nimbusUrl}/api/catalog/tags/${id}`);
     return data;
   }
 
@@ -310,8 +410,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.post(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-tags/`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/table-tags/`,
       body,
     );
     return data;
@@ -323,8 +428,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-tags/${id}`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/table-tags/${id}`,
     );
     return data;
   }
@@ -335,8 +445,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
     const { data } = await axios.get(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-rules/`,
+      `${nimbusUrl}/api/catalog/table-rules/`,
       body,
     );
     return data;
@@ -348,8 +463,13 @@ class CatalogService {
         ? ``
         : `-${body.info.customer.toLowerCase()}`;
 
-    const { data } = await axios.delete(
-      `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera/api/catalog/table-rules/${id}`,
+    const nimbusUrl =
+      process.env.ENV === 'prd'
+        ? `https://nimbus-${body.info.customer.toLowerCase()}.dadosfera.ai`
+        : `${process.env.NIMBUS_BASE_URL}${customer}.${process.env.ENV}.dadosfera`;
+
+    const { data } = await axios.get(
+      `${nimbusUrl}/api/catalog/table-rules/${id}`,
     );
     return data;
   }