Skip to content

Commit

Permalink
Pet 1.1.2.3 mergemaster (#417)
Browse files Browse the repository at this point in the history
* Update terraform provider version (#416)

* Release-1.2  (#242)

* chore(deps): update all dependencies (#159)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* RET-2643 (#185)

* chore(deps): update all dependencies (#159)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* RET-2643

* RET-2643

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Harpreet Jhita <harpreet.jhita@justice.gov.uk>

* caseTypeId removed from log as it is null (#186)

* Added pound symbol and line seperators (#188)

* RET-2792 (#192)

* RET-2792 - revert changes (#197)

* RET-2792 (#196)

* RET-2731: Mock out ACAS Service tests and improve logging in et-sya-api (#190)

* RET-2731: Mock AcasService tests

* RET-2731: Add logs to AcasService attemptWithRetriesToFetchAcasCertificates()

* RET-2731: change acas apie key to dummy

* RET-2731: Checkstyle fixes

* RET-2731: Remove disabled annotation

Co-authored-by: KirsanovI <ivan.kirsanov@hmcts.net>

* Ret 2800 (#195)

* RET-2800: Supporting Document not present in documentCollection

* RET-2800: Fixed pmd

* moved method to CaseDocumentService

* Ret 2783 Welsh translation content - Generate Welsh pdf claim form (#191)

* RET-2783: Added welsh PDF case file generation if the user has selected to be contacted in welsh

* Fix broken unit tests

* added welsh tests

* fixed welsh tests to work with differant language generations

* minor review comments

* fixed breaking change, changing pdf document name

* fixed build issues

Co-authored-by: Jack Brogan <jack.brogan@hmcts.net>
Co-authored-by: paul.peasegood <paul.peasegood@version1.com>

* Ret 2800 2 (#198)

* RET-2800: Supporting Document not present in documentCollection

* RET-2800: Fixed pmd

* moved method to CaseDocumentService

* RET-2800: Added test coverage

* Ret 2792 new (#200)

* Ret 2792 new (#201)

* Ret 2846 (#202)

* Updates for PDF Creation

* Updates for PDF Creation

* Suppressed jackson core - jackson databind@2.13.4
NOTE: this is a new vulnerability defined on 17/NOV/2022 details are defined in the url https://nvd.nist.gov/vuln/detail/CVE-2022-42003

* Suppressed jackson core - jackson databind@2.13.4
NOTE: this is a new vulnerability defined on 17/NOV/2022 details are defined in the url https://nvd.nist.gov/vuln/detail/CVE-2022-42003

* Removed suppressed vulnerability and changed spring-cloud-starter-openfeign version from 3.1.2 to 3.1.5

* Removed suppressed vulnerability

* Vulnerability CVE-2022-42003 is resolved by adding implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.14.0' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Vulnerability CVE-2022-42003 is resolved by adding implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.13.4.1' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Vulnerability CVE-2022-42003 is resolved by adding   implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.14.0' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Ret 2864 postcode and test updates - javadoc Implementation (#205)

* Updates for PDF Creation

* Updates for PDF Creation

* Suppressed jackson core - jackson databind@2.13.4
NOTE: this is a new vulnerability defined on 17/NOV/2022 details are defined in the url https://nvd.nist.gov/vuln/detail/CVE-2022-42003

* Suppressed jackson core - jackson databind@2.13.4
NOTE: this is a new vulnerability defined on 17/NOV/2022 details are defined in the url https://nvd.nist.gov/vuln/detail/CVE-2022-42003

* Removed suppressed vulnerability and changed spring-cloud-starter-openfeign version from 3.1.2 to 3.1.5

* Removed suppressed vulnerability

* Vulnerability CVE-2022-42003 is resolved by adding implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.14.0' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Vulnerability CVE-2022-42003 is resolved by adding implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.13.4.1' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Vulnerability CVE-2022-42003 is resolved by adding   implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.14.0' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Updated tests added new postcode formatter to PdfMapperUtil

* Updated tests added new postcode formatter to PdfMapperUtil

* Added Javadocs to PdfMapperUtil

* Added Javadocs to PdfMapperUtil

* Added Javadocs to PdfMapperUtil

* Changed convertFirstCharactersToCapitalCase method name to convertFirstCharactersOfWordsToCapitalCase

* Updates for country list of UK. (#206)

* Handling null values (#204)

* Fixed missing imports

* Refactored test

* Merge1.1.0.2 into welsh (#208)

* RET-2643 (#185)

* chore(deps): update all dependencies (#159)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* RET-2643

* RET-2643

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Harpreet Jhita <harpreet.jhita@justice.gov.uk>

* caseTypeId removed from log as it is null (#186)

* Added pound symbol and line seperators (#188)

* RET-2792 (#192)

* RET-2792 - revert changes (#197)

* RET-2731: Mock out ACAS Service tests and improve logging in et-sya-api (#190)

* RET-2731: Mock AcasService tests

* RET-2731: Add logs to AcasService attemptWithRetriesToFetchAcasCertificates()

* RET-2731: change acas apie key to dummy

* RET-2731: Checkstyle fixes

* RET-2731: Remove disabled annotation

Co-authored-by: KirsanovI <ivan.kirsanov@hmcts.net>

* Ret 2800 (#195)

* RET-2800: Supporting Document not present in documentCollection

* RET-2800: Fixed pmd

* moved method to CaseDocumentService

* Ret 2800 2 (#198)

* RET-2800: Supporting Document not present in documentCollection

* RET-2800: Fixed pmd

* moved method to CaseDocumentService

* RET-2800: Added test coverage

* Ret 2846 (#202)

* Updates for PDF Creation

* Updates for PDF Creation

* Suppressed jackson core - jackson databind@2.13.4
NOTE: this is a new vulnerability defined on 17/NOV/2022 details are defined in the url https://nvd.nist.gov/vuln/detail/CVE-2022-42003

* Suppressed jackson core - jackson databind@2.13.4
NOTE: this is a new vulnerability defined on 17/NOV/2022 details are defined in the url https://nvd.nist.gov/vuln/detail/CVE-2022-42003

* Removed suppressed vulnerability and changed spring-cloud-starter-openfeign version from 3.1.2 to 3.1.5

* Removed suppressed vulnerability

* Vulnerability CVE-2022-42003 is resolved by adding implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.14.0' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Vulnerability CVE-2022-42003 is resolved by adding implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.13.4.1' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Vulnerability CVE-2022-42003 is resolved by adding   implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.14.0' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Ret 2864 postcode and test updates - javadoc Implementation (#205)

* Updates for PDF Creation

* Updates for PDF Creation

* Suppressed jackson core - jackson databind@2.13.4
NOTE: this is a new vulnerability defined on 17/NOV/2022 details are defined in the url https://nvd.nist.gov/vuln/detail/CVE-2022-42003

* Suppressed jackson core - jackson databind@2.13.4
NOTE: this is a new vulnerability defined on 17/NOV/2022 details are defined in the url https://nvd.nist.gov/vuln/detail/CVE-2022-42003

* Removed suppressed vulnerability and changed spring-cloud-starter-openfeign version from 3.1.2 to 3.1.5

* Removed suppressed vulnerability

* Vulnerability CVE-2022-42003 is resolved by adding implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.14.0' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Vulnerability CVE-2022-42003 is resolved by adding implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.13.4.1' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Vulnerability CVE-2022-42003 is resolved by adding   implementation group: 'com.fasterxml.jackson.core', name:  'jackson-databind', version: '2.14.0' to the dependencies section of build.gradle at line 220. Besides upgraded depreciated main definition on line 326

* Updated tests added new postcode formatter to PdfMapperUtil

* Updated tests added new postcode formatter to PdfMapperUtil

* Added Javadocs to PdfMapperUtil

* Added Javadocs to PdfMapperUtil

* Added Javadocs to PdfMapperUtil

* Changed convertFirstCharactersToCapitalCase method name to convertFirstCharactersOfWordsToCapitalCase

* Updates for country list of UK. (#206)

* Update CaseService.java

Update CaseService.java

* Refactored test

* Checkstyle

Co-authored-by: GauravChawlaMOJ <58194626+GauravChawlaMOJ@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ikirsanov <105438011+ikirsanov@users.noreply.github.com>
Co-authored-by: KirsanovI <ivan.kirsanov@hmcts.net>
Co-authored-by: robin-ieong <101253854+robin-ieong@users.noreply.github.com>
Co-authored-by: Mehmet Tahir Dede <105645217+JustMehmet@users.noreply.github.com>

* Test fix

* Test fix

Test fix

* RET-2750: Add functional tests to controllers classes (#203)

* RET-2750: Add DocumentUpload functional test

* RET-2750: Chekstyle fix

* RET-2750: Chekstyle fix

* RET-2750: Add vulnerability issue fix

* RET-2750: Change multipart params

* RET-2750: CheckStyle

* RET-2750: multipart content type

* RET-2750: Add functional tests to DocumentUploadController

* RET-2750: Add functional tests for DocumentController

* RET-2750: Fix DocumentControllerFunctionalTest

* RET-2750: Add AcasControllerFunctionalTest

Co-authored-by: KirsanovI <ivan.kirsanov@hmcts.net>

* RET-2574: Add manageOffice assignment before case submitted (#178)

* chore(deps): update all dependencies (#159)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* RET-2574: Add manageOffice assignment before case submitted

* RET-2574: Rename case assignment to local office service and move it to service package

* RET-2574: checkStyle test fixes

* RET-2574: checkStyle test fixes

* RET-2574: Fix assigning case to local office logic, remove unused imports

* RET-2574: Add suppressions for spring security and tomcat

* RET-2574: Set @disable to AcasService tests

* RET-2574: Add in convertCaseRequestToCaseDataWithTribunalOffice managingOffice assignment to caseRequest

* RET-2574: getManagingOffice returns Unassigned if invalidPostcodeException thrown

* RET-2574: checkstyle fix

* RET-2574: Remove suppressions

* RET-2574: AcasServiceTest fix

* RET-2574: AcasServiceTest fix

* RET-2574: Refactor condition in assingCaseToLocalOfficeService

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: KirsanovI <ivan.kirsanov@hmcts.net>
Co-authored-by: Harpreet Jhita <harpreet.jhita@justice.gov.uk>

* Fix disability claim (#209)

* claimantInd null values (#214)

* Keeping sonar happy (#215)

* claimantInd null values

* sonar checks

* sonar checks

* RET-2877 - Null check for contact language (#212)

* Null check for contact language

* Refactor notification service

* Use Welsh language constant

* RET-2871 fix (#217)

* RET-2818. Update et-data-model version to add hearing language preference. (#211)

* cve (#220)

* cve

* cve suppressions

* cve suppressions

* cve suppressions

* RET-2848 (#219)

* Et data model update (#225)

* Ret 2864 add java docs to public/protected elements (#224)

* 2864: add javadocs to classes

* 2864: add jdocs

* 2864: add more jdocs

* 2864: add jdocs and fix issues

* 2864: fix merge and pmd

* Release 1.1.0.2 (#207) (#226)

All code merged for Release 1.1.0.2.

- Referral Enhancements
- Initial Consideration Enhancements
- Bug Fixes
- ECM fixes/enhancements

Co-authored-by: Harpreet Jhita <harpreet.jhita@justice.gov.uk>
Co-authored-by: Marc Judge <marc.judge@version1.com>

* Add file extension (#227)

* Add file extension

* Fix checkstyle

* Bump spring boot

Co-authored-by: Marc Judge <marc.judge@version1.com>

* Acas cert logging removed (#232)

* welsh doc template updated (#233)

* Allow all test responses (#239)

Co-authored-by: Marc Judge <marc.judge@version1.com>

* RET-3045: Fix for respondent details being reset (#238)

* RET-3045: Fix for respondent details being reset

* Fix for CVEs

* Fix for CVEs

* Fix for checkstyle

* Refactered to not use var type

* 1.2 - Dependency bump (#240)

* Bump patch

* Add CVE

* New CVEs

* bump additional

* Remove CVE and bump tomcat

* Remove outdated suppressions

* Bump spring-security-crypto

* Remove outdated supressions

* Remove spring suppressions

Co-authored-by: Marc Judge <marc.judge@version1.com>

* RET-2616. Create submit-claimant-application endpoint. (#245)

* RET-2616. Create submit-claimant-application endpoint.

* Bump et-data-model

Co-authored-by: Marc Judge <marc.judge@version1.com>

* Bump data model (#257)

* Update Welsh email template to prod (#259)

* RET-2289: Et-common version bump to 1.0.11 (#260)

* RET-2289 (#261)

* RET-2289: Et-common version bump to 1.0.11

* RET-2289: et-common version bump to 1.0.13

* RET-2296 (#262)

* RET-2296

RET-2296

RET-2296

Update Chart.yaml

* Chart update

* Ret 2816 - Create PDF CYA page for 'Contact the Tribunal about something else' (#243)

* RET-2616/7. Interim commit - define caseEvent for submitting an application - need to actually create the endpoints for the frontend that triggers the event.

* 2816: add Tse SYA pdf create

* 2816: add test

* 2816: add tests

* 2816: refactor code to upload pdf to dm-store

* 2816: refactor code into function

* 2816: add tests for new changes

* 2816: create fixes for gradle build issues

* FRET-2816. Fix PMD

* FRET-2816. Move tse pdf generation to the tse endpoint

* FRET-2816. Fix tests.

* RET-2816. Fix imports.

* RET-2816. Clean with builder

* RET-2816. Fix checkstyle

* RET-2816. Try bumping chart up

* Add application form to document collection

* RET-2816. Fix tests

* RET-2816. Add logic deciding when to generate and upload the document

* RET-2816. Fix PMD issue

* Order imports

* Initialize empty document collection

* Change is_type_c to type_c

---------

Co-authored-by: Itay-Kirsh <Itayk747@gmail.com>
Co-authored-by: marcjudge <marc.judge@hmcts.net>

* RET-2758 (#270)

* Send acknowledgement email to claimant

* RET-2758: Add Changes to NotificationsHelper, ManageCaseControllerTest, CaseServiceTest and caseDetails.json files to fix the unit tests

* RET-2758: Remove spacings, uncomment the sendnotifications lines

* RET-2758: Format NotificationServiceTest

* RET-2758: Fix checkstyle

* RET-2758: Merge conflict solving

* RET-2758: Fix checkstyle

* RET-2758: Fix PMD rules

* Simplify notification service

---------

Co-authored-by: Marc Judge <marc.judge@version1.com>
Co-authored-by: marcjudge <marc.judge@hmcts.net>
Co-authored-by: marcjudge <98343606+marcjudge@users.noreply.github.com>

* Fix caseId (#273)

* Ret 2816 fix uploading of documents

* RET-2816 upload the supporting document to the document list

* Fix checkstyles

* Fix type of document to be one of the set list.

* Make sure supporting document uploaded regardless of application overview pdf.

* Fix returning new case details when submitting application

* Fix build (#276)

* Add null check (#277)

* RET-2815 + RET-2814 (#278)

* Add emails to respondent and tribunal

* Add test coverage

* Add application service tests

* Fix code smells

* Add Notifications Helper tests

* Add hearing date tests

* Fix more smells

* Get CYA doc from doc collection

* Fix tribunal email

* Fix up issues

* Add logging and handling (#280)

* Suppress CVE (#282)

* CVEs

* CVEs

* Fix respondent email sending

* Chart

* Update app insights key (#284)

* Chart

* Bump packages (#286)

* Bump minor + checkstyle + pmd

* Add all plugin updated and new PMD rules

* Fix merge commit (#290)

* Fix merge issues (#288)

* Ret 2785 - Endpoint for saving claimant response to application from respondent (#289)

* Create Respond to Application endpoint

* Add unit tests and refactor

* Small fixes

* Add integration tests

* Use SUBMIT_CLAIAMNT_TSE event (#295)

* Update all dependencies (#296)

* Update all dependencies

* Remove breaking updates

* remove suppressions

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: marcjudge <98343606+marcjudge@users.noreply.github.com>
Co-authored-by: marcjudge <marc.judge@hmcts.net>

* Ret 2786 final (#299)

* Use SUBMIT_CLAIAMNT_TSE event

* Use CLAIMANT_TSE_RESPOND event

* Fix saving doc upload (#300)

* ACAS Claimant Request Docs

* Revert "ACAS Claimant Request Docs"

This reverts commit 703d25d.

* ACAS Claimant Request Docs

* Send response email to Tribunal (#302)

Co-authored-by: Marc Judge <marc.judge@version1.com>

* Update all dependencies (#301)

* Update all dependencies

* Update gradle-wrapper.properties

* Update build.gradle

* Update snake yaml cve

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: marcjudge <98343606+marcjudge@users.noreply.github.com>
Co-authored-by: Marc Judge <marc.judge@version1.com>

* RET-3356: Fix for View All Application page not displaying full app type (#304)

* RET-3356: Fix for View All Application page not displaying full app type

* Fixed checkstyle

* Fixed PMD

* RET-3055 (#313)

* RET-3055: Change retention period to 78 weeks from 52

* RET-3055: Fix dependencies versions

* RET-3055, add suppressions

* RET-3055, bump tomcat version

* RET-3055, add suppressions

* RET-3055, remove suppression

* RET 2827 - email to Claimant for Responding to an application (#315)

* add email acknowledgement

* test: add unit tests for added notification service method

* add missing java doc param

* bump spring framework version

* bump tomcat-embed versions to 9.0.73

* add claimant portal url to email

* Update all dependencies (#318)

* Update all dependencies

* Update gradle-wrapper.properties

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: marcjudge <98343606+marcjudge@users.noreply.github.com>

* Ret 2826 (#316)

* Create pdf of claimant response to application

* Fix checkstyle and pmd

* Add unit tests

* Add java docs

* RET-2927 (#319)

* RET-2729: Update sendNotification state to 'viewed'

* RET-2729: Fix tests imports

* RET-2729: Fix checkstyle

* RET-2729: Fix checkstyle

* RET-2729: PMD rules

* RET-2729: Code review changes on SendNotificationService logic-added startEventResponse before submitUpdate

* Ret 2829 Apps & Case Mgmt common – Generate email notification to Respondent when Claimant responds to an application (#321)

* RET-2829 added sendResponseEmailToRespondent

* RET-2829 added unit tests

* RET-2829 review comments

* RET-2829 fix PMD issues

* RET-2829 reivew comments

* RET-2829 update ruleset

* RET-2829 minor formating

---------

Co-authored-by: Paul.Peasegood@hmcts.net <paulp@LAPTOP4439.V1.com>

* Update values.yaml

* RET-3464 - Mergefix (#327)

* PET-1.1.1.2 ET-PET PI29 Sprint 3 (#297)

* Update for the service getAllUserCases to convert it to elastic search (#293)

* RET-2961 - wrong pdf template (#298)

* Update CaseServiceTest.java

* ret-3168 implementation reimported to new branch (#305)

* ret-3168 implementation reimported to new branch

* Bumping chart version/ fixing aliases

* template ids updated

Template ids are updated for case submission emails. Also, new id is added for doc upload error email.  All three email template ids are for prod environment.

* user selected language check logic corrected

* prod template ids restored

---------

Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* PET 1.1.1.2 fix (#308)

* PET 1.1.1.2 fix

* PET 1.1.1.2 fix (#309)

* PET 1.1.1.2 fix

* PET 1.1.1.2 fix

* RET-3168 (#314)

* Updates for the task RET-3168

* Updates for the task RET-3168

* Updates for the task RET-3168

* Updates for the task RET-3168

* Updates for the task RET-3168

* Updates for the task RET-3168

* Ret-3168 Update for Code Quality (#317)

* Updates for code quality.

* Updates for code quality.

* Updates for code quality.

* Updates for code quality.

* Updates for code quality.

* Updates for code quality.

* Updates for code quality.

* Code Smell Updates (#320)

* Code Smell Updates

* Updates for SUBMIT_CASE_EMAIL_TEMPLATE_ID, CY_SUBMIT_CASE_EMAIL_TEMPLATE_ID, SUBMIT_CASE_DOC_UPLOAD_ERROR_EMAIL_TEMPLATE_ID for sending emails with files.

---------

Co-authored-by: GauravChawlaMOJ <58194626+GauravChawlaMOJ@users.noreply.github.com>
Co-authored-by: Harpreet Jhita <harpreet.jhita@justice.gov.uk>
Co-authored-by: btensay <tensay.bulcha@gmail.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* Fix Emails (#326)

* Fortify issue fix (#324)

* Fortify issue fix

* Fortify issue fix

* Fix notification service test

* Bumping chart version/ fixing aliases

* Remove duplicate

---------

Co-authored-by: Mehmet Tahir Dede <105645217+JustMehmet@users.noreply.github.com>
Co-authored-by: GauravChawlaMOJ <58194626+GauravChawlaMOJ@users.noreply.github.com>
Co-authored-by: Harpreet Jhita <harpreet.jhita@justice.gov.uk>
Co-authored-by: btensay <tensay.bulcha@gmail.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* Fix branch

* Ret 3396: Update Templates with Dynamic Links (#322)

* RET-3396: Merge Claimant Response to Tribunal emails into one email

* RET-3396: Update Claimant Application to use dynamic link

* RET-3396: Update Claimant Application email to Respondent to use dynamic link

* RET-3396: Update Claimant Application email to Claimant to use dynamic link

* RET-3396: Some code tidy up

* RET-3396: Post merge tidy up

* Update et-model-data version number (#332)

* Ret 2829 Apps & Case Mgmt common – Generate email notification to Respondent when Claimant responds to an application (CitizenUI) (#328)

* RET-2829 added sendResponseEmailToRespondent

* RET-2829 added unit tests

* RET-2829 review comments

* RET-2829 fix PMD issues

* RET-2829 reivew comments

* RET-2829 update ruleset

* RET-2829 minor formating

* RET-2829 fix bug on sending responant email on a no response

* RET-2829 fix checkstyle issues

* RET-2829 reivew comment

---------

Co-authored-by: Paul.Peasegood@hmcts.net <paulp@LAPTOP4439.V1.com>

* RET-3480 - Retrieve all cases (#340)

* Retrieve all cases

* Add commons-fileupload 1.5

* Bump chart (#343)

* Ret 2929 Provide something Tribunal asked for - CYA page for response to order/request from Tribunal (CitizenUI) (#342)

* RET-2929 added add-response-send-notification

* RET-2929 added unit tests

* Bumping chart version/ fixing aliases

* RET-2929 added javaDocs

* RET-2929 fix java docs

* RET-2929: Add to response 'Claimant', 'Date', 'Reponse size' and change sendNotificationState

---------

Co-authored-by: Paul.Peasegood@hmcts.net <paulp@LAPTOP4439.V1.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: marcjudge <98343606+marcjudge@users.noreply.github.com>
Co-authored-by: ikirsanov <ivan.kirsanov@version1.com>

* Ret 2931/2932 - send email notifications for response to a notification (#347)

* RET-2929 added add-response-send-notification

* RET-2929 added unit tests

* Bumping chart version/ fixing aliases

* RET-2929 added javaDocs

* RET-2929 fix java docs

* RET-2929: Add to response 'Claimant', 'Date', 'Reponse size' and change sendNotificationState

* RET-2931 added sendResponseNotificationEmailToTribunal

* RET-2932 added sendResponseNotificationEmailToRespondent

* RET-2930 added sendResponseNotificationEmailToClaimant

* RET-2931 small fixes after testing

* ret-2931 fix checkstyle issues

* RET-2931 fix failing unit test

---------

Co-authored-by: Paul.Peasegood@hmcts.net <paulp@LAPTOP4439.V1.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: marcjudge <98343606+marcjudge@users.noreply.github.com>
Co-authored-by: ikirsanov <ivan.kirsanov@version1.com>

* RET-2929_bug_fix (#350)

* RET-2929_bug_fix: change status of notification to VIEWED when respond added to notification

* RET-2929_bug_fix: removed unused import

* Ret 3513 (#355)

* RET-3513. Remove application.properties

* RET-3513. Use dev template ids

* RET-3549: Align with data-model 2 (#361)

* Ret 3233 - View an application/case judgment from CitizenUI hub page (#360)

* Create new doclist if it is null

* interim commit - not sure it works by now

* Adding admin decision state

* Adding admin decision notification state test

* Fixed failing test

* Bump model

* Reset data model

* Fix checkstyle

* checksyle fixes

---------

Co-authored-by: Itay-Kirsh <Itayk747@gmail.com>

* Ret 3502 (#356). Fix NPE Document collection.

* Create new doclist if it is null

* interim commit - not sure it works by now

---------

Co-authored-by: lvo700 <lorr05@qub.ac.uk>

* RET-3513. Fix submit claim emails (#362)

* RET-3513. Fix submit claim emails
- Missing Welsh template
- Both templates outdated - new pdf-template added locally.
- Welsh missing case id in citizen portal link
- Remove values.yaml values that are already in application.yaml

* Bumping chart version/ fixing aliases

---------

Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* Ret 3513. Update error email template (#363)

* Remove testing of spring properties - useless tests.

* Update template id for error email. Remove from Values.yaml

* Tested error email being sent to all parties, had to have actual email defaults for dev.

* Chart bump

* Update Chart.yaml

* Update Chart.yaml

* RET-3153. Clean application.yaml and charts (#367)

* Move properties around

* Remove Values.yaml properties that are in both values.yaml and application.yaml

* interim - bring back:
- locally overridden tse properties
- non-locally overridden pse properties

* Todo

* Start separating PSE and TSE

* Finish separating TSE and PSE and clean a little.

* bump chart ver

* Remove duplicated requestCaseDataListEnglandAcas

* Fix checkstyle and sonarlint issues

* RET-3596: Rule 92 Screen displayed when other party is not a system user (#378)

* RET-3596: Rule 92 Screen displayed when other party is not a system user

* Bumping chart version/ fixing aliases

* Refactored for pmd

---------

Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* Ret-3697. Change status of applications when claimant responds to respondent (#379)

* When claimant responds to respondent's application, set status to waitingForTheTribunal

* Add test

* Update test to include more appropriate data

* Update application state request for a claimant viewing an application
Also added testing around finding an application by its id

* Add empty document list if doesn't exist

* Clean test code

* Clean imports

* Fix PMD

* RET-3626 Bug fix - claimant response to application without an upload (#381)

* allow response to application  with either text or upload file, upload not mandatory

* fix checkstyle, pmd

* change null check for uploading file

* remove unused import

* Updated springboot patch version and suppressed vuns that don't have newer versions (#387)

* Ret 3684. Status update for respondents applications. (#382)

* Transition "view an application" to "change application status"

* Upgrade data-model version so that I can keep track of whether claimant / respondent responded

* Upgrade data-model version again

* RET-3684 Claimant responding to tribunal request for information (#391)

* Scenario 4

* Update datamodel version with fix for booleans -> Booleans for default value to null

* Fix tests so that they run against claimantResponseRequired, not respondentResponseRequired

* ResponseRequired might be null, swap order of equals comparison, add another test

* PMD fix

* Suppress owasp vulnerability

* Parameterize the ApplicationServiceTest tests

* Suppress "UnusedPrivateMethod" as done in the callbacks

* RET 3796, 3797 Emails to tribunal, claimant on response to tribunal order within an application (#395)

* add 3796, 3797

* add unit tests

* change unit test to use ParameterizedTest

* RET-3796 v2 (#398)

* change Boolean to boolean

* update getter for isRespondingToRequestOrOrder

* Ret 3798. Email respondent when claimant replies to tribunal  (#394). Lots of generic cleaning as well

* Clean code

* Methods and class don't need to be public

* Class might need to be public (unless we move the exception to the same package)

* Send new email out to respondent if claimant replies and rule 92 is yes

* Clean and add tests. Also fix it just simply not working
(I changed status to not needing to respond and then checked it later when sending emails)

* Clean imports

* Fix PMD main

* Rearrange related RespondToApplication tests to be together in the nested class and fix PMD issues

* Clean code and remove duplication

* Clean code with CoreEmailDetails

* Align law of demeter properties with callbacks

* Fix PMD

* Fixed tests and add task to clean template ids

* Rename application.yaml properties to match a consistent pattern

* Use constant - pmd issue fix

* Reorder notification properties

* Early return to remove else

* Remove patterns for concatenating strings

* Use string join instead of simple concatenation

* clean code

* Resolve Conflicts after PET release (#396)

* conflicts

* Fix decision state update (#400)

* RET-3890. Add identical shortDescription for supporting document of claimant TSE apps (#402)

* RET-3798. Fix url parameter to include link directly to case page (#406)

* RET-3792 - Add endpoint for setting admin response as viewed (#408)

* Add endpoint for setting admin response as viewed

* Add java docs

* Update src/main/java/uk/gov/hmcts/reform/et/syaapi/service/ApplicationService.java

Co-authored-by: JackReevies <43950645+JackReevies@users.noreply.github.com>

---------

Co-authored-by: JackReevies <43950645+JackReevies@users.noreply.github.com>

* Add short description to supporting material response doc (#410)

* Add short description to supporting material response doc

* Update tests

* Add functional test artifacts  (#407)

* Test functional

* Removed unneeded artifacts

* Added functional tests for ManageCaseController

* Fix PMD

* Added sad path test

* Fix PMD

* Update application.properties

* Fixed test

* Fixed test

* Add timeout

* Fix checkstyle

* added role for functional test account

* Fix checkstyle

* Added response validations and sad paths to FTs

* Fix pmd

* Make tests run against preview and staging pods

* Set tests to point to demo as aat is not set for release 1.2

---------

Co-authored-by: dharmendra kumar <dharmendra.kumar@hmcts.net>

* Change the url to point to aat

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GauravChawlaMOJ <58194626+GauravChawlaMOJ@users.noreply.github.com>
Co-authored-by: Harpreet Jhita <harpreet.jhita@justice.gov.uk>
Co-authored-by: ikirsanov <105438011+ikirsanov@users.noreply.github.com>
Co-authored-by: KirsanovI <ivan.kirsanov@hmcts.net>
Co-authored-by: robin-ieong <101253854+robin-ieong@users.noreply.github.com>
Co-authored-by: paul-peasegood <116294451+paul-peasegood@users.noreply.github.com>
Co-authored-by: Jack Brogan <jack.brogan@hmcts.net>
Co-authored-by: paul.peasegood <paul.peasegood@version1.com>
Co-authored-by: Mehmet Tahir Dede <105645217+JustMehmet@users.noreply.github.com>
Co-authored-by: Itay-Kirsh <Itayk747@gmail.com>
Co-authored-by: Daryl Boam <104851463+DarylBoam@users.noreply.github.com>
Co-authored-by: Marc Judge <marc.judge@version1.com>
Co-authored-by: lvo700 <lorr05@qub.ac.uk>
Co-authored-by: brendanmchugh <95289167+brendanmchugh@users.noreply.github.com>
Co-authored-by: Paul.Peasegood@hmcts.net <paulp@LAPTOP4439.V1.com>
Co-authored-by: btensay <tensay.bulcha@gmail.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: fergusoshea <114142469+fergusoshea@users.noreply.github.com>
Co-authored-by: ikirsanov <ivan.kirsanov@version1.com>
Co-authored-by: JackReevies <43950645+JackReevies@users.noreply.github.com>
Co-authored-by: Jack Reeve <jack@reevies.tech>
Co-authored-by: gauravchawla <gaurav-chawla@hotmail.com>
Co-authored-by: dharmendra kumar <dharmendra.kumar@hmcts.net>

* RET-2857 Pact Test Updates (#415)

* Updates to activate Pact-Tests

* Update to consumer tests

* Update to consumer tests

* Update to consumer tests

* Master conflicts

---------

Co-authored-by: dharmendra kumar <dharmendra.kumar@hmcts.net>
Co-authored-by: marcjudge <98343606+marcjudge@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GauravChawlaMOJ <58194626+GauravChawlaMOJ@users.noreply.github.com>
Co-authored-by: ikirsanov <105438011+ikirsanov@users.noreply.github.com>
Co-authored-by: KirsanovI <ivan.kirsanov@hmcts.net>
Co-authored-by: robin-ieong <101253854+robin-ieong@users.noreply.github.com>
Co-authored-by: paul-peasegood <116294451+paul-peasegood@users.noreply.github.com>
Co-authored-by: Jack Brogan <jack.brogan@hmcts.net>
Co-authored-by: paul.peasegood <paul.peasegood@version1.com>
Co-authored-by: Mehmet Tahir Dede <105645217+JustMehmet@users.noreply.github.com>
Co-authored-by: Itay-Kirsh <Itayk747@gmail.com>
Co-authored-by: Daryl Boam <104851463+DarylBoam@users.noreply.github.com>
Co-authored-by: Marc Judge <marc.judge@version1.com>
Co-authored-by: lvo700 <lorr05@qub.ac.uk>
Co-authored-by: brendanmchugh <95289167+brendanmchugh@users.noreply.github.com>
Co-authored-by: Paul.Peasegood@hmcts.net <paulp@LAPTOP4439.V1.com>
Co-authored-by: btensay <tensay.bulcha@gmail.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: fergusoshea <114142469+fergusoshea@users.noreply.github.com>
Co-authored-by: ikirsanov <ivan.kirsanov@version1.com>
Co-authored-by: JackReevies <43950645+JackReevies@users.noreply.github.com>
Co-authored-by: Jack Reeve <jack@reevies.tech>
Co-authored-by: gauravchawla <gaurav-chawla@hotmail.com>
  • Loading branch information
1 parent 1ba2baf commit 4393b76
Show file tree
Hide file tree
Showing 83 changed files with 7,179 additions and 1,164 deletions.
30 changes: 30 additions & 0 deletions Jenkinsfile_CNP
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,34 @@ withPipeline(type, product, component) {
enablePactAs([AppPipelineDsl.PactRoles.CONSUMER])
syncBranchesWithMaster(branchesToSync)
enableSlackNotifications('#et-builds')

before('smoketest:preview') {
env.IDAM_URL = "https://idam-api.aat.platform.hmcts.net"
env.SYA_API_TEST_URL = "http://et-sya-api-aat.service.core-compute-aat.internal"
}

before('functionalTest:preview') {
env.MAX_FT_TESTS_PARALLEL_FORKS = 5
env.ENABLE_TEST_USER_DELETION = true
}

afterAlways('functionalTest:preview') {
steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/reports/tests/functional/**/*'
}

before('smoketest:aat') {
env.IDAM_URL = "https://idam-api.aat.platform.hmcts.net"
env.SYA_API_TEST_URL = "https://et-sya-api-staging.aat.platform.hmcts.net/"
}

before('functionalTest:aat') {
env.INITIATION_JOB_RUNNING = false
env.MAX_FT_TESTS_PARALLEL_FORKS = 5
env.ENABLE_TEST_USER_DELETION = true
}

afterAlways('functionalTest:aat') {
steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/reports/tests/functional/**/*'
}

}
4 changes: 4 additions & 0 deletions Jenkinsfile_nightly
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ withNightlyPipeline(type, product, component) {
afterSuccess('fortify-scan') {
steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/Fortify Scan/**/*'
}

afterAlways('functionalTest') {
steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/reports/tests/functional/**/*'
}
}
23 changes: 13 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ checkstyle {
}

pmd {
toolVersion = "6.41.0"
toolVersion = "6.55.0"
sourceSets = [sourceSets.main, sourceSets.test, sourceSets.functionalTest, sourceSets.integrationTest,
sourceSets.smokeTest, sourceSets.contractTest]
reportsDir = file("$project.buildDir/reports/pmd")
Expand Down Expand Up @@ -205,10 +205,11 @@ ext {
}

dependencies {

implementation('com.github.hmcts:et-common:1.16.1') { transitive = false }
implementation group: 'uk.gov.dwp.regex', name: 'postcode-validation', version: '1.1.0'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '3.1.5', {
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '3.1.6', {
exclude group: 'commons-io', module: 'commons-io'
}

Expand All @@ -225,10 +226,12 @@ dependencies {
implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.7.0'

implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '5.1.9'
implementation group: 'com.github.hmcts', name: 'et-data-model', version: '1.17.0'

implementation group: 'com.github.hmcts', name: 'et-data-model', version: '2.3.2'

implementation group: 'com.github.hmcts', name: 'ccd-client', version: '4.9.2'
implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '2.1.1'
implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.1.0'
implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.1.2'

implementation group: 'uk.gov.service.notify', name: 'notifications-java-client', version: '3.19.1-RELEASE'
implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'
Expand Down Expand Up @@ -315,7 +318,7 @@ wrapper {
distributionType = Wrapper.DistributionType.ALL
}

task runAndPublishConsumerPactTests(type: Test){
task runAndPublishConsumerPactTests(type: Test) {
logger.lifecycle("Runs pact Tests")
testClassesDirs = sourceSets.contractTest.output.classesDirs
classpath = sourceSets.contractTest.runtimeClasspath
Expand All @@ -329,11 +332,11 @@ project.ext {
pactVersion = getCheckedOutGitCommitHash()
}

task fortifyScan(type: JavaExec) {
// main = "uk.gov.hmcts.fortifyclient.FortifyClientMainApp"
mainClass.set("uk.gov.hmcts.fortifyclient.FortifyClientMainApp")
classpath += sourceSets.test.runtimeClasspath
jvmArgs = ['--add-opens=java.base/java.lang.reflect=ALL-UNNAMED']
task fortifyScan(type: JavaExec) {
// main = "uk.gov.hmcts.fortifyclient.FortifyClientMainApp"
mainClass.set("uk.gov.hmcts.fortifyclient.FortifyClientMainApp")
classpath += sourceSets.test.runtimeClasspath
jvmArgs = ['--add-opens=java.base/java.lang.reflect=ALL-UNNAMED']
}

pact {
Expand Down
2 changes: 1 addition & 1 deletion charts/et-sya-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: "1.0"
description: A Helm chart for et-sya-api Java API
name: et-sya-api
home: https://github.com/hmcts/et-sya-api
version: 0.0.29
version: 0.0.30
maintainers:
- name: HMCTS et team
dependencies:
Expand Down
1 change: 1 addition & 0 deletions charts/et-sya-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ java:
TORNADO_URL: "https://docmosis.{{ .Values.global.environment }}.platform.hmcts.net/rs/render"
CASE_DOCUMENT_AM_URL: "http://ccd-case-document-am-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
CITIZEN_PORTAL_LINK: "https://et-sya.{{ .Values.global.environment }}.platform.hmcts.net/citizen-hub/"
EXUI_CASE_DETAILS_URL: "https://manage-case.{{ .Values.global.environment }}.platform.hmcts.net/cases/case-details/"
97 changes: 5 additions & 92 deletions config/owasp/suppressions.xml
Original file line number Diff line number Diff line change
@@ -1,103 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress until="2030-01-01">
<notes><![CDATA[
Suppressing as it's a false positive (see: https://pivotal.io/security/cve-2018-1258)
]]></notes>
<gav regex="true">^org\.springframework\.security:spring-security-crypto:5.4.[0-5]</gav>
<cpe>cpe:/a:pivotal_software:spring_security</cpe>
<cve>CVE-2018-1258</cve>
</suppress>
<suppress>
<notes><![CDATA[
CVE is a json vulnerability for Node projects. False positive reported at https://github.com/jeremylong/DependencyCheck/issues/2794
]]></notes>
<cve>CVE-2020-10663</cve>
<cve>CVE-2020-7712</cve>
</suppress>
</suppress>
<suppress>
<notes>Suppresses commons-io-2.6.jar vulnerabilities</notes>
<cve>CVE-2021-29425</cve>
</suppress>
<suppress>
<notes>Suppresses spring-web-5.3.22.jar</notes>
<cve>CVE-2016-1000027</cve>
</suppress>
<suppress>
<notes>Suppresses spring-security-crypto-5.7.5.jar vulnerabilities</notes>
<cve>CVE-2020-5408</cve>
</suppress>
<suppress>
<notes>Suppresses tomcat embedded version tomcat-embed-core-9.0.56.jar vulnerabilities</notes>
<cve>CVE-2022-23181</cve>
</suppress>
<suppress>
<notes><![CDATA[
Suppress until updated package is available file name: spring-retry-1.3.2.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.springframework\.retry/spring\-retry@.*$</packageUrl>
<cpe>cpe:/a:vmware:spring_framework</cpe>
</suppress>
<suppress until="2022-07-25">
<cve>CVE-2022-22968</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: tomcat-embed-core-9.0.62.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org.apache.tomcat.embed/tomcat-embed-core@.*$</packageUrl>
<cve>CVE-2022-29885</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: tomcat-embed-websocket-9.0.62.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org.apache.tomcat.embed/tomcat-embed-websocket@.*$</packageUrl>
<cve>CVE-2022-29885</cve>
</suppress>
<suppress until="2022-11-20">
<cve>CVE-2022-22976</cve>
</suppress>
<suppress until="2022-11-20">
<cve>CVE-2022-22978</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: tomcat-embed-core-9.0.63.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.tomcat\.embed/tomcat\-embed\-core@.*$</packageUrl>
<cve>CVE-2022-34305</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: tomcat-embed-websocket-9.0.63.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.tomcat\.embed/tomcat\-embed\-websocket@.*$</packageUrl>
<cve>CVE-2022-34305</cve>
</suppress>
<suppress until="2022-11-20">
<cve>CVE-2022-31569</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: spring-web-5.3.22.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.springframework/spring\-web@.*$</packageUrl>
<cve>CVE-2016-1000027</cve>
</suppress>
<suppress until="2022-11-20">
<cve>CVE-2022-25857</cve>
</suppress>
<suppress until="2022-11-20">
<cve>CVE-2022-42003</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: commons-codec-1.15.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/commons-codec/commons-codec@.*$</packageUrl>
<cve>CVE-2021-37533</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: commons-io-2.11.0.jar
Expand Down Expand Up @@ -176,10 +89,10 @@
<cve>CVE-2023-20861</cve>
</suppress>
<suppress>
<notes><![CDATA[
<notes><![CDATA[
file name: jackson-databind-2.14.2.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
<cpe>cpe:/a:fasterxml:jackson-databind</cpe>
</suppress>
<packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
<cpe>cpe:/a:fasterxml:jackson-databind</cpe>
</suppress>
</suppressions>
9 changes: 6 additions & 3 deletions config/pmd/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<exclude name="JUnitTestContainsTooManyAsserts"/>
<exclude name="JUnitAssertionsShouldIncludeMessage"/>
<exclude name="JUnitTestsShouldIncludeAssert"/>
<exclude name="UnusedPrivateMethod"/>
</rule>
<rule ref="category/java/codestyle.xml">
<exclude name="AtLeastOneConstructor"/>
Expand Down Expand Up @@ -54,7 +55,7 @@
</rule>
<rule ref="category/java/design.xml/LawOfDemeter">
<properties>
<property name="violationSuppressRegex" value="(.*method chain calls.*|.*object not created locally.*)"/>
<property name="violationSuppressRegex" value="(.*method chain calls.*|.*object not created locally.*|.*static property access.*)"/>
</properties>
</rule>
<rule ref="category/java/design.xml/SignatureDeclareThrowsException">
Expand All @@ -67,8 +68,10 @@
<exclude name="CommentSize"/>
<exclude name="UncommentedEmptyMethodBody"/>
</rule>
<rule ref="category/java/errorprone.xml">
<exclude name="BeanMembersShouldSerialize"/>
<rule ref="category/java/errorprone.xml/AvoidDuplicateLiterals">
<properties>
<property name="violationSuppressRegex" value=".*%s(\s+%s)+.*"/>
</properties>
</rule>
<rule ref="category/java/multithreading.xml"/>
<rule ref="category/java/performance.xml"/>
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.7
1.4.4
2 changes: 1 addition & 1 deletion infrastructure/state.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ terraform {
backend "azurerm" {}

required_providers {
azurerm = "3.33.0"
azurerm = "3.66.0"
}
}
7 changes: 7 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>hmcts/.github:renovate-config",
"local>hmcts/.github//renovate/automerge-all"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@SpringBootTest({
"core_case_data.api.url : localhost:8890"
})
public class SpringBootContractBaseTest {
public class SpringBootContractTestBase {
public static final String AUTH_TOKEN = "Bearer someAuthorizationToken";
public static final String SERVICE_AUTH_TOKEN = "Bearer someServiceAuthorizationToken";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
import au.com.dius.pact.core.model.annotations.Pact;
import org.junit.jupiter.api.Test;
import uk.gov.hmcts.reform.ccd.client.model.CaseDetails;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractBaseTest;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractTestBase;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.springframework.http.HttpMethod.GET;
import static org.springframework.http.HttpStatus.OK;

@PactTestFor(providerName = "ccd_data_store_get_casebyid", port = "8890")
class CcdGetCasesByCaseIdPactTest extends SpringBootContractBaseTest {
@PactTestFor(providerName = "ccdDataStoreAPI_Cases", port = "8890")
class CcdGetCasesByCaseIdPactTest extends SpringBootContractTestBase {
private static final String CCD_CASE_URL = "/cases/" + CASE_ID;

@Pact(provider = "ccd_data_store_get_casebyid", consumer = "et_sya_api_service")
@Pact(provider = "ccdDataStoreAPI_Cases", consumer = "et_sya_api_service")
RequestResponsePact executeCcdGetCasesByCaseId(PactDslWithProvider builder) {

return builder
.given("a case exists")
.given("A Get Case is requested")
.uponReceiving("Provider receives a GET /cases/{caseId} request from et-sya-api API")
.path(CCD_CASE_URL)
.method(GET.toString())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import uk.gov.hmcts.reform.ccd.client.model.StartEventResponse;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractBaseTest;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractTestBase;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.springframework.http.HttpMethod.GET;


class StartEventForCitizenConsumerTest extends SpringBootContractBaseTest {
class StartEventForCitizenConsumerTest extends SpringBootContractTestBase {

@Pact(provider = "ccd_data_store_api_cases", consumer = "et_sya_api_service")
RequestResponsePact startEventForCitizen(PactDslWithProvider builder) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import uk.gov.hmcts.reform.ccd.client.model.StartEventResponse;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractBaseTest;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractTestBase;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.springframework.http.HttpMethod.GET;

class StartForCitizenConsumerTest extends SpringBootContractBaseTest {
class StartForCitizenConsumerTest extends SpringBootContractTestBase {

@Pact(provider = "ccd_data_store_api_cases", consumer = "et_sya_api_service")
RequestResponsePact startForCitizen(PactDslWithProvider builder) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
import uk.gov.hmcts.reform.ccd.client.model.CaseDataContent;
import uk.gov.hmcts.reform.ccd.client.model.CaseDetails;
import uk.gov.hmcts.reform.ccd.client.model.Event;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractBaseTest;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractTestBase;
import uk.gov.hmcts.reform.et.syaapi.service.utils.ResourceLoader;

import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.springframework.http.HttpMethod.POST;

class SubmitEventForCitizenConsumerTest extends SpringBootContractBaseTest {
class SubmitEventForCitizenConsumerTest extends SpringBootContractTestBase {

@Pact(provider = "ccd_data_store_api_cases", consumer = "et_sya_api_service")
RequestResponsePact submitEventForCitizen(PactDslWithProvider builder) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
import uk.gov.hmcts.reform.ccd.client.model.CaseDataContent;
import uk.gov.hmcts.reform.ccd.client.model.CaseDetails;
import uk.gov.hmcts.reform.ccd.client.model.Event;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractBaseTest;
import uk.gov.hmcts.reform.et.syaapi.consumer.SpringBootContractTestBase;
import uk.gov.hmcts.reform.et.syaapi.service.utils.ResourceLoader;

import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.springframework.http.HttpMethod.POST;

class SubmitForCitizenConsumerTest extends SpringBootContractBaseTest {
class SubmitForCitizenConsumerTest extends SpringBootContractTestBase {

@Pact(provider = "ccd_data_store_api_cases", consumer = "et_sya_api_service")
RequestResponsePact submitForCitizen(PactDslWithProvider builder) {
Expand Down
Loading

0 comments on commit 4393b76

Please sign in to comment.