Skip to content

Commit 9e19549

Browse files
committed
update courtschedule related changes
1 parent 4e3c4af commit 9e19549

File tree

5 files changed

+48
-31
lines changed

5 files changed

+48
-31
lines changed

build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ ext['snakeyaml.version'] = '2.0'
157157
def openApiModule = project(":openapi")
158158
def inputSpecFile = new File(openApiModule.projectDir, "src/main/resources/openapi/courtSchedule.yml")
159159

160-
if (!inputSpecFile.exists()) {
161-
throw new GradleException("OpenAPI spec file not found: $inputSpecFile")
162-
}
163160

164161
openApiGenerate {
165162
generatorName = "spring"

src/integrationTest/java/uk/gov/hmcts/cp/controllers/OpenApiControllerTest.java renamed to src/integrationTest/java/uk/gov/hmcts/cp/controllers/CourtSceduleControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@ExtendWith(SpringExtension.class)
1717
@SpringBootTest
1818
@AutoConfigureMockMvc
19-
class OpenApiControllerTest {
19+
class CourtSceduleControllerTest {
2020

2121
@Autowired
2222
private MockMvc mockMvc;

src/main/java/uk/gov/hmcts/cp/controllers/OpenApiController.java renamed to src/main/java/uk/gov/hmcts/cp/controllers/CourtSceduleController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
import org.springframework.web.bind.annotation.RestController;
77
import uk.gov.hmcts.cp.openapi.api.CourtScheduleApi;
88
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschema;
9-
import uk.gov.hmcts.cp.services.OpenApiService;
9+
import uk.gov.hmcts.cp.services.CourtScheduleService;
1010

1111
@RestController
1212
@RequiredArgsConstructor
13-
public class OpenApiController implements CourtScheduleApi {
13+
public class CourtSceduleController implements CourtScheduleApi {
1414

15-
private final OpenApiService openApiService;
15+
private final CourtScheduleService courtScheduleService;
1616

1717
@Override
1818
public ResponseEntity<CourtScheduleschema> getCourtScheduleByCaseUrn(String caseUrn) {
19-
CourtScheduleschema courtScheduleschema = openApiService.getCourtScheduleschema(caseUrn);
19+
CourtScheduleschema courtScheduleschema = courtScheduleService.getCourtScheduleschema(caseUrn);
2020
return new ResponseEntity<>(courtScheduleschema, HttpStatus.OK);
2121
}
2222

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package uk.gov.hmcts.cp.services;
2+
3+
import static java.util.UUID.randomUUID;
4+
5+
import org.springframework.stereotype.Service;
6+
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschema;
7+
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschemaCourtScheduleInner;
8+
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschemaCourtScheduleInnerHearingsInner;
9+
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschemaCourtScheduleInnerHearingsInnerCourtSittingsInner;
10+
11+
import java.time.OffsetDateTime;
12+
13+
import java.util.List;
14+
15+
@Service
16+
public class CourtScheduleService {
17+
18+
public CourtScheduleschema getCourtScheduleschema(String caseUrn) {
19+
20+
CourtScheduleschemaCourtScheduleInnerHearingsInnerCourtSittingsInner courtSittingsItem =
21+
new CourtScheduleschemaCourtScheduleInnerHearingsInnerCourtSittingsInner();
22+
courtSittingsItem.courtHouse(randomUUID().toString());
23+
courtSittingsItem.sittingStart(OffsetDateTime.now());
24+
courtSittingsItem.setSittingEnd(OffsetDateTime.now().plusMinutes(30));
25+
courtSittingsItem.judiciaryId(randomUUID().toString());
26+
27+
CourtScheduleschemaCourtScheduleInnerHearingsInner hearingsItem =
28+
new CourtScheduleschemaCourtScheduleInnerHearingsInner();
29+
hearingsItem.hearingId(randomUUID().toString());
30+
hearingsItem.listNote("Requires interpreter");
31+
hearingsItem.hearingDescription("Sentencing for theft case");
32+
hearingsItem.hearingType("Trial");
33+
hearingsItem.courtSittings(List.of(courtSittingsItem));
34+
35+
CourtScheduleschemaCourtScheduleInner courtScheduleInner = new CourtScheduleschemaCourtScheduleInner();
36+
courtScheduleInner.addHearingsItem(hearingsItem);
37+
38+
CourtScheduleschema courtScheduleschema = new CourtScheduleschema();
39+
courtScheduleschema.courtSchedule(List.of(courtScheduleInner));
40+
41+
return courtScheduleschema;
42+
}
43+
}

src/main/java/uk/gov/hmcts/cp/services/OpenApiService.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)