Club revenue #1427
Open
Club revenue #1427
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 tasks
|
@evanugarte date formats have been corrected |
evanugarte
reviewed
Jun 15, 2024
evanugarte
reviewed
Jun 15, 2024
api/main_endpoints/routes/User.js
Outdated
|
|
||
| const today = new Date(); | ||
|
|
||
| let count, newSingleSemester, newAnnualMembers, totalNewMembersThisYear, currentActiveMembers; |
There was a problem hiding this comment.
initialize these when you assign them, and use const
evanugarte
reviewed
Jun 21, 2024
api/main_endpoints/routes/User.js
Outdated
Comment on lines
520
to
529
| const currentYear = new Date().getFullYear(); | ||
|
|
||
| const today = new Date(); | ||
| const jan1ThisYear = new Date(currentYear, 0, 1); | ||
| const june1ThisYear = new Date(currentYear, 5, 1); | ||
| const jan1NextYear = new Date(currentYear + 1, 0, 1); | ||
| const june1NextYear = new Date(currentYear + 1, 5, 1); | ||
| const dec31ThisYear = new Date(currentYear, 11, 31); | ||
|
|
||
| const totalNewMembersThisYear = await User.countDocuments({ emailVerified: true, accessLevel: membershipState.MEMBER, joinDate: { $gte: jan1ThisYear, $lte: today } }); |
There was a problem hiding this comment.
this logic is pretty tough to follow, can we do something like this
# find out what part of the year "now" is
beginningOfSemester = # set to beginning of current semester
endOfThisSemester = # set to beginning of current semester
endOfNextSemester = # set to beginning of current semester
numberOfNewSemesterMemberships = # query the number of members who's accounts were created after beginningOfSemester, and expiration is endOfThisSemester
numberOfNewAnnualMemberships = # query the number of members who's accounts were created after beginningOfSemester, and expiration is endOfNextSemester
# take numberOfNewSemesterMemberships and numberOfNewAnnualMemberships and return that to the frontend as json
evanugarte
approved these changes
Jun 27, 2024
api/main_endpoints/routes/User.js
Outdated
Comment on lines
529
to
533
| } else { | ||
| beginningOfSemester = new Date(currentYear, 5, 1); | ||
| endOfThisSemester = new Date(currentYear + 1, 0, 1); | ||
| endOfNextSemester = new Date(currentYear + 1, 5, 1); | ||
| } |
There was a problem hiding this comment.
make the initial values of the variables these, put it above the if statement, no need for else
| @@ -509,4 +509,41 @@ router.post('/usersSubscribedAndVerified', function(req, res) { | |||
| }); | |||
| }); | |||
|
|
|||
| // For Club Revenue page | |||
| router.post('/countMembers', async (req, res) => { | |||
There was a problem hiding this comment.
wanna try adding a unit test for this? see
Line 135 in 1ab954d
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issuse #1414