Amend permission end date to use locale time #1651
Merged
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
https://eaflood.atlassian.net/browse/IWTF-3324 The end date calculation for a permission is going wrong after the change to BST, where it is going back an extra day. This is because the permission start date is set as midnight in the locale time, which is 11pm the day before in GMT, and the end date calculation takes the last minute of the previous date. Therefore '2023-03-31T23:00:00.000Z', which is '2023-04-01T00:00:00.000+01:00' is resulting in an end date of '2023-03-30T23:59:00.000Z'. It should actually be '2023-03-31T22:59:00.000Z', or '2023-03-31T23:59:00.000+01:00'.
jaucourt
commented
Feb 23, 2023
| @@ -63,7 +63,7 @@ export const calculateEndDateMoment = async ({ permitId, startDate }) => { | |||
| const permit = await getReferenceDataForEntityAndId(Permit, permitId) | |||
| const duration = moment.duration(`P${permit.durationMagnitude}${permit.durationDesignator.description}`) | |||
| if (permit.durationMagnitude === 12 && permit.durationDesignator.description === 'M') { | |||
| return moment(startDate).add(duration).subtract(1, 'day').tz('Europe/London').endOf('day') | |||
| return moment(startDate).tz(SERVICE_LOCAL_TIME).add(duration).subtract(1, 'day').endOf('day') | |||
There was a problem hiding this comment.
I realise there's no test for the bug here, but the bug doesn't occur when running tests - moment exhibits buggy behaviour of its' own (see moment/moment#4743). This masks the bug that manifests once the web app is running. So all I can do is fix the bug :/
|
Kudos, SonarCloud Quality Gate passed! |
irisfaraway
approved these changes
Feb 23, 2023
ScottDormand96
added a commit
that referenced
this pull request
Sep 14, 2023
* Welsh lang update check contact details page (#1290) * Welsh lang update check contact details page https://eaflood.atlassian.net/browse/IWTF-2712 Add welsh lang translations to check contact details page. Also, refactor the contact summary page to use a single row generator class, use i18n labels for contact summary key text, labels, visually hidden text, etc Refactored tests so that the only thing contact summary route exports is the result of pageRoute, rather than all the other functions which were only exported for testing purposes Co-authored-by: Phil Benson <phil.benson@defra.gov.uk> * chore(release): publish v1.27.0-rc.6 * Welsh translation - error page (#1501) * Welsh translation - error page https://eaflood.atlassian.net/browse/IWTF-2986 Update the error page to include welsh translations * added translations * updated missing translations * update missing translation * Route to view server error page (#1504) * Route to view server error page https://eaflood.atlassian.net/browse/IWTF-3049 Page so when /server-error displays the server error page * added tests and added route for server * test console error * chore(release): publish v1.27.0-rc.7 * chore(release): publish v1.27.0-rc.8 * Add new custom matcher for GAFL (#1519) * Add new custom matcher for GAFL Adding the new GetDataRedirect matcher for GAFL that's already been committed to the multibuy branch * chore(release): publish v1.27.0-rc.9 * GetDataRedirect test refactor (#1520) GetDataRedirect test refactor A new, custom matcher has been added for the GetDataRedirect error, so we need to refactor tests that up until now have only been checking for the type of error thrown and not for the url that's set on these errors. * chore(release): publish v1.27.0-rc.10 * Analytics error when in welsh (#1518) * Analytics error when in welsh https://eaflood.atlassian.net/browse/IWTF-3105 Error message dispalying when in welsh and try to select analytics * allow welsh language redirect * updated and added tests * Google search takes user incorrect page (#1495) * Google search takes user incorrect page https://eaflood.atlassian.net/browse/IWTF-3070 Adding a redirect to the BOBO page if not already been through journey * add noindex tag * add redirect * update tests, change to set in layout and fix lint * ignore prettier for a block that seems to present problems * remove console logs and spaces * change to journey beginning * remove commented test * refactor so onlyy set beginning of journey * update tests * refactor with new redirect test Co-authored-by: Phil Benson <phil.benson@defra.gov.uk> * chore(release): publish v1.27.0-rc.11 * chore(release): publish v1.27.0-rc.12 * Welsh language - persist on error page (#1503) * Welsh language - persist on error page https://eaflood.atlassian.net/browse/IWTF-2917 Persist Welsh language persist when pressing back from GovPay Co-authored-by: Phil Benson <phil.benson@defra.gov.uk> * chore(release): publish v1.27.0-rc.13 * Amend journey content for under 13 (#1529) * Amend journey content for under 13 https://eaflood.atlassian.net/browse/IWTF-3038 Amend so delete "how much will this cost" from journey when under 13 journey * remove sentence * chore(release): publish v1.27.0-rc.14 * Welsh - do you receive any of the following (#1533) * Welsh - do you recieve any of the following https://eaflood.atlassian.net/browse/IWTF-3118 Minor amendments to if you receieve any of the following page * translations changed * Welsh translation for Do they want to go paperless? page (#1536) * Welsh translation for Do they want to go paperless? page https://eaflood.atlassian.net/browse/IWTF-3131 The user should be able to view the Do they want to go paperless page in Welsh. * chore(release): publish v1.27.0-rc.15 * chore(release): publish v1.27.0-rc.16 * Translation to how do they want their licence page (#1538) * Translation to how do they want their licence page https://eaflood.atlassian.net/browse/IWTF-3132 User should be able to read page in Welsh with correct translations. * chore(release): publish v1.27.0-rc.17 * Translation for you do not need a licence yet (#1540) * Translation for you do not need a licence yet https://eaflood.atlassian.net/browse/IWTF-3137 A user who is under 13 should be able to read the "You do not need a licence yet" page in Welsh. * chore(release): publish v1.27.0-rc.18 * Welsh - contact details (#1534) * Welsh - contact details https://eaflood.atlassian.net/browse/IWTF-3119 Minor amendments for check contact details none bobo * check who licence for and change translation * following comments change if statement * move code to getData * change let to const * remove space * chore(release): publish v1.27.0-rc.19 * Refactor licence summary page (#1535) * Refactor licence summary page https://eaflood.atlassian.net/browse/IWTF-3099 Refactor licence summary page, bringing licence summary rows out of the nunjucks template and into the getData function so that they can be tested. Also took the opportunity to refactor the tests. * chore(release): publish v1.27.0-rc.20 * Back button - licence type (#1546) * Back button - licence type https://eaflood.atlassian.net/browse/IWTF-3128 Change where back button goes from licence type page * change back link page * chore(release): publish v1.27.0-rc.21 * chore(release): publish v1.27.0 * Welsh translation - licence details (#1553) * Welsh translation - licence details https://eaflood.atlassian.net/browse/IWTF-3151 Add translations to licence details page * add translations * added further translations * add missing translations * Welsh translation - order complete page (#1552) * Welsh translation - order complete page https://eaflood.atlassian.net/browse/IWTF-3150 Add welsh translation to the order complete page * added translations * added further translations * chore(release): publish v1.28.0-rc.0 * chore(release): publish v1.28.0-rc.1 * Persist language - order complete and licence details (#1554) * Persist language - order complete and licence details https://eaflood.atlassian.net/browse/IWTF-3152 Persist language choice between order complete and Licence details page * add addlanguagecodetouri to order complete page for licence details * rename test * chore(release): publish v1.28.0-rc.2 * Update dev env docker config (#1557) * Update dev env docker config Update the dev env docker config to work with the new M1 Macbook * Switch elasticmq image as existing one didn't work with a M1 Macbook, update the config * Tried SQS in Localstack, it still doesn't work, so updated comment and config * chore(release): publish v1.28.0-rc.3 * Welsh Translations - order complete licence details (#1555) * Welsh Translations - order complete licence details https://eaflood.atlassian.net/browse/IWTF-3150 Fix error in translations on order complete page * chore(release): publish v1.28.0-rc.4 * Welsh - translations licence details (#1556) * Welsh - translations licence details https://eaflood.atlassian.net/browse/IWTF-3151 Add translations to display junior and senior licences Co-authored-by: Phil Benson <phil.benson@defra.gov.uk> * chore(release): publish v1.28.0-rc.5 * Pin Docker to localstack v1.2.0 (#1563) Localstack v1.3.0 was released yesterday. This included some breaking changes for us - the `DEFAULT_REGION` env var has been deprecated and the location of the init scripts appears to have changed. I wasn't able to immediately fix this so pinning to an earlier working version for now, as I think we'll need a Jira ticket to properly upgrade it. * chore(release): publish v1.28.0-rc.6 * Contact Page shows incorrect information for license confirmation page (#1526) * Contact Page shows incorrect information for license confirmation page https://eaflood.atlassian.net/browse/IWTF-3103 When a user purchases a 12 month licence and selects email for notifications and text for reminders both should be reflect as the chosen contact options. * chore(release): publish v1.28.0-rc.7 * Phone number splitting over two lines (#1562) * Phone number splitting over two lines https://eaflood.atlassian.net/browse/IWTF-3162 When the presentation language is switched to Welsh, the phone number is split over two lines. Split licence details warning message into three, so we can isolate the phone number in one message, wrap it in a span and then add a new style that keeps the phone number together rather than wrapping over two lines * chore(release): publish v1.28.0-rc.8 * chore(release): publish v1.28.0 * Persist lang from Contact to Licence Summary (#1574) * Persist lang from Contact to Licence Summary https://eaflood.atlassian.net/browse/IWTF-3192 When selecting to modify the licence from the contact summary, the language selection isn't persisted * Decorate LICENCE_SUMMARY.uri with language code * chore(release): publish v1.29.0-rc.0 * chore(release): publish v1.29.0 * Back button during payment (#1570) * Back button during payment https://eaflood.atlassian.net/browse/IWTF-3149 Change location of back button to above pay for the licence button * move warning message * chore(release): publish v1.30.0-rc.0 * Fix cache error (#1573) * Fix cache error https://eaflood.atlassian.net/browse/IWTF-2942 This error mostly seems to occur when pressing back from GovPay. Although the cause isn't too clear, the fix looks to be straightforward so this is to fix it: * Add tests for checking CacheError is thrown, throw CacheError if state is null / undefined as well as when sessionCookie is null / undefined * chore(release): publish v1.30.0-rc.1 * Trigger specific error response codes from route (#1579) https://eaflood.atlassian.net/browse/IWTF-3123 This PR adds a new route for testing specific error response codes. So going to /buy/throw-error?error=401 will return a 401 response code, etc. The env var ERROR_PAGE_ROUTE must be set to true for it to work. * chore(release): publish v1.30.0-rc.2 * Remove 'order-complete' undefined logging (#1585) * Remove 'order-complete' undefined logging https://eaflood.atlassian.net/browse/IWTF-2325 Remove logging for cannot read property 'order complete' * remove logging and linked tests * chore(release): publish v1.30.0-rc.3 * Update Welsh translations for client errors (#1591) https://eaflood.atlassian.net/browse/IWTF-3125 This PR updates some existing error message translations. * Add Welsh translations to server error messages (#1590) https://eaflood.atlassian.net/browse/IWTF-3126 This ticket adds missing translations for server error scenarios. * Update Ubuntu version used for GH Actions builds (#1596) GitHub Actions is deprecating Ubuntu 18.04 for builds so we need to update this. * chore(release): publish v1.30.0-rc.4 * Refactor redirects to automatically use correct language (#1580) https://eaflood.atlassian.net/browse/IWTF-3111 This PR refactors internal redirects to use a new redirectWithLanguageCode function on the response toolkit. This function allows us to call a redirect for the correct language without having to also call addLanguageCodeToUri each time. This approach was initially demoed in #1514 but this PR handles the implementation of the function and rolling it out to the rest of the app (as well as adding some tests for a few untested files). * chore(release): publish v1.30.0-rc.5 * Fix typos in Welsh translation (#1600) https://eaflood.atlassian.net/browse/IWTF-3125 This also splits the text for the start again link on the client error page into two different versions, as while it is the same in English, there are differences in Welsh. * chore(release): publish v1.30.0-rc.6 * Add new cost fields (#1594) * Add new cost fields https://eaflood.atlassian.net/browse/IWTF-3183 Add the new cost fields to the Permit entity * Added newCost and newCostStartDate fields * chore(release): publish v1.30.0-rc.7 * Notification banner (#1593) * Notification banner https://eaflood.atlassian.net/browse/IWTF-3179 Implement notification banner - in this occurence for price changes * created banner, added to pages and add var * changed njk file to data., added to getData method and added tests * change boolean to string * chore(release): publish v1.30.0-rc.8 * Use permission start date to calculate price (#1598) https://eaflood.atlassian.net/browse/IWTF-3184 Prices are now increasing, so the permission price needs to be calculated using the permission start date * Refactored pricing summary tests * Updated to incorporate licence start date in price calculation * chore(release): publish v1.30.0-rc.9 * Stop language parameters from being duplicated in URLs (#1603) https://eaflood.atlassian.net/browse/IWTF-3111 Testing revealed that the links to accept and reject cookies were failing when the language was set to Welsh. This turned out to be because multiple `lang` parameters were being added - for example, `/buy?lang=cy&lang=cy` We don't want this to happen, so this PR changes the addLanguageCodeToUri function to strip any existing `lang=` params from the provided URL so we can make sure we only add the relevant ones. * Fix translation and title errors on server error page (#1602) https://eaflood.atlassian.net/browse/IWTF-3126 This PR fixes two issues - a minor Welsh translation difference on one of the feedback links, and making sure the title attribute on server error pages matches the heading. While making the second change, I realised I was creating some duplicated logic in the page code and it was probably more complex than should be handled in Nunjucks anyway, so I refactored and moved some checks to the error handler, which then needed tests, etc etc etc... * chore(release): publish v1.30.0-rc.10 * chore(release): publish v1.30.0-rc.11 * Add getPrice to Permission (#1608) * Add getPrice to Permission https://eaflood.atlassian.net/browse/IWTF-3185 Use the permit associated with the permission to calculate the price, rather than cost being a static value * Added new module to business rules lib for calculating permission cost before and after price switch day * Refactored tests for order complete page, tidied up data passed to template, added permission cost calculation * Modified transaction creation to use cost calculation from business rules lib * chore(release): publish v1.30.0-rc.12 * Error after Ts&Cs page purchasing licence (#1612) * Attach permit to permission before passing to cost calculator * chore(release): publish v1.30.0-rc.13 * Update transaction journal to use new price (#1613) * Update transaction journal to use new price https://eaflood.atlassian.net/browse/IWTF-3187 Update transaction journal creation to use new price calculation in business rules lib Also, refactored to rationalise data passed to getPermissionCost and fixed a bug where we were showing the price paid with no trailing zeros, so, for example, £49.50 was displaying as £49.5 * chore(release): publish v1.30.0-rc.14 * On licence type page, prices should display with two decimals or none (#1614) * Update pricingDetail to return strings and pad decimals to two places * chore(release): publish v1.30.0-rc.15 * Price incorrect on Licence Summary page (#1616) * Price incorrect on Licence Summary page https://eaflood.atlassian.net/browse/IWTF-3273 The price shown is the old price. * Created displayPermissionPrice function to centralise logic and rolled it out where we were using getPermissionCost and custom logic to format the price * Fix bug on licence summary page where correct price wasn't being displayed * chore(release): publish v1.30.0-rc.16 * Remove double pound sign (#1618) * chore(release): publish v1.30.0-rc.17 * chore(release): publish v1.30.0 * Change in age of senior concession (#1604) * Change in age of senior concession https://eaflood.atlassian.net/browse/IWTF-3188 Changes to raise the age of senior concession from 65 to 66 * Refactored tests for isMinor / isJunior / isSenior, added new senior age starting after 1st April 2023 * Updated senior calculation in licence number generation to pass start date for change in senior age qualification * Alter senior check when adding concession so that start date is used in the check * chore(release): publish v1.31.0-rc.0 * Fix completion message for junior licences (#1625) https://eaflood.atlassian.net/browse/IWTF-3283 We recently changed how the displayed price was calculated, but this led to some unintended behaviour on the completion page where the word "free" was displayed with the header. This change fixes that. * chore(release): publish v1.31.0-rc.1 * Code coverage in authenticate.js (#1606) * Code coverage in authenticate.js https://eaflood.atlassian.net/browse/IWTF-3147 Increase code coverage in authenticate.js to 100% * add test * chore(release): publish v1.31.0-rc.2 * Fix typo in test file name (#1626) https://eaflood.atlassian.net/browse/IWTF-2348 Someone had previously reported that this snapshot test wasn't providing the expected test coverage. When running locally, it does seem to provide the expected coverage - however I did spot there was a typo in the filename so it's possible that caused issues somewhere too. * Price changes page (#1623) * Price changes page https://eaflood.atlassian.net/browse/IWTF-3190 New page showing price changes for 2023, 2024 and 2025 * chore(release): publish v1.31.0-rc.3 * Add price increase notification banner text (#1627) https://eaflood.atlassian.net/browse/IWTF-3242 We want to tell users about the price change before they reach payment so they can make an informed decision. * chore(release): publish v1.31.0-rc.4 * Add Welsh translations for price change banner (#1628) https://eaflood.atlassian.net/browse/IWTF-3265 * chore(release): publish v1.31.0-rc.5 * Welsh - Price increase (#1630) * Welsh - Price increase https://eaflood.atlassian.net/browse/IWTF-3266 Add welsh translations for price increase page * added translations * add missing translations and change to use mssgs.free * apostrophe change * added gov.uk to title * chore(release): publish v1.31.0-rc.6 * Add "GOV.UK" suffix to new prices page title (#1637) * Add "GOV.UK" suffix to new prices page title * chore(release): publish v1.31.0-rc.7 * Date of birth message (#1641) * Date of birth message https://eaflood.atlassian.net/browse/IWTF-3178 Change content to add message to understand why date of birth important * added content page, adding wording to json files * open link in new page * add welsh * add welsh translation for inset * chore(release): publish v1.31.0-rc.8 * Refund policy remove post office and repetition (#1643) * Refund policy remove post office and repititon https://eaflood.atlassian.net/browse/IWTF-3270 Update refund polciy to remove reference to post office * added translations, added extra content to page * added contact info * Remove post office content from privacy page (#1642) * Remove post office content from privacy page https://eaflood.atlassian.net/browse/IWTF-3269 Update the privacy policy to remove content about the Post Office * remove translations and remove bulletpoint * change name of mssgs to better order * chore(release): publish v1.31.0-rc.9 * chore(release): publish v1.31.0-rc.10 * Display price as free rather than £0 (#1650) https://eaflood.atlassian.net/browse/IWTF-3277 The pricing summary module should display licences with no cost as free, rather than as £0. * Add logic to display 'over 65' before 1/4 and 'over 66' on or after 1/4 (#1647) * Show 'over 65' or 'over 66' depending on licence start date https://eaflood.atlassian.net/browse/IWTF-3310 Implement logic to show 'over 65' for licences starting before 1st April, or 'over 66' for licences starting on or after 1st April. * chore(release): publish v1.31.0-rc.11 * chore(release): publish v1.31.0-rc.12 * Welsh - date of birth page (#1646) * Welsh - date of birth page https://eaflood.atlassian.net/browse/IWTF-3267 remove additional full stop * chore(release): publish v1.31.0-rc.13 * Improve test coverage (#1629) https://eaflood.atlassian.net/browse/IWTF-2924 This PR covers adding additional tests to fill the gaps in our unit test coverage. It also cleans up some `if` statements in the analytics handler. * chore(release): publish v1.31.0-rc.14 * Amend permission end date to use locale time (#1651) * Amend permission end date to use locale time https://eaflood.atlassian.net/browse/IWTF-3324 The end date calculation for a permission is going wrong after the change to BST, where it is going back an extra day. This is because the permission start date is set as midnight in the locale time, which is 11pm the day before in GMT, and the end date calculation takes the last minute of the previous date. Therefore '2023-03-31T23:00:00.000Z', which is '2023-04-01T00:00:00.000+01:00' is resulting in an end date of '2023-03-30T23:59:00.000Z'. It should actually be '2023-03-31T22:59:00.000Z', or '2023-03-31T23:59:00.000+01:00'. * chore(release): publish v1.31.0-rc.15 * chore(release): publish v1.31.0 * Stop checking SFTP (#1655) * Remove call to download from ftp location, as we don't need to do that anymore and it's causing an error due to the post office having removed the SFTP address * remove references to ftpToS3 * chore(release): publish v1.32.0-rc.0 * chore(release): publish v1.32.0 * Refactor renewal start date validator (#1622) * Refactor renewal start date validator https://eaflood.atlassian.net/browse/IWTF-3025 Refactor renewal start date validator so doesnt use seperate page to perform validation * refactor validation to route * refactor route and begin adding tests * added further tests and mocked moment * added tests mocking moment * change moment setup * remove handler and tests, remove outdated tests and refactor new tests * rename tests * refactor route and tests * refactor tests * remove if result.error in setlicencestartdateandtime * set 1 default export and mock page route * import page route to be able test * grab permission in validator, fix tests * chore(release): publish v1.33.0-rc.0 * Refactor how we determine whether a licence can be posted (#1657) https://eaflood.atlassian.net/browse/IWTF-1970 This PR covers refactoring licence-type-display.js to change how we check whether or not a licence can be posted. This also includes: * Move find-permit.js to processors - This will be getting more use so doesn't make sense to keep it off with the summary pages. * Use new isPhysical function on licence type page - To do this, we have to call findPermit first, but fortunately this is the first page in the journey where we should have all the necessary info to determine the permit. This change had a knock-on effect on a lot of seemingly-unrelated integration tests, which were hitting this page before testing their own pages and thus were now calling the sales API. * Add and refactor lots of tests * chore(release): publish v1.33.0-rc.1 * Remove reference to post office on gov pay fail (#1662) * Remove reference to post office on gov pay fail https://eaflood.atlassian.net/browse/IWTF-3286 https://eaflood.atlassian.net/browse/IWTF-3299 When fail at gov pay, error page that displays no longer have reference to post office, welsh translations added also * edited test as try again button removed from page * changes following comments * remove duplicate by * Refund policy welsh (#1660) * Refund policy welsh https://eaflood.atlassian.net/browse/IWTF-3294 Update refund policy page with welsh translation * added translations * changed following comments * Error page persist welsh (#1661) * Error page persist welsh https://eaflood.atlassian.net/browse/IWTF-3328 Add code to allow welsh language to persist when click start again on client error page * add addlanguagecodetouri to error-routes and add tests * remove agreed and controller from client error * chore(release): publish v1.33.0-rc.2 * chore(release): publish v1.33.0-rc.3 * chore(release): publish v1.33.0-rc.4 * Fishing byelaws link (#1665) * Fishing byelaws link https://eaflood.atlassian.net/browse/IWTF-3317 Allow for the fishing byelaws link on view licence details page to open in new tab * open link new tab * add opens in new tab wording * chore(release): publish v1.33.0-rc.5 * Welsh language refund policy (#1669) * Welsh language refund policy https://eaflood.atlassian.net/browse/IWTF-3294 Add full stop that is missing from welsh content * full stop added * chore(release): publish v1.33.0-rc.6 * Remove text from address lookup page (#1671) https://eaflood.atlassian.net/browse/IWTF-3367 This PR removes a sentence from the address lookup page that was causing confusion for users without posted licences. * Remove redudant text from user journey (#1672) https://eaflood.atlassian.net/browse/IWTF-3366 The message in this text is now explained on the previous page in the journey, so this hint text is no longer necessary. The variant text for the BOBO journey does not seem to have been in use at all, so removing it as well for cleanup. * chore(release): publish v1.33.0-rc.7 * chore(release): publish v1.33.0-rc.8 * Clarify content on licence fulfilment page (#1673) https://eaflood.atlassian.net/browse/IWTF-3365 https://eaflood.atlassian.net/browse/IWTF-3370 This PR makes content changes to the page formerly known as "Do you want to go paperless?" in response to user feedback. It also refactors how BOBO text variants are set. * Fix tests expecting 65 to still be senior concession age (#1677) Further PR with more thorough cleanup to follow pending Jira ticket. * chore(release): publish v1.33.0-rc.9 * Fix typo in paperless message (#1686) https://eaflood.atlassian.net/browse/IWTF-3365 * chore(release): publish v1.33.0-rc.10 * Add new field for short-term licence confirmation preferences (#1652) * Add new field for short-term licence confirmation preferences https://eaflood.atlassian.net/browse/IWTF-3170 As a customer purchasing a short term licence I want my preferences for short term licence confirmation recorded separately to 12 month licence confirmations to avoid them being overwritten. * add short term cpnfirmation field * added further tests and add to contact.entity * add handler, change test data, add method in sales api to grab contact from name, dob and postcode * update sales api connector, update agreed handler tests, update sales api connector tests, add if not 12 month licence statment to agreed handler and add method of confirmation handler and tests * move code from handler to within sales api * contact service to findAll contacts and recreate method handler * refactor changes back and add if within contacts.service * fix tests back to orginal * make checks in contact.service, add tests, fix test dataand fix tests * added missing tests * adding tests * refactor tests * remove mock setup * change if conditions and tests --------- Co-authored-by: ScottDormand96 <sdormand@hotmail.com> * Update Hapi-Gapi to v2 (#1688) * Update Hapi-Gapi to v2 https://eaflood.atlassian.net/browse/IWTF-3389 Hapi-Gapi has been updated to v2.0.0 ready for GA4. * chore(release): publish v1.33.0-rc.11 * Fix no tags after v (#1693) * Fix "no tags after v" There is a long standing problem where if any tags are created starting with v, w, x, y or z they'll cause the versioning script to break, as it relies on alphabetical order to grab the last version. For example, if a tag is created 'youreIt', this comes after all standard version tags (v1.32.0-rc.1) in alphabetical order. To fix this we can pipe the versions through a grep that'll elimate all non-version tagS * Modify version script to pipe versions through grep that'll ignore all tags apart from new versions and standard release candidates * chore(release): publish v1.33.0-rc.12 * Fix issue with missing permit data (#1674) * Fix issue with missing permit data https://eaflood.atlassian.net/browse/IWTF-3338 On arrival on the licence summary page, on occasion the permission seems to not have a permit, or to be missing permit data as newCostStartDate is not present (and presumably other properties are missing too). This adds additional logging to see if some light can be shed on why this is happening * chore(release): publish v1.33.0-rc.13 * Update GA secret property env var name (#1695) * Update GA secret property env var name https://eaflood.atlassian.net/browse/IWTF-3389 Primary property needs to be named correctly, rather than xgov name it has at present. * chore(release): publish v1.33.0-rc.14 * Feature/iwtf update to envvar for analytics (#1699) Update gafl_webapp.secrets.env.example * chore(release): publish v1.33.0-rc.15 * Remove a from opens in a new tab (#1703) * Remove a from opens in a new tab https://eaflood.atlassian.net/browse/IWTF-3387 Change wording for links open in new tab by removing a * change wording for opening in new tab, english and welsh * update missing translation * chore(release): publish v1.33.0-rc.16 * Clean up code around senior concession age change (#1701) https://eaflood.atlassian.net/browse/IWTF-3212 Now that 1 April 2023 has passed and the age change has come into effect, we can remove redundant code around checking if the change date has passed yet. * chore(release): publish v1.33.0-rc.17 * Remove post office reference error page add button (#1702) * Remove post office reference error page add button https://eaflood.atlassian.net/browse/IWTF-3299 Add button to pre payment error page * add button * Licence details byelaws content (#1707) * Licence details byelaws content https://eaflood.atlassian.net/browse/IWTF-3388 Update licence details page with new line of content about byelaws * updated wording * chore(release): publish v1.33.0-rc.18 * Update dynamics-lib to handle postal order https://eaflood.atlassian.net/browse/IWTF-3417 In order to adapt the POCL job to process postal orders, we need to first update dynamics-lib to handle the new fields that have been added to the PoclValidationError. * Added newStartDate field to pocl validation error file. * Remove obsolete analytics attribution data (#1700) * Remove obsolete analytics attribution data https://eaflood.atlassian.net/browse/IWTF-3451 Analytics attribution code is no longer used in hapi-gapi and therefore needs to be removed. Removed all attribution code and handlers that are no longer in use with the new GA4 update, as well as obsolete urls --------- Co-authored-by: Phil Benson <phil.benson@defra.gov.uk> * chore(release): publish v1.33.0-rc.19 * uploading for review as tests failing * Added new payment source value and updated tests. * Added remaining tests for coverage * Updated option-set-data defra_financialtransactionsource data in line with most recent dev CRM data. * Remove hyperlink gov pay fail (#1714) * Remove hyperlink gov pay fail https://eaflood.atlassian.net/browse/IWTF-3299 Remove hyperlink for gov pay fail page where post office content was * remove link * pre pay force error once * undo changes into develop that are tested * change to if not pre payment dont display link * Formatting --------- Co-authored-by: Phil Benson <phil.benson@defra.gov.uk> * chore(release): publish v1.33.0-rc.20 * Short term licence confirmation (#1708) * Short term licence confirmation https://eaflood.atlassian.net/browse/IWTF-3170 Set so newsletter and reminder does not update when buy short term licence, emails and text data is not overriden * update test data, change permission to permit, set so phone and email dont get deleted, change scenario newsletter * code smell for missing coverage * update how set phone and email, sort tests * change how phone/email updated, refactor tests * move setup mock permit into file * describe.each for when testing same emails * describe.each for when testing same phone number * chore(release): publish v1.33.0-rc.21 * Old prices being sent to Govpay (#1718) * Old prices being sent to Govpay https://eaflood.atlassian.net/browse/IWTF-3509 Old prices are being sent to Govpay because the start date isn't defined when transactions are created for 'immediate start' permissions (actually starting in 30 mintutes), because it's not possible to determine how long someone might take to pay (or might decide not to buy a licence after all). Setting a permission start time when the transaction was created would also open a loophole where an angler could start the purchase, then only compete it if they saw a bailiff coming, receiving as a start time for their license whatever time they begun the transaction. * Added default for start date of current date / time if the start date isn't provided in the permission * chore(release): publish v1.33.0-rc.22 * chore(release): publish v1.33.0 * Remove screenshot advice in journey (#1726) * Remove screenshot advice in journey https://eaflood.atlassian.net/browse/IWTF-3528 and https://eaflood.atlassian.net/browse/IWTF-3529 We're advising anglers to take a screenshot of their permission purchase, but this isn't correct to the letter of the law so it should be removed * Removed references to screenshots, plus entirely removed proof of licence label from licence details page * chore(release): publish v1.34.0-rc.0 * chore(release): publish v1.34.0 * Remove inset text about concession age (#1725) * Remove inset text about concession age https://eaflood.atlassian.net/browse/IWTF-3489 Remove inset text on what is your date of birth? page * remove inset * remove dob_inset in json files * chore(release): publish v1.35.0-rc.0 * chore(release): publish v1.35.0-rc.1 * Order complete display new price (#1729) * Order complete display new price https://eaflood.atlassian.net/browse/IWTF-3509 Update how we get price by using transaction instead of permission to display correctly * allow to select from transaction.payment.created_date if passed in * refactor test setup * add test to allow undefined payment (junior licences) * add tests to test result when has value of created date * remove console logs * chore(release): publish v1.35.0-rc.2 * Fix double count of page views from analytics banner (#1738) * Fix double count of page views from analytics banner https://eaflood.atlassian.net/browse/IWTF-3566 When users accept tracking and hide banner the page tracks each refresh page view. * chore(release): publish v1.35.0-rc.3 * Update caniuse-lite * chore(release): publish v1.35.0-rc.4 * New country field for validation errors table (#1746) * New country field for validation errors table https://eaflood.atlassian.net/browse/IWTF-3418 Switched to defra_countrylist being the country field as that's an optionset lookup * Updated entity and tests * Update country references in pocl transform * chore(release): publish v1.35.0-rc.5 * Over 66 content (#1741) * --allow-empty * Update over 66 content https://eaflood.atlassian.net/browse/IWTF-3537 Update the wording for over 66 to change content * change json file wording, change tests and edit licence type display * move , into label * chore(release): publish v1.35.0-rc.6 * Update English language version of accessibility statement (#1752) https://eaflood.atlassian.net/browse/IWTF-3055 This PR makes some modifications to the English language version of the accessibility statement as documented on Jira. * Update Welsh language version of accessibility statement (#1753) https://eaflood.atlassian.net/browse/IWTF-3053 This PR makes some modifications to the Welsh language version of the accessibility statement as documented on Jira. * chore(release): publish v1.35.0-rc.7 * chore(release): publish v1.35.0-rc.8 * Update over 66 content (#1755) * Update over 66 content https://eaflood.atlassian.net/browse/IWTF-3537 Updating age concession wording on licence details page * change wording of age senior concession * chore(release): publish v1.35.0-rc.9 * Only prefill payment details when user buys for themself (#1754) https://eaflood.atlassian.net/browse/IWTF-3543 If a user is buying on behalf of someone else, we do not want to pre-populate GOV.UK Pay fields with the licensee info, as the person who is buying on behalf may be paying instead. This PR changes the code to only pre-populate those fields when a user is buying a single licence for themself. It also includes some test refactoring for the payment processor to bring it more in line with the rest of the test suite. * chore(release): publish v1.35.0-rc.10 * Add instructions for doing docker builds on M1 Macbooks as the procedure here has changed * chore(release): publish v1.35.0-rc.11 * Merge develop into multibuy https://eaflood.atlassian.net/browse/IWTF-3461 merge develop into multibuy * update package.json so doesnt log * remove duplicate in t and c, remove console log * changes following pull request * updated following comments * add removed labels --------- Co-authored-by: Michael Steinacher <49474728+MickStein@users.noreply.github.com> Co-authored-by: Phil Benson <phil.benson@defra.gov.uk> Co-authored-by: GitHub Actions <actions@users.noreply.github.com> Co-authored-by: Iris Faraway <iris.faraway@gmail.com> Co-authored-by: michael steinacher <steinacherm@hotmail.co.uk>
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.
https://eaflood.atlassian.net/browse/IWTF-3324
The end date calculation for a permission is going wrong after the change to BST, where it is going back an extra day. This is because the permission start date is set as midnight in the locale time, which is 11pm the day before in GMT, and the end date calculation takes the last minute of the previous date. Therefore '2023-03-31T23:00:00.000Z', which is '2023-04-01T00:00:00.000+01:00' is resulting in an end date of '2023-03-30T23:59:00.000Z'. It should actually be
'2023-03-31T22:59:00.000Z', or '2023-03-31T23:59:00.000+01:00'.