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
13 changes: 1 addition & 12 deletions src/request/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,7 @@ abstract class Request extends RequestFilter implements RequestInterface {
try {
this.applyConstraintsOnRequestFields(payload);
} catch (error: any) {
let errorDetail: any;

if (error.message) errorDetail = error.message;
else if (error.errors) errorDetail = error.errors;
else errorDetail = error;

throw new BadRequestContentError({
message: "invalid.request.fields",
details: {
error: errorDetail,
},
});
throw error;
}

this.requestId = uuidv4();
Expand Down
25 changes: 9 additions & 16 deletions tests/request/custom-request.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,10 @@ describe('request class', () => {
const result = mySchema.safeParse(requestData.field_2);

if (!result.success) {
throw new BadRequestContentError(result.error.format())
throw new BadRequestContentError({
message: 'invalid.request.fields',
errors: result.error.format()
})
}
}
};
Expand All @@ -278,14 +281,9 @@ describe('request class', () => {
expect(errorDetails.status).toEqual(Status.ERROR);
expect(errorDetails.error_code).toEqual(StatusCode.BAD_REQUEST);
expect(error.getMessage()).toEqual('invalid.request.fields');
expect(error.getDetailsMessage()).toEqual({
expect(errorDetails.errors).toEqual({
_errors: ['[field_2] must be a string.'],
});
expect(errorDetails.details).toEqual({
error: {
_errors: ['[field_2] must be a string.'],
}
});
}
});

Expand Down Expand Up @@ -314,8 +312,7 @@ describe('request class', () => {
expect(error instanceof BadRequestContentError).toBeTruthy();
expect(errorDetails.status).toEqual(Status.ERROR);
expect(errorDetails.error_code).toEqual(StatusCode.BAD_REQUEST);
expect(errorDetails.message).toEqual('invalid.request.fields');
expect(error.getDetailsMessage()).toEqual('validation.constraints');
expect(errorDetails.message).toEqual('validation.constraints');
}
});

Expand All @@ -328,7 +325,7 @@ describe('request class', () => {

protected applyConstraintsOnRequestFields(requestData: Record<string, any>): void
{
throw new Error();
throw new Error('error_message');
}
};

Expand All @@ -338,12 +335,8 @@ describe('request class', () => {
field_4: 3
});
} catch (error: any) {
const errorDetails = error.format();
expect(error instanceof BadRequestContentError).toBeTruthy();
expect(errorDetails.status).toEqual(Status.ERROR);
expect(errorDetails.error_code).toEqual(StatusCode.BAD_REQUEST);
expect(errorDetails.message).toEqual('invalid.request.fields');
expect(error.getDetailsMessage()).toBeInstanceOf(Error);
expect(error instanceof Error).toBeTruthy();
expect(error.message).toEqual('error_message');
}
});
});