From 77e72862668ccab695c23b53902f3cc1570b3603 Mon Sep 17 00:00:00 2001 From: chocoboash Date: Wed, 31 Jul 2024 14:52:27 -0400 Subject: [PATCH 1/2] add isRetreat to userModel --- server/src/models/UserModel.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/models/UserModel.js b/server/src/models/UserModel.js index baa3fbe7..55966371 100644 --- a/server/src/models/UserModel.js +++ b/server/src/models/UserModel.js @@ -153,6 +153,11 @@ const UserSchema = new mongoose.Schema( contentType: String, data: Buffer, }, + isRetreat: { + // used for F!rosh that paid for retreat + type: Boolean, + required: false, + }, }, { discriminatorKey: 'userType' }, ); From b226fd689c1763063fe7e783683aa9682aa6b485 Mon Sep 17 00:00:00 2001 From: chocoboash Date: Wed, 31 Jul 2024 12:52:05 -0400 Subject: [PATCH 2/2] fix upload waiver not working if attendingRetreat left blank --- server/src/middlewares/upload.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/src/middlewares/upload.js b/server/src/middlewares/upload.js index 9cc490e9..14378134 100644 --- a/server/src/middlewares/upload.js +++ b/server/src/middlewares/upload.js @@ -57,6 +57,14 @@ router.post('/upload-waiver', (req, res) => { req.file.originalname, )}`; + if (!user.waiver) { + user.waiver = {}; + } + + if (user.attendingRetreat === null || user.attendingRetreat === undefined) { + user.attendingRetreat = true; + } + // save to MongoDB user.waiver = { filename,