Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Poc/civ 16473 #5556

Closed
wants to merge 15 commits into from
Closed
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Jenkinsfile_CNP
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@ def type = "nodejs"
def product = "civil"
def component = "citizen-ui"
def camundaBranch = "master"
def dmnBranch = "master"
def dmnBranch = "POC/CIV-16473"
def waStandaloneBranch = "master"
def ccdBranch = "master"
def ccdBranch = "POC/CIV-16473"
def generalappCCDBranch = "master"
AppPipelineConfig pipelineConf

Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@ ccd:
ELASTIC_SEARCH_DATA_NODES_HOSTS: http://${SERVICE_NAME}-es-master:9200
DATA_STORE_DB_PASSWORD: ${POSTGRES_PASSWORD}
ROLE_ASSIGNMENT_URL: http://${SERVICE_NAME}-am-role-assignment-service
CCD_MULTIPARTY_CASE_TYPES: CIVIL
CCD_MULTIPARTY_EVENTS: DEFENDANT_RESPONSE,ACKNOWLEDGE_CLAIM,CLAIMANT_RESPONSE,queryManagementRaiseQuery,queryManagementRespondQuery
secrets:
DATA_STORE_DB_PASSWORD:
secretRef: "{{ .Values.global.postgresSecret }}"
@@ -107,7 +109,7 @@ civil-service:
java:
applicationPort: 4000
releaseNameOverride: ${SERVICE_NAME}-civil-service
image: 'hmctspublic.azurecr.io/civil/service:latest'
image: 'hmctspublic.azurecr.io/civil/service:pr-6124'
imagePullPolicy: Always
ingressHost: ${SERVICE_NAME}-civil-service.preview.platform.hmcts.net
devcpuRequests: 1000m
Original file line number Diff line number Diff line change
@@ -218,6 +218,8 @@ ccd:
ELASTIC_SEARCH_ENABLED: true
ELASTIC_SEARCH_HOSTS: ${SERVICE_NAME}-es-master:9200
ELASTIC_SEARCH_DATA_NODES_HOSTS: http://${SERVICE_NAME}-es-master:9200
CCD_MULTIPARTY_CASE_TYPES: CIVIL
CCD_MULTIPARTY_EVENTS: DEFENDANT_RESPONSE,ACKNOWLEDGE_CLAIM,CLAIMANT_RESPONSE,queryManagementRaiseQuery,queryManagementRespondQuery
secrets:
DATA_STORE_DB_PASSWORD:
secretRef: postgres
4 changes: 3 additions & 1 deletion charts/civil-citizen-ui/values.preview.template.yaml
Original file line number Diff line number Diff line change
@@ -194,6 +194,8 @@ ccd:
ELASTIC_SEARCH_ENABLED: true
ELASTIC_SEARCH_HOSTS: ${SERVICE_NAME}-es-master:9200
ELASTIC_SEARCH_DATA_NODES_HOSTS: http://${SERVICE_NAME}-es-master:9200
CCD_MULTIPARTY_CASE_TYPES: CIVIL
CCD_MULTIPARTY_EVENTS: DEFENDANT_RESPONSE,ACKNOWLEDGE_CLAIM,CLAIMANT_RESPONSE,queryManagementRaiseQuery,queryManagementRespondQuery
keyVaults: []
ingressHost: ccd-data-store-api-${SERVICE_NAME}.preview.platform.hmcts.net
secrets:
@@ -364,7 +366,7 @@ civil-service:
java:
applicationPort: 4000
releaseNameOverride: ${SERVICE_NAME}-civil-service
image: 'hmctspublic.azurecr.io/civil/service:latest'
image: 'hmctspublic.azurecr.io/civil/service:pr-6124'
imagePullPolicy: Always
ingressHost: ${SERVICE_NAME}-civil-service.preview.platform.hmcts.net
devcpuRequests: 1000m
5 changes: 3 additions & 2 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -65,9 +65,10 @@ src/main/routes/features/directionsQuestionnaire/supportRequiredController.ts, \
src/main/routes/features/directionsQuestionnaire/witnesses/otherWitnessesController.ts, \
src/main/routes/features/claim/totalAmountController.ts, \
src/main/routes/features/claimantResponse/incompleteClaimantResponseSubmissionController.ts, \

src/main/assets/js/disable-submit.js, \
src/main/modules/helmet/index.ts, \
src/main/common/form/models/mediation/uploadDocuments/uploadDocumentsForm.ts
src/main/common/form/models/mediation/uploadDocuments/uploadDocumentsForm.ts, \
src/main/routes/features/queryManagement/queryManagement.ts, \
src/main/app/client/civilServiceClient.ts

sonar.organization=hmcts
25 changes: 14 additions & 11 deletions src/main/app/auth/launchdarkly/launchDarklyClient.ts
Original file line number Diff line number Diff line change
@@ -122,7 +122,8 @@ export async function isPcqShutterOn(): Promise<boolean> {
}

export async function isCUIReleaseTwoEnabled(): Promise<boolean> {
return await getFlagValue(CUI_RELEASE_TWO_ENABLED) as boolean;
return true;
//await getFlagValue(CUI_RELEASE_TWO_ENABLED) as boolean;
}

export async function isGaForLipsEnabled(): Promise<boolean> {
@@ -142,19 +143,21 @@ export async function isJudgmentOnlineLive(): Promise<boolean> {
}

export async function isDashboardEnabledForCase(date: Date): Promise<boolean> {
const { DateTime } = require('luxon');
const systemTimeZone = DateTime.local().zoneName;
const epoch = DateTime.fromISO(date, { zone: systemTimeZone }).toSeconds();
const cuiR2Flag = await getFlagValue(CUI_RELEASE_TWO_ENABLED) as boolean;
const dashboardEnabledForR2Cases = await getFlagValue(IS_DASHBOARD_ENABLED_FOR_CASE, epoch) as boolean;
return cuiR2Flag && dashboardEnabledForR2Cases;
// const { DateTime } = require('luxon');
// const systemTimeZone = DateTime.local().zoneName;
// const epoch = DateTime.fromISO(date, { zone: systemTimeZone }).toSeconds();
// const cuiR2Flag = await getFlagValue(CUI_RELEASE_TWO_ENABLED) as boolean;
// const dashboardEnabledForR2Cases = await getFlagValue(IS_DASHBOARD_ENABLED_FOR_CASE, epoch) as boolean;
// return cuiR2Flag && dashboardEnabledForR2Cases;
return true;
}

export async function isCarmEnabledForCase(date: Date): Promise<boolean> {
const { DateTime } = require('luxon');
const systemTimeZone = DateTime.local().zoneName;
const epoch = DateTime.fromISO(date, { zone: systemTimeZone }).toSeconds();
return await getFlagValue(CARM_ENABLED_FOR_CASE, epoch) as boolean;
// const { DateTime } = require('luxon');
// const systemTimeZone = DateTime.local().zoneName;
// const epoch = DateTime.fromISO(date, { zone: systemTimeZone }).toSeconds();
// return await getFlagValue(CARM_ENABLED_FOR_CASE, epoch) as boolean;
return true;
}

export async function isMintiEnabledForCase(date: Date): Promise<boolean> {
4 changes: 4 additions & 0 deletions src/main/app/client/civilServiceClient.ts
Original file line number Diff line number Diff line change
@@ -369,6 +369,10 @@ export class CivilServiceClient {
return this.submitEvent(CaseEvent.REQUEST_FOR_RECONSIDERATION, claimId, updatedClaim, req);
}

async submitQueryManagementRaiseQuery(claimId: string, updatedClaim: ClaimUpdate, req?: AppRequest): Promise<Claim> {
return this.submitEvent(CaseEvent.QUERY_MANAGEMENT_RAISE_QUERY, claimId, updatedClaim, req);
}

async submitEvent(event: CaseEvent, claimId: string, updatedClaim?: ClaimUpdate, req?: AppRequest): Promise<Claim> {
const config = this.getConfig(req);
const userId = req.session?.user?.id;
4 changes: 4 additions & 0 deletions src/main/common/models/civilClaimResponse.ts
Original file line number Diff line number Diff line change
@@ -89,6 +89,7 @@ import {CCDDisclosureOfNonElectronicDocuments} from 'models/ccdResponse/ccdDiscl
import {CCDDocumentsToBeConsidered} from 'models/ccdResponse/ccdDocumentsToBeConsidered';
import {CCDGeneralApplication} from 'models/gaEvents/eventDto';
import {CCDEvidenceConfirmDetails} from 'models/ccdResponse/ccdEvidenceConfirmDetails';
import {CaseQueries} from 'models/queryManagement/caseQueries';

export class CivilClaimResponse {
id: string;
@@ -320,6 +321,9 @@ export interface CCDClaim extends ClaimUpdate {
joIsLiveJudgmentExists?: YesNoUpperCamelCase;
respondent1NoticeOfDiscontinueAllPartyViewDoc?: CaseDocument;
repaymentSummaryObject?:string;
//query management
qmApplicantCitizenQueries?: CaseQueries;
qmRespondentCitizenQueries?: CaseQueries;
}

export interface ClaimFeeData {
4 changes: 4 additions & 0 deletions src/main/common/models/claim.ts
Original file line number Diff line number Diff line change
@@ -86,6 +86,7 @@ import {FlightDetails} from './flightDetails';
import {JudgmentOnline} from 'models/judgmentOnline/judgmentOnline';
import { RespondentGaAppDetail } from './generalApplication/response/respondentGaAppDetail';
import {ClaimGeneralApplication} from 'models/generalApplication/claimGeneralApplication';
import {CaseQueries} from 'models/queryManagement/caseQueries';

export class Claim {
resolvingDispute: boolean;
@@ -192,6 +193,9 @@ export class Claim {
refreshDataForDJ?: boolean = true;
// Index signature to allow dynamic property access
[key: string]: any;
//Query management
qmApplicantCitizenQueries?: CaseQueries;
qmRespondentCitizenQueries?: CaseQueries;

public static fromCCDCaseData(ccdClaim: CCDClaim): Claim {
const claim: Claim = Object.assign(new Claim(), ccdClaim);
1 change: 1 addition & 0 deletions src/main/common/models/events/caseEvent.ts
Original file line number Diff line number Diff line change
@@ -18,4 +18,5 @@ export enum CaseEvent {
JUDGMENT_PAID_IN_FULL = 'JUDGMENT_PAID_IN_FULL',
INITIATE_GENERAL_APPLICATION = 'INITIATE_GENERAL_APPLICATION',
REQUEST_FOR_RECONSIDERATION = 'REQUEST_FOR_RECONSIDERATION',
QUERY_MANAGEMENT_RAISE_QUERY = 'queryManagementRaiseQuery'
}
3 changes: 3 additions & 0 deletions src/main/common/models/events/eventDto.ts
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import {CCDClaimantPaymentOption} from 'models/ccdResponse/ccdClaimantPaymentOpt
import {CCDClaimantPayBySetDate} from '../ccdResponse/ccdPayBySetDate';
import {CcdMediationCarm} from 'models/ccdResponse/ccdMediationCarm';
import {CCDRepaymentPlanFrequency} from 'models/ccdResponse/ccdRepaymentPlan';
import {CaseQueries} from 'models/queryManagement/caseQueries';

export interface EventDto {
event: CaseEvent,
@@ -29,4 +30,6 @@ export interface ClaimUpdate {
applicant1SuggestInstalmentsRepaymentFrequencyForDefendantSpec?: CCDRepaymentPlanFrequency;
applicant1SuggestPayImmediatelyPaymentDateForDefendantSpec?: Date;
applicant1ClaimSettledDate?: Date;
qmApplicantCitizenQueries?: CaseQueries;
qmRespondentCitizenQueries?: CaseQueries;
}
31 changes: 31 additions & 0 deletions src/main/common/models/queryManagement/caseQueries.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import {YesNoUpperCamelCase} from 'form/models/yesNo';
import {Document} from 'models/document/document';

export interface CaseQueries {
caseMessages: QueryMessage[];
partyName: string;
roleOnCase: string;
}

export interface QueryMessage {
id: string;
value: CaseMessage;
}

export interface CaseMessage {
id: string;
subject: string;
name: string;
body: string;
attachments?: FormDocument[];
isHearingRelated: YesNoUpperCamelCase;
hearingDate?: string;
createdOn: string;
createdBy: string;
parentId?: string;
}

export interface FormDocument {
id: string;
value: Document;
}
Loading
Loading