Skip to content

Commit 7403a59

Browse files
committed
fix activityIndex bug
1 parent aecf57a commit 7403a59

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/graphql/resolvers/Activity.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ export default {
2222
if (!user) {
2323
throw new Error('No auth');
2424
}
25-
const procedure = await ProcedureModel.findOne({
26-
$or: [{ procedureId }, { _id: Types.ObjectId(procedureId) }],
27-
});
25+
let searchQuery;
26+
if (Types.ObjectId.isValid('procedureId')) {
27+
searchQuery = { _id: Types.ObjectId(procedureId) };
28+
} else {
29+
searchQuery = { procedureId };
30+
}
31+
const procedure = await ProcedureModel.findOne(searchQuery);
2832
if (!procedure) {
2933
throw new Error('Procedure not found');
3034
}

0 commit comments

Comments
 (0)