Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
BrandonSharratt committed Feb 3, 2020
1 parent 515d37f commit a723732
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
7 changes: 1 addition & 6 deletions microservices/requestApi/db/model/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ model.getAll = function(query, limit, page, user, callback){
if (results){
for (var i=0; i<results.length; i++){
if ( (typeof(results[i]) !== "undefined") && (typeof(results[i].topic) !== "undefined") ){
console.log("TOPIC ID", results[i].topic);
let topicId = results[i].topic;
results[i].projects = projectR.get(topicId);
}
Expand All @@ -417,16 +416,12 @@ model.getAll = function(query, limit, page, user, callback){
}

if ('_id' in query) {
console.log("id in query");
db.Request.findById(query['_id'], (err3, req) => {
console.log("_ID", typeof(req), req);
if ( (typeof(req) !== "undefined") && (typeof(req.topic) !== "undefined") ){
console.log("TOPIC ID", req.topic);
if ( (req !== null) && (typeof(req) !== "undefined") && (typeof(req.topic) !== "undefined") ){
getAllTopics(user, { id: req.topic }, queryRequests);
}
});
} else {
console.log("id NOT in query");
getAllTopics(user, {}, queryRequests);
}
};
Expand Down
3 changes: 0 additions & 3 deletions microservices/requestApi/routes/routes/requests.js
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,7 @@ var buildDynamic = function(projectConfig, db, notify, util, router){
var config = require('config');
var logger = require('npmlog');

console.log("req.params.requestId", req.params.requestId, requestId);
console.log("Saving");
db.Request.getAll({_id: requestId}, 1, 1, req.user, function(findErr, findRes){
console.log("Inside get all", requestId, findErr, findRes);
if (findErr || !findRes || findRes.length <= 0){
res.status(400);
res.json({error: "No such request"});
Expand Down

0 comments on commit a723732

Please sign in to comment.