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
2 changes: 1 addition & 1 deletion nextstep-backend/src/controllers/resources_controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const createResumeResource = async (req: Request, res: Response) => {
return res.status(201).send(resumeFilename);
} catch (error) {
if (error instanceof multer.MulterError || error instanceof TypeError) {
return res.status(400).send(error.message);
return res.status(400).send({ message: error.message });
} else {
handleError(error, res);
}
Expand Down
18 changes: 14 additions & 4 deletions nextstep-backend/src/openapi/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -816,14 +816,24 @@ paths:
'400':
description: Bad request
content:
text/plain:
application/json:
schema:
type: object
properties:
message:
type: string
description: Error message indicating the specific issue
example: "File too large"
examples:
fileTooLarge:
value: "File too large"
value:
message: "File too large"
invalidFileType:
value: "Invalid file type. Only PDF, DOC, DOCX and TXT/TEXT files are allowed"
value:
message: "Invalid file type. Only PDF, DOC, DOCX and TXT/TEXT files are allowed"
noFileUploaded:
value: "No file uploaded"
value:
message: "No file uploaded"
'401':
description: Unauthorized
'500':
Expand Down
4 changes: 2 additions & 2 deletions nextstep-backend/src/tests/resources_resumes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ describe('Resume API Tests', () => {
.attach('file', Buffer.from('invalid content'), { filename: 'test.png' })
.expect(400);

expect(response.text).toBe('Invalid file type. Only PDF, DOC, DOCX and TXT/TEXT files are allowed.');
expect(response.text).toBe(`{"message":"Invalid file type. Only PDF, DOC, DOCX and TXT/TEXT files are allowed."}`);
});

it('should handle missing file', async () => {
Expand All @@ -152,7 +152,7 @@ describe('Resume API Tests', () => {
.set('Authorization', `Bearer ${testToken}`)
.expect(400);

expect(response.text).toBe('No file uploaded.');
expect(response.text).toBe(`{"message":"No file uploaded."}`);
});
});

Expand Down
10 changes: 8 additions & 2 deletions nextstep-frontend/src/pages/Resume.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,14 @@ const Resume: React.FC = () => {
setLoading(false);
};

} catch (err) {
setError(err instanceof Error ? err.message : 'An error occurred');
} catch (err: any) {
if (err.response && err.response.status === 400 &&
err.response.data && err.response.data &&
err.response.data.message) {
setError(err.response.data.message);
} else {
setError(err instanceof Error ? err.message : 'An error occurred');
}
setLoading(false);
}
};
Expand Down
Loading