Skip to content

Rename courtRoomId to roomId in change-court-room-for-multiday-hearing command #34

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.

Sign up for GitHub

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

Merged
ozturkmenb merged 2 commits into from
Jul 10, 2026
Merged

Rename courtRoomId to roomId in change-court-room-for-multiday-hearing command #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dfc82a
Rename courtRoomId to roomId in change-court-room-for-multiday-hearin…
ozturkmenb Jul 10, 2026
5305db7
Merge branch 'team/ccsph2n' into dev/roomid-rename-multiday-change-co…
ozturkmenb Jul 10, 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
3 changes: 2 additions & 1 deletion ...sting-command-api/src/main/java/uk/gov/moj/cpp/listing/command/api/ListingCommandApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public class ListingCommandApi {
private static final String ESTIMATED_MINUTES = "estimatedMinutes";
private static final String COURT_SCHEDULE_ID = "courtScheduleId";
private static final String COURT_ROOM_ID = "courtRoomId";
private static final String ROOM_ID = "roomId";
private static final String SESSION_DATE = "sessionDate";
private static final String SESSION_START_TIME = "sessionStartTime";
private static final String SESSION_END_TIME = "sessionEndTime";
Expand Down Expand Up @@ -549,7 +550,7 @@ public void handleChangeCourtRoomForMultidayHearing(final JsonEnvelope envelope)
.add(DAY_START_TIME, session.sessionStartTime() != null ? session.sessionStartTime() : requested.getString(DAY_START_TIME))
.add(DAY_DURATION_MINUTES, requested.getInt(NON_DEFAULT_DAY_DURATION))
.add(COURT_CENTRE_ID, requested.getString(COURT_CENTRE_ID))
.add(COURT_ROOM_ID, session.courtRoomId() != null ? session.courtRoomId() : requested.getString(COURT_ROOM_ID))
.add(COURT_ROOM_ID, session.courtRoomId() != null ? session.courtRoomId() : requested.getString(ROOM_ID))
.add(COURT_SCHEDULE_ID, session.courtScheduleId().toString()));
}

Expand Down
4 changes: 2 additions & 2 deletions ...ing-command-api/src/raml/json/listing.command.change-court-room-for-multiday-hearing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"startTime": "2026-07-15T09:30:00Z",
"duration": 360,
"courtCentreId": "07e45c88-9e5d-3e44-b664-d5345bb13be2",
"courtRoomId": "9d324f4f-6c3b-451f-ac1e-f459db781153",
"roomId": "9d324f4f-6c3b-451f-ac1e-f459db781153",
"courtScheduleId": "6e1bef55-7e13-4615-b3ba-8663f4438e16",
"virtual": true
},
{
"startTime": "2026-07-16T09:30:00Z",
"duration": 360,
"courtCentreId": "07e45c88-9e5d-3e44-b664-d5345bb13be2",
"courtRoomId": "9d324f4f-6c3b-451f-ac1e-f459db781153",
"roomId": "9d324f4f-6c3b-451f-ac1e-f459db781153",
"courtScheduleId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
"virtual": true
}
Expand Down
4 changes: 2 additions & 2 deletions ...mand-api/src/raml/json/schema/listing.command.change-court-room-for-multiday-hearing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"startTime": { "type": "string", "format": "date-time" },
"duration": { "type": "integer", "maximum": 360 },
"courtCentreId": { "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" },
"courtRoomId": { "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" },
"roomId": { "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" },
"courtScheduleId": { "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid" },
"virtual": { "type": "boolean", "enum": [true] }
},
"required": ["startTime", "duration", "courtCentreId", "courtRoomId", "courtScheduleId", "virtual"],
"required": ["startTime", "duration", "courtCentreId", "roomId", "courtScheduleId", "virtual"],
"additionalProperties": false
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...g-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/ListingCommandApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,14 +841,14 @@ public void shouldChangeCourtRoomForMultidayHearingBuildingChangedDaysFromAdapte
.add("startTime", d2 + "T09:30:00Z")
.add("duration", 360)
.add("courtCentreId", courtCentreId.toString())
.add("courtRoomId", requestedCourtRoomId.toString())
.add("roomId", requestedCourtRoomId.toString())
.add("courtScheduleId", courtScheduleId2b.toString())
.add("virtual", true))
.add(Json.createObjectBuilder()
.add("startTime", d3 + "T09:30:00Z")
.add("duration", 360)
.add("courtCentreId", courtCentreId.toString())
.add("courtRoomId", requestedCourtRoomId.toString())
.add("roomId", requestedCourtRoomId.toString())
.add("courtScheduleId", courtScheduleId3b.toString())
.add("virtual", true))
.build();
Expand Down Expand Up @@ -990,14 +990,14 @@ public void shouldRejectChangeCourtRoomForMultidayHearingWhenDuplicateDayDates()
.add("startTime", d2 + "T09:30:00Z")
.add("duration", 360)
.add("courtCentreId", courtCentreId.toString())
.add("courtRoomId", courtRoomId.toString())
.add("roomId", courtRoomId.toString())
.add("courtScheduleId", courtScheduleIdA.toString())
.add("virtual", true))
.add(Json.createObjectBuilder()
.add("startTime", d2 + "T14:00:00Z")
.add("duration", 360)
.add("courtCentreId", courtCentreId.toString())
.add("courtRoomId", courtRoomId.toString())
.add("roomId", courtRoomId.toString())
.add("courtScheduleId", courtScheduleIdB.toString())
.add("virtual", true))
.build();
Expand Down Expand Up @@ -1037,7 +1037,7 @@ public void shouldPropagateAdapterExceptionAndNotSendWhenCourtschedulerRejectsCh
.add("startTime", d2 + "T09:30:00Z")
.add("duration", 360)
.add("courtCentreId", courtCentreId.toString())
.add("courtRoomId", courtRoomId.toString())
.add("roomId", courtRoomId.toString())
.add("courtScheduleId", courtScheduleId.toString())
.add("virtual", true))
.build();
Expand Down
8 changes: 4 additions & 4 deletions ...ion-test/src/test/java/uk/gov/moj/cpp/listing/it/ChangeCourtRoomForMultidayHearingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ void shouldReturn400WhenVirtualIsNotTrue() {
+ "\"startTime\":\"" + hearing.day2 + "T09:00:00Z\","
+ "\"duration\":" + DAY_DURATION_MINUTES + ","
+ "\"courtCentreId\":\"" + hearing.courtCentreId + "\","
+ "\"courtRoomId\":\"" + hearing.courtRoomId + "\","
+ "\"roomId\":\"" + hearing.courtRoomId + "\","
+ "\"courtScheduleId\":\"" + UUID.randomUUID() + "\","
+ "\"virtual\":false}]}";

Expand All @@ -207,7 +207,7 @@ void shouldReturn400WhenDurationExceedsMaximum() {
+ "\"startTime\":\"" + hearing.day2 + "T09:00:00Z\","
+ "\"duration\":720,"
+ "\"courtCentreId\":\"" + hearing.courtCentreId + "\","
+ "\"courtRoomId\":\"" + hearing.courtRoomId + "\","
+ "\"roomId\":\"" + hearing.courtRoomId + "\","
+ "\"courtScheduleId\":\"" + UUID.randomUUID() + "\","
+ "\"virtual\":true}]}";

Expand All @@ -225,7 +225,7 @@ void shouldReturn400WhenCourtScheduleIdMissing() {
+ "\"startTime\":\"" + hearing.day2 + "T09:00:00Z\","
+ "\"duration\":" + DAY_DURATION_MINUTES + ","
+ "\"courtCentreId\":\"" + hearing.courtCentreId + "\","
+ "\"courtRoomId\":\"" + hearing.courtRoomId + "\","
+ "\"roomId\":\"" + hearing.courtRoomId + "\","
+ "\"virtual\":true}]}";

final Response response = postChangeCourtRoom(hearing.hearingId, payload);
Expand Down Expand Up @@ -468,7 +468,7 @@ private static String changeCourtRoomPayload(final UUID courtCentreId, final Lis
.add("startTime", day.date + "T09:00:00Z")
.add("duration", DAY_DURATION_MINUTES)
.add("courtCentreId", courtCentreId.toString())
.add("courtRoomId", day.courtRoomId.toString())
.add("roomId", day.courtRoomId.toString())
.add("courtScheduleId", day.targetCourtScheduleId.toString())
.add("virtual", true);
nonDefaultDays.add(dayBuilder);
Expand Down
Loading