Skip to content

Commit 4e3c4af

Browse files
committed
api-cp-crime-schedulingandlisting-courtschedule project setup;
1 parent abf064b commit 4e3c4af

File tree

6 files changed

+29
-24
lines changed

6 files changed

+29
-24
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "openapi"]
22
path = openapi
3-
url = ../api-cp-refdata-courthearing-courthouses.git
3+
url = ../api-cp-crime-schedulingandlisting-courtschedule.git
44
branch = master

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ ext {
155155
ext['snakeyaml.version'] = '2.0'
156156

157157
def openApiModule = project(":openapi")
158-
def inputSpecFile = new File(openApiModule.projectDir, "src/main/resources/openapi/courtHouses.yml")
158+
def inputSpecFile = new File(openApiModule.projectDir, "src/main/resources/openapi/courtSchedule.yml")
159159

160160
if (!inputSpecFile.exists()) {
161161
throw new GradleException("OpenAPI spec file not found: $inputSpecFile")

openapi

src/integrationTest/java/uk/gov/hmcts/cp/controllers/OpenApiControllerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package uk.gov.hmcts.cp.controllers;
22

3-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
4-
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
5-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
6-
73
import org.junit.jupiter.api.DisplayName;
84
import org.junit.jupiter.api.Test;
95
import org.junit.jupiter.api.extension.ExtendWith;
@@ -13,6 +9,10 @@
139
import org.springframework.test.context.junit.jupiter.SpringExtension;
1410
import org.springframework.test.web.servlet.MockMvc;
1511

12+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
13+
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
14+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
15+
1616
@ExtendWith(SpringExtension.class)
1717
@SpringBootTest
1818
@AutoConfigureMockMvc
@@ -21,10 +21,10 @@ class OpenApiControllerTest {
2121
@Autowired
2222
private MockMvc mockMvc;
2323

24-
@DisplayName("Should /courthouses/{court_id} request with 200 response code")
24+
@DisplayName("Should /case/{case_urn}/courtschedule request with 200 response code")
2525
@Test
2626
void shouldCallActuatorAndGet200() throws Exception {
27-
mockMvc.perform(get("/courthouses/123"))
27+
mockMvc.perform(get("/case/123/courtschedule"))
2828
.andDo(print())
2929
.andExpect(status().isOk());
3030
}

src/main/java/uk/gov/hmcts/cp/controllers/OpenApiController.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
import org.springframework.http.HttpStatus;
55
import org.springframework.http.ResponseEntity;
66
import org.springframework.web.bind.annotation.RestController;
7-
import uk.gov.hmcts.cp.openapi.api.DefaultApi;
8-
import uk.gov.hmcts.cp.openapi.model.CourtHousesschema;
7+
import uk.gov.hmcts.cp.openapi.api.CourtScheduleApi;
8+
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschema;
99
import uk.gov.hmcts.cp.services.OpenApiService;
1010

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

1515
private final OpenApiService openApiService;
1616

1717
@Override
18-
public ResponseEntity<CourtHousesschema> courthousesCourtIdGet(String courtId) {
19-
CourtHousesschema courtHousesschema = openApiService.getCourtHouse(courtId);
20-
return new ResponseEntity<>(courtHousesschema, HttpStatus.OK);
18+
public ResponseEntity<CourtScheduleschema> getCourtScheduleByCaseUrn(String caseUrn) {
19+
CourtScheduleschema courtScheduleschema = openApiService.getCourtScheduleschema(caseUrn);
20+
return new ResponseEntity<>(courtScheduleschema, HttpStatus.OK);
2121
}
2222

2323
}
Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
package uk.gov.hmcts.cp.services;
22

33
import org.springframework.stereotype.Service;
4-
import uk.gov.hmcts.cp.openapi.model.CourtHousesschema;
5-
import uk.gov.hmcts.cp.openapi.model.CourtHousesschemaCourtHouse;
4+
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschema;
5+
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschemaCourtScheduleInner;
6+
import uk.gov.hmcts.cp.openapi.model.CourtScheduleschemaCourtScheduleInnerHearingsInner;
7+
8+
import java.util.List;
69

710
@Service
811
public class OpenApiService {
912

10-
public CourtHousesschema getCourtHouse(String courtId) {
11-
CourtHousesschema courtHousesschema = new CourtHousesschema();
12-
CourtHousesschemaCourtHouse courtHouse = new CourtHousesschemaCourtHouse();
13-
courtHouse.courtHouseName("House name 221B");
14-
courtHouse.courtHouseCode(courtId);
15-
courtHousesschema.courtHouse(courtHouse);
16-
return courtHousesschema;
13+
public CourtScheduleschema getCourtScheduleschema(String caseUrn) {
14+
CourtScheduleschema courtScheduleschema = new CourtScheduleschema();
15+
CourtScheduleschemaCourtScheduleInner courtScheduleInner = new CourtScheduleschemaCourtScheduleInner();
16+
CourtScheduleschemaCourtScheduleInnerHearingsInner hearingsItem =
17+
new CourtScheduleschemaCourtScheduleInnerHearingsInner();
18+
hearingsItem.hearingId(caseUrn);
19+
courtScheduleInner.addHearingsItem(hearingsItem);
20+
courtScheduleschema.courtSchedule(List.of(courtScheduleInner));
21+
return courtScheduleschema;
1722
}
1823
}

0 commit comments

Comments
 (0)