Skip to content

Commit 5e23bec

Browse files
committed
getting rid of more unwanted changes
1 parent 76f6d32 commit 5e23bec

11 files changed

Lines changed: 11 additions & 1416 deletions

File tree

src/backend/src/routes/users.routes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ userRouter.post(
3232
UsersController.setUserSecureSettings
3333
);
3434
userRouter.get('/auth/current', UsersController.getCurrentUser);
35+
userRouter.post('/auth/log-out', UsersController.logUserOut);
3536

3637
userRouter.post(
3738
'/schedule-settings/set',

src/backend/src/services/reimbursement-requests.services.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,10 @@ export default class ReimbursementRequestService {
717717
where: { reimbursementRequestId }
718718
});
719719

720+
const numReceipts = await prisma.receipt.count({
721+
where: { reimbursementRequest: { organizationId: organization.organizationId } }
722+
});
723+
720724
if (!reimbursementRequest) throw new NotFoundException('Reimbursement Request', reimbursementRequestId);
721725
if (reimbursementRequest.dateDeleted) {
722726
throw new DeletedException('Reimbursement Request', reimbursementRequestId);
@@ -732,6 +736,7 @@ export default class ReimbursementRequestService {
732736
);
733737
}
734738

739+
file.filename = 'receipt' + numReceipts;
735740
const imageData = await uploadFile(file);
736741

737742
if (!imageData?.name) {

src/backend/src/utils/google-integration.utils.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ interface GoogleDriveError {
8787
export const uploadFile = async (fileObject: Express.Multer.File) => {
8888
const bufferStream = new stream.PassThrough();
8989
bufferStream.end(fileObject.buffer);
90-
if (fileObject.filename?.length || fileObject.originalname.length > 20)
90+
if (
91+
(fileObject.filename && fileObject.filename?.length > 20) ||
92+
(!fileObject.filename && fileObject.originalname.length > 20)
93+
)
9194
throw new HttpException(400, 'File name can only be at most 20 characters long');
9295
//The regex /^[\w.]+$/ limits the file name to the set of alphanumeric characters (\w) and dots (for file type)
9396
if (!/^[\w.]+$/.test(fileObject.filename || fileObject.originalname))
@@ -105,7 +108,7 @@ export const uploadFile = async (fileObject: Express.Multer.File) => {
105108
body: bufferStream
106109
},
107110
requestBody: {
108-
name: fileObject.originalname,
111+
name: fileObject.filename ?? fileObject.originalname,
109112
parents: GOOGLE_DRIVE_FOLDER_ID ? [GOOGLE_DRIVE_FOLDER_ID] : undefined
110113
},
111114
fields: 'id,name'

src/backend/tests/unmocked/work-package-template.test.ts

Lines changed: 0 additions & 167 deletions
This file was deleted.

0 commit comments

Comments
 (0)