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

EUI-8736 JRD e-Links API V2 #3227

Merged
merged 35 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2f95f16
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Aug 16, 2023
412b44d
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Aug 21, 2023
484cb19
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Aug 22, 2023
fb6029b
Revert "EUI-8736 JRD e-Links API V2"
johnbenjamin-hmcts Aug 23, 2023
8c36afe
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Aug 23, 2023
efbc9a3
EUI-8779 Merge unmerged RA code
johnbenjamin-hmcts Aug 24, 2023
0491e96
Revert "EUI-8779 Merge unmerged RA code"
johnbenjamin-hmcts Aug 24, 2023
da9b804
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Aug 24, 2023
5cfc350
feature/EUI-8736-JRD-e-Links-API-V2: Setting Preview Deployment ID
johnbenjamin-hmcts Aug 24, 2023
502d771
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Aug 24, 2023
34935bd
Merge branch 'feature/EUI-8736-JRD-e-Links-API-V2' of https://github.…
johnbenjamin-hmcts Aug 24, 2023
1c22941
feature/EUI-8736-JRD-e-Links-API-V2: Setting Preview Deployment ID
johnbenjamin-hmcts Aug 24, 2023
6713406
Merge from master
johnbenjamin-hmcts Aug 25, 2023
5b91917
feature/EUI-8736-JRD-e-Links-API-V2: Setting Preview Deployment ID
johnbenjamin-hmcts Aug 25, 2023
d7fdabe
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Aug 25, 2023
f28a652
Bumping chart version/ fixing aliases
hmcts-jenkins-j-to-z[bot] Aug 25, 2023
eb7fde8
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Sep 1, 2023
aa48ce1
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Sep 1, 2023
9ee9775
feature/EUI-8736-JRD-e-Links-API-V2: Setting Preview Deployment ID
johnbenjamin-hmcts Sep 1, 2023
0263e90
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Sep 1, 2023
60c7d2f
Update yarn-audit-known-issues
johnbenjamin-hmcts Sep 1, 2023
fa3aae6
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Sep 5, 2023
58be0fb
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Sep 19, 2023
0fe5323
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Sep 26, 2023
dc5aef7
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Sep 28, 2023
535fbe2
Update yarn-audit-known-issues
johnbenjamin-hmcts Sep 28, 2023
5677863
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Sep 29, 2023
217f7cc
EUI-8736 JRD e-Links API V2
johnbenjamin-hmcts Sep 29, 2023
2313529
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Sep 29, 2023
3bb89ec
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Oct 3, 2023
0757a71
Bumping chart version/ fixing aliases
hmcts-jenkins-j-to-z[bot] Oct 3, 2023
8091591
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
sreekanthpuligadda Oct 3, 2023
4e7ca86
Update yarn-audit-known-issues
johnbenjamin-hmcts Oct 3, 2023
acf8be3
Merge branch 'master' into feature/EUI-8736-JRD-e-Links-API-V2
johnbenjamin-hmcts Oct 5, 2023
e3018e4
Test update using new case id as old case removed from system in backend
sreekanthpuligadda Oct 12, 2023
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
16 changes: 12 additions & 4 deletions api/prd/judicial/data/judicial.mock.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ export const ALL_JUDICIAL_USERS: JudicialUserModel[] = [
knownAs: 'Hearing Judge',
personalCode: 'p1000000',
surname: 'Collins',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
},
{
emailId: 'jasmine.chiswell@judicial.com',
Expand All @@ -82,7 +84,9 @@ export const ALL_JUDICIAL_USERS: JudicialUserModel[] = [
knownAs: 'Lead Judge',
personalCode: 'p1000001',
surname: 'Chiswell',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
},
{
emailId: 'jamie.vardy@judicial.com',
Expand All @@ -94,7 +98,9 @@ export const ALL_JUDICIAL_USERS: JudicialUserModel[] = [
knownAs: 'Lead Judge',
personalCode: 'p1000002',
surname: 'Vardy',
title: 'Mr'
title: 'Mr',
initials: 'JV',
postNominals: 'JP'
},
{
emailId: 'james.priest@judicial.com',
Expand All @@ -106,6 +112,8 @@ export const ALL_JUDICIAL_USERS: JudicialUserModel[] = [
knownAs: 'Hearing Judge',
personalCode: 'p1000003',
surname: 'Priest',
title: 'Mr'
title: 'Mr',
initials: 'JP',
postNominals: 'JP'
}
];
6 changes: 5 additions & 1 deletion api/prd/judicial/models/judicialUser.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ export interface JudicialUserModel {
personalCode: string;
surname: string;
title: string;
initials: string;
postNominals: string;
}

/**
Expand All @@ -44,6 +46,8 @@ export function transformToJudicialUserModel(rawJudicialUserModel: RawJudicialUs
knownAs: rawJudicialUserModel.known_as,
personalCode: rawJudicialUserModel.personal_code,
surname: rawJudicialUserModel.surname,
title: rawJudicialUserModel.title
title: rawJudicialUserModel.title,
initials: '',
postNominals: ''
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ describe('HearingJudgeNamesListComponent', () => {
knownAs: 'Hearing Judge',
personalCode: 'P100001',
surname: 'Jacky',
title: ''
title: '',
initials: 'JC',
postNominals: 'JP'
};

beforeEach(waitForAsync(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ describe('HearingJudgeComponent', () => {
knownAs: 'Hearing Judge',
personalCode: 'P100001',
surname: 'Jacky',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
};
component.showSpecificJudge(RadioOptions.YES);
expect(component.specificJudgeSelection).toBe(RadioOptions.YES);
Expand Down Expand Up @@ -165,7 +167,9 @@ describe('HearingJudgeComponent', () => {
knownAs: 'Hearing Judge',
personalCode: 'P100001',
surname: 'Jacky',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
};

component.hearingJudgeForm.controls.specificJudge.setValue(RadioOptions.YES);
Expand Down Expand Up @@ -214,7 +218,9 @@ describe('HearingJudgeComponent', () => {
knownAs: 'Jacky Collins',
personalCode: 'P100001',
surname: 'Jacky Collins',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
},
{
emailId: 'jammie.williams@judicial.com',
Expand All @@ -226,7 +232,9 @@ describe('HearingJudgeComponent', () => {
knownAs: 'Jammie Williams',
personalCode: 'P0000002',
surname: 'Jammie Williams',
title: 'Mr'
title: 'Mr',
initials: 'JW',
postNominals: 'JP'
}];
component.specificJudgeSelection = RadioOptions.YES;
component.hearingJudgeFormInfo.includedJudges = ['P0000001'];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,9 @@ describe('HearingPanelComponent', () => {
knownAs: 'Hearing Judge',
personalCode: 'P0000001',
surname: 'Jacky Collins',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
}];
component.initForm();
expect(component.includedJudgeList.length).toBe(1);
Expand All @@ -297,7 +299,9 @@ describe('HearingPanelComponent', () => {
knownAs: 'Hearing Judge',
personalCode: 'P0000001',
surname: 'Jacky',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
};

component.includedJudge.judgeList = [judgeInfo];
Expand Down
12 changes: 9 additions & 3 deletions src/hearings/hearing.test.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ export const judicialUsersRefData: JudicialUserModel[] = [{
knownAs: 'Jacky Collins',
personalCode: 'P0000001',
surname: 'Jacky Collins',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
}];

export const panelMembersRefData: JudicialUserModel[] = [{
Expand All @@ -95,7 +97,9 @@ export const panelMembersRefData: JudicialUserModel[] = [{
knownAs: 'Ramon',
personalCode: '7007496',
surname: 'Herrera',
title: 'Mr'
title: 'Mr',
initials: 'RH',
postNominals: 'JP'
}];

export const judgeRefData: JudicialUserModel[] = [
Expand All @@ -109,7 +113,9 @@ export const judgeRefData: JudicialUserModel[] = [
knownAs: 'Jacky Collins',
personalCode: 'P0000001',
surname: 'Collins',
title: 'Mr'
title: 'Mr',
initials: 'JC',
postNominals: 'JP'
}];

export const hearingPriorityRefData = [
Expand Down
2 changes: 2 additions & 0 deletions src/hearings/models/judicialUser.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ export interface JudicialUserModel {
personalCode: string;
surname: string;
title: string;
initials: string;
postNominals: string;
}