Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix remaining tickets #834

Merged
merged 2 commits into from
Jul 31, 2024
Merged
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
27 changes: 19 additions & 8 deletions server/src/services/PaymentServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,25 @@ const PaymentServices = {
* @returns {Number} number of non-expired payments for a given item
*/
async getNonExpiredPaymentsCountForItem(item) {
return FroshModel.countDocuments({
payments: { $elemMatch: { item, expired: false } },
}).then(
(count) => count,
(error) => {
throw new Error('UNABLE_TO_GET_COUNT_OF_PAYMENTS', { cause: error });
},
);
try {
let froshCount = 0;
let userCount = 0;

if (item === 'Retreat Ticket') {
userCount = await UserModel.countDocuments({
payments: { $elemMatch: { item, expired: false } },
});
} else {
froshCount = await FroshModel.countDocuments({
payments: { $elemMatch: { item, expired: false } },
});
}

const totalCount = froshCount + userCount;
return totalCount;
} catch (error) {
throw new Error('UNABLE_TO_GET_COUNT_OF_PAYMENTS', { cause: error });
}
},

/**
Expand Down
Loading