From d9671ba7ae4aa8b372d323923d130e7e9195f9ac Mon Sep 17 00:00:00 2001 From: abbasiTahir Date: Wed, 28 Aug 2024 10:22:57 +0100 Subject: [PATCH 1/6] DTSPB-4115 added timestamo to upload DocumentLink.java --- .../uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java b/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java index 72dd26c40b..ce0ca7f45a 100644 --- a/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java +++ b/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java @@ -4,6 +4,8 @@ import lombok.Builder; import lombok.Data; +import java.time.LocalDateTime; + @Data @Builder public class DocumentLink { @@ -20,4 +22,7 @@ public class DocumentLink { @JsonProperty(value = "document_hash") private String documentHash; + @JsonProperty(value = "upload_timestamp" ) + private LocalDateTime uploadTimestamp; + } From 59f96eb09e669b6f10bf331afc107a668a6329c9 Mon Sep 17 00:00:00 2001 From: abbasiTahir Date: Wed, 28 Aug 2024 11:01:00 +0100 Subject: [PATCH 2/6] DTSPB-4115 added timestamo to upload DocumentLink.java --- .../java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java b/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java index ce0ca7f45a..8c99d879c8 100644 --- a/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java +++ b/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; import lombok.Data; - import java.time.LocalDateTime; @Data @@ -22,7 +21,7 @@ public class DocumentLink { @JsonProperty(value = "document_hash") private String documentHash; - @JsonProperty(value = "upload_timestamp" ) + @JsonProperty(value = "upload_timestamp") private LocalDateTime uploadTimestamp; } From 0a18cf55200c0a40a7d15e7f278a78969070ed26 Mon Sep 17 00:00:00 2001 From: FeliTam Date: Fri, 6 Sep 2024 16:42:53 +0100 Subject: [PATCH 3/6] run nightly on demo --- Jenkinsfile_CNP | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 0e35a66e46..f4f7a48d4b 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -231,12 +231,12 @@ withPipeline("java", product, component) { afterSuccess('functionalTest:preview') { if (checkForEnableNightlyLabel(env.BRANCH_NAME)) { - env.TEST_E2E_URL = "https://xui-probate-back-office-pr-${CHANGE_ID}.preview.platform.hmcts.net" + env.TEST_E2E_URL = "https://manage-case.demo.platform.hmcts.net" sh 'yarn install' sh 'yarn test:fullfunctional-pr' } if (checkForEnableCWNightlyLabel(env.BRANCH_NAME)) { - env.TEST_E2E_URL = "https://xui-probate-back-office-pr-${CHANGE_ID}.preview.platform.hmcts.net" + env.TEST_E2E_URL = "https://manage-case.demo.platform.hmcts.net" sh 'yarn install' sh 'yarn test:fullfunctional-cw' } From 65087b676332057dc34563501a862dfdd849ac5e Mon Sep 17 00:00:00 2001 From: FeliTam Date: Mon, 23 Sep 2024 14:51:45 +0100 Subject: [PATCH 4/6] Revert "run nightly on demo" This reverts commit 51751ab30ce43954b39dd93da4f47d0c6d77ecef. --- Jenkinsfile_CNP | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index f4f7a48d4b..0e35a66e46 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -231,12 +231,12 @@ withPipeline("java", product, component) { afterSuccess('functionalTest:preview') { if (checkForEnableNightlyLabel(env.BRANCH_NAME)) { - env.TEST_E2E_URL = "https://manage-case.demo.platform.hmcts.net" + env.TEST_E2E_URL = "https://xui-probate-back-office-pr-${CHANGE_ID}.preview.platform.hmcts.net" sh 'yarn install' sh 'yarn test:fullfunctional-pr' } if (checkForEnableCWNightlyLabel(env.BRANCH_NAME)) { - env.TEST_E2E_URL = "https://manage-case.demo.platform.hmcts.net" + env.TEST_E2E_URL = "https://xui-probate-back-office-pr-${CHANGE_ID}.preview.platform.hmcts.net" sh 'yarn install' sh 'yarn test:fullfunctional-cw' } From 1d2e0e9261e24afee5bc5cfb90882faad394eef7 Mon Sep 17 00:00:00 2001 From: jamiealbertelli Date: Tue, 12 Nov 2024 11:08:21 +0000 Subject: [PATCH 5/6] DTSPB-4115: Add serialisation --- .../uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java b/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java index 8c99d879c8..b43ead8011 100644 --- a/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java +++ b/src/main/java/uk/gov/hmcts/probate/model/ccd/raw/DocumentLink.java @@ -1,6 +1,9 @@ package uk.gov.hmcts.probate.model.ccd.raw; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import lombok.Builder; import lombok.Data; import java.time.LocalDateTime; @@ -21,6 +24,8 @@ public class DocumentLink { @JsonProperty(value = "document_hash") private String documentHash; + @JsonSerialize(using = LocalDateTimeSerializer.class) + @JsonDeserialize(using = LocalDateTimeDeserializer.class) @JsonProperty(value = "upload_timestamp") private LocalDateTime uploadTimestamp; From 69d9168760d0b72d946ae07c282d6f2c3b11cbd7 Mon Sep 17 00:00:00 2001 From: jamiealbertelli Date: Fri, 17 Jan 2025 17:19:50 +0000 Subject: [PATCH 6/6] DTSPB-4115: Bump commons version to match 4115 changes --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 848f180264..836777f7d9 100644 --- a/build.gradle +++ b/build.gradle @@ -170,7 +170,7 @@ def versions = [ lombok : '1.18.36', mapStruct : '1.2.0.Final', pact_version : '4.1.34', - probateCommonsVersion : '2.0.33', + probateCommonsVersion : '2.0.37', probatePactCommonsVersion : '1.0.2', restAssured : '5.5.0', serenity : '4.2.12',