Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Update ITHC with master (#569)
Browse files Browse the repository at this point in the history
* SSCS-10742 Remove branch syncs (#280)

* Cardiff-LA-commons-bump (#281)

* update for suppression (#288)

* SSCS-10713 - Update to listing status (#264)

* Add Cancel to listing status

* Unkown values as null

* Refactor ProcessHmcMessageService + tests

* Add pr comments

* Remove object mapper configuration

* Treat listing status = cancelled as hmc status = cancelled

* Update suppressions

Co-authored-by: Marc Judge <[email protected]>
Co-authored-by: marcjudge <[email protected]>

* SSCS-10087 Override Fields (#267)

* SSCS-10087 Override Fields

* SSCS-10087 Refactoring Magic Number to Constant

* SSCS-10087 Panel Member Tests

* SSCS-10087 HearingChannel Tests

* SSCS-10087 Update poToAttend Tests

* SSCS-10087 Add OverridesMappingTest

* SSCS-10087 Add Override Interpreter Langauges Tests

* SSCS-10087 Add Override Auto List Tests

* SSCS-10087 Add Override Duration and Venue Tests

* SSCS-10371 Adding Role Type regex in code

* SSCS-10598 Amending Hearing Request (#275)

* SSCS-10087 Adding log for setDefaultOverrideFields

* SSCS-10087 Commons change

* SSCS-10087 Fixing Venue Id Field on event

* SSCS-10087 Adding list item to list

* SSCS-10087 Updating PUT Request to new endpoint

* SSCS-10087 Fixing the field name AmendReasonCodes

* SSCS-10087 Bump Commons

* Update Helm release java to v4.0.1 (#286)

* Update Helm release java to v4.0.1

* Bumping chart version/ fixing aliases

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com>
Co-authored-by: marcjudge <[email protected]>

* SSCS-10747 Relationship Type Update (#290)

* HearingPartiesMapping.java:
1. Added constant REPRESENTATIVE_RELATION_TYPE_SOLICITOR_CODE as 11
2. method getRelatedParty at line 294 is updated to return relationship type as 11 for Representatives according to task SSCS-10747.
HearingsPartiesMappingTest.java
1. Check at line 813 is updated to check for REPRESENTATIVE_RELATION_TYPE_SOLICITOR_CODE instead of REPRESENTATIVE.getHmcReference()

* HearingPartiesMapping.java:
1. Added constant REPRESENTATIVE_RELATION_TYPE_SOLICITOR_CODE as 11
2. method getRelatedParty at line 294 is updated to return relationship type as 11 for Representatives according to task SSCS-10747.
HearingsPartiesMappingTest.java
1. Check at line 813 is updated to check for REPRESENTATIVE_RELATION_TYPE_SOLICITOR_CODE instead of REPRESENTATIVE.getHmcReference()

* HearingPartiesMapping.java:
1. Added constant REPRESENTATIVE_RELATION_TYPE_SOLICITOR_CODE as 11
2. method getRelatedParty at line 294 is updated to return relationship type as 11 for Representatives according to task SSCS-10747.
HearingsPartiesMappingTest.java
1. Check at line 813 is updated to check for REPRESENTATIVE_RELATION_TYPE_SOLICITOR_CODE instead of REPRESENTATIVE.getHmcReference()

* Removed representative check from getRelatedParty method and on line 281 default solicitor code is given as relationship type for Representatives.

* Removed javadocs

* EntityRoleCode.java: Added this class to remove dependency to SSCS commons project.
HearingsMapping.java: Replaced package from SSCS commons with hearing api packages.
 HearingPartiesMapping.java: Replaced package from SSCS commons with hearing api packages and at line 265 added party relationship type code.
 PartyRelationShipType Added this class to put relationshiptypes for entity roles.
 HearingPartiesMappingTest.java: Updated this class to check by party relationship types at line 812

* EntityRoleCode.java: Added this class to remove dependency to SSCS commons project.
HearingsMapping.java: Replaced package from SSCS commons with hearing api packages.
 HearingPartiesMapping.java: Replaced package from SSCS commons with hearing api packages and at line 265 added party relationship type code.
 PartyRelationShipType Added this class to put relationshiptypes for entity roles.
 HearingPartiesMappingTest.java: Updated this class to check by party relationship types at line 812

* EntityRoleCode.java: Added this class to remove dependency to SSCS commons project.
HearingsMapping.java: Replaced package from SSCS commons with hearing api packages.
 HearingPartiesMapping.java: Replaced package from SSCS commons with hearing api packages and at line 265 added party relationship type code.
 PartyRelationShipType Added this class to put relationshiptypes for entity roles.
 HearingPartiesMappingTest.java: Updated this class to check by party relationship types at line 812

* Bumping chart version/ fixing aliases

* EntityRoleCode.java: Added this class to remove dependency to SSCS commons project.
HearingsMapping.java: Replaced package from SSCS commons with hearing api packages.
 HearingPartiesMapping.java: Replaced package from SSCS commons with hearing api packages and at line 265 added party relationship type code.
 PartyRelationShipType Added this class to put relationshiptypes for entity roles.
 HearingPartiesMappingTest.java: Updated this class to check by party relationship types at line 812

* EntityRoleCode.java: Added this class to remove dependency to SSCS commons project.
HearingsMapping.java: Replaced package from SSCS commons with hearing api packages.
 HearingPartiesMapping.java: Replaced package from SSCS commons with hearing api packages and at line 265 added party relationship type code.
 PartyRelationShipType Added this class to put relationshiptypes for entity roles.
 HearingPartiesMappingTest.java: Updated this class to check by party relationship types at line 812

* HearingsPartiesMapping.java:
added relatedParties.add(getRelatedParty(partyId, roleCode.getHmcReference()));
HearingsPartiesMappingTest.java
replaced REPRESENTATIVE.getPartyRelationshipType().getRelationshipTypeCode() with SOLICITOR.getRelationshipTypeCode()
EntityRoleCode.java
added @JsonValue to hmcReference

Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com>

* SSCS-10676 Duplication of Hearings After HMC Request Fix (#291)

* SSCS-10676 Duplication of Hearings After HMC Request Fix

SSCS-10676 Moving constants to properties

* SSCS-10676 Remove Retry Cancellation, Add Hearings Lookup Check

* SSCS-10676 Rename Method to FindExistingRequestedHearings

Co-authored-by: marcjudge <[email protected]>

* SSCS-10748 Add UTC to Uk localdateTime converter (#292)

* SSCS-10748 Add UTC to Uk localdateTime converter

* SSCS-10748 create local variable hearingEndDateTime

* SSCS-10748 test fix

Co-authored-by: V1\KirsanovI <wer>

* SSCS-10739 List Case After Postponement (#294)

Co-authored-by: marcjudge <[email protected]>

* SSCS-10784 Panel Type & Panel Specialism schema change (#297)

* HearingsPanelMapping.java: Updated method getRoleTypes at line 56, added benefitCode parameter to getRoleTypes method at line 48.
ServiceHearingValuesMapping.java: Added benefitCode parameter to getRoleTypes method at line 48.
HearingsPanelMappingTest.java: Added 2 new tests which checks getRoleTypes method according to given benefitCode.

* Added new control at line 116 for benefit. If benefit is CHILD_SUPPORT specialism should be empty.

* HearingsMappingBase.java: added new constant at line 50 as CHILD_SUPPORT_BENEFIT_CODE
HearingsPanelMappingTest.java: added new test for cases with benefit CHILD_SUPPORT to return empty list.

* HearingsMappingBase.java: added new constant at line 50 as CHILD_SUPPORT_BENEFIT_CODE
HearingsPanelMappingTest.java: added new test for cases with benefit CHILD_SUPPORT to return empty list.

* BenefitRoleRelationType.java: created
HearingsPanelMapping.java: Updated the method at line 54 to call findRoleTypesByBenefitCode from BenefitRoleRelationType enum.

* SSCS-10192 - Ability to allow for the scenario of multiple hearing lo… (#293)

* SSCS-10192 - Ability to allow for the scenario of multiple hearing locations in 1 city

* SSCS-10192 - Rebasing branch

* SSCS-10192 - Rebasing branch

* Update HearingsService.java

* Update HearingsService.java

* Update HearingsDetailsMapping.java

Returning return Collections.emptyList(); instead of null. reverting changes

* SSCS-10192 - Addressing review comments

* SSCS-10192 - Addressing review comments

* SSCS-10192 - Addressing review comments

* Delete ResourceLoader.java

Removing ResourceLoader

* SSCS-10192 - Addressing review comments

* Update HearingsDetailsMapping.java

* Update HearingsDetailsMappingTest.java

* Merge branch 'master' into SSCS-10192_AM

* SSCS-10192 resolving master merge issues

Co-authored-by: Aditya Mittal <[email protected]>

* extend suppression dates (#298)

Co-authored-by: gokul-sol <[email protected]>

* SSCS-10804 Elastic implementation. (#300)

* SSCS-10804 Elastic implementation.

* SSCS-10804 Temporarily igore tests.

* SSCS-10804 Refactoring, tests.

* SSCS-10804 Nullcheck result, use map to build linked cases.

* SSCS-10773: add param to .appellantHearingChannel mapping in HearingC… (#299)

* SSCS-10773: add param to .appellantHearingChannel mapping in HearingChannelMapping.class

* SSCS-10773: Add assert for hearingChannel check(if OverrideFields present)

Co-authored-by: KirsanovI <[email protected]>

* SSCS-10776 Fix logging. (#304)

* Sscs 10773 fix hearing channel fields (#305)

* SSCS-10773: add param to .appellantHearingChannel mapping in HearingChannelMapping.class

* SSCS-10773: Add assert for hearingChannel check(if OverrideFields present)

* SSCS-10773: Testing commit

Co-authored-by: KirsanovI <[email protected]>

* SSCS-10805-update-jar-version (#303)

* SSCS-10805-update-jar-version

* update for reduce suppression

* SSCC-10773: adding logs for override fields for testing (#306)

Co-authored-by: KirsanovI <[email protected]>

* SSCS-10773 Revert initial changes. (#308)

* SSCS-10773: Update HearingsChannelMapping getHearingChannel condition… (#310)

* SSCS-10773: Update HearingsChannelMapping getHearingChannel conditions, getAllHearingChannelPreferences -> parameter to ChannelsRetrieval

* SSCS-10773: indent fix

* SSCS-10773: commons version bump

* SSCS-10773: version revert

* SSCS-10773: Fix imports, add bump version to sscs common

* SSCS-10773: Update commons

* SSCS-10773: Remove getHearingChannel condition on HearingsChannelMapping.java

* SSCS-10773: Remove getHearingChannel condition on HearingsChannelMapping.java

Co-authored-by: KirsanovI <[email protected]>

* chore: increment sscs-common version (#320)

* Add backstage configuration file (#321)

* sscs-9874-common-version-update (#311)

* sscs-9874-common-version-update

* version update

* version update

* version update

* update for code style

* update for code style

* common version update

* common version update

* common version bump

* Update ServiceHearingPartiesMapping.java

* SSCS-rollback_logs: reverted logs in OverrideMapping.class (#323)

Co-authored-by: KirsanovI <[email protected]>

* SSCS-10841 Common bump (#317)

* SSCS-10841 Common bump

* SSCS-10841 Common bump.

* SSCS-10841 Common bump

* SSCS-10810 - Don't send relatedParties payload for Appointees, Jp's & Other parties (#316)

* fix: remove appointees etc from related parties

* fix: add interpreters to roles related parties

* fix: remove unused parameter

* fix: issue

* fix: calling code to unused parameter

* fix: more calling code to unused parameter

* fix: yet more calling code to unused parameter

* fix: yet more calling code to unused parameter

Co-authored-by: careyma <[email protected]>

* SSCS-10332 - Ability to book hearings for 'paper' cases to any venue within the same region as the RPC (#307)

* SSCS-10332 - For paper cases, the hearing locations object should return list of all venues with same RPC.

* SSCS-10805-update-jar-version (#303)

* SSCS-10805-update-jar-version

* update for reduce suppression

* SSCS-10332 - For paper cases, the hearing locations object should return list of all venues with same RPC.

* SSCS-10332 - For paper cases, the hearing locations object should return list of all venues with same RPC.

* SSCS-10332 - For paper cases, the hearing locations object should return list of all venues with same RPC.

* SSCS-10332 - Fixing ServiceHearing imports, using old path to EntityRoleCode class

* SSCS-10332 - Change return list to VenueDetails, couple of minor changes for PR review in test class.

* SSCS-10332 - Remove else clause, provide more verbose test description, remove wildcard import, setUp method for test data, some builder line readability.

* SSCS-10332 - Updates to use the epimsId for the RPC instead of the name when using common VenueService code to determine the list of epimsIds in the region.

* SSCS-10332 point to commons RC version

* Update suppressions.xml

Giving more time for snake.yaml and springframework

* SSCS-10332

- Attempting to restore build by adding temporary CVE suppressions

Co-authored-by: DGordonV1 <[email protected]>
Co-authored-by: bensonlievoco <[email protected]>
Co-authored-by: DGordonV1 <[email protected]>
Co-authored-by: amoslv1 <[email protected]>
Co-authored-by: Filippo Possenti <[email protected]>

* Revert "SSCS-10332 - Ability to book hearings for 'paper' cases to any venue within the same region as the RPC" (#334)

* Revert "SSCS-10332 - Ability to book hearings for 'paper' cases to any venue within the same region as the RPC (#307)"

This reverts commit d25e6504d5fd180e2e91e1f6e695302ced639436.

* Update suppressions.xml

* Revert "SSCS-10841 Common bump (#317)" (#335)

This reverts commit 346d70b62f57ebec6c734416286fce3c985788d1.

* 10818,10798 PR (#324)

* SSCS-10818 Adding Hearing Channel to Hearing Details

SSCS-10818 Moving HearingType to Hearings

* SSCS-10798 ProcessHmcMessageService Fixes

SSCS-10798 Reworking Grant Postponement Hearing Process

SSCS-10798 Feeback !isYes change

SSCS-10798 Feedback moving public to private

SSCS-10798 Minor typo fix

Potential bug fix

* suppression

* SSCS-10901 Configure renovate (#337)

* SSCS-10901 Configure renovate

* SSCS-10889 Improve logging (#328)

* SSCS-10889 Improve logging

- New log message when an incorrect benefit/issue code combination is used, intended to clarify what would otherwise cause a NullPointerException soon afterwards.
- Gradle fix for snakeyaml vulnerability (superseded by a cherry-picked commit)
- Remove unnecessary CVE suppressions
- Update remaining suppression to highlight it doesn't apply to our code

* sscs-10294-hearing-duration-set-in-the-adjournment-notice-is-included (#339)

* feat: first cut of second attempt

* fix: move getelementdisputed to durationmapping

* SSCS-10889 Improve logging (#328)

* SSCS-10889 Improve logging

- New log message when an incorrect benefit/issue code combination is used, intended to clarify what would otherwise cause a NullPointerException soon afterwards.
- Gradle fix for snakeyaml vulnerability (superseded by a cherry-picked commit)
- Remove unnecessary CVE suppressions
- Update remaining suppression to highlight it doesn't apply to our code

* fix: move getelementdisputed related tests etc

* fix: attempt to sort test coverage

* feat: first cut of second attempt

* fix: move getelementdisputed to durationmapping

* fix: move getelementdisputed related tests etc

* fix: attempt to sort test coverage

* fix: attempt to sort test coverage 2

* fix: formatting issues etc

* fix: formatting issues 1 etc

* fix: remove constants from hearingsdetailsmapping that are now in duration

* fix: refactor  getelementsdisputed()

* fix: refactor  getelementsdisputed() 1

* fix: refactor mappingdurationtests that share the same casedata

* fix: refactor further mappingdurationtests that share the same casedata

* fix: refactor renamed test to match what it does

* fix: try and deal with wacker builder indenting

* fix: remove wildcard import from hearingdurationtest

* fix: use assertthat over assertequals

Co-authored-by: filippo-possenti-version1 <[email protected]>

* Update dependency com.github.hmcts:sscs-common to v4.15.6 (#352)

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

* SSCS-10177 - DWP - FTA requirement - create/add new domain value 'Hearing Date Issued' for FTA State- attribute (#314)

* SSCS-10177 - Push branch with updates for setting dwp state as hearing data issues when hncStatus is listed, during message process event.

* SSCS-10177 - Fix extant EntityRoleCode import issues, so PR can build.

* SSCS-10177 - PR feedback updates, move setDwpState out into HearingUpdateService, provide tests for this method and also verify call in ProcessHmcMessageService.

* SSCS-10177 - Remove unused import

* Update build.gradle

* reverted sscsCommon version
SSCS-10177

* updated correct version number
SSCS-10177

* SSCS-10177 Common bump

* commons bump
SSCS-10177

* Apply suggestions from code review

Co-authored-by: dattipoeHMCTS <[email protected]>

* fixed tests after changing resolve Dwp State
SSCS-10177

Co-authored-by: DGordonV1 <[email protected]>
Co-authored-by: Nick Hill <[email protected]>
Co-authored-by: NickHill111 <[email protected]>
Co-authored-by: dattipoeHMCTS <[email protected]>

* SSCS-10332 Paper Case Venues (#338)

* Squashed commit of the following:

commit 5a2143ed744b3a0795daeace63bc439bcaefb40e
Author: Filippo Possenti <[email protected]>
Date:   Mon Sep 12 17:07:46 2022 +0100

    SSCS-10332

    - Attempting to restore build by adding temporary CVE suppressions

commit aa254634cca398c6f9b1f770df70e1736c84fe80
Author: amoslv1 <[email protected]>
Date:   Mon Sep 12 16:34:38 2022 +0100

    Update suppressions.xml

    Giving more time for snake.yaml and springframework

commit d614b7ace446583286832a4f44e1247ac8503254
Merge: 7ad5fa8e 5137827c
Author: amoslv1 <[email protected]>
Date:   Mon Sep 12 16:13:09 2022 +0100

    Merge branch 'master' into SSCS-10332

commit 7ad5fa8e5f6562f643efcc05d15546538bd22601
Author: amoslv1 <[email protected]>
Date:   Mon Sep 12 16:12:15 2022 +0100

    SSCS-10332 point to commons RC version

commit 34a96c1628d9994901ddb5c5d65cea0289d7a6d1
Author: DGordonV1 <[email protected]>
Date:   Mon Aug 22 13:09:47 2022 +0100

    SSCS-10332 - Updates to use the epimsId for the RPC instead of the name when using common VenueService code to determine the list of epimsIds in the region.

commit 7bea9b8034ce0de7370a2c1ebdc483208c23d83e
Merge: 7070b436 84dd4211
Author: DGordonV1 <[email protected]>
Date:   Fri Aug 19 10:44:01 2022 +0100

    Merge branch 'master' into SSCS-10332

commit 7070b436080b4ee1c1c865adc0f4fb5214efd7af
Author: DGordonV1 <[email protected]>
Date:   Tue Aug 16 11:59:12 2022 +0100

    SSCS-10332 - Remove else clause, provide more verbose test description, remove wildcard import, setUp method for test data, some builder line readability.

commit c04092aebbdc9a84445036c24f8e16e35f5f8c57
Author: DGordonV1 <[email protected]>
Date:   Wed Aug 10 14:48:51 2022 +0100

    SSCS-10332 - Change return list to VenueDetails, couple of minor changes for PR review in test class.

commit 42ad6341ea7aeb1eeec5e37b1252a2e87199e772
Merge: 96f6cff8 d6685b0f
Author: DGordonV1 <[email protected]>
Date:   Wed Aug 10 08:41:18 2022 +0100

    Merge remote-tracking branch 'origin/SSCS-10332' into SSCS-10332

commit 96f6cff8566303e76e876f229e5065361bfc2d49
Author: DGordonV1 <[email protected]>
Date:   Wed Aug 10 08:40:42 2022 +0100

    SSCS-10332 - Fixing ServiceHearing imports, using old path to EntityRoleCode class

commit 739372dfc13b85e0979374517d56ecea0a811f4f
Author: DGordonV1 <[email protected]>
Date:   Wed Aug 10 08:29:50 2022 +0100

    SSCS-10332 - For paper cases, the hearing locations object should return list of all venues with same RPC.

commit 2836e5c0ab8b84d7de0cb93a431e249afec2f4b5
Author: DGordonV1 <[email protected]>
Date:   Mon Aug 8 11:05:03 2022 +0100

    SSCS-10332 - For paper cases, the hearing locations object should return list of all venues with same RPC.

commit d6685b0f4a7fad6a2612c886d1f1e5fba83f4dcd
Author: DGordonV1 <[email protected]>
Date:   Wed Aug 10 08:29:50 2022 +0100

    SSCS-10332 - For paper cases, the hearing locations object should return list of all venues with same RPC.

commit f197ed072d20e887e94b64fa9f67776a21d59204
Merge: affcfb5c 1b2e9620
Author: DGordonV1 <[email protected]>
Date:   Mon Aug 8 11:15:03 2022 +0100

    Merge branch 'master' of https://github.com/hmcts/sscs-hearings-api into SSCS-10332

commit affcfb5c30f0ba60d9a5c30cfd42cf1b1e5da0bc
Author: bensonlievoco <[email protected]>
Date:   Mon Aug 8 09:49:57 2022 +0100

    SSCS-10805-update-jar-version (#303)

    * SSCS-10805-update-jar-version

    * update for reduce suppression

commit fce599eda3668e532609169361972a99eee05219
Author: DGordonV1 <[email protected]>
Date:   Mon Aug 8 11:05:03 2022 +0100

    SSCS-10332 - For paper cases, the hearing locations object should return list of all venues with same RPC.

* SSCS-10332 Update common

* SSCS-10332 Add logging for paper case venue resolultion.

* SSCS-10332 bump to 4.16.1

Co-authored-by: dattipoeHMCTS <[email protected]>
Co-authored-by: Del Attipoe <[email protected]>
Co-authored-by: amoslv1 <[email protected]>

* SSCS-10882 Fixing Conflicting IDs (#332)

* SSCS-10882 Fixing Conflicting IDs

* SSCS-10882 RelatedPartyId Fix

* SSCS-10882 RelatedPartyId matching PartyId Fix

* SSCS-10892 Remove Reserve to Judge (#336)

* SSCS-10177 Fix dwp state (#353)

* SSCS-10177 Fix dwp state

* SSCS-10177 Update tests.

* SSCS-10891 DWP Party as Individual (#343)

* SSCS-10891 DWP Party as Individual

* SSCS-10891 Remove face to face default for PO officer attending.

* SSCS-10891 Rebase fixes.

Co-authored-by: Del Attipoe <[email protected]>

* Sscs 10829 add sscs service code filter to hmc topic (#325)

* Update service-bus.tf

Copies the same skeleton block over from terraform-module-servicebus-subscription

* SSCS-10829 Edit names

* SSCS-10829 Upgrade spring

* SSCS-10829 extends CVE suppression by 1 month 

and removes other suppressions which were expired and not causing issues

* Adds snakeyaml dependency

* SSCS-10829 accessing namespace via data

* SSCS-10829 renaming references and resources

* SSCS-10829 fixes spelling mistake cft 

and uses correct ref for subscription_id

* SSCS-10829 - update TF

* Update service-bus.tf

Copies the same skeleton block over from terraform-module-servicebus-subscription

* SSCS-10829 Edit names

* SSCS-10829 Upgrade spring

* SSCS-10829 extends CVE suppression by 1 month 

and removes other suppressions which were expired and not causing issues

* Adds snakeyaml dependency

* SSCS-10829 accessing namespace via data

* SSCS-10829 renaming references and resources

* SSCS-10829 fixes spelling mistake cft 

and uses correct ref for subscription_id

* SSCS-10829 - update TF

* SSCS-10829 minor naming adjustments

* Update resource name

* Correct naming of resource

Co-authored-by: Christopher Pateman <[email protected]>

* Adds adjournment feature flag to application.yaml and boolean to ReferenceDataServiceHolder (#357)

* Correct Terraform Errors (#359)

* Update TF version, Format TF, Remove non-required variable, Add descriptions to variables

* Add Git ignore

* Undo TF Changes (#365)

* Update TF version, Format TF, Remove non-required variable, Add descriptions to variables

* Add Git ignore

* Undo Tf Changes

* correct module reference

* Correct formatting

* Trigger change

* SSCS-10910 (#366)

* SSCS-10910

- Update of snakeyaml library

* SSCS-10968 cve suppression (#379)

* SSCS-10985 CVE Fix Commons Bump (#380)

* CVE Fix Commons Bump

* Commons Bump

* Update dependency gradle to v7.5.1 (#282)

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

* Update dependency com.github.hmcts:sscs-common to v4.20.1 (#375)

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

* SSCS-10895 remove PO attending from override fields (#378)

* updated hearings api for new commons
SSCS-10895

* added suppressions
SSCS-10895

* Update build.gradle

commons bump

Co-authored-by: Nick Hill <[email protected]>

* SSCS-11008 - Add content type and tags to secrets (#396)

* SSCS-10924 Create new secret. (#358)

* SSCS-10924 Create new secret.

* Bumping chart version/ fixing aliases

* SSCS-10924 Remove old secret

* SSCS-10924 Add tags back

* Update values.yaml

Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com>

* SSCS-10924 Enable secret (#398)

* SSCS-10924 Enable secret

* Update values.yaml

* Bumping chart version/ fixing aliases

Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com>

* SSCS-11063 Use Renovate Shared Preset (#399)

* tomcat to 9.0.68 (#417)

* tomcat to 9.0.68

* Update suppressions.xml

* spring security to 5.7.5

* adds remaining spring security implementations

at 5.7.5

* Update dependency com.github.hmcts:sscs-common to v4.21.1 (#418)

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

* updates jackson databind to latest 2.14.0-rc3 (#419)

* updates jackson databind to latest 2.14.0-rc3

* updates all other jacksons

* SSCS-10954 : Made the queue connection string configurable (#414)

* SSCS-10954 : Made the queue connection string configurable

* SSCS-10954 : Corrected variable name

* SSCS-10954 : CVE fix (jackson databind)

* SSCS-10954 : Removed incorrect quotations

* SSCS-10853 Hearing Postponed Event Change (#367)

* SSCS-10853 Hearing Postponed Event Change

* SSCS-10853 Fix updateCaseData

* Update hmctspublic.azurecr.io/base/java Docker tag to v17 (#413)

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

* suppresses CVE-2021-37533 and CVE-2016-3094 (#426)

* suppresses CVE-2021-37533 and CVE-2016-3094

* lengthens suppressions to 8th Jan

* amends regex

* updates comment

* SSCS-11092 and SSCS-10294 upgrades to new Adjournment from common as well as applies hearing duration (#421)

SSCS-11092 changes sscs-common version in build.gradle to 4.21.18

SSCS-11092 changes sscs-common version in build.gradle to 4.21.17

SSCS-11092 revert common ver in build.gradle

11092 common branch has been merged to master

SSCS-11092 adds ticket number to TODOs for removing feature flag SSCS-10951

SSCS-11092 updates to latest common version d002abc3

SSCS-11092 adds test case for reserved panel members

SSCS-11092 removes nested classes and excess helper methods from tests

SSCS-11092 updates to latest common (no getters in enums)

changes from method source to csv source

SSCS-11092 consolidates common setup of caseData from HearingsDurationMappingTest and HearingsDurationMappingAdjournmentTest into HearingsMappingBase for increased clarity

SSCS-11092 consolidates common setup of caseData in HearingsDurationMappingTest for increased clarity

SSCS-11092 splits out HearingsDurationMappingAdjournmentTest

SSCS-11092 updates to latest common version with getAdjournmentInProgress

SSCS-11092 extracts method for handleNonStandardDuration

SSCS-11092 tidies HearingsDurationMappingTest

SSCS-11092 some test fixes

SSCS-11092 fixes YesNo in HearingsDurationMappingTest

SSCS-11092 makes most changes to HearingsDurationMappingTest

app is building

SSCS-10294 re-includes test for paper duration

SSCS-10294 post rebase

SSCS-10294 adds test for blank nextHearingListingDuration returns null

SSCS-10294 adds test for null outcome when wants to attend is NO but case is not paper

SSCS-10294 adds final missing case for 0 sessions

SSCS-10294 adds extra parameter for invalid duration + valid units

SSCS-10294 adds test for blank nextHearingListingDuration returns null

SSCS-10294 moves feature flag check inside getHearingDurationAdjournment

SSCS-10294 adds tests for flag enabled and disabled with getHearingDurationAdjournment returning null

SSCS-10294 tidies some formatting in code and tests

SSCS-10294 layout

SSCS-10294 adds test for null outcome when wants to attend is NO but case is not paper

SSCS-10294 adds feature flag to duration logic

tidies test class and enables flag for one test

* Hearing venue set in Adjournment notice is included in new hearing request (#355)

* adjourned venue now added in hearing request with tests
SSCS-10293

* added exception test
SSCS-10293

* replied to Lucians comments
SSCS-10293

* refactored my tests
SSCS-10293

* fixed line sizes
SSCS-10293

* fixed line size errors
SSCS-10293

* changed string tuple to string...
SSCS-10293

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMapping.java

removed else

Co-authored-by: Lucas <[email protected]>

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMapping.java

fixed thrown error to correct exception

Co-authored-by: Lucas <[email protected]>

* Update src/test/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMappingTest.java

cleaned up assertion

Co-authored-by: Lucas <[email protected]>

* created enum for next hearing venue type, refactored tests
SSCS-10293

* removed check for venue ID if latest hearing is wrong
SSCS-10293

* added flag
SSCS-10293

* updated log messages and moved to mock calls
SSCS-10293

* added test to check that flag works
SSCS-10293

* Apply suggestions from code review

better formatting and adding to current case data instead of overriding the created one

Co-authored-by: Lucas <[email protected]>

* fixed the setup to go into one statement
SSCS-10293

* Apply suggestions from code review

changed venueid to epimsid

Co-authored-by: Lucas <[email protected]>

* fixed getting the adjourned hearing location
SSCS-10293

* switched venue id to epimsid
SSCS-10293

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMapping.java

remove the catch to the exception

Co-authored-by: Lucas <[email protected]>

* removed the catch for the invalid exception
SSCS-10293

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMapping.java

Co-authored-by: Lucas <[email protected]>

* reverted listing comments change
SSCS-10293

* refactored changes into seperate file
SSCS-10293

* removed god class on hearingslocationmapping
SSCS-10293

* added logging to show venue name when getting adjourned locations
SSCS-10293

* added suppression
SSCS-10293

* updated supression date
SSCS-10293

* updated to manipulatew the venue id into the epims ID
SSCS-10293

* adjourned venue now added in hearing request with tests
SSCS-10293

* added exception test
SSCS-10293

* replied to Lucians comments
SSCS-10293

* refactored my tests
SSCS-10293

* fixed line sizes
SSCS-10293

* fixed line size errors
SSCS-10293

* changed string tuple to string...
SSCS-10293

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMapping.java

removed else

Co-authored-by: Lucas <[email protected]>

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMapping.java

fixed thrown error to correct exception

Co-authored-by: Lucas <[email protected]>

* Update src/test/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMappingTest.java

cleaned up assertion

Co-authored-by: Lucas <[email protected]>

* created enum for next hearing venue type, refactored tests
SSCS-10293

* removed check for venue ID if latest hearing is wrong
SSCS-10293

* added flag
SSCS-10293

* updated log messages and moved to mock calls
SSCS-10293

* added test to check that flag works
SSCS-10293

* fixed the setup to go into one statement
SSCS-10293

* Apply suggestions from code review

changed venueid to epimsid

Co-authored-by: Lucas <[email protected]>

* fixed getting the adjourned hearing location
SSCS-10293

* switched venue id to epimsid
SSCS-10293

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMapping.java

remove the catch to the exception

Co-authored-by: Lucas <[email protected]>

* removed the catch for the invalid exception
SSCS-10293

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsDetailsMapping.java

Co-authored-by: Lucas <[email protected]>

* reverted listing comments change
SSCS-10293

* refactored changes into seperate file
SSCS-10293

* removed god class on hearingslocationmapping
SSCS-10293

* added logging to show venue name when getting adjourned locations
SSCS-10293

* added suppression
SSCS-10293

* updated supression date
SSCS-10293

* updated to manipulatew the venue id into the epims ID
SSCS-10293

* adjourned location includes regional processing center
SSCS-10293

* removed suppression and updated a test to shot the rpc gets set
SSCS-10293

* changed variable to private
SSCS-10293

* updated suppressions
SSCS-10293

* updated suppressions
SSCS-10293

* updates summary with location data
SSCS-10293

* revert changes to set region
SSCS-10293

* updated hearings to get the rpc from the rpc service
SSCS-10293

* using gaps name
SSCS-10293

* send just the epims ID in the hearing location
SSCS-10293

* fixed tests
SSCS-10293

* bump commons
SSCS-10293

* update suppressions
SSCS-10293

* take out merging line from suppressions
SSCS-10293

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsLocationMapping.java

Co-authored-by: amoslv1 <[email protected]>

* removed unneccesary adjournmentinprogress'
SSCS-10293

* added isYes improt
SSCS-10293

* remove helper function and manually add to tests
SSCS-10293

Co-authored-by: Nick Hill <[email protected]>
Co-authored-by: Lucas <[email protected]>
Co-authored-by: Nicholas Hill <[email protected]>
Co-authored-by: amoslv1 <[email protected]>

* SSCS-11165 : Added pre commit hooks (#424)

* SSCS-11165 : Added pre commit hooks

* SSCS-11165 : CVE

* SSCS-11165 : Updated windows variable

* Update dependency com.github.hmcts:sscs-common to v4.21.20 (#425)

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

* Update dependency com.github.hmcts:sscs-common to v4.23.0 (#429)

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

* Update Networking (#406)

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

* Update Tools - Data Processing (#411)

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

* Update dependency com.github.hmcts:sscs-common to v4.24.0 (#431)

* Update dependency com.github.hmcts:sscs-common to v4.24.0

* update DwpState

* io.netty vunerability fix

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

* SSCS-11090 listing error (#428)

* add invalidhearingmappingexception when there isnt a duration
SSCS-11090

* updated tests
SSCS-11090

* updated common version
SSCS-11090

* sends listing error
SSCS-11090

* revert null hearing change
SSCS-11090

* updates ccd defs and throws error
SSCS-11090

* add back deleted lines
SSCS-11090

* hearings successfully throws a listing exception event
SSCS-11090

* add test for throwing a listing error
SSCS-11090

* remove description and just use getMessage
SSCS-11090

* add line break between globals and constructor
SSCS-11090

* fixed stashed changes
SSCS-11090

* spread out constructor
SSCS-11090

* dont throw error now
SSCS-11090

* revert to throwing error
SSCS-11090

* add suppression for netty
SSCS-11090

* functionality now works off of wrong benefit code
SSCS-11090

* add test
SSCS-11090

* revert flag change
SSCS-11090

* fix merge conflict
SSCS-11090

* updage build version to new master
SSCS-11090

Co-authored-by: Nicholas Hill <[email protected]>

* SSCS-11325 listing error (#433)

* merge both listing exceptions into one place
SSCS-11325

* update suppressions
SSCS-11325

* change exception to handling error from listing error
SSCS-11325

* updated suppressions
SSCS-11325

* update suppressions and change function name
SSCS-11325

* update suppressions
SSCS-11325

* common bump
SSCS-11325

Co-authored-by: Nicholas Hill <[email protected]>

* change duration to integer from number (#434)

* change duration to integer from number
SSCS-11359

* update common to master
SSCS-11359

Co-authored-by: Nicholas Hill <[email protected]>

* Update dependency com.github.hmcts:sscs-common to v4.24.5 (#436)

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

* SSCS-10292-Updated to set the hearing channel type. (#427)

* SSCS-10292-Updated to set the hearing channel type.

* Updated to set the panel member

* Updated as per the review comments

* Updated the sscs-common version.

* SSCS-10292: Updated as per the review comment.

* SSCS-10292: Updated as per the review comment.

* SSCS-10202 Added delay the processing the message.

* Updated the sscs-common version.

* Updated pmd issues.

* SSCS-10292: Updated to fix the PMD violation.

* SSCS-10292: Reverted the preview deployment chnages.

* SSCS-10292: Changed the wait time to 10 seconds to process the message.

* SSCS-10292: Updated as per the review comments

* SSCS-10292 optimises HearingsChannelMappingTest by putting caseData in the BeforeEach

* SSCS-10292 points to new common branch

* Update build.gradle

* SSCS-10292 updates common version to cb2d343

* SSCS-10292 adds suppression for CVE-2022-41881

* Update common version to point at tag of PR build

* Update suppressions

* Updated the common version

---------

Co-authored-by: amoslv1 <[email protected]>
Co-authored-by: DGordonV1 <[email protected]>

* upgrade dependencycheck (#456)

* SSCS-10295 use interpreter language if provided (#423)

* SSCS-10294 adds feature flag to duration logic

tidies test class and enables flag for one test

* SSCS-10294 adds test for null outcome when wants to attend is NO but case is not paper

* SSCS-10294 layout

* SSCS-10294 tidies some formatting in code and tests

* SSCS-10294 adds tests for flag enabled and disabled with getHearingDurationAdjournment returning null

* SSCS-10294 moves feature flag check inside getHearingDurationAdjournment

* SSCS-10294 adds test for blank nextHearingListingDuration returns null

* SSCS-10294 adds extra parameter for invalid duration + valid units

* SSCS-10294 adds final missing case for 0 sessions

* SSCS-10294 adds test for null outcome when wants to attend is NO but case is not paper

* SSCS-10294 adds test for blank nextHearingListingDuration returns null

* SSCS-10294 post rebase

* SSCS-10294 re-includes test for paper duration

* SSCS-11092 makes most changes to HearingsDurationMappingTest

app is building

* SSCS-11092 fixes YesNo in HearingsDurationMappingTest

* SSCS-11092 some test fixes

* SSCS-11092 tidies HearingsDurationMappingTest

* SSCS-11092 extracts method for handleNonStandardDuration

* SSCS-11092 updates to latest common version with getAdjournmentInProgress

* SSCS-11092 splits out HearingsDurationMappingAdjournmentTest

* SSCS-11092 consolidates common setup of caseData in HearingsDurationMappingTest for increased clarity

* SSCS-11092 consolidates common setup of caseData from HearingsDurationMappingTest and HearingsDurationMappingAdjournmentTest into HearingsMappingBase for increased clarity

* SSCS-10294 adds feature flag to duration logic

tidies test class and enables flag for one test

* SSCS-10294 adds test for null outcome when wants to attend is NO but case is not paper

* SSCS-10294 layout

* SSCS-10294 tidies some formatting in code and tests

* SSCS-10294 adds tests for flag enabled and disabled with getHearingDurationAdjournment returning null

* SSCS-10294 moves feature flag check inside getHearingDurationAdjournment

* SSCS-10294 adds test for blank nextHearingListingDuration returns null

* SSCS-10294 adds extra parameter for invalid duration + valid units

* SSCS-10294 adds final missing case for 0 sessions

* SSCS-10294 adds test for null outcome when wants to attend is NO but case is not paper

* SSCS-10294 adds test for blank nextHearingListingDuration returns null

* SSCS-10294 post rebase

* SSCS-10294 re-includes test for paper duration

* SSCS-11092 makes most changes to HearingsDurationMappingTest

app is building

* SSCS-11092 fixes YesNo in HearingsDurationMappingTest

* SSCS-11092 some test fixes

* SSCS-11092 tidies HearingsDurationMappingTest

* SSCS-11092 extracts method for handleNonStandardDuration

* SSCS-11092 updates to latest common version with getAdjournmentInProgress

* SSCS-11092 splits out HearingsDurationMappingAdjournmentTest

* SSCS-11092 consolidates common setup of caseData in HearingsDurationMappingTest for increased clarity

* SSCS-11092 consolidates common setup of caseData from HearingsDurationMappingTest and HearingsDurationMappingAdjournmentTest into HearingsMappingBase for increased clarity

* SSCS-11092 updates to latest common (no getters in enums)

changes from method source to csv source

* SSCS-11092 removes nested classes and excess helper methods from tests

* SSCS-10295 use interpreter language if provided

* SSCS-10295 use interpreter language if provided

* SSCS-11092 adds test case for reserved panel members

* SSCS-11092 updates to latest common version d002abc3

* SSCS-10294 adds feature flag to duration logic

tidies test class and enables flag for one test

* SSCS-10294 adds test for null outcome when wants to attend is NO but case is not paper

* SSCS-10294 layout

* SSCS-10294 tidies some formatting in code and tests

* SSCS-10294 adds tests for flag enabled and disabled with getHearingDurationAdjournment returning null

* SSCS-10294 moves feature flag check inside getHearingDurationAdjournment

* SSCS-10294 adds test for blank nextHearingListingDuration returns null

* SSCS-10294 adds extra parameter for invalid duration + valid units

* SSCS-10294 adds final missing case for 0 sessions

* SSCS-10294 adds test for null outcome when wants to attend is NO but case is not paper

* SSCS-10294 adds test for blank nextHearingListingDuration returns null

* SSCS-10294 post rebase

* SSCS-10294 re-includes test for paper duration

* SSCS-11092 makes most changes to HearingsDurationMappingTest

app is building

* SSCS-11092 fixes YesNo in HearingsDurationMappingTest

* SSCS-11092 some test fixes

* SSCS-11092 tidies HearingsDurationMappingTest

* SSCS-11092 extracts method for handleNonStandardDuration

* SSCS-11092 updates to latest common version with getAdjournmentInProgress

* SSCS-11092 splits out HearingsDurationMappingAdjournmentTest

* SSCS-11092 consolidates common setup of caseData in HearingsDurationMappingTest for increased clarity

* SSCS-11092 consolidates common setup of caseData from HearingsDurationMappingTest and HearingsDurationMappingAdjournmentTest into HearingsMappingBase for increased clarity

* SSCS-11092 updates to latest common (no getters in enums)

changes from method source to csv source

* SSCS-11092 removes nested classes and excess helper methods from tests

* SSCS-11092 adds test case for reserved panel members

* SSCS-11092 updates to latest common version d002abc3

* review comments

* review comments

* fix checkstyle

* update dependency

* fix dependency

* fix dependency

* SSCS-10295 implements thread.sleep fix

* SSCS-10295 adds suppression for CVE-2022-41881

* SSCS-10295 changes common version to new branch

* test

* merge with master

* merge with master

* update common version

* suppress cve

* update CVE expiry

* update dependencycheck version

---------

Co-authored-by: amoslv1 <[email protected]>
Co-authored-by: amoslv1 <[email protected]>
Co-authored-by: Pankaj Khare <[email protected]>

* Update dependency com.github.hmcts:sscs-common to v4.25.1 (#439)

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

* Update dependency pmd to v6.54.0 (#455)

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

* Update dependency gradle to v7.6 (#454)

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

* Update Helm release java to v4.0.13 (#447)

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

* Update dependency org.elasticsearch:elasticsearch to v7.17.9 (#451)

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

* Update dependency hashicorp/terraform to v1.3.8 (#450)

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

* Update dependency org.projectlombok:lombok to v1.18.26 (#446)

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

* Update Networking (#448)

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

* Update Tools - Data Processing (#445)

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

* Update netty monorepo to v4.1.89.Final (#453)

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

* SSCS-11420 : Removed LA to HMC status comparison (#459)

* SSCS-11420 : Removed LA to HMC status comparison

* SSCS-11420 : Changed to use message status, not API

* fix suppressions (#473)

* remove all suppressions
uncontrolled

* fix suppressions
uncontrolled

---------

Co-authored-by: Nicholas Hill <[email protected]>

* Upgrade renovate (#474)

* upgrade renovate v2 (#475)

* Update dependency org.slf4j:slf4j-api to v2 (#442)

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

* Revert "Update dependency org.slf4j:slf4j-api to v2 (#442)" (#479)

This reverts commit 9730f07623efbb0ec75f52ce50891b284a97e5f5.

* updated to use correct judicial ref data api SSCS-10290 (#457)

* updated to use correct judicial ref data api
SSCS-10290

* Update build.gradle

common bump

---------

Co-authored-by: Nicholas Hill <[email protected]>

* SSCS-11511 SSCS-11512 SSCS-11513 (#478)

* SSCS-11511 SSCS-11512 SSCS-11513

- Send fake names for an organisation rep who only lists their organisation name.
- Return face to face hearing type if someone marks they want to attend but does not specify a hearing type.
- Dont process any hearing requests for cases in an invalid case state, currently Dormant or Listing Error

* SSCS-11512 : Updated log to include case status

* Revert "SSCS-11512 : Updated log to include case status"

This reverts commit d2e17ca04a2812a3d4cc70492f33d55557caac40.

* SSCS-11512 : Added case state to hearing wrapper and logged

* SSCS-11512 : Added case state as its own field in HearingWrapper

* SSCS-10296 requested date from adjournment notice is used in the new hearing request (#354)

* SSCS-10296 requested date from adjournment notice is used in the new hearing request

SSCS-10296 adds ticket numbers to TODOs

for writing to "other" field  SSCS-11224

for removing feature flag SSCS-10951

SSCS-10296 readds testGetFirstDateTimeMustBe which was mistakenly deleted (again)

SSCS-10296 removes unnecessary helper isHearingAdjourned

SSCS-10296 changes testIsHearingAdjourned to CsvSource

SSCS-10296 removes test instance per class

SSCS-10296 updates to latest common (no getters in enums)

changes from method source to csv source

SSCS-10296 adds test to cover isHearingAdjourned == false case

SSCS-10296 uses strings from AdjournCaseNextHearingXxx for comparison

SSCS-10296 fixes law of demeter

SSCS-10296 incorporates SSCS-11092 Adjournment class

updates tests

removes clunky functional enums in favour of helper methods in if statements in AdjournmentCalculateDateHelper

SSCS-11092 upgrades all jackson dependencies

SSCS-10296 cs

SSCS-10296 updates jackson databind and removes suppressions

SSCS-10296 rebase

SSCS-10296 switches to simpler YesNo prop for isHearingAdjourned

adds unit test

updates/removes tests marked with TODO

SSCS-10296 updates todo text

SSCS-10296 adds test to ensure a non-adjourned case uses the normal path even with flag enabled

SSCS-10296 formatting of )

SSCS-10296 one final refactor

SSCS-10296 one final refactor

SSCS-10296 removes BeanUtils and simplifies checkForMissingData helper method

also deletes UnrecognisedFieldException

SSCS-10296 whitespace

readds placeholder test for testGetFirstDateTimeMustBe

SSCS-10296 refactors helper methods into optionals and in the enum

SSCS-10296 upgrades beanutils dependency to fix vulnerabilities

SSCS-10296 adds beanutils dependency

SSCS-10296 fixes UnrecognisedFieldException to take a Throwable as argument

SSCS-10296 replaces RuntimeException with custom UnrecognisedFieldException

SSCS-10296 renames test class to AdjournmentCalculateDateHelperTest

SSCS-10296 moves enums into own enums package

SSCS-10296 reverts elseif layout

SSCS-10296 un-extracts test logic

converts comment into actual code in test assertion

SSCS-10296 moves enums and static helper class into own new package

SSCS-10296 uses optional orElseThrow instead of checking isPresent

SSCS-10296 moves optional helper methods into their respective enum

SSCS-10296 replaces SneakyThrows with a try/catch

SSCS-10296 updates testBuildHearingDetailsAdjourned with new requirement for generated date to be today

SSCS-10296 adjusts isHearingAdjourned to check if adjournCaseGeneratedDate is today

also updates test accordingly

includes TODOs for when iIsCaseAdjournmentInProgress field is added to ccdDefs and commons

SSCS-10296 space

moves suppression to top of file

SSCS-10296 amends testBuildHearingDetailsAdjourned so that exception is thrown when adjourn route is used

removes comment and incorporates into DisplayName

SSCS-10296 alters isHearingAdjourned to use adjournCaseGeneratedDate as the check

SSCS-10296 renames tests to be more verbose

SSCS-10296 formatting

SSCS-10296 improves checkForMissingData helper method by using BeanUtils.getProperty

SSCS-10296 suppression extension

SSCS-10296 cs 2

SSCS-10296 cs

SSCS-10296 moves flag check into HearingsWindowMappingTest

requires referenceDataServiceHolder to be included in buildHearingWindow builder

SSCS-10296 fixes test name

SSCS-10296 moves all static methods and constants out of enums into helper class

tests pass

SSCS-10296 creates AdjournmentCalculateDateHelper and moves static helper methods in there

SSCS-10296 moves exception for unexpected date type value into mapping class

similar needs to be done for dateOrPeriod value

also move methods into static helper class

SSCS-10296 renames helper calculateDateAfterDateOrPeriod for clarity

SSCS-10296 cs

SSCS-10296 adds getAfterDateOrPeriodFromCaseData and handles exceptions

all tests passing incl error cases

SSCS-10296 adds getEnumByValue to each enum's calculate methods

error cases in AdjournHearingsWindowMappingTest need to be reworked

SSCS-10296 extracts enum into two separate classes

SSCS-10296 moves method logic into each enum value

SSCS-10296 amend string constants in test file

SSCS-10296 code style

SSCS-10296 some tidying, rename helper method names for clarity

SSCS-10296 cs

SSCS-10296 renames AdjournHearingsWindowMappingTest

tests working

SSCS-10296 simplifies tests for feature flag

SSCS-10296 adds test for isHearingAdjourned

SSCS-10296 adds test for feature flag

SSCS-10296 renames test file + cs

SSCS-10296 renames test file

unable to name it AdjournHearingsWindowMappingTest because gradle does not recognise any tests

SSCS-10296 rename test class

SSCS-10296 inserts check for isAdjournmentFlagEnabled

SSCS-10296 renames tests to point to AdjournHearingsWindowMapping

tests passing

SSCS-10296 creates AdjournHearingsWindowMapping and extracts all adjournment code from HearingsWindowMapping into it

SSCS-10296 adds isHearingAdjourned into HearingsDetailsMapping in preparation for AdjournedHearingsWindowMapping separate class

SSCS-10296 moves all date calculation into AdjournmentDetail enum

SSCS-10296 specifies static imports of enum props

SSCS-10296 adds logging for each adjournment date outcome

SSCS-10296 includes case id in exception messages

and updates tests

SSCS-10296 moves String constants into enum

SSCS-10296 converts getHearingWindowStart into if/else if/if block

removes all excess whitespace

moves placement of TODO for time details to be more accurate for future work

SSCS-10296 converts getHearingWindowStart into if/else if/if block

SSCS-10296 removes todo

SSCS-10296 change public to private for isCaseAdjourned

SSCS-10296 whitespace

SSCS-10296 tidies imports

SSCS-10296 adds test for invalid date

uses isBlank instead of isNull in checkForMissingData

SSCS-10296 adjusts logic in isCaseAdjourned boolean

SSCS-10296 checkstyle and equalsIgnoreCase

SSCS-10296 tidy tests

SSCS-10296 checkstyle

SSCS-10296 tidies some tests

SSCS-10296 moves functionality out of getFirstDateTimeMustBe and into the top of getHearingWindowStart

isCaseAdjourned requires rework

SSCS-10296 pmd

SSCS-10296 checkstyle

SSCS-10296 extracts test class to own separate file

SSCS-10296 adds and improves DisplayNames of tests

SSCS-10296 adds tests for error cases for MissingFormatArgumentExceptions

SSCS-10296 adds tests for error cases for IllegalArgumentExceptions

SSCS-10296 adds test for after date

SSCS-10296 adds param test for after period

SSCS-10296 adds two more tests for date to be fixed and first available date

SSCS-10296 extract strings to constants

first test for returning null if not adjourned

SSCS-10296 extracts more methods

Majority of logic possibly done

SSCS-10296 extracts some methods for cleaner reading

SSCS-10296 first commit

establishing logic in getFirstDateTimeMustBe

SSCS-11092 removes nested classes and excess helper methods from tests

* SSCS-10296 adds Thread.sleep to TribunalsHearingsEventQueueListener

adds suppression for netty CVE-2022-41881

* suppress CVE-2021-4277

* SSCS-10296 Extend suppressions

* Suppress snakeyaml cve

---------

Co-authored-by: NickHill111 <[email protected]>

* Update dependency com.github.hmcts:sscs-common to v4.25.6 (#464)

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

* renovate v1 (#483)

* Update dependency com.github.hmcts:sscs-common to v4.25.7 (#484)

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

* SSCS-11537 : Remove sleep statement from hearings event queue (#482)

* Update dependency com.github.hmcts:sscs-common to v4.25.8 (#486)

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

* SSCS-11516 : Remove invalid case states (#487)

* Update dependency com.github.hmcts:sscs-common to v4.25.10 (#488)

* Update dependency com.github.hmcts:sscs-common to v4.25.10

* add suppression
SSCS-common

---------

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

* Update dependency hashicorp/terraform to v1.4.2 (#468)

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

* Update Terraform azurerm to ~> 3.49.0 (#449)

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

* Update Networking (#467)

* Update Networking

* Suppression

---------

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

* add suppressions (#491)

uncontrolled

Co-authored-by: Nicholas Hill <[email protected]>

* CVE-05.04.23 (#499)

* CVE-05.04.23

* CVE-05.04.23

* Update dependency com.github.hmcts:sscs-common to v4.25.16 (#495)

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

* SSCS-11380-Added error log for HMC Service call (#463)

* Added error log for HMC Service call

* Update dependency com.github.hmcts:sscs-common to v4.25.19 (#500)

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

* CVEFix-24.04.23 (#501)

* Update dependency com.github.hmcts:sscs-common to v4.25.22 (#503)

* Update dependency com.github.hmcts:sscs-common to v4.25.22

* add suppressions
SSCS-common

* update suppressions
SSCS-common

---------

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

* CVEFix-02.05.2023 (#502)

* CVEFix-02.05.2023

* CVEFix-02.05.2023

* CVEFix-02.05.2023

* CVEFix-02.05.2023

* DTSPO-13810 reschedule jenkins nightly builds (#508)

* CVE Fix.30.05.2023 - Tomcat 9.0.75 (#510)

* Update dependency com.github.hmcts:sscs-common to v4.25.26 (#504)

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

* CVE Suppression 01.06.2023 (#511)

* CVE Suppression 01.06.2023

* Snakeyaml 2.0

* CVE Fix - 12.06.2023 (#514)

* Update dependency com.github.hmcts:sscs-common to v4.26.0 (#518)

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

* CVE Fix - 27.06.2023 (#521)

* CVE Fix - 30.06.2023 (#522)

* CVE Fix - 03.07.2023 (#523)

* Update dependency com.github.hmcts:sscs-common to v4.26.2 (#520)

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

* Update Automated Checks (#403)

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

* Update dependency com.github.hmcts:sscs-common to v4.26.3 (#530)

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

* Update Tools - Data Processing (#496)

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

* Update Helm release java to v4.1.5 (#492)

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

* Update netty monorepo to v4.1.95.Final (#529)

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

* Update dependency gradle to v7.6.2 (#528)

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

* Update Tools - General (#516)

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

* CVE Fix 31.07.2023 (#531)

* SSCS-11712 - Application Insights and Java 17 (#512)

* SSCS-11712 - ApplicationInsights

* SSCS-11712

* Update

---------

Co-authored-by: Mohamed Ashraf Hajamohideen <[email protected]>
Co-authored-by: hajam09 <[email protected]>

* Update dependency org.elasticsearch:elasticsearch to v7.17.12 (#517)

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

* Update dependency com.github.hmcts:sscs-common to v4.26.9 (#534)

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

* Update dependency com.github.hmcts:sscs-common to v4.26.10 (#535)

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

* SSCSCI-12 (#536)

CVE suppresions

* Sscs 10291 update panel member (#460)

* updated to use correct judicial ref data api
SSCS-10290

* remove unused function with reservetojudge
SSCS-11395

* Updated the panel member changes

* Updated the panel member type

* Updated as per the review comments

* Updated as per the review comments

* Updated as per the review comments

* Updated as per the review comments

* common bump
SSCS-11395

* Update dependency pmd to v6.54.0 (#455)

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

* Update dependency gradle to v7.6 (#454)

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

* Update Helm release java to v4.0.13 (#447)

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

* Update dependency org.elasticsearch:elasticsearch to v7.17.9 (#451)

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

* remove unused function with reservetojudge
SSCS-11395

* Update dependency hashicorp/terraform to v1.3.8 (#450)

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

* Update dependency org.projectlombok:lombok to v1.18.26 (#446)

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

* Update Networking (#448)

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

* Update Tools - Data Processing (#445)

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

* Update netty monorepo to v4.1.89.Final (#453)

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

* SSCS-11420 : Removed LA to HMC status comparison (#459)

* SSCS-11420 : Removed LA to HMC status comparison

* SSCS-11420 : Changed to use message status, not API

* Update build.gradle

common bump

* Updated the panel member changes

* Updated the panel member type

* Updated as per the review comments

* Updated as per the review comments

* Updated as per the review comments

* Updated as per the review comments

* fix merge conflict
SSCS-10291

* Update build.gradle

add space back

* Update build.gradle

add whitespace back

* small refactor and change to use personal code instead of IdamId
SSCS-10291

* change to isYes
SSCS-10291

* add suppressions
SSCS-11395

* Update src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsPanelMapping.java

Co-authored-by: amoslv1 <[email protected]>

* fix tabbing
SSCS-10291

* debug message

* more logs

* SSCS-10865 / SSCS-10291 - Fix for null on hmc response get venues and fix for hearingWindow using override values from old non-adjournment code.

* SSCS-10865 / SSCS-10291 - Remove unused var

* SSCS-10865 / SSCS-10291 - Remove unnecessary tests

* SSCS-10865 / SSCS-10291 - Remove unnecessary import

* debug

* checkstyle fix

* SSCS-11689: added panel requirements to hearing values

* removed debug info

* SSCS-10865 / SSCS-10291 - Add logging for adjournment hearing window

* SSCS-10865 / SSCS-10291 - Update adjournmentInProgress flag after adjournment issued and create or update hearing message completed

* SSCS-11689: debug message

* SSCS-11696 - First pass, override mapping and associat…
  • Loading branch information
Show file tree
Hide file tree
Showing 124 changed files with 6,848 additions and 3,448 deletions.
7 changes: 0 additions & 7 deletions .github/dependabot.yml

This file was deleted.

13 changes: 4 additions & 9 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{
"enabledManagers": ["helm-requirements","gradle-wrapper"],
"labels": ["dependencies"],
"helm-requirements":
{
"fileMatch": ["\\Chart.yaml$"],
"aliases": {
"hmctspublic": "https://hmctspublic.azurecr.io/helm/v1/repo/"
}
}
"extends": [
"local>hmcts/.github:renovate-config",
"github>hmcts/sscs-common//.github/sscs-renovate.json"
]
}
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '11'
Expand Down
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,14 @@ bin/
*.log
tmp/
pacts/


# Terraform
**/.terraform
.idea/
*terraform.lock.hcl
**/**/override.tf

# Application insight
lib/applicationinsights-agent-*.jar
lib/applicationinsights.log
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG APP_INSIGHTS_AGENT_VERSION=3.2.4
FROM hmctspublic.azurecr.io/base/java:11-distroless
ARG APP_INSIGHTS_AGENT_VERSION=3.4.13
FROM hmctspublic.azurecr.io/base/java:17-distroless

COPY lib/AI-Agent.xml /opt/app/
COPY lib/applicationinsights.json /opt/app/
COPY build/libs/sscs-hearings-api.jar /opt/app/

EXPOSE 8083
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile_CNP
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import uk.gov.hmcts.contino.AppPipelineDsl
def type = "java"
def product = "sscs"
def component = "hearings-api"
def branchesToSync = ['demo', 'ithc', 'perftest']
def branchesToSync = ['demo']

def vaultOverrides = [
'preview' : 'aat'
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile_nightly
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

properties([
// H allow predefined but random minute see https://en.wikipedia.org/wiki/Cron#Non-standard_characters
pipelineTriggers([cron('H 05 * * *')])
pipelineTriggers([cron('H 07 * * 1-5')])
])

@Library("Infrastructure")
Expand Down
Loading

0 comments on commit 0bc2da9

Please sign in to comment.