Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b0764d4
DTSSTCI-1704: create documents table
Mar 31, 2026
499144a
DTSSTCI-1704: checkstyle fixes
Mar 31, 2026
f6b6506
DTSSTCI-1704: checkstyle fix
Mar 31, 2026
85eb479
DTSSTCI-1704: include saved_at field to record when docs are saved to…
Apr 1, 2026
e4b0361
DTSSTCI-1704: refactor to save new docs direct to db on creation
Apr 10, 2026
7e708b3
DTSSTCI-1704: checkstyle fixes
Apr 10, 2026
e495788
DTSSTCI-1704: add testing for document saves to db
Apr 14, 2026
d956239
DTSSTCI-1704: remove unused import (checkstyle)
Apr 14, 2026
b62ab26
Merge branch 'DTSSTCI-1729-BE-citizen-dashboard' into DTSSTCI-1704
pr00279 Apr 14, 2026
215c671
DTSSTCI-1704: add test case ref number to FTs, remove composite pk, a…
Apr 16, 2026
edec66a
DTSSTCI-1704: add categoryId to stitched bundle
Apr 16, 2026
3bad52f
DTSSTCI-1704: fix bundle tests with new bundle category & include isD…
Apr 16, 2026
4362649
DTSSTCI-1704: amend field declarations of documentsRepository and rem…
Apr 16, 2026
c38026a
DTSSTCI-1704: remove unused imports
Apr 16, 2026
e3afe92
DTSSTCI-1704: checkstyle reorder import
Apr 16, 2026
fa6d500
DTSSTCI-1704: include new categoryID for stitched bundle document
Apr 16, 2026
c69ac28
Merge branch 'DTSSTCI-1729-BE-citizen-dashboard' into DTSSTCI-1704
Apr 16, 2026
f276c49
DTSSTCI-1704: refactor buildAndSaveDocumentEntityfrom DocumentUtil to…
Apr 17, 2026
bfb1fda
DTSSTCI-1704: add git commit to test documentsService exception thrown
Apr 17, 2026
4750ff2
DTSSTCI-1704: add category ID for uploadedPDF in NotificationServiceCIC
Apr 17, 2026
362e7ed
DTSSTCI-1704: remove unused imports (checkstyle)
Apr 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"orderContentOrderTemplate": "CIC3_Rule_27",
"orderContentMainContent": "Order Main Content",
"orderContentOrderSignature": "Order Signatory",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"orderContentOrderTemplate": "CIC3_Rule_27",
"orderContentMainContent": "Order Main Content",
"orderContentOrderSignature": "Order Signatory",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"newCaseworkerCICDocumentUpload": [
{
"id": "1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"cicCaseEmail": "subject@hmcts.net",
"securityClass": "PUBLIC",
"cicCaseAddress": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "1-cicBundle.pdf"
"document_filename": "1-cicBundle.pdf",
"category_id": "BD"
},
"dateAndTime": "2024-06-11T12:00:00.000",
"folders": [
Expand Down Expand Up @@ -97,7 +98,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "2-cicBundle.pdf"
"document_filename": "2-cicBundle.pdf",
"category_id": "BD"
},
"dateAndTime": "2024-06-10T12:00:00.000",
"folders": [
Expand Down Expand Up @@ -187,7 +189,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "3-cicBundle.pdf"
"document_filename": "3-cicBundle.pdf",
"category_id": "BD"
},
"dateAndTime": "2024-06-09T12:00:00.000",
"folders": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "1-cicBundle.pdf"
"document_filename": "1-cicBundle.pdf",
"category_id": "BD"
},
"folders": [
{
Expand Down Expand Up @@ -123,7 +124,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "2-cicBundle.pdf"
"document_filename": "2-cicBundle.pdf",
"category_id": "BD"
},
"folders": [
{
Expand Down Expand Up @@ -214,7 +216,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "3-cicBundle.pdf"
"document_filename": "3-cicBundle.pdf",
"category_id": "BD"
},
"folders": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "c340d45a-7909-466b-bee9-ec07742cc59c",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "c340d45a-7909-466b-bee9-ec07742cc59c",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "c340d45a-7909-466b-bee9-ec07742cc59c",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "c340d45a-7909-466b-bee9-ec07742cc59c",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"messages": [
{
"id": "1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"dssCaseDataOtherInfoDocuments": [
{
"id": "1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"caseNumber": "1616591401473378",
"dssCaseDataCaseTypeOfApplication": "CIC",
"dssCaseDataSubjectFullName": "test_first_name",
"dssCaseDataSubjectDateOfBirth": null,
Expand All @@ -19,9 +20,9 @@
"id": null,
"value": {
"documentLink": {
"document_url": null,
"document_filename": null,
"document_binary_url": null,
"document_url": "http://dm-store-aat.service.core-compute-aat.internal/documents/328c674f-59c3-418a-b76b-78f2cc52d21c",
"document_filename": "mockFileUpdatedTribunalFormDoc.pdf",
"document_binary_url": "http://dm-store-aat.service.core-compute-aat.internal/documents/328c674f-59c3-418a-b76b-78f2cc52d21c/binary",
"category_id": null
}
}
Expand All @@ -32,9 +33,9 @@
"id": null,
"value": {
"documentLink": {
"document_url": null,
"document_filename": null,
"document_binary_url": null,
"document_url": "http://dm-store-aat.service.core-compute-aat.internal/documents/328c674f-59c3-418a-b76b-78f2cc52d21b",
"document_filename": "mockFileUpdatedSupportingDoc.pdf",
"document_binary_url": "http://dm-store-aat.service.core-compute-aat.internal/documents/328c674f-59c3-418a-b76b-78f2cc52d21b/binary",
"category_id": null
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "${json-unit.any-string}",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "${json-unit.any-string}",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "${json-unit.any-string}",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "${json-unit.any-string}",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"cicCaseDraftOrderDynamicList": {
"list_items": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"cicCaseDraftOrderDynamicList": {
"list_items": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "1-cicBundle.pdf"
"document_filename": "1-cicBundle.pdf",
"category_id": "BD"
},
"folders": [
{
Expand Down Expand Up @@ -100,7 +101,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "2-cicBundle.pdf"
"document_filename": "2-cicBundle.pdf",
"category_id": "BD"
},
"folders": [
{
Expand Down Expand Up @@ -191,7 +193,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "3-cicBundle.pdf"
"document_filename": "3-cicBundle.pdf",
"category_id": "BD"
},
"folders": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"title": "CIC Bundle",
"description": "",
"stitchedDocument": {
"document_filename": "3-cicBundle.pdf"
"document_filename": "3-cicBundle.pdf",
"category_id": "BD"
},
"folders": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"caseLinks": [],
"allCaseworkerCICDocument": [],
"newCaseworkerCICDocument": [],
Expand Down Expand Up @@ -45,7 +46,10 @@
"value": {
"documentCategory": "DSS Supporting uploaded documents",
"documentLink": {
"category_id": "DSS"
"category_id": "DSS",
"document_url": "http://dm-store-aat.service.core-compute-aat.internal/documents/328c674f-59c3-418a-b76b-78f2cc52d21b",
"document_filename": "mockFileUpdatedSupportingDoc.pdf",
"document_binary_url": "http://dm-store-aat.service.core-compute-aat.internal/documents/328c674f-59c3-418a-b76b-78f2cc52d21b/binary"
},
"date": "${json-unit.any-string}"
}
Expand All @@ -55,7 +59,10 @@
"value": {
"documentCategory": "DSS Tribunal form uploaded documents",
"documentLink": {
"category_id": "DSS"
"category_id": "DSS",
"document_url": "http://dm-store-aat.service.core-compute-aat.internal/documents/328c674f-59c3-418a-b76b-78f2cc52d21c",
"document_filename": "mockFileUpdatedTribunalFormDoc.pdf",
"document_binary_url": "http://dm-store-aat.service.core-compute-aat.internal/documents/328c674f-59c3-418a-b76b-78f2cc52d21c/binary"
},
"date": "${json-unit.any-string}"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"cicCaseRespondentName": "Appeals team",
"cicCaseRespondentOrganisation": "CICA",
"cicCaseRespondentEmail": "appeals.team@cica.gov.uk",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"cicCaseRespondentName": "Appeals team",
"cicCaseRespondentOrganisation": "CICA",
"cicCaseRespondentEmail": "appeals.team@cica.gov.uk",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"data": {
"caseNumber": "1616591401473378",
"allCaseworkerCICDocument": [
{
"id": "1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import uk.gov.hmcts.sptribs.ciccase.model.DecisionTemplate;
import uk.gov.hmcts.sptribs.ciccase.model.LanguagePreference;
import uk.gov.hmcts.sptribs.common.config.WebMvcConfig;
import uk.gov.hmcts.sptribs.common.repositories.DocumentsRepository;
import uk.gov.hmcts.sptribs.document.CaseDataDocumentService;
import uk.gov.hmcts.sptribs.document.model.CICDocument;
import uk.gov.hmcts.sptribs.idam.IdamService;
Expand Down Expand Up @@ -56,6 +57,7 @@
import static uk.gov.hmcts.sptribs.testutil.TestConstants.SERVICE_AUTHORIZATION;
import static uk.gov.hmcts.sptribs.testutil.TestConstants.SUBMITTED_URL;
import static uk.gov.hmcts.sptribs.testutil.TestConstants.TEST_AUTHORIZATION_TOKEN;
import static uk.gov.hmcts.sptribs.testutil.TestConstants.TEST_CASE_ID;
import static uk.gov.hmcts.sptribs.testutil.TestConstants.TEST_CASE_ID_HYPHENATED;
import static uk.gov.hmcts.sptribs.testutil.TestDataHelper.callbackRequest;
import static uk.gov.hmcts.sptribs.testutil.TestDataHelper.caseData;
Expand Down Expand Up @@ -91,6 +93,9 @@ public class CaseWorkerIssueDecisionIT {
@MockitoBean
private CaseDataDocumentService caseDataDocumentService;

@MockitoBean
private DocumentsRepository documentsRepository;

@BeforeAll
static void setUp() {
IdamWireMock.start();
Expand All @@ -104,6 +109,7 @@ static void tearDown() {
@Test
void shouldClearDecisionSignatureInAboutToStart() throws Exception {
final CaseData caseData = caseData();
caseData.setCaseNumber(TEST_CASE_ID.toString());

String response = mockMvc.perform(post(ABOUT_TO_START_URL)
.contentType(APPLICATION_JSON)
Expand Down Expand Up @@ -202,6 +208,7 @@ void shouldSetCategoryIdOnDecisionDocumentInAboutToSubmit() throws Exception {
.build();

final CaseData caseData = CaseData.builder()
.caseNumber(TEST_CASE_ID.toString())
.caseIssueDecision(caseIssueDecision)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import uk.gov.hmcts.sptribs.ciccase.model.OrderTemplate;
import uk.gov.hmcts.sptribs.ciccase.model.PartiesCIC;
import uk.gov.hmcts.sptribs.common.config.WebMvcConfig;
import uk.gov.hmcts.sptribs.common.repositories.DocumentsRepository;
import uk.gov.hmcts.sptribs.document.DocAssemblyService;
import uk.gov.hmcts.sptribs.idam.IdamService;
import uk.gov.hmcts.sptribs.notification.NotificationServiceCIC;
Expand Down Expand Up @@ -62,6 +63,7 @@
import static uk.gov.hmcts.sptribs.testutil.TestConstants.SERVICE_AUTHORIZATION;
import static uk.gov.hmcts.sptribs.testutil.TestConstants.SUBMITTED_URL;
import static uk.gov.hmcts.sptribs.testutil.TestConstants.TEST_AUTHORIZATION_TOKEN;
import static uk.gov.hmcts.sptribs.testutil.TestConstants.TEST_CASE_ID;
import static uk.gov.hmcts.sptribs.testutil.TestConstants.TEST_CASE_ID_HYPHENATED;
import static uk.gov.hmcts.sptribs.testutil.TestDataHelper.callbackRequest;
import static uk.gov.hmcts.sptribs.testutil.TestDataHelper.caseData;
Expand Down Expand Up @@ -91,6 +93,9 @@ public class CaseworkerCreateAndSendOrderIT {
@MockitoBean
private NotificationServiceCIC notificationServiceCIC;

@MockitoBean
private DocumentsRepository documentsRepository;

private static final String CASEWORKER_CREATE_AND_SEND_ORDER_ABOUT_TO_START_RESPONSE =
"classpath:responses/caseworker-create-and-send-order-about-to-start-response.json";

Expand Down Expand Up @@ -168,6 +173,7 @@ void shouldUpdateOrdersWithNewAnonymousOrderAboutToSubmit() throws Exception {
.build();

final CaseData caseData = CaseData.builder()
.caseNumber(TEST_CASE_ID.toString())
.draftOrderContentCIC(draftOrderContentCIC)
.cicCase(CicCase.builder()
.orderIssuingType(CREATE_AND_SEND_NEW_ORDER)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import uk.gov.hmcts.sptribs.ciccase.model.CaseData;
import uk.gov.hmcts.sptribs.ciccase.model.CicCase;
import uk.gov.hmcts.sptribs.common.config.WebMvcConfig;
import uk.gov.hmcts.sptribs.common.repositories.DocumentsRepository;
import uk.gov.hmcts.sptribs.document.DocAssemblyService;
import uk.gov.hmcts.sptribs.document.model.DocumentInfo;
import uk.gov.hmcts.sptribs.idam.IdamService;
Expand Down Expand Up @@ -76,6 +77,9 @@ public class CaseworkerCreateDraftOrderIT {
@MockitoBean
private DocAssemblyService docAssemblyService;

@MockitoBean
private DocumentsRepository documentsRepository;

private static final String CASEWORKER_CREATE_DRAFT_ORDER_MID_EVENT_RESPONSE =
"classpath:responses/caseworker-create-draft-order-mid-event-response.json";
private static final String CASEWORKER_CREATE_DRAFT_ORDER_ABOUT_TO_SUBMIT_RESPONSE =
Expand Down Expand Up @@ -181,6 +185,7 @@ void shouldUpdateDraftOrderListOnAboutToSubmit() throws Exception {
.build())
.build()
)
.caseNumber(TEST_CASE_ID.toString())
.hearingList(getHearingList())
.draftOrderContentCIC(DraftOrderContentCIC.builder()
.orderTemplate(CIC3_RULE_27)
Expand Down
Loading