From dd5db073b76ebcd7b071bfc520155361b5eba7f1 Mon Sep 17 00:00:00 2001
From: BrandonSharratt <brandon@highwaythreesolutions.com>
Date: Wed, 5 Feb 2020 08:24:07 -0800
Subject: [PATCH] fixing some more things

---
 microservices/requestApi/routes/v2/db/model/request.js |  1 -
 microservices/requestApi/routes/v2/routes/requests.js  | 10 +++++++---
 microservices/requestApi/test/v2/requests.js           |  1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/microservices/requestApi/routes/v2/db/model/request.js b/microservices/requestApi/routes/v2/db/model/request.js
index 9661e3ae9..b49d7937f 100644
--- a/microservices/requestApi/routes/v2/db/model/request.js
+++ b/microservices/requestApi/routes/v2/db/model/request.js
@@ -263,7 +263,6 @@ model.getAll = function(query, limit, page, user, callback){
 
     if ('_id' in query) {
         db.Request.findById(query['_id'], (err3, req) => {
-            console.log("ID Query?", query['_id'], err3, req);
             if ( (req !== null) && (typeof(req) !== "undefined") && (typeof(req.topic) !== "undefined") ){
                 getAllTopics(user, { id: req.topic }, queryRequests);
             }else{
diff --git a/microservices/requestApi/routes/v2/routes/requests.js b/microservices/requestApi/routes/v2/routes/requests.js
index 5cd9930e4..5d746f73c 100644
--- a/microservices/requestApi/routes/v2/routes/requests.js
+++ b/microservices/requestApi/routes/v2/routes/requests.js
@@ -44,7 +44,6 @@ var getRouter = function(db){
                 r = JSON.parse(formRes);
             }catch(ex){}
 
-            res.status(r.status)
             res.json(r);
         });
     });
@@ -55,6 +54,7 @@ var getRouter = function(db){
         if (req.user.groups.indexOf(adminGroup) === -1){
             res.status(403);
             res.json({error: "Forbidden"});
+            return;
         }
         formioClient.postForm(req.body, function(formErr, formRes){
             if (formErr){
@@ -491,7 +491,6 @@ var getRouter = function(db){
                 r = JSON.parse(formRes);
             }catch(ex){}
 
-            res.status(r.status)
             res.json(r);
         });
     });
@@ -502,6 +501,7 @@ var getRouter = function(db){
         if (req.user.groups.indexOf(adminGroup) === -1){
             res.status(403);
             res.json({error: "Forbidden"});
+            return;
         }
         var formName = req.params.formName;
         formioClient.putForm(formName, req.body, function(formErr, formRes){
@@ -527,6 +527,7 @@ var getRouter = function(db){
         if (req.user.groups.indexOf(adminGroup) === -1){
             res.status(403);
             res.json({error: "Forbidden"});
+            return;
         }
         var formName = req.params.formName;
         formioClient.putForm(formName, req.body, function(formErr, formRes){
@@ -540,7 +541,10 @@ var getRouter = function(db){
                 r = JSON.parse(formRes);
             }catch(ex){}
 
-            res.status(r.status)
+            try{
+                res.status(r.status)
+            }catch(ex){}
+            
             res.json(r);
         });
     });
diff --git a/microservices/requestApi/test/v2/requests.js b/microservices/requestApi/test/v2/requests.js
index 0e4216ec9..abcd19881 100644
--- a/microservices/requestApi/test/v2/requests.js
+++ b/microservices/requestApi/test/v2/requests.js
@@ -870,6 +870,7 @@ describe("Forms", function() {
                     }]
                 })
                 .end(function (err, res) {
+                    console.log("should create form", res.status, res.body);
                     res.should.have.status(200);
                     res.body.should.have.property('_id');
                     done();