Skip to content

Commit 2415a24

Browse files
committed
fix Added endpoint to find requests created by users and guests
1 parent 6ed3d37 commit 2415a24

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

routes/user-request.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ var winston = require('../config/winston');
55
const requestEvent = require('../event/requestEvent');
66
const { check, validationResult } = require('express-validator');
77
var requestService = require('../services/requestService');
8+
var mongoose = require('mongoose');
89

910

1011
router.patch('/:requestid/rating', function (req, res) {
@@ -104,8 +105,22 @@ router.get('/me', function (req, res, next) {
104105
var user_id = req.user._id;
105106
winston.debug('REQUEST ROUTE - user_id: '+user_id);
106107

107-
var query = { "id_project": req.projectid, "status": {$lt:1000}, preflight:false,
108-
$or:[{"snapshot.requester.id_user": user_id}, {"snapshot.requester.uuid_user": user_id}]};
108+
var isObjectId = mongoose.Types.ObjectId.isValid(user_id);
109+
winston.debug("isObjectId:"+ isObjectId);
110+
111+
112+
var query = { "id_project": req.projectid, "status": {$lt:1000}, preflight:false};
113+
114+
115+
if (isObjectId) {
116+
query["snapshot.requester.id_user"] = user_id;
117+
// query.id_user = mongoose.Types.ObjectId(contact_id);
118+
} else {
119+
query["snapshot.requester.uuid_user"] = user_id;
120+
}
121+
122+
123+
// $or:[{"snapshot.requester.id_user": user_id}, {"snapshot.requester.uuid_user": user_id}]};
109124

110125
winston.debug('REQUEST ROUTE - query ', query);
111126

0 commit comments

Comments
 (0)