Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions spec/ParseQuery.Aggregate.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1500,4 +1500,24 @@ describe('Parse.Query Aggregate testing', () => {
expect(results.length).toEqual(3);
await database.adapter.deleteAllClasses(false);
});

it_only_db('mongo')('aggregate handle mongodb errors', async () => {
const pipeline = [
{
$search: {
index: "default",
text: {
path: ["name"],
query: 'foo',
},
},
},
];
try {
await new Parse.Query(TestObject).aggregate(pipeline);
fail();
} catch (e) {
expect(e.code).toBe(Parse.Error.INVALID_QUERY);
}
});
});
2 changes: 2 additions & 0 deletions spec/support/CurrentSpecReporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const flakyTests = [
"Email Verification Token Expiration: sets the _email_verify_token_expires_at and _email_verify_token fields after user SignUp",
// Expected 0 to be 1.
"Email Verification Token Expiration: should send a new verification email when a resend is requested and the user is UNVERIFIED",
// Expected 0 to be 1.
"Email Verification Token Expiration: should match codes with emailVerifyTokenReuseIfValid",
];

/** The minimum execution time in seconds for a test to be considered slow. */
Expand Down
23 changes: 12 additions & 11 deletions src/Routers/AggregateRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ClassesRouter from './ClassesRouter';
import UsersRouter from './UsersRouter';

export class AggregateRouter extends ClassesRouter {
handleFind(req) {
async handleFind(req) {
const body = Object.assign(req.body || {}, ClassesRouter.JSONFromQuery(req.query));
const options = {};
if (body.distinct) {
Expand All @@ -31,24 +31,25 @@ export class AggregateRouter extends ClassesRouter {
if (typeof body.where === 'string') {
body.where = JSON.parse(body.where);
}
return rest
.find(
try {
const response = await rest.find(
req.config,
req.auth,
this.className(req),
body.where,
options,
req.info.clientSDK,
req.info.context
)
.then(response => {
for (const result of response.results) {
if (typeof result === 'object') {
UsersRouter.removeHiddenProperties(result);
}
);
for (const result of response.results) {
if (typeof result === 'object') {
UsersRouter.removeHiddenProperties(result);
}
return { response };
});
}
return { response };
} catch (e) {
throw new Parse.Error(Parse.Error.INVALID_QUERY, e.message);
}
}

/* Builds a pipeline from the body. Originally the body could be passed as a single object,
Expand Down
Loading