fix: check first week of next year, get period by date [LIBS-688] #74
+83
−4
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #74 +/- ##
==========================================
+ Coverage 91.25% 91.27% +0.01%
==========================================
Files 56 56
Lines 1201 1203 +2
Branches 326 329 +3
==========================================
+ Hits 1096 1098 +2
Misses 103 103
Partials 2 2 ☔ View full report in Codecov by Sentry. |
tomzemp
commented
Oct 2, 2024
| @@ -102,13 +118,21 @@ describe('Gregorian Calendar period by date calculation', () => { | |||
| expect(actual?.id).toBe('2020BiW26') | |||
| }) | |||
|
|
|||
| it('should return "2020SunW1" for period type "BIWEEKLY" on "2020-01-01"', () => { | |||
| it('should return "2020BiW1" for period type "BIWEEKLY" on "2020-01-01"', () => { | |||
There was a problem hiding this comment.
just fixing typo in test description
tomzemp
commented
Oct 2, 2024
| @@ -136,7 +147,7 @@ describe('Ethiopic Calendar period by date calculation', () => { | |||
| expect(actual?.id).toBe('2014BiW26') | |||
| }) | |||
|
|
|||
| it('should return "2012SunW1" for period type "BIWEEKLY" on "2012-01-01"', () => { | |||
| it('should return "2012BiW1" for period type "BIWEEKLY" on "2012-01-01"', () => { | |||
There was a problem hiding this comment.
just fixing typo in test description
tomzemp
commented
Oct 2, 2024
| @@ -21,8 +21,8 @@ const getWeeklyFixedPeriodByDate: GetWeeklyFixedPeriodByDate = ({ | |||
| startingDay: 1, | |||
| }) | |||
|
|
|||
| // if start date of first period of year is after current date get last | |||
| // period of last year | |||
| // if current date is before start date of first period of year | |||
There was a problem hiding this comment.
I just modified the language of the comment here, so that it more closely matched the actual logical operation performed below
kabaros
approved these changes
Oct 8, 2024
dhis2-bot
added a commit
that referenced
this pull request
Oct 9, 2024
## [1.3.2](v1.3.1...v1.3.2) (2024-10-09) ### Bug Fixes * check first week of subsequent year when geting period by date [LIBS-688] ([#74](#74)) ([8662fe0](8662fe0))
|
🎉 This PR is included in version 1.3.2 🎉 The release is available on: Your semantic-release bot 📦🚀 |
dhis2-bot
added a commit
that referenced
this pull request
Nov 21, 2024
# [2.0.0-alpha.6](v2.0.0-alpha.5...v2.0.0-alpha.6) (2024-11-21) ### Bug Fixes * check first week of subsequent year when geting period by date [LIBS-688] ([#74](#74)) ([8662fe0](8662fe0))
|
🎉 This PR is included in version 2.0.0-alpha.6 🎉 The release is available on: Your semantic-release bot 📦🚀 |
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.
See: https://dhis2.atlassian.net/jira/software/c/projects/LIBS/issues/LIBS-688
I've amended the logic of GetWeeklyFixedPeriodByDate to return the first period of the subsequent year if the requested date is after the end date of the the periods for the year. This logic mirrors the existing logic for returning the previous year's last week if requested date is before the start date of the first period of the year.
I guess a slightly safer implementation would also perform the check on the previous year/subsequent year's period to make sure the requested date is in range, but I assume it should not be necessary.