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.

Sign up for GitHub

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

Return version can be on/after licence start date #1224

Merged
merged 9 commits into from
Aug 2, 2024
Merged

Return version can be on/after licence start date #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9567d8f
Return version can be on/after licence start date
rvsiyad Aug 1, 2024
337f535
Use date.min() for start date validator to specify as the oldest date…
rvsiyad Aug 1, 2024
daf47c3
Merge branch 'main' into return-requirement-start-date
rvsiyad Aug 1, 2024
1dad8f5
Fix error message to reflect change in validation to allow dates on t…
rvsiyad Aug 1, 2024
3a6a172
Fix start date validator test to reflect changes to error messages
rvsiyad Aug 1, 2024
df449ec
Merge branch 'main' into return-requirement-start-date
rvsiyad Aug 1, 2024
276ca4a
Remove .only()
rvsiyad Aug 1, 2024
3b3d710
Merge branch 'return-requirement-start-date' of https://github.com/DE…
rvsiyad Aug 1, 2024
d8a6d2d
Merge branch 'main' into return-requirement-start-date
rvsiyad Aug 2, 2024
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
4 changes: 2 additions & 2 deletions app/validators/return-requirements/start-date.validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ function _validateAnotherStartDate (payload, licenceStartDate, licenceEndDate) {
.date()
.format(['YYYY-MM-DD'])
.required()
.greater(licenceStartDate)
.min(licenceStartDate)
.less(licenceEndDate || '9999-12-31')
.messages({
'date.base': 'Enter a real start date',
'date.format': 'Enter a real start date',
'date.greater': 'Start date must be after the original licence start date',
'date.min': 'Start date must be on or after the original licence start date',
'date.less': 'Start date must be before the licence end date'
}),
otherwise: Joi.forbidden()
Expand Down
4 changes: 2 additions & 2 deletions test/validators/return-requirements/start-date.validator.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ describe('Start Date validator', () => {
payload['start-date-year'] = '2022'
})

it('fails validation with the message "Start date must be after the original licence start date"', () => {
it('fails validation with the message "Start date must be on or after the original licence start date"', () => {
const result = StartDateValidator.go(payload, licenceStartDate, licenceEndDate)

expect(result.error).to.exist()
expect(result.error.details[0].message).to.equal('Start date must be after the original licence start date')
expect(result.error.details[0].message).to.equal('Start date must be on or after the original licence start date')
})
})

Expand Down
Loading