Skip to content

Commit d5cbd1f

Browse files
ethatcher83ethatcher83
authored
Merge pull request #138 from companieshouse/GCI-2299-add-company-name-field-to-delivery-details
add company name field to delivery details
2 parents f128680 + d5391a6 commit d5cbd1f

File tree

6 files changed

+42
-3
lines changed

6 files changed

+42
-3
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<system-rules-version>1.17.2</system-rules-version>
2929
<spring-cloud-contract-wiremock-version>2.2.2.RELEASE</spring-cloud-contract-wiremock-version>
3030
<start-class>uk.gov.companieshouse.orders.api.OrdersApiApplication</start-class>
31-
<private-api-sdk-java.version>2.0.109</private-api-sdk-java.version>
31+
<private-api-sdk-java.version>2.0.188</private-api-sdk-java.version>
3232
<api-sdk-manager-java-library.version>1.0.3</api-sdk-manager-java-library.version>
3333
<api-sdk-java.version>4.3.3</api-sdk-java.version>
3434
<api-helper-java.version>1.4.1</api-helper-java.version>

‎src/main/java/uk/gov/companieshouse/orders/api/dto/DeliveryDetailsDTO.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
public class DeliveryDetailsDTO {
99

10+
@JsonProperty("company_name")
11+
private String companyName;
12+
1013
@NotBlank
1114
@JsonProperty("address_line_1")
1215
private String addressLine1;
@@ -39,6 +42,14 @@ public class DeliveryDetailsDTO {
3942
@JsonProperty("surname")
4043
private String surname;
4144

45+
public String getCompanyName() {
46+
return companyName;
47+
}
48+
49+
public void setCompanyName(String companyName) {
50+
this.companyName = companyName;
51+
}
52+
4253
public String getAddressLine1() {
4354
return addressLine1;
4455
}

‎src/main/java/uk/gov/companieshouse/orders/api/model/DeliveryDetails.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
public class DeliveryDetails {
88

9+
@Field("company_name")
10+
@JsonProperty("company_name")
11+
private String companyName;
12+
913
@Field("address_line_1")
1014
@JsonProperty("address_line_1")
1115
private String addressLine1;
@@ -29,6 +33,14 @@ public class DeliveryDetails {
2933
private String surname;
3034

3135

36+
public String getCompanyName() {
37+
return companyName;
38+
}
39+
40+
public void setCompanyName(String companyName) {
41+
this.companyName = companyName;
42+
}
43+
3244
public String getAddressLine1() {
3345
return addressLine1;
3446
}

‎src/test/java/uk/gov/companieshouse/orders/api/controller/BasketControllerIntegrationTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,7 @@ private Basket getBasket(boolean isPostalDelivery, final String itemUri) {
996996
BasketData basketData = new BasketData();
997997
if (isPostalDelivery) {
998998
DeliveryDetails deliveryDetails = new DeliveryDetails();
999+
deliveryDetails.setCompanyName(COMPANY_NAME);
9991000
deliveryDetails.setAddressLine1(ADDRESS_LINE_1);
10001001
deliveryDetails.setForename(FORENAME);
10011002
deliveryDetails.setSurname(SURNAME);
@@ -1242,6 +1243,7 @@ void getBasketReturnsBasketPopulatedWithCertificate() throws Exception {
12421243

12431244
final DeliveryDetails getDeliveryDetails = response.getDeliveryDetails();
12441245
final Item item = response.getItems().get(0);
1246+
assertEquals(COMPANY_NAME, getDeliveryDetails.getCompanyName());
12451247
assertEquals(ADDRESS_LINE_1, getDeliveryDetails.getAddressLine1());
12461248
assertEquals(ADDRESS_LINE_2, getDeliveryDetails.getAddressLine2());
12471249
assertEquals(COUNTRY, getDeliveryDetails.getCountry());
@@ -1319,6 +1321,7 @@ void getBasketReturnsBasketPopulatedWithCertifiedCopy() throws Exception {
13191321

13201322
final DeliveryDetails getDeliveryDetails = response.getDeliveryDetails();
13211323
final Item item = response.getItems().get(0);
1324+
assertEquals(COMPANY_NAME, getDeliveryDetails.getCompanyName());
13221325
assertEquals(ADDRESS_LINE_1, getDeliveryDetails.getAddressLine1());
13231326
assertEquals(ADDRESS_LINE_2, getDeliveryDetails.getAddressLine2());
13241327
assertEquals(COUNTRY, getDeliveryDetails.getCountry());
@@ -1422,6 +1425,7 @@ void addDeliveryDetailsToBasketIfTheBasketExists() throws Exception {
14221425

14231426
AddDeliveryDetailsRequestDTO addDeliveryDetailsRequestDTO = new AddDeliveryDetailsRequestDTO();
14241427
DeliveryDetailsDTO deliveryDetailsDTO = new DeliveryDetailsDTO();
1428+
deliveryDetailsDTO.setCompanyName(COMPANY_NAME);
14251429
deliveryDetailsDTO.setAddressLine1(ADDRESS_LINE_1);
14261430
deliveryDetailsDTO.setAddressLine2(ADDRESS_LINE_2);
14271431
deliveryDetailsDTO.setCountry(COUNTRY);
@@ -1444,6 +1448,7 @@ void addDeliveryDetailsToBasketIfTheBasketExists() throws Exception {
14441448

14451449
final Optional<Basket> retrievedBasket = basketRepository.findById(ERIC_IDENTITY_VALUE);
14461450
final DeliveryDetails getDeliveryDetails = retrievedBasket.get().getData().getDeliveryDetails();
1451+
assertEquals(COMPANY_NAME, getDeliveryDetails.getCompanyName());
14471452
assertEquals(ADDRESS_LINE_1, getDeliveryDetails.getAddressLine1());
14481453
assertEquals(ADDRESS_LINE_2, getDeliveryDetails.getAddressLine2());
14491454
assertEquals(COUNTRY, getDeliveryDetails.getCountry());
@@ -1461,6 +1466,7 @@ void addDeliveryDetailsToBasketIfTheBasketDoesNotExist() throws Exception {
14611466

14621467
AddDeliveryDetailsRequestDTO addDeliveryDetailsRequestDTO = new AddDeliveryDetailsRequestDTO();
14631468
DeliveryDetailsDTO deliveryDetailsDTO = new DeliveryDetailsDTO();
1469+
deliveryDetailsDTO.setCompanyName(COMPANY_NAME);
14641470
deliveryDetailsDTO.setAddressLine1(ADDRESS_LINE_1);
14651471
deliveryDetailsDTO.setAddressLine2(ADDRESS_LINE_2);
14661472
deliveryDetailsDTO.setCountry(COUNTRY);
@@ -1483,6 +1489,7 @@ void addDeliveryDetailsToBasketIfTheBasketDoesNotExist() throws Exception {
14831489

14841490
final Optional<Basket> retrievedBasket = basketRepository.findById(ERIC_IDENTITY_VALUE);
14851491
final DeliveryDetails getDeliveryDetails = retrievedBasket.get().getData().getDeliveryDetails();
1492+
assertEquals(COMPANY_NAME, getDeliveryDetails.getCompanyName());
14861493
assertEquals(ADDRESS_LINE_1, getDeliveryDetails.getAddressLine1());
14871494
assertEquals(ADDRESS_LINE_2, getDeliveryDetails.getAddressLine2());
14881495
assertEquals(COUNTRY, getDeliveryDetails.getCountry());
@@ -2338,6 +2345,7 @@ private Basket createBasket(final LocalDateTime start, final String itemUri) {
23382345
basket.getData().getItems().add(basketItem);
23392346

23402347
DeliveryDetails deliveryDetails = new DeliveryDetails();
2348+
deliveryDetails.setCompanyName(COMPANY_NAME);
23412349
deliveryDetails.setAddressLine1(ADDRESS_LINE_1);
23422350
deliveryDetails.setAddressLine2(ADDRESS_LINE_2);
23432351
deliveryDetails.setCountry(COUNTRY);

‎src/test/java/uk/gov/companieshouse/orders/api/mapper/DeliveryDetailsMapperTest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package uk.gov.companieshouse.orders.api.mapper;
22

3+
import static org.junit.Assert.assertEquals;
4+
35
import org.junit.jupiter.api.Test;
46
import org.junit.jupiter.api.extension.ExtendWith;
57
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,12 +14,11 @@
1214
import uk.gov.companieshouse.orders.api.dto.DeliveryDetailsDTO;
1315
import uk.gov.companieshouse.orders.api.model.DeliveryDetails;
1416

15-
import static org.junit.Assert.assertEquals;
16-
1717
@ExtendWith(SpringExtension.class)
1818
@SpringJUnitConfig(DeliveryDetailsMapperTest.Config.class)
1919
public class DeliveryDetailsMapperTest {
2020

21+
private static final String COMPANY_NAME = "company name";
2122
private static final String ADDRESS_LINE_1 = "address line 1";
2223
private static final String ADDRESS_LINE_2 = "address line 2";
2324
private static final String COUNTRY = "country";
@@ -40,6 +41,7 @@ public void testDeliveryDetailsDTOToDeliveryDetails(){
4041

4142
final AddDeliveryDetailsRequestDTO dto = new AddDeliveryDetailsRequestDTO();
4243
DeliveryDetailsDTO deliveryDetailsDTO = new DeliveryDetailsDTO();
44+
deliveryDetailsDTO.setCompanyName(COMPANY_NAME);
4345
deliveryDetailsDTO.setAddressLine1(ADDRESS_LINE_1);
4446
deliveryDetailsDTO.setAddressLine2(ADDRESS_LINE_2);
4547
deliveryDetailsDTO.setCountry(COUNTRY);
@@ -53,6 +55,7 @@ public void testDeliveryDetailsDTOToDeliveryDetails(){
5355

5456
DeliveryDetails deliveryDetails = deliveryDetailsMapper.addToDeliveryDetailsRequestDTOToDeliveryDetails(dto);
5557

58+
assertEquals(COMPANY_NAME, deliveryDetails.getCompanyName());
5659
assertEquals(ADDRESS_LINE_1, deliveryDetails.getAddressLine1());
5760
assertEquals(ADDRESS_LINE_2, deliveryDetails.getAddressLine2());
5861
assertEquals(COUNTRY, deliveryDetails.getCountry());
@@ -69,6 +72,7 @@ public void testDeliveryDetailsToDeliveryDetailsDTO(){
6972

7073
final DeliveryDetails deliveryDetails = new DeliveryDetails();
7174

75+
deliveryDetails.setCompanyName(COMPANY_NAME);
7276
deliveryDetails.setAddressLine1(ADDRESS_LINE_1);
7377
deliveryDetails.setAddressLine2(ADDRESS_LINE_2);
7478
deliveryDetails.setCountry(COUNTRY);
@@ -81,6 +85,7 @@ public void testDeliveryDetailsToDeliveryDetailsDTO(){
8185

8286
AddDeliveryDetailsResponseDTO addDeliveryDetailsResponseDTO = deliveryDetailsMapper.deliveryDetailsToAddToDeliveryDetailsDTO(deliveryDetails);
8387

88+
assertEquals(COMPANY_NAME, addDeliveryDetailsResponseDTO.getCompanyName());
8489
assertEquals(ADDRESS_LINE_1, addDeliveryDetailsResponseDTO.getAddressLine1());
8590
assertEquals(ADDRESS_LINE_2, addDeliveryDetailsResponseDTO.getAddressLine2());
8691
assertEquals(COUNTRY, addDeliveryDetailsResponseDTO.getCountry());

‎src/test/java/uk/gov/companieshouse/orders/api/service/CheckoutServiceTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class CheckoutServiceTest {
4343
private static final String LINKS_PAYMENT = "links/payment";
4444
private static final String KIND = "order";
4545

46+
private static final String COMPANY_NAME = "company name";
4647
private static final String ADDRESS_LINE_1 = "address line 1";
4748
private static final String ADDRESS_LINE_2 = "address line 2";
4849
private static final String COUNTRY = "country";
@@ -170,6 +171,7 @@ void createCheckoutPopulatesAndSavesCheckedOutBy() {
170171
void createCheckoutPopulatesAndSavesDeliveryDetails() {
171172
when(checkoutRepository.save(any(Checkout.class))).thenReturn(new Checkout());
172173
DeliveryDetails deliveryDetails = new DeliveryDetails();
174+
deliveryDetails.setCompanyName(COMPANY_NAME);
173175
deliveryDetails.setAddressLine1(ADDRESS_LINE_1);
174176
deliveryDetails.setAddressLine2(ADDRESS_LINE_2);
175177
deliveryDetails.setCountry(COUNTRY);
@@ -186,6 +188,7 @@ void createCheckoutPopulatesAndSavesDeliveryDetails() {
186188
verify(checkoutRepository).save(checkoutCaptor.capture());
187189

188190
DeliveryDetails createdDeliveryDetails = checkout().getData().getDeliveryDetails();
191+
assertThat(createdDeliveryDetails.getCompanyName(), is(COMPANY_NAME));
189192
assertThat(createdDeliveryDetails.getAddressLine1(), is(ADDRESS_LINE_1));
190193
assertThat(createdDeliveryDetails.getAddressLine2(), is(ADDRESS_LINE_2));
191194
assertThat(createdDeliveryDetails.getCountry(), is(COUNTRY));

0 commit comments

Comments
 (0)