From 146af4a023c7bad91658c357c6d44d87a285f520 Mon Sep 17 00:00:00 2001
From: Tiago Garcia <tiagojsag@gmail.com>
Date: Wed, 19 Jul 2023 09:22:18 +0100
Subject: [PATCH] Update rw api integration lib to remove requestApplication
 from request data

---
 app/microservice/public-swagger.json |   2 -
 app/microservice/register.json       | 101 ---------------------------
 app/microservice/swagger.json        |   1 -
 app/src/services/query.service.js    |   3 -
 package.json                         |   2 +-
 yarn.lock                            |   8 +--
 6 files changed, 5 insertions(+), 112 deletions(-)
 delete mode 100644 app/microservice/public-swagger.json
 delete mode 100644 app/microservice/register.json
 delete mode 100644 app/microservice/swagger.json

diff --git a/app/microservice/public-swagger.json b/app/microservice/public-swagger.json
deleted file mode 100644
index 2c63c08..0000000
--- a/app/microservice/public-swagger.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/app/microservice/register.json b/app/microservice/register.json
deleted file mode 100644
index 202b920..0000000
--- a/app/microservice/register.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "name": "#(service.name)",
-  "tags": [
-    "gfw",
-    "rw"
-  ],
-  "endpoints": [
-    {
-      "path": "/v1/query/:dataset",
-      "method": "GET",
-      "binary": true,
-      "redirect": {
-        "method": "POST",
-        "path": "/api/v1/query/:dataset"
-      }
-    },
-    {
-      "path": "/v1/query/:dataset",
-      "method": "POST",
-      "binary": true,
-      "redirect": {
-        "method": "POST",
-        "path": "/api/v1/query/:dataset"
-      }
-    },
-    {
-      "path": "/v1/query",
-      "method": "GET",
-      "redirect": {
-        "method": "GET",
-        "path": "/api/v1/query"
-      }
-    },
-    {
-      "path": "/v1/query",
-      "method": "POST",
-      "redirect": {
-        "method": "POST",
-        "path": "/api/v1/query"
-      }
-    },
-    {
-      "path": "/v1/download/:dataset",
-      "method": "GET",
-      "binary": true,
-      "redirect": {
-        "method": "GET",
-        "path": "/api/v1/download/:dataset"
-      }
-    },
-    {
-      "path": "/v1/download/:dataset",
-      "method": "POST",
-      "binary": true,
-      "redirect": {
-        "method": "POST",
-        "path": "/api/v1/download/:dataset"
-      }
-    },
-    {
-      "path": "/v1/download",
-      "method": "GET",
-      "redirect": {
-        "method": "GET",
-        "path": "/api/v1/download"
-      }
-    },
-    {
-      "path": "/v1/download",
-      "method": "POST",
-      "redirect": {
-        "method": "POST",
-        "path": "/api/v1/download"
-      }
-    },
-    {
-      "path": "/v1/jiminy",
-      "method": "GET",
-      "redirect": {
-        "method": "GET",
-        "path": "/api/v1/jiminy"
-      }
-    },
-    {
-      "path": "/v1/jiminy",
-      "method": "POST",
-      "redirect": {
-        "method": "POST",
-        "path": "/api/v1/jiminy"
-      }
-    },
-    {
-      "path": "/v1/fields/:dataset",
-      "method": "GET",
-      "redirect": {
-        "method": "GET",
-        "path": "/api/v1/fields/:dataset"
-      }
-    }
-  ]
-}
diff --git a/app/microservice/swagger.json b/app/microservice/swagger.json
deleted file mode 100644
index 0967ef4..0000000
--- a/app/microservice/swagger.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/app/src/services/query.service.js b/app/src/services/query.service.js
index 13c13da..f7579b1 100644
--- a/app/src/services/query.service.js
+++ b/app/src/services/query.service.js
@@ -191,7 +191,6 @@ class QueryService {
                 qs = { ...ctx.query };
                 delete qs.sql;
                 body = { ...ctx.request.body, sql: newSql };
-                delete body.requestApplication;
             }
         } else {
             const newTableName = dataset.tableName;
@@ -200,7 +199,6 @@ class QueryService {
             } else {
                 qs = { ...ctx.query };
                 body = { ...ctx.request.body, tableName: newTableName };
-                delete body.requestApplication;
             }
         }
         logger.debug('isQuery - ctx.path', ctx.path);
@@ -215,7 +213,6 @@ class QueryService {
         };
 
         delete qs.loggedUser;
-        delete qs.requestApplication;
         options.qs = qs;
         if (ctx.method === 'GET') {
             options.method = 'GET';
diff --git a/package.json b/package.json
index fd39d6b..79ffa37 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "koa-simple-healthcheck": "^0.0.1",
     "request": "2.88.0",
     "request-promise": "4.2.2",
-    "rw-api-microservice-node": "5.0.0-rc.5",
+    "rw-api-microservice-node": "5.0.0-rc.6",
     "sql2json": "2.0.6"
   },
   "lint-staged": {
diff --git a/yarn.lock b/yarn.lock
index 3e7cf27..0056cd4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5107,10 +5107,10 @@ run-parallel@^1.1.9:
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
   integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
 
-rw-api-microservice-node@5.0.0-rc.5:
-  version "5.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/rw-api-microservice-node/-/rw-api-microservice-node-5.0.0-rc.5.tgz#e1eb2eddab34472de9ab638fba9127b5d476631b"
-  integrity sha512-P9F+Q31CMynFTylkKam4y7YpdOCz2096z0M+PNCkCZ2l22wUNfVdaPhODmyHG7KhAGhChRNbywGDhJFRrbmVeg==
+rw-api-microservice-node@5.0.0-rc.6:
+  version "5.0.0-rc.6"
+  resolved "https://registry.yarnpkg.com/rw-api-microservice-node/-/rw-api-microservice-node-5.0.0-rc.6.tgz#c2659d2db95e0b0066e8ff42516215be770bab47"
+  integrity sha512-ULN8J1Wmeo2+mptJF95lEu+cR9E549u/26kGEViK8+s2mAyfcI0in/Z6LA9HAPgCSb9jtSGZg3ExgX6Ob9tLYg==
   dependencies:
     "@koa/cors" "^3.4.3"
     "@tiagojsag/fastly-promises" "^1.0.1"