Skip to content

Commit

Permalink
RIA-7875 Merge SNL -> Master (DO NOT MERGE) (#609)
Browse files Browse the repository at this point in the history
* RIA-7416 Split witness names to capture first and last names in LR journey (#592)

* RIA-7416: Update 'witnessDetails' with witness family name

* RIA-7416: Use Junit 5 features in functional tests

* RIA-7416: Temporarily address dependency vulnerability

* RIA-7416: Disable an existing failing functional test to progress PR in pipeline

- This functional test fails because of some authorisation issue.
- It has been esatablished that the update in this PR is not the
  cause of the failing test.
- Not sure how it passed successfully through the pipeline

---------

Co-authored-by: Augustine Onubeze <augustine.onubeze@hmcts.net>

* RIA-7574: Appeal submission summary document displays Legal Rep full Name (#603)

Co-authored-by: Augustine Onubeze <augustine.onubeze@hmcts.net>

* RIA-TASK Merged master changes to SNL - documents-api (#646)

* RIA-7378 - preventing application startup if secrets can't be found (#608)

* RIA-7378 - added ConfigValidatorAppListener + test

* RIA-7378 - update

* Bumping chart version/ fixing aliases

---------

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

* RIA-7319 - Gradle + Java 17 + AppInsights Upgrade (#587)

Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* RIA-7722 Solve suppressions (#632)

---------

Co-authored-by: burnstHMCTS <134689347+burnstHMCTS@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>

* RIA-7567 appellant and witness interpreter requirement are available (#645)

* RIA-7567 appellant and witness interpreter requirement are available #1220

* fix the problem of "exception in phase 'semantic analysis' in source unit '_BuildScript_' Unsupported class file major version 61"

* fix the problem of "Failed to apply plugin 'net.serenity-bdd.aggregator'."

* fix the problem of "Could not set unknown property 'configDir' for extension 'checkstyle' of type org.gradle.api.plugins.quality.CheckstyleExtension."

* revert the changes for fixing the build problem

* add the functional test for RIA-7567

* add the functional test for RIA-7567 for updateHearingRequirements event

* update the witness name of the functional test for draftHearingRequirements event updateHearingRequirements event

* extract some logic to private method for setting interpreter information of appellant and witness

* RIA-7750 party ID generation LR journey (#662)

* RIA-7875  updates to resolve conflicts (#689)

* Updates to fix FT failures

* updates to fix build issues

* RIA-7860 Hearings Tab setup

* Update renovate.json

* RIA-7879 map epims ids to ccd hearing locations (#710)

* RIA-7879 map epims ids to ccd hearing locations

* Added the unit test and functional test

* renovate json patch

* update functional test

* RIA-7881 list the case system user (#726)

* RIA-7860 Hearings Tab setup

* RIA-7881 Authorization for system user for listCase

* Update suppressions.xml

* RIA-7195 remove listing reference number from notification template when hearing list assist hearing v2 (#750)

* RIA-7195 remove listing reference number from notification template when hearing list assist hearing v2

* update the unit test, functional test and temporarily suppress CVE problem

* update the unit test

* update the unit test for isIntegrated flag

* RIA-7792 Remove witness list element from logic (#753)

* RIA-7860 Hearings Tab setup

* RIA-7792 Refactor logic to forgo witnessListElement

* RIA-7792 Upgrade chart version

* Bumping chart version/ fixing aliases

---------

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

* RIA-7922 Improve test coverage (#756)

* RIA-7860 Hearings Tab setup

* RIA-7792 Improve WitnessDetailsTest

* RIA-7792 Improve HearingRequirementsTemplateTest

* RIA-7792 Delete DynamicMultiSelectList

* RIA-7792 Delete DynamicMultiSelectList

* RIA-7792 Undo stale change that got lumped in with the rest

* RIA-7922 update witness details class (#757)

* RIA-7860 Hearings Tab setup

* RIA-7792 Add field to WitnessDetails

* RIA-7882 Add editCaseListing permission for caseworker-ia-system (#758)

* RIA-7882 Add editCaseListing permission for caseworker-ia-system

* RIA-7882 Increase temporary suppression

* Update AuthorizationHeadersProvider.java

* Update CcdScenarioRunnerTest.java

* Update CcdScenarioRunnerTest.java

* RIA-7973 Updated Bail application details template (#765)

* RIA-7973 Updated Bail application details template

* RIA-7973 Added Bail FT scenarios pattern

* RIA-7973 Fixed Ft

* Update CcdScenarioRunnerTest.java

* RIA-8119 Bail application document changes with added interpreter fields (#778)

* RIA-8119 Bail application document changes with added interpreter fields

* RIA-8119 Suppressing CVE-2023-6481 and CVE-2023-34055

* RIA-8119 Suppressing CVE-2023-33202, CVE-2023-46589, CVE-2023-6378

* RIA-8364 Bail template change 01134 -> 01144 (#789)

* RIA-8489 Refactored interpreter language (#798)

* RIA-8410 RIA-8409 Generate and store hearing notice on case (initial listing and relisting) (#794)

* RIA-8410: Generate hearing documents

- Create Handler, Template and configuration classes to generate notice
  of hearing for case relisting.

* RIA-8409: Generate hearing documents

- Create handler, template and configuration classes to generate notice of hearing for initial listing event.

* RIA-8410: Some code refactoring

* RIA-8508 Fix appeals refactored interpreter language (#803)

* RIA-8415 record adjournment details (#801)

* RIA-7860 Hearings Tab setup

* RIA-8415 Add recordAdjournmentDetails event

* RIA-8415 Add noticeOfAdjournedHearing document tag

* RIA-8415 Add classes and config to handle RecordAdjournmentDetails

* RIA-8415 Functional test for RecordAdjournmentDetails

* RIA-8415 Update test

* RIA-8507 Fix the field type for fcs_has_passport in BailCaseFieldDefinition (#810)

* RIA-8554 Fix detention location on hearing-notice template (#817)

* RIA-8554 Using enums for Field definition comparison (#819)

* Update BailDocumentCreatorConfiguration.java

* Update BailSubmissionTemplate.java

* updates to fix rebasing issues

* Updates to fix sonar issue

* Updates to fix sonar issue

* Updates to fix rebase issue

* Fix issues in functional tests (#861)

* Update suppressions.xml

* RIA-8802 bails notice of hearing displays the correct location information snl (#885)

* RIA-8935: Fix issue in Exception management (#893)

* RIA-8916 To resolve merge conflicts with master branch (#889)

* DIAC-123 cdam download change fix (#806)

* DIAC-123 trying cdam download auth change

* DIAC-123 trying cdam download auth change

* DIAC-123 trying cdam download auth change

* DIAC-123

* DIAC-123 removing logging

---------

Co-authored-by: KleoG <KleoG@users.noreply.github.com>

* RIA-8726 - Merge SNL (BAILS) - > Master (DO NOT MERGE) (#841)

* RIA-7973
* RIA-7973 Updated Bail application details template

* RIA-7973 Added Bail FT scenarios pattern

* RIA-7973 Fixed Ft

* RIA-8119
* RIA-8119 Bail application document changes with added interpreter fields

* RIA-8364
* RIA-8364 Bail template change 01134 -> 01144

* RIA-8489
* RIA-8489 Refactored interpreter language

* RIA-8410 RIA-8409 Generate and store hearing notice on case (initial listing and relisting)

* RIA-8410: Generate hearing documents

- Create Handler, Template and configuration classes to generate notice of hearing for case relisting

* RIA-8409: Generate hearing documents

- Create handler, template and configuration classes to generate notice of hearing for initial listing event

* RIA-8410: Some code refactoring

* RIA-8508
* RIA-8508 Fix appeals refactored interpreter language

* RIA-8507
* RIA-8507 Fix the field type for fcs_has_passport in BailCaseFieldDefinition

* RIA-8554
* RIA-8554 Fix detention location on hearing-notice template

* RIA-8554
* RIA-8554 Using enums for Field definition comparison

* Update BailSubmissionTemplateProvider.java

* RIA-8738: IMA - Rebasing docmosis template (#845)

* Updates to fix build failure

* RIA-8773: Add missing hearing centres in the hearing location to hearing address mapping document (#858)

* RIA-8773 Fix rebasing of CcdScenarioRunnerTest

* RIA-8774 Add logging (#862)

* RIA-8774 Add logging

* RIA-8770 Run functional tests on pipeline

* RIA-8774 Enable logging on functional tests

* RIA-8774 Enable logging on functional tests

* Update DocumentTagTest.java

---------

Co-authored-by: Marcellofabbri <marcello.fabbri@hmcts.net>
Co-authored-by: Augustine Onubeze <ikechukwu.onubeze@gmail.com>
Co-authored-by: Marcello Fabbri <56549133+Marcellofabbri@users.noreply.github.com>

* RIA-TASK NABA -> Master : DO NOT MERGE (#520)

* RIA-6455: Added new Hearing centre - Harmondsworth (#518)

* RIA-6455: Added new Hearing centre - Harmondsworth

* Fix vulnerabilities

* Added Location (#519)

* Added Location

* Suppressions

Co-authored-by: Jamie <jamiemurphy@version1.com>

* RIA-6491: Give admin officer access to edit appeal post submission (#521)

* RIA-6491: Give admin officer access to edit appeal post submission

* RIA-6491: Address dependency vulnerabilities

* RIA-6529: Generate Hearing Notice after listing for ADA cases (#522)

* RIA-6529: Generate Hearing Notice after listing for ADA cases

* Suppress vulnerabilities

* Added Yarls Wood as hearing centre and also its address (#524)

* Ria 6424 appeal submission summary (#527)

* Added some defs to extract case data
Added some puts to copy case data to field values which docmosis can use to generate the appeal submission summary

* Modified tests

* Formatted for sonar scan

* Final changes

* Refactored AppealSubmissionTemplate and added logic for displaying removal order date and time

* Added tests for detained fields and removal order date

* Formatted import and method line seperations for serenity checks

* Added CVE suppression

* Changed where appelantInDetention defaults to YesOrNo.NO

* Moved the parsing of complex asylum case fields (nomsNumber, dateCustodialSentence & otherDetentionFacilityName, to a dedicated method. Modified tests to cover more scenarios and make the tests more robust by checking all other relevant fields in the same flow.

* Added assertion to check size of templateFieldValues

* Bundled common fields together and setting Mockito strictness to lenient

* Added suppressions

* RIA-6424: Fix the TypeReference class for the field - 'hasPendingBailApplications' (#528)

- Changed from YesOrNo type to BailApplicationStatus type.
- update relevant unit tests.

* Added guards in event nomsNumber, releaseDate & removalOrderDate are empty strings (#530)

* Added guards in event nomsNumber and releaseDate are empty strings

* Adding suppression

* Ria 6424 (#531)

* Added guards in event nomsNumber and releaseDate are empty strings

* Adding suppression

* Added check for custodial sentence release date as it is not always guaranteed to be provided

* Modified test to allow mock for containsKey method of asylumCase

* Added check for custodial sentence release date as it is not always guaranteed to be provided

* Modified test to allow mock for containsKey method of asylumCase

* Ria 6564 hearing notice edited ada (#532)

* RIA-6564 - Adding hearing notice document generation for ADA cases

* RIA-6564 - Checkstyle

* RIA-6564 - Adding suppression

* Ria 6685 date decision letter (#545)

* RIA-6685 Added logic for Date decision letter to appear in Appeal template

* Formatting changes and tests

* Fixed tests

* added decisionLetterReceivedDate test

Co-authored-by: Jamie <jamiemurphy@version1.com>

* RIA-6685-fixed-test (#546)

Co-authored-by: Jamie <jamiemurphy@version1.com>

* Ria 6605 ada suitability document api (#547)

* Saving work

* Saving changes

* Saving work before a forced update

* Latest changes

* latest changes

* Added new template

* Rebased

* Added ADASuitabilityReviewDecision entity. Added suitability review, reason and judge to AsylumCaseDefinition. Added AdaSuitability document tag. Added suitability review event. Created pre-submit handler to generate ada suitability document. Added AdaSuitability to bundleOrder. Created new AdaSuitabilityTemplate. Added Adasuitability bean to DocumentCreatorConfiguration. Added AdaSuitabilityDocument metadata to application.yml. Created AdaSuitabilityTemplateTest.

* Resolved comments in PR specifically regarding extra line seperations and variable name formatting

* Added functional test for ADA suitability document generation

* Adding system credentials and appropriate method to generate headers for pipeline build failures.

* Fix for failing functional test: RIA-5778-end-appeal-automatically-notice-document.json

* RIA-6612: Update Bundling events to include Ada suitability review do… (#549)

* RIA-6612: Update Bundling events to include Ada suitability review document

- new document added under section of Tribunal Documents.
- added functional and unit tests.

* Update owasp.dependencyCheck

* Updated 'after' method call in Jenkinfile*

* RIA-6694-Admin-Submit-Appeal (#551)

* RIA-6694-Admin-Submit-Appeal

* fixed state test

---------

Co-authored-by: Jamie <jamiemurphy@version1.com>
Co-authored-by: Dbarnes-v1 <99024336+Dbarnes-v1@users.noreply.github.com>

* RIA-6700 - Allowing access to editAppeal for Admin users (#552)

* RIA-6721 Added isAdmin field to templateFieldValues in appeal submission summary template. (#554)

Added isAdmin field to AsylumCaseDefinition.
Updated unit tests.

* RIA-6702 - Internal case creation adding access to the following even… (#553)

* RIA-6702 - Internal case creation adding access to the following events for Admins:

	1. makeAnApplication
	2. draftHearingRequirements
	3. buildCase
	4. submitCase
	5. uploadAdditionalEvidence
	6. applyForFTPAAppellant
	7. requestFeeRemission

* RIA-6702 - Updating unit test

* RIA-6702 - Suppression

* RIA-6873 appeal summary changes (#555)

* RIA-6873_appeal_summary_changes

* Charts java version upgraded

* Adding new suppression

* Change HAS_OTHER_APPEALS field type with new object class

* Ria 6844 Add date to ADA suitability document (#556)

* RIA-6844 Added date to ADA suitability document. Updated unit test.

* Bumping chart version/ fixing aliases

---------

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

* RIA-6560 - Functional tests improvements (#568)

* RIA-6560 - Functional tests improvements

* RIA-6560 - Functional tests improvements

* RIA-6560 - Functional tests improvements

* RIA-6560 - Functional tests improvements

* RIA-6560 - Functional tests improvements

* RIA-6560 - Functional tests improvements

* RIA-6560 - Functional tests improvements

* RIA-6560 - Functional tests improvements

* RIA-6560 - Suppress CVE-2023-20863 (#570)

* Rebase from Master (#571)

* fix for refactoring DocumentUploadClientApi with CaseDocumentClient. … (#502)

* fix for refactoring DocumentUploadClientApi with CaseDocumentClient. DocumentManagementUploader is updated but this class is not used or ex
tended by any other class

* update scanbase packages

* update gradle for test

* suppressing org.yaml:snakeyaml:1.26

* update tvtStringProvider

* update tvtStringProvider

* fix build failures

* fix build failures

* fix build failures

* Updates to fix build failures

* Updates to fix secure doc store client

* Bumping chart version/ fixing aliases

* Updates to fix build failures

* Updates to fix build failures

* Updates to fix test failures

* Updates to fix test failures

* Updates to fix test failures

* Updates to fix test failures

* Updates to suppress cves to allow build to happen

* fix for failing gradle build

* RIA-5804: reload jenkins build

* Bumping chart version/ fixing aliases

* RIA-5804: fixed vulnerabilities

* RIA-5804: upgraded java chart version

---------

Co-authored-by: rajeshthuraiyur <rajesh.thuraiyur@gmail.com>
Co-authored-by: rajeshthuraiyur <48379561+rajeshthuraiyur@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: Javier Marin <fjavimarc@gmail.com>

* Update suppressions.xml (#557)

* To update azurerm version for terraform (#558)

* Update state.tf

* Update .terraform-version

* Update variables.tf

* Update main.tf

* Update main.tf

* Revert "To update azurerm version for terraform (#558)" (#559)

This reverts commit a90efa41ddaa7b71f143c038f2355c4100e8a152.

* Revert "Update suppressions.xml (#557)" (#560)

This reverts commit 247256adf152dd85bd2f0dc3b3eb216478ff77a5.

* Revert "fix for refactoring DocumentUploadClientApi with CaseDocumentClient. … (#502)" (#561)

This reverts commit 52eab14c22caa2398868bf623ffef1c9de6540bc.

* To revert cdam changes from production (#562)

* Update .terraform-version

* Update main.tf

* Update state.tf

* Update variables.tf

* Update suppressions.xml

* Update Chart.yaml

* Update suppressions.xml

* Bumping chart version/ fixing aliases

* Update Chart.yaml

* Update suppressions.xml

---------

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

* Update Dockerfile (#565)

* Update Dockerfile

* Update Dockerfile

* Update suppressions.xml

* Updated suppressions

---------

Co-authored-by: addison-jephtah <108927648+addison-jephtah@users.noreply.github.com>
Co-authored-by: rajeshthuraiyur <rajesh.thuraiyur@gmail.com>
Co-authored-by: rajeshthuraiyur <48379561+rajeshthuraiyur@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: Javier Marin <fjavimarc@gmail.com>
Co-authored-by: mokainos <72137340+mokainos@users.noreply.github.com>

* Updated dependencies to remove suppressed CVEs (#564) (#573)

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>
Co-authored-by: mcareyma <matthew.carey@version1.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>

* RIA-7043 add NOTICE_OF_DECISION_UT_TRANSFER document tag (#576)

* RIA-7043
* Added NOTICE_OF_DECISION_UT_TRANSFER enum to DocumentTag.java

* RIA-7043
* Updated DocumentTagTest.java

* RIA-7043
* Updated document bundle configs

* Supressed CVE-2023-28709 (#580)

* Added new line character to kick off new build on pipeline (#582)

* RIA-7158 request case building notification attachment letter (#583)

* * Added powermock to build.gradle which is used in testing
* Added template for internal cases for FTs
* Added requestCaseBuilding event to enums
* Added NOTIFICATION_ATTACHMENT_DOCUMENTS to asylumCase to store new AIP notification attachment docs
* Added AdaListCase direction tag to fix bug where the direction cannot be parsed as it's not in the list of DirectionTag enums
* Added requestCaseBuilding Doc tag
* Updated bundleOrder with the new DocTag
* Added holidaydates service
* Added DueDateService
* Added new handler/docGenerator for requestCaseBuilding event for internal ADA cases
* Created new template for the new handler/docGenerator
* Added asylumcaseutils
* Added internalAdaBuildCase bean to DocumentCreatorConfiguration for the above new handler/template
* Updated CustomerServicesProvider with new email/telephone for internal ADA cases
* Added internalAdaBuildCaseDocument metadata to application.yml. Also gave CO permission for requestCaseBuilding event and added internal ADA contact details
* Added unit tests for above
* Added FT for LO requestCaseBuilding to verify doc generated

* RIA-7158
* Moved the deconstruction of directions to AsylumCaseUtils to make it generalised for future use
* Added utility class to format dates
* Updated tests
* Added comment as per PR review feedback

* Added suppression to make CI/CD pipeline pass (#584)

* RIA-7158 (#585)

* Formatted date

* Update suppressions.xml

force build

* Update minimal-aip-appeal-submitted.json

* Update minimal-appeal-submitted.json

* Update suppressions.xml

* Update suppressions.xml

* RIA-7175 Internal ADA suitability document - unsuitable (#593)

* RIA-7175 Internal ADA suitability document - unsuitable

* RIA-7175 Suppress CVE-2023-35116 and CVE-2023-2976

* Revert "RIA-7175 Internal ADA suitability document - unsuitable (#593)" (#594)

This reverts commit 8d9236e8d0b9c89ac23bee6c4279d4d07b9c8c96.

* RIA-7174 ADA suitability document - suitable (#596)

* RIA-7174 ADA suitability notification doc for suitable decision

* RIA-7174 Suppressing CVE-2023-35116

* RIA-7174 Changes from code review, some refactoring work also

* RIA-7174
* Removed common method and put it back into the template as a private method.

* RIA-7174 Added empty line at end of functional test

---------

Co-authored-by: FarukH <hussain.faruk@hmcts.net>
Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7175 internal ada suitability unsuitable document (#595)

* RIA-7175 Internal ADA suitability document - unsuitable

* RIA-7175 Fixed formatting issues after rebase branch

* RIA-7172: Generate letter when 'HO Request Review' event is triggered (#597)

* RIA-7172: Generate letter when 'HO Request Review' ebent is triggered

- add the new letter in the Notification_letter collection.
- new tag added.

* RIA-7172: Fix Functional test

* RIA-7172: Trigger letter generation only for ADA

* RIA-7212 Internal ADA Appeal decided, allowed document generation (#598)

* RIA-7212 Internal ADA Appeal decided, allowed document generation

* RIA-7212 Fixed unit tests after rebase

* RIA-7212 Tidying up code using common methods

* RIA-7212 Refactor packages

* Ria 7540 dynamic internal email/tel (#599)

* RIA-7540 Updated customer service provider to return internal case dynamic email/tel

* RIA-7540 updated HoReviewEvidenceLetterTemplate to get fetch dynamic email and tel

* RIA-7540 updated InternalAdaDecisionsAndReasonsAllowedLetterTemplate to get fetch dynamic email and tel

---------

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7174 Refactor package location (#600)

* RIA-7175 Refactor of package (#601)

* RIA-7198: Generate letter when HO maintains decision in 'Upload Appea… (#605)

* RIA-7198: Generate letter when HO maintains decision in 'Upload Appeal Response' event

- added new user for functional test - HomeOfficeLart
- added new entity - AppealReviewOutcome.

* RIA-7198: Fix customer services contact info methods

* RIA-7198: Fix unit tests

* RIA-7198: Fix functional test for 'end appeal automatically' event

* RIA-7198: Added system env variable to secret mapping for the lart user credentials

* RIA-7213_internal_ada_appeal_decided_dismissed_document: Add Dismisse… (#604)

* RIA-7213_internal_ada_appeal_decided_dismissed_document: Add Dismissed - ADA (Letter) template generation, tests

* RIA-7213_internal_ada_appeal_decided_dismissed_document: Fixed code styles

* RIA-7213_internal_ada_appeal_decided_dismissed_document: RIA-7212 FT disabled:true

* RIA-7213_internal_ada_appeal_decided_dismissed_document: RIA-7212 FT disabled:true

* RIA-7213_internal_ada_appeal_decided_dismissed_document: InternalAdaDecisionsReasonsLetterAllowedGenerator(and Dismissed) refactored into one generic class with conditions, tests fixed as well

* RIA-7213_internal_ada_appeal_decided_dismissed_document: InternalAdaDecisionsAndReasonsDismissedLetterTemplate refactored dueDate code lines

* RIA-7200 (#602)

* Added new template for hearing bundle ready letter
* Added new handlers and functionality to generate this letter AFTER generate hearing bundle event when async stitching bundle event is implicitly called and is successful
* Added unit/functional tests

* RIA-7174 Adding new template vars to template (#607)

* RIA-7174 Adding new template vars to template

* RIA-7174 Functional test reworked to add directions

* RIA-7174 Another functional test rework

* RIA-7538 Updated config and handler to handle internal case detained non ADA document generation (#610)

* RIA-7606_change_customer_service_mail (#611)

* RIA-7606_change_customer_service_mail: Fix customer service mail in application.yml

* RIA-7606_change_customer_service_mail: Fix customer service mail in InternalDetGenerateHearingBundleTemplateTest

* RIA-7215 Updated template to handle detained non-ada letter (#612)

* RIA-7200 Fix hearing centre name (#613)

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7218 Allow document generation for all detained cases (#615)

* RIA-7218 Allow document generation for all detained cases

* RIA-7218 Functional test fixed

* RIA-7159 Request case building detained letter generation (#616)

* RIA-7159: WIP

- Used one generator for for both detained and non-detained letter
  generations

* RIA-7159 Final changes. tests and checkstyle changes

* RIA-7159 Removing redundant unit tests

---------

Co-authored-by: Neha Aggarwal <neha.aggarwal@version1.com>
Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7159 Rework of Non-ADA template to reduce duplication (#619)

* RIA-7548_internal_appeal_submission_non_ada (#618)

* RIA-7548_internal_appeal_submission_non_ada: Add appeal submission template for internal, non ada, detained only cases

* RIA-7548_internal_appeal_submission_non_ada: styles fix

* RIA-7548_internal_appeal_submission_non_ada: Add document tag, fix tests for this tag

* RIA-7548_internal_appeal_submission_non_ada: Rename template, properties, configuration qualifier

* RIA-7548_internal_appeal_submission_non_ada: Rename template, properties, configuration qualifier

* RIA-7548_internal_appeal_submission_non_ada: Fix condition AsylumCase definition in AppealSubmissionCreator

* RIA-7548_internal_appeal_submission_non_ada: Bundle sort tests fix

* RIA-7216 Added appeal decided dismissed detained non ADA document templates (#622)

* Update suppressions.xml

* Update suppressions.xml

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record ou… (#623)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7552_appeal_can_proceed: Fix test EventTest

* RIA-7552_appeal_can_proceed: Fix checkstyle

* RIA-7552_appeal_can_proceed (#624)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7552_appeal_can_proceed: Fix test EventTest

* RIA-7552_appeal_can_proceed: Fix checkstyle

* RIA-7552_appeal_can_proceed: Reduce code duplications

* Ria 7552 appeal can proceed (#626)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7552_appeal_can_proceed: Fix test EventTest

* RIA-7552_appeal_can_proceed: Fix checkstyle

* RIA-7552_appeal_can_proceed: Reduce code duplications

* RIA-7552_appeal_can_proceed: Reduce code duplications

* RIA-7552_appeal_can_proceed: Reduce code duplications

* RIA-7552_appeal_can_proceed: Reduce code duplications

* Ria 7554 directed to upload bundle (#628)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7554_directed_to_upload_bundle: Add Doctag, configurationm generator, template for request respondent evidence letter

* RIA-7554_directed_to_upload_bundle: Test fixes

* RIA-7554_directed_to_upload_bundle: code review fix

* RIA-7554_directed_to_upload_bundle: remove unused import

* Ria 7554 directed to upload bundle (#629)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7554_directed_to_upload_bundle: Add Doctag, configurationm generator, template for request respondent evidence letter

* RIA-7554_directed_to_upload_bundle: Test fixes

* RIA-7554_directed_to_upload_bundle: code review fix

* RIA-7554_directed_to_upload_bundle: remove unused import

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* Ria 7554 directed to upload bundle (#630)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7554_directed_to_upload_bundle: Add Doctag, configurationm generator, template for request respondent evidence letter

* RIA-7554_directed_to_upload_bundle: Test fixes

* RIA-7554_directed_to_upload_bundle: code review fix

* RIA-7554_directed_to_upload_bundle: remove unused import

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* Ria 7554 directed to upload bundle (#631)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7554_directed_to_upload_bundle: Add Doctag, configurationm generator, template for request respondent evidence letter

* RIA-7554_directed_to_upload_bundle: Test fixes

* RIA-7554_directed_to_upload_bundle: code review fix

* RIA-7554_directed_to_upload_bundle: remove unused import

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-7554_directed_to_upload_bundle: reduce code duplications

* RIA-TASK Merged master changes to Naba - documents-api (#614)

* Fix functional tests (#588)

* Fix functional tests

* Fix functional tests

* RIA-7385 Removed pedantic checkstyle rules (#589)

* RIA-7384 Enforce conventions on commit messages and branches (#591)

* RIA-7378 - preventing application startup if secrets can't be found (#608)

* RIA-7378 - added ConfigValidatorAppListener + test

* RIA-7378 - update

* Bumping chart version/ fixing aliases

---------

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

* RIA-7319 - Gradle + Java 17 + AppInsights Upgrade (#587)

Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* RIA-7722 Solve suppressions (#632)

* Fixed tests

---------

Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: burnstHMCTS <134689347+burnstHMCTS@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>

* RIA-7582 non_payment_end_appeal (#637)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7582_non_payment_end_appeal: Add template, generator, configuration, Asylum definitions for remission type, tests

* RIA-7582_non_payment_end_appeal: Add RemissionType test

* RIA-7582_non_payment_end_appeal: Fix application properties document fileName and functional test 7582

* RIA-7580 (#638)

* Added new handler, template and bean config for internal detained non-ada appeal fee letter with no remissions
* Imported AppealType class from case-api
* Updated existing unit tests (State, BundleOrder & DocumentTag)
* Added unit tests and FT

* RIA-7581 Added internal detained mark as paid letter (#639)

* RIA-7618 document remission partially approved rejected (#641)

* RIA-7618 Initial document changes before rebase

* RIA-7618 Final refactored changes after rebasing

* RIA-7618 Utils method change

* RIA-7618 Adding unit test for RemissionDecision class

* RIA-7618 checkstyle test fix

* RIA-7556 internal det ho review maintained (#640)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7556 init commit

* RIA-7556_internal_det_ho_review_maintaned: Add tests unit/functional, update application.yml for new event and fix document extension in application.yml

* RIA-7556_internal_det_ho_review_maintaned: Add tests for new event

* RIA-7556_internal_det_ho_review_maintaned: Fix on dueDate in template and test for this template

* RIA-7556_internal_det_ho_review_maintaned: Fix on functional test

* RIA-7556_internal_det_ho_review_maintaned: Fix on functional test

* RIA-7556_internal_det_ho_review_maintaned: Adding detenction

---------

Co-authored-by: ThomasKKC <thomas.cheong@version1.com>

* RIA-7559 DET letter case listing detained (#642)

* RIA-7559 Generator and template for doc generation

* RIA-7559 internal detained list case letter generation

* RIA-7559 document creator values updated to correct document

* RIA-7559 functional test added

* RIA-7559 append document to notifications attachments group

* RIA-7559 functional test fix

* RIA-7559 Checkstyle and unit test fixes for pipeline

* RIA-7557 Internal detained review HO response decision withdrawn letter generation (#643)

* RIA-7557
* Added functionality for new letter generation when LO requests AIP to review HO response
* Added new doc tag for the new letter
* Refactored RIA-7556
* Added/updated unit/FTs

* Rebasing

* RIA-7557
* Updated FT

* RIA-7561 - Added handler to generate letter when 'Request Hearing Requ… (#644)

* RIA-7561: Added handler to generate letter when 'Request Hearing Requirements' Event is triggered

* RIA-7561: Remove local testing code.

* RIA-7561: Remove unused import.

* RIA-7561: Fix BundleOrderTest after rebase.

* RIA-7561: Fix PMD violations.

* Update suppressions.xml

* RIA-7556/RIA-7557 (#648)

* Renamed document file names for home office response review decision maintained and withdrawn

* RIA-7372 appeal_ended_aip_journey (#647)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7372_appeal_ended_aip_journey: Add Document tag for internal cases, generator, template, configuration, application.yml links and tests

* RIA-7372_appeal_ended_aip_journey: Add functional test and bundle tests

* RIA-7372_appeal_ended_aip_journey: Add functional test and bundle tests

* RIA-7372_appeal_ended_aip_journey: Add functional test and bundle tests

* RIA-7561: Allow LF for Request Hearing Requirements Feature (#649)

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7281 Added internal detained edit case listing letter (#650)

* RIA-7281 Added internal detained edit case listing letter

* RIA-7281 Added extra unit tests for thrown exceptions

* RIA-7374 mark_appeal_as_ada (#651)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7374_mark_appeal_as_ada: Add for internal journey mark as ada, configuration, template, document Tag, event, Bundler order tag. Populate application props with link to letter, add functional tests

* RIA-7374_mark_appeal_as_ada: Fix merge conflicts

* RIA-7374_mark_appeal_as_ada: Remove condition check if appeal is Ada, as well remove from tests functional and junit

* RIA-7364 internal decideAnApplication letter generation (#653)

* RIA-7364
* Added functionality for decideAnApplication letter generation for internal cases
* Copied across makeAnApplication logic and its parsing/extraction from case data
* Added new doc tag
* Added/updated unit and FTs

* RIA-7364
* Updated FTs

* RIA-7364 Made some changes for sonar cloud failures (#655)

* Added isPresent() check
* Updated assertion for default case in enhanced switch statement

* Update suppressions.xml

* RIA-7328 ho_ftpa_submitted (#657)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7328_ho_ftpa_submitted: Add DocumentTag, Populate BundlerOrder, DocumentCreatorConfiguration for APPLY_FOR_FTPA_RESPONDENT. Add roles, junit/functional tests for APPLY_FOR_FTPA_RESPONDENT

* RIA-7328_ho_ftpa_submitted: Fix FT credentials for FTPA respondent apply

* RIA-7328_ho_ftpa_submitted: Fix FT credentials for FTPA respondent apply

* RIA-7328_ho_ftpa_submitted: Fix jenkins roles mappings

* RIA-7328_ho_ftpa_submitted: Fix jenkins roles mappings

* RIA-7365 (#660)

* Added new template for internal decide an application where decision is refused
* Refactored 7364 so granted+refused use a single handler with independent DocumentCreatorConfiguration beans and seperate templates.
* Added/updated unit/FTs.

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7701 Added transfer out of ADA letter (#661)

* RIA-7326 (#663)

* Added functionality to generate letter when admin officer applies for ftpa for internal cases
* Added/updated tests

* RIA-7326 (#665)

* Updated doc tag

* RIA-7330 Internal appellant FTPA decided granted document (#670)

* RIA-7330 Internal appellant FTPA decided granted document

* RIA-7330 Checkstyle and unit test fixes

* Update suppressions.xml

* Update suppressions.xml

* RIA-7360 ho_ftpa_decided_granted (#671)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7360_ho_ftpa_decided_granted: Add Letter, Configuration, changes to InternalFtpaDecidedLetterGenerator for HO FTPA decided granted. Add Tests and functional test, Document.tag, Definitions.

* RIA-7361 ho_ftpa_decided_partially_granted (#672)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7361_ho_ftpa_decided_partially_granted: Add Letter, Configuration, changes to InternalFtpaDecidedLetterGenerator for HO FTPA decided partially granted. Add Tests and functional test

* RIA-7326 (#673)

* Give LR permission for applyForFTPAAppellant event doc generation

* RIA-7362 ho_ftpa_decided_refused (#675)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7362_ho_ftpa_decided_refused: Add Letter, Configuration, changes to InternalFtpaDecidedLetterGenerator for HO FTPA decided refused. Add Tests and functional test

* RIA-7362_ho_ftpa_decided_refused: Fix typo

* RIA-7331 Internal appellant ftpa decided - partially granted document (#676)

* RIA-7331 Internal appellant ftpa decided - partially granted document

* RIA-7331 Corrected deadline date values for ada and non-ada

* RIA-7332 Document for Appellant ftp decided - refused (#677)

* RIA-7332 Document for Appellant ftp decided - refused

* RIA-7332 Suppressing CVE-2023-41080

* RIA-7332 Split functional test into ADA and non-ADA scenarios

* RIA-7332 Functional test file rename

* RIA-7331 Further changes to ADA working days scenario (#678)

* RIA-7330 Split functional tests into ADA and non-ADA scenarios (#679)

* RIA-7330 Split functional tests into ADA and non-ADA scenarios

* RIA-7330 rename FT title for non-ADA FT

* RIA-TASK - Merged Master changes to NABA case-documents (#669)

* Fix functional tests (#588)

* Fix functional tests

* Fix functional tests

* RIA-7385 Removed pedantic checkstyle rules (#589)

* RIA-7384 Enforce conventions on commit messages and branches (#591)

* RIA-7378 - preventing application startup if secrets can't be found (#608)

* RIA-7378 - added ConfigValidatorAppListener + test

* RIA-7378 - update

* Bumping chart version/ fixing aliases

---------

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

* RIA-7319 - Gradle + Java 17 + AppInsights Upgrade (#587)

Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* RIA-7722 Solve suppressions (#632)

* RIA-5804 using feature flag (#586)

Co-authored-by: Matthew Carey <matthew.carey@htmcts.net>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>

* RIA-7802 To fix incorrect env value for PROD (#656)

* Update values.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>

* Merged Master changes to NABA

* Merged Master changes to NABA

* Merged Master changes to NABA

* Merged Master changes to NABA

* Merged Master changes to NABA

* Update suppressions.xml

* Merged Master changes to NABA

---------

Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: burnstHMCTS <134689347+burnstHMCTS@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>
Co-authored-by: Matthew Carey <matthew.carey@version1.com>
Co-authored-by: Matthew Carey <matthew.carey@htmcts.net>
Co-authored-by: rajeshthuraiyur <48379561+rajeshthuraiyur@users.noreply.github.com>

* RIA-7844 (#682)

* Added content for application type - reinstate to InternalDecideAnApplicationDecisionGrantedLetterTemplate.getWhatHappensNextContent()
* Added reinstate content test
* Added FTs for reinstate application type when decided

* RIA-7844 (#684)

* Adding full stop to String

* RIA-7322 Internal hearing requirements updated letter generation (#686)

* RIA-7367 (#685)

* Refactored internal appellant application decided (refused+granted)
* Updated internalApplicationDecided handler to pick correct DocumentCreatorCongif bean based on granted/refused and appellant/respondent application
* Added new bean for HO decide application
* Added/updated unit tests
* Refactored 7364 FTs to include Admin Officer as application applicant
* Added new FTs

* RIA-7368 (#690)

* Addedn functionality to generate letter when HO application decided
* Refactored RIA-7365
* Added/updated unit/FTs

* RIA-7372 appeal_ended (#688)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7372_appeal_ended: change decisionMaker to fetch from END_APPEAL_APPROVER_TYPE, fix endAppealDate fortmat, fix tests

* RIA-7372_appeal_ended: remove unused import

---------

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7322 hearingDate removed from template (#691)

* RIA-7561: Fix the deadline date in the 'Request Hearing Requirements' letter (#687)

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7378 unlink_appeal (#693)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7378_unlink_appeal: Add new Document letter generation for Maintain Case Link event.

* RIA-7378_unlink_appeal: Change tag name

* RIA-7378_unlink_appeal: Change tag name

* RIA-7378_unlink_appeal: remove unused import

* RIA-7378 unlink case (#694)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7378_unlink_appeal: refactor test method name

* RIA-7427 Internal upload additional evidence doc generation (#695)

* RIA-7427 Internal upload additional evidence doc generation

* RIA-7427 Test and checkstyle fixes

* RIA-7378 unlink_case (#696)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7378_unlink_appeal: refactor test method name

* RIA-7378_unlink_appeal: Rename classes, tags to 'Maintain case unlink appeal'

* RIA-7378_unlink_appeal: Rename classes, tags to 'Maintain case unlink appeal'

* RIA-7378 unlink_case (#697)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7378_unlink_appeal: refactor test method name

* RIA-7378_unlink_appeal: Rename classes, tags to 'Maintain case unlink appeal'

* RIA-7378_unlink_appeal: Rename classes, tags to 'Maintain case unlink appeal'

* RIA-7378_unlink_appeal: Fix the code duplication issue on Sonar Cloud

* RIA-7378 unlink_appeal (#698)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7378_unlink_appeal: Fix the code duplication issue on Sonar Cloud

* RIA-7378 unlink_appeal (#699)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7378_unlink_appeal: Fix the code duplication issue on Sonar Cloud

* RIA-7378_unlink_appeal: Fix the code duplication issue on Sonar Cloud

* RIA-7895 bug_fix_rule3235 (#700)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7895_bug_fix_rule3235: Populate FtpaDecisionOutcomeType with values of 23 and 35 rules

---------

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7279 (#705)

* Added handler and template for generating letter when LO requests HO to amend appeal response
* Imported isValidUserDirection from notifications-api.
* Added/updated unit and FTs

* RIA-7376 link_case (#704)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7376_link_case_det: Add Event create case link. Template, configurations, tests

* RIA-7376_link_case_det: Fix unit test

* RIA-7376_link_case_det: Fix intends

* RIA-7376_link_case_det: populate FT with more values, AsylumCase object mapper populated with dateTime module

* RIA-7376_link_case_det: merge conflicts

* RIA-7437 internal non standard direction letter (#706)

* RIA-7437 Non standard direction to appellant - ADA & NonADA (Letter)

* RIA-7437 Non standard direction to appellant, updating tests - ADA & NonADA (Letter)

* RIA-7437 Non standard direction to appellant, updating tests, second time - ADA & NonADA (Letter)

* RIA-7437 Non standard direction to appellant, updating tests, third time - ADA & NonADA (Letter)

* RIA-7437 Non standard direction to appellant, updating tests, third time - ADA & NonADA (Letter)

* RIA-7437 Non standard direction to appellant, updating tests, Fourth time - ADA & NonADA (Letter)

* RIA-7437 Non standard direction to appellant, updating functional tests - ADA & NonADA (Letter)

* RIA-7437 Non standard direction to appellant, updating functional tests, try two - ADA & NonADA (Letter)

* RIA-7437 - Renamed bean

* RIA-7437 - fixed functional tests

* RIA-7437 Non standard direction to appellant, resolving comments (Letter)

* RIA-7437 Non standard direction to appellant, fixing checkstyle error (Letter)

---------

Co-authored-by: JamieClarkeV1 <120718578+JamieClarkeV1@users.noreply.github.com>
Co-authored-by: colmlynch60 <colm.lynch@hmcts.net>

* RIA-7376 link_cases (#711)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7376_link_cases: fix dates serialization mechanism

* RIA-7376_link_cases: fix styles

* RIA-7437 Generate letter when party is APPELLANT_AND_RESPONDENT in 'S… (#714)

* RIA-7437 Generate letter when party is APPELLANT_AND_RESPONDENT in 'Send Direction' event

* Update renovate.json

---------

Co-authored-by: colmlynch60 <113999496+colmlynch60@users.noreply.github.com>

* RIA-7433 Generate letter when LO changes hearing centre for detained… (#702)

* RIA-7433: Generate letter when LO changes hearing centre for detained internal appeals

* RIA-7433 updated functional test description

* RIA-7433: Added FT for non-ADA appeal

* Fix checkstyle errors

* RIA-7418 Appeal edited - ADA & Non ADA (Letter) (#717)

* RIA-7418: added new edit template letter and logic behind

* RIA-7418: fixed BundleOrderTest.java

* RIA-7432: Fix template to reflect old and new hearing centres (#721)

* RIA-7370 (#719)

* Refactored implementation of RIA-7427 to make InternalUploadAdditionalEvidenceGenerator generic for all users
* Imported HasDocument interface and made current implementation of DocumentWithMetadata implement it
* Imported events from case-api
* Added 2 new doc tags (LO additional evidence upload and HO additional evidence upload)
* Created 2 new templates for HO and LO additional evidence upload
* Added new methods in AsylumCaseUtils to extract addendum evidence documents and to fetch most recent addendum evidence added
* Created 2 new beans in DocumentCreatorConfiguration (LO/HO additional evidence upload)
* 2 new application.yaml entries for document templates
* Updated existing tests and added new unit/FTs

* RIA-7370 Provide home office apc permission for uploadAdditionalEvidenceHomeOffice and uploadAddendumEvidenceHomeOffice (#725)

* RIA-7370
* Provide home office apc permission for uploadAdditionalEvidenceHomeOffice and uploadAddendumEvidenceHomeOffice

* RIA-7370
* Fixed sonar check. Performing isEmpty() check on optional var before a .get()

* RIA-7370 (#727)

* Added a null check on addendum metadata

* Suppress CVE (#728)

* RIA-7471 letter generation direction due date changed (#715)

* RIA-7471 Letter generation when 'Change Direction due date' is triggered

- for ADA and non ADA internal cases
- when recipient party is either APPELLANT or APPELLANT AND RESPONDENT.

* Fix naming of a variable

* RIA-7471 - fixed unit test

* RIA-7471 Fix functional tests

* Fix unit test

* Fix template personalisations

* Fix name for template env variable

---------

Co-authored-by: colmlynch60 <colm.lynch@hmcts.net>

* RIA-7435 Home_office_non-Standard_direction_letter (#730)

Co-authored-by: JamieClarkeV1 <120718578+JamieClarkeV1@users.noreply.github.com>

* RIA-7439 ho_change_direction_due_date (#729)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7439_ho_direction_due_date: Add Ho change direction due date letter, configurations, tests for internal DET cases

* RIA-7439_ho_direction_due_date: Move method isPartyIsRespondent ot Utils

* RIA-7439_ho_direction_due_date: remove spaces

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: merge tests fix

* RIA-7439_ho_direction_due_date: merge conflicts resolve

* RIA-7439 ho_change_direction_due_date (#731)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7439_ho_direction_due_date: Add Ho change direction due date letter, configurations, tests for internal DET cases

* RIA-7439_ho_direction_due_date: Move method isPartyIsRespondent ot Utils

* RIA-7439_ho_direction_due_date: remove spaces

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: merge tests fix

* RIA-7439_ho_direction_due_date: merge conflicts resolve

* RIA-7439_ho_direction_due_date: resolving code duplication Sonar Cloud issue

* RIA-7439 ho_change_direction_due_date (#735)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7439_ho_direction_due_date: Add Ho change direction due date letter, configurations, tests for internal DET cases

* RIA-7439_ho_direction_due_date: Move method isPartyIsRespondent ot Utils

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: Add test for AsylumUtils

* RIA-7439_ho_direction_due_date: resolving code duplication Sonar Cloud issue

* RIA-7439_ho_direction_due_date: resolving code duplication Sonar Cloud issue

* RIA-7429 Letter generation for Internal Reinstate Appeal (#722)

* RIA-7435 Rename the letter generator class and corresponding unit tests (#737)

* RIA-7435 Rename the letter generator class and corresponding unit tests

* Fix checkstyle error

* Fix functional tests

* Fixing functional test

* RIA-7911 Update hearing adjustments (#739)

* RIA-7911_Update_hearing_adjustments

* RIA-7911 Update hearing adjustments functional tests

---------

Co-authored-by: JamieClarkeV1 <120718578+JamieClarkeV1@users.noreply.github.com>

* Update suppressions.xml

* Update suppressions.xml

* RIA-7537 EJP Adding new roles for legal officer (#746)

Co-authored-by: JamieClarkeV1 <120718578+JamieClarkeV1@users.noreply.github.com>

* RIA-8888 Upgraded chart version (#751)

* RIA-8888 Upgraded chart version

* RIA-8888 revert version because it is auto bumped

* RIA-8888 added suppressions

* Bumping chart version/ fixing aliases

---------

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

* RIA-7411 Removing OOC feature flag fields (#743) (#754)

* RIA-7411 Removing OOC feature flag fields

* RIA-7411 Suppressing CVE-2023-42794, CVE-2023-42795, CVE-2023-45648

Co-authored-by: Ryan-Nesbitt <95298094+Ryan-Nesbitt@users.noreply.github.com>

* RIA-TASK - Merge master changes to NABA - ia-case-documents-api (#760)

* Fix functional tests (#588)

* Fix functional tests

* Fix functional tests

* RIA-7385 Removed pedantic checkstyle rules (#589)

* RIA-7384 Enforce conventions on commit messages and branches (#591)

* RIA-7378 - preventing application startup if secrets can't be found (#608)

* RIA-7378 - added ConfigValidatorAppListener + test

* RIA-7378 - update

* Bumping chart version/ fixing aliases

---------

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

* RIA-7319 - Gradle + Java 17 + AppInsights Upgrade (#587)

Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* RIA-7722 Solve suppressions (#632)

* RIA-5804 using feature flag (#586)

Co-authored-by: Matthew Carey <matthew.carey@htmcts.net>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>

* RIA-7802 To fix incorrect env value for PROD (#656)

* Update values.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>

* RIA-5679 Updating suppressions (#681)

* RIA-5679 Updated suppression for CVE-2023-35116

* RIA-5679 Adding suppression for CVE 2023-41080

* RIA-5679, Changed suppression to fixed dependency (#683)

* RIA-5679 nightly fixes (#708)

* RIA-5679 nightly fixes

* DIAC-2 Updated Renovate config file, added automerge, scheduling and package… (#732)

* Updated Renovate config file, added automerge, scheduling and package types. Also backdated restAssured from 5.3.1 to 5.3.0 to test Renovate

* Updating extends in renovate json

* Extending suppresion of CVE-2023-35116 due to no solution yet

* DIAC-2 updating renovate schedule (#734)

* DIAC-2 updating renovate schedule

* DIAC-2 updating renovate schedule london timezone

* RIA-1234 swagger workflow run fix (#736)

* Update all non-major dependencies (#738)

* Update all non-major dependencies

* Fixing dependency for spring bootstrap. Added TODO for an upgrade

* Reverting ccd-case-document-am-client to older version

* Updating renovate config to no longer check for cdam upgrade

---------

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

* DIAC-2 changing deprecated config option (#742)

* DIAC-2 changing deprecated config option

* DIAC-2 adding config option for exluding major updates

* DIAC-000 Dependency fix (#749)

* dependency fix

* updating pr validation

---------

Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: burnstHMCTS <134689347+burnstHMCTS@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>
Co-authored-by: Matthew Carey <matthew.carey@version1.com>
Co-authored-by: Matthew Carey <matthew.carey@htmcts.net>
Co-authored-by: rajeshthuraiyur <48379561+rajeshthuraiyur@users.noreply.github.com>
Co-authored-by: Jake Cohen <101183561+JakeCohenSol@users.noreply.github.com>
Co-authored-by: Nilay <nilay.patel@solirius.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: JakeCohenSol <jake.cohen@solirius.com>

* Removed print line that causes issues on windows (#762)

* RIA-7950 upgrade_fix (#767)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-7950_upgrade_fix: trigger rebuild

* RIA-2023 rebuild_pipelines (#775)

* RIA-7552_appeal_can_proceed: Add Asylum case definition for Record out of time decision, Letter template, Letter generator and configuration, tests

* RIA-20231212_rebuild_pipelines: Restart pipelines

* RIA-20231212_rebuild_pipelines: Add supressions

* Update suppressions.xml

* RIA-7324 Hearing adjourned without a date - ADA & Non ADA (Letter) (#788)

* RIA-7324: added adjourn hearing without date letter template

* RIA-7324: small fix on DocumentTag applied

* RIA-8214 Add a new screen to Bails start application - UT appeal pending (#791)

* RIA-8214: bail application submission template fixed with new fields

* RIA-8214: small refactor name on definitions

* Revert "RIA-8214 Add a new screen to Bails start application - UT appeal pending" (#793)

* RIA-TASK - Merge master changes to NABA - ia-case-documents-api (#792)

* Fix functional tests (#588)

* Fix functional tests

* Fix functional tests

* RIA-7385 Removed pedantic checkstyle rules (#589)

* RIA-7384 Enforce conventions on commit messages and branches (#591)

* RIA-7378 - preventing application startup if secrets can't be found (#608)

* RIA-7378 - added ConfigValidatorAppListener + test

* RIA-7378 - update

* Bumping chart version/ fixing aliases

---------

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

* RIA-7319 - Gradle + Java 17 + AppInsights Upgrade (#587)

Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>
Co-authored-by: Filippo Possenti <filippo.possenti@version1.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* RIA-7722 Solve suppressions (#632)

* RIA-5804 using feature flag (#586)

Co-authored-by: Matthew Carey <matthew.carey@htmcts.net>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: filippo-possenti-version1 <109352283+filippo-possenti-version1@users.noreply.github.com>

* RIA-7802 To fix incorrect env value for PROD (#656)

* Update values.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>

* RIA-5679 Updating suppressions (#681)

* RIA-5679 Updated suppression for CVE-2023-35116

* RIA-5679 Adding suppression for CVE 2023-41080

* RIA-5679, Changed suppression to fixed dependency (#683)

* RIA-5679 nightly fixes (#708)

* RIA-5679 nightly fixes

* DIAC-2 Updated Renovate config file, added automerge, scheduling and package… (#732)

* Updated Renovate config file, added automerge, scheduling and package types. Also backdated restAssured from 5.3.1 to 5.3.0 to test Renovate

* Updating extends in renovate json

* Extending suppresion of CVE-2023-35116 due to no solution yet

* DIAC-2 updating renovate schedule (#734)

* DIAC-2 updating renovate schedule

* DIAC-2 updating renovate schedule london timezone

* RIA-1234 swagger workflow run fix (#736)

* Update all non-major dependencies (#738)

* Update all non-major dependencies

* Fixing dependency for spring bootstrap. Added TODO for an upgrade

* Reverting ccd-case-document-am-client to older version

* Updating renovate config to no longer check for cdam upgrade

---------

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

* DIAC-2 changing deprecated config option (#742)

* DIAC-2 changing deprecated config option

* DIAC-2 adding config option for exluding major updates

* DIAC-000 Dependency fix (#749)

* dependency fix

* updating pr validation

* DIAC-66 getting all functionals to run (#747)

* DIAC-66 getting all functionals to run

* DIAC-66 dependency update

* DIAC-66 dependency update

* DIAC-70 adding integration, smoke and unit testing and report to nightly runs

* DIAC-70 removing integration

* DIAC-70 adding secrets

* DIAC-70 adding mutation test reporting

* DIAC-70 adding mutation test reporting

* DIAC-66 integration tests

* DIAC-66 dependency upgrade

* DIAC-66 checkstyle fix

* DIAC-66 java chart upgrade

* DIAC-00 Revert pact dependency upgrade (#759)

* DIAC-84 Disable Decision and reasons document PDF conversion (#752)

* DIAC-84 Disable Decision and reasons document PDF conversion

* Remove PDF conversion

* upgrade java helm chart

* Delete Decision and reasons document PDF c…
  • Loading branch information
1 parent 7d5e8c1 commit 4352de7
Show file tree
Hide file tree
Showing 77 changed files with 2,060 additions and 211 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
"schedule": [
"before 3am every weekday"
]
}
}
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ dependencies {
implementation group: 'uk.gov.hmcts.reform', name: 'logging', version: versions.reformLogging
implementation group: 'uk.gov.hmcts.reform', name: 'logging-appinsights', version: versions.reformLogging
implementation group: 'uk.gov.hmcts.reform', name: 'service-auth-provider-client', version: '3.1.4'
implementation group: 'uk.gov.hmcts.reform', name: 'properties-volume-spring-boot-starter', version: '0.1.0'


implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
implementation group: 'commons-io', name: 'commons-io', version: '2.16.0'
Expand Down Expand Up @@ -381,6 +381,7 @@ dependencies {
testImplementation group: 'net.serenity-bdd', name: 'serenity-junit', version: versions.serenity
testImplementation group: 'net.serenity-bdd', name: 'serenity-rest-assured', version: versions.serenity
testImplementation group: 'net.serenity-bdd', name: 'serenity-spring', version: versions.serenity

testImplementation group: 'com.github.hmcts', name: 'ccd-case-document-am-client', version: '1.7.3'

testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.1', classifier: 'all', {
Expand Down
2 changes: 1 addition & 1 deletion charts/ia-case-documents-api/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: ia-case-documents-api
home: https://github.com/hmcts/ia-case-documents-api
version: 0.0.40
version: 0.0.41
description: Immigration & Asylum Case Documents Service
maintainers:
- name: HMCTS Immigration & Asylum Team
Expand Down
66 changes: 44 additions & 22 deletions charts/ia-case-documents-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,47 @@ java:
ia:
resourceGroup: ia
secrets:
- system-username
- system-password
- idam-client-id
- idam-secret
- s2s-secret
- s2s-microservice
- em-stitching-enabled
- docmosis-access-key
- launch-darkly-sdk-key
- ia-config-validator-secret
- AppInsightsInstrumentationKey
- customer-services-telephone
- customer-services-email
- hearing-centre-bradford-email
- hearing-centre-manchester-email
- hearing-centre-newport-email
- hearing-centre-taylor-house-email
- hearing-centre-north-shields-email
- hearing-centre-birmingham-email
- hearing-centre-hatton-cross-email
- hearing-centre-glasgow-email
- app-insights-connection-string
- name: system-username
alias: IA_SYSTEM_USERNAME
- name: system-password
alias: IA_SYSTEM_PASSWORD
- name: idam-client-id
alias: IA_IDAM_CLIENT_ID
- name: idam-secret
alias: IA_IDAM_SECRET
- name: s2s-secret
alias: idam.s2s-auth.totp_secret
- name: s2s-microservice
alias: IA_S2S_MICROSERVICE
- name: em-stitching-enabled
alias: IA_EM_STITCHING_ENABLED
- name: docmosis-access-key
alias: DOCMOSIS_ACCESS_KEY
- name: launch-darkly-sdk-key
alias: LAUNCH_DARKLY_SDK_KEY
- name: ia-config-validator-secret
alias: IA_CONFIG_VALIDATOR_SECRET
- name: AppInsightsInstrumentationKey
alias: azure.application-insights.instrumentation-key
- name: customer-services-telephone
alias: IA_CUSTOMER_SERVICES_TELEPHONE
- name: customer-services-email
alias: IA_CUSTOMER_SERVICES_EMAIL
- name: hearing-centre-bradford-email
alias: IA_HEARING_CENTRE_BRADFORD_EMAIL
- name: hearing-centre-manchester-email
alias: IA_HEARING_CENTRE_MANCHESTER_EMAIL
- name: hearing-centre-newport-email
alias: IA_HEARING_CENTRE_NEWPORT_EMAIL
- name: hearing-centre-taylor-house-email
alias: IA_HEARING_CENTRE_TAYLOR_HOUSE_EMAIL
- name: hearing-centre-north-shields-email
alias: IA_HEARING_CENTRE_NORTH_SHIELDS_EMAIL
- name: hearing-centre-birmingham-email
alias: IA_HEARING_CENTRE_BIRMINGHAM_EMAIL
- name: hearing-centre-hatton-cross-email
alias: IA_HEARING_CENTRE_HATTON_CROSS_EMAIL
- name: hearing-centre-glasgow-email
alias: IA_HEARING_CENTRE_GLASGOW_EMAIL
- name: app-insights-connection-string
alias: app-insights-connection-string
20 changes: 17 additions & 3 deletions config/owasp/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<suppress until="2024-06-01">
<notes><![CDATA[
This vulnerability is about potential Remote Code Execution when serializing and deserializing Java classes
using HttpInvokerServiceExport and org.springframework.remoting.
using HttpInvokerServiceExport and org.springframework.remoting
As we don't use those constructs, we are not affected by it.
The suppression will be a long-term one. An expiry to the suppression is kept to allow re-evaluating whether
we are still unaffected by it.
Expand All @@ -20,8 +20,22 @@
]]</notes>
<cve>CVE-2022-45688</cve>
</suppress>
<suppress until="2023-11-30">
<cve>CVE-2023-35116</cve><!-- 2023-09-04 jackson-databind 2.15.2 (the latest version at time of checking) is still vulnerable. Try again when a new version comes out. -->
<suppress until="2023-12-31">
<cve>CVE-2023-35116</cve><!-- 2023-09-04 jackson-databind 2.15.2 (the latest version at time of. checking) is still vulnerable. Try again when a new version comes out. -->
</suppress>
<suppress until="2023-12-31">
<notes>![CDATA[
Temporary suppression.
]]</notes>
<cve>CVE-2023-42794</cve>
<cve>CVE-2023-44487</cve>
<cve>CVE-2023-42795</cve>
<cve>CVE-2023-45648</cve>
<cve>CVE-2023-6481</cve>
<cve>CVE-2023-34055</cve>
<cve>CVE-2023-33202</cve>
<cve>CVE-2023-46589</cve>
<cve>CVE-2023-6378</cve>
</suppress>
<suppress until="2024-01-31">
<notes>Suppress until org.springframework.cloud, service-auth-provider-client, document-management-client and cd-case-document-am-cli upgrade their org.bouncycastle dependents</notes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@
import io.restassured.http.Headers;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
Expand Down Expand Up @@ -76,7 +71,7 @@ void authenticateMe() {
public void setup() {
MapSerializer.setObjectMapper(objectMapper);
RestAssured.baseURI = targetInstance;
RestAssured.useRelaxedHTTPSValidation();
RestAssured.useRelaxedHTTPSValidation();
}

@Test
Expand All @@ -100,10 +95,9 @@ public void scenarios_should_behave_as_specified() throws IOException {
scenarioPattern = "*" + scenarioPattern + "*.json";
}

Collection<String> scenarioSources =
StringResourceLoader
.load("/scenarios/" + scenarioPattern)
.values();
Collection<String> scenarioSources = new ArrayList<>();
scenarioSources.addAll(StringResourceLoader.load("/scenarios/" + scenarioPattern).values());
scenarioSources.addAll(StringResourceLoader.load("/scenarios/bail/" + scenarioPattern).values());

System.out.println((char) 27 + "[36m" + "-------------------------------------------------------------------");
System.out.println((char) 27 + "[33m" + "RUNNING " + scenarioSources.size() + " SCENARIOS");
Expand All @@ -112,8 +106,10 @@ public void scenarios_should_behave_as_specified() throws IOException {
List<String> runScenarios = new ArrayList<>();
int maxRetries = 3;
for (String scenarioSource : scenarioSources) {
String description = "";

for (int i = 0; i < maxRetries; i++) {

String description = "";
try {
Map<String, Object> scenario = deserializeWithExpandedValues(scenarioSource);

Expand Down Expand Up @@ -362,23 +358,22 @@ private Headers getAuthorizationHeaders(Map<String, Object> scenario) {
}

if ("System".equalsIgnoreCase(credentials)) {

return authorizationHeadersProvider
.getSystemAuthorization();
}

if ("HomeOfficeLart".equalsIgnoreCase(credentials)) {

return authorizationHeadersProvider
.getHomeOfficeLartAuthorization();
.getHomeOfficeLartAuthorization();
}

if ("HomeOfficePOU".equalsIgnoreCase(credentials)) {

return authorizationHeadersProvider
.getHomeOfficePouAuthorization();
.getHomeOfficePouAuthorization();
}

return new Headers();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -257,28 +257,27 @@ public Headers getCitizenAuthorization() {
new Header("Authorization", accessToken)
);
}

public Headers getSystemAuthorization() {

MultiValueMap<String, String> tokenRequestForm = new LinkedMultiValueMap<>();
tokenRequestForm.add("grant_type", "password");
tokenRequestForm.add("redirect_uri", idamRedirectUrl);
tokenRequestForm.add("client_id", idamClientId);
tokenRequestForm.add("client_secret", idamClientSecret);
tokenRequestForm.add("username", System.getenv("SYSTEM_USERNAME"));
tokenRequestForm.add("password", System.getenv("SYSTEM_PASSWORD"));
tokenRequestForm.add("username", System.getenv("IA_SYSTEM_USERNAME"));
tokenRequestForm.add("password", System.getenv("IA_SYSTEM_PASSWORD"));
tokenRequestForm.add("scope", userScope);

String serviceToken = tokens.computeIfAbsent("ServiceAuth", user -> serviceAuthTokenGenerator.generate());
String accessToken = tokens.computeIfAbsent(
"System",
user -> "Bearer " + idamApi.token(tokenRequestForm).getAccessToken()
"SystemUser",
user -> "Bearer " + idamApi.token(tokenRequestForm).getAccessToken()
);

return new Headers(
new Header("ServiceAuthorization", serviceToken),
new Header("Authorization", accessToken)
new Header("ServiceAuthorization", serviceToken),
new Header("Authorization", accessToken)
);
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down Expand Up @@ -82,7 +83,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down Expand Up @@ -78,7 +79,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down Expand Up @@ -82,7 +83,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down Expand Up @@ -78,7 +79,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down Expand Up @@ -85,7 +86,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down Expand Up @@ -81,7 +82,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down Expand Up @@ -83,7 +84,8 @@
{
"id": "1",
"value": {
"witnessName": "WitnessName"
"witnessName": "WitnessName",
"witnessFamilyName": "WitnessFamilyName"
}
}
],
Expand Down
Loading

0 comments on commit 4352de7

Please sign in to comment.