Merge pull request #51 from companieshouse/lp-314-store-partnership-type-mongo

Lp 314 store partnership type mongo

Author: mattch1

spec/schema.json

@@ -154,6 +154,10 @@
         "name_ending": {
           "type": "string",
           "enum": ["Limited Partnership", "LP", "L.P.", "Partneriaeth Cyfyngedig", "PC", "P.C."]
+        },
+        "partnership_type": {
+          "type": "string",
+          "enum": ["LP", "PFLP", "SLP", "SPFLP"]
         }
       }
     },

src/main/java/uk/gov/companieshouse/limitedpartnershipsapi/model/PartnershipType.java

@@ -0,0 +1,8 @@
+package uk.gov.companieshouse.limitedpartnershipsapi.model;
+
+public enum PartnershipType {
+    LP,
+    PFLP,
+    SLP,
+    SPFLP
+}

src/main/java/uk/gov/companieshouse/limitedpartnershipsapi/model/dao/DataDao.java

@@ -1,6 +1,7 @@
 package uk.gov.companieshouse.limitedpartnershipsapi.model.dao;
 
 import org.springframework.data.mongodb.core.mapping.Field;
+import uk.gov.companieshouse.limitedpartnershipsapi.model.PartnershipType;
 
 public class DataDao {
 
@@ -13,6 +14,9 @@ public class DataDao {
     @Field("registered_email_address")
     private String email;
 
+    @Field("partnership_type")
+    private PartnershipType partnershipType;
+
     public String getPartnershipName() {
         return partnershipName;
     }
@@ -36,4 +40,12 @@ public String getEmail() {
     public void setEmail(String email) {
         this.email = email;
     }
+
+    public PartnershipType getPartnershipType() {
+        return partnershipType;
+    }
+
+    public void setPartnershipType(PartnershipType partnershipType) {
+        this.partnershipType = partnershipType;
+    }
 }

src/main/java/uk/gov/companieshouse/limitedpartnershipsapi/model/dto/DataDto.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import uk.gov.companieshouse.limitedpartnershipsapi.model.PartnershipNameEnding;
+import uk.gov.companieshouse.limitedpartnershipsapi.model.PartnershipType;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
 
@@ -18,6 +19,10 @@ public class DataDto {
     @JsonProperty("email")
     private String email;
 
+    @JsonInclude(NON_NULL)
+    @JsonProperty("partnership_type")
+    private PartnershipType partnershipType;
+
     public String getPartnershipName() {
         return partnershipName;
     }
@@ -41,4 +46,12 @@ public String getEmail() {
     public void setEmail(String email) {
         this.email = email;
     }
+
+    public PartnershipType getPartnershipType() {
+        return partnershipType;
+    }
+
+    public void setPartnershipType(PartnershipType partnershipType) {
+        this.partnershipType = partnershipType;
+    }
 }

src/test/java/uk/gov/companieshouse/limitedpartnershipsapi/mapper/LimitedPartnerMapperTest.java

@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import uk.gov.companieshouse.limitedpartnershipsapi.model.PartnershipNameEnding;
+import uk.gov.companieshouse.limitedpartnershipsapi.model.PartnershipType;
 import uk.gov.companieshouse.limitedpartnershipsapi.model.dao.DataDao;
 import uk.gov.companieshouse.limitedpartnershipsapi.model.dao.LimitedPartnershipSubmissionDao;
 import uk.gov.companieshouse.limitedpartnershipsapi.model.dto.DataDto;
@@ -23,6 +24,7 @@ void givenDto_whenMapsToDao_thenCorrect() {
         DataDto sourceData = new DataDto();
         sourceData.setPartnershipName("Joe Bloggs");
         sourceData.setNameEnding(PartnershipNameEnding.LIMITED_PARTNERSHIP);
+        sourceData.setPartnershipType(PartnershipType.LP);
         source.setData(sourceData);
 
         // when
@@ -32,6 +34,7 @@ void givenDto_whenMapsToDao_thenCorrect() {
         DataDao destinationData = destination.getData();
         assertEquals(sourceData.getPartnershipName(), destinationData.getPartnershipName());
         assertEquals(sourceData.getNameEnding().getDescription(), destinationData.getNameEnding());
+        assertEquals(sourceData.getPartnershipType(), destinationData.getPartnershipType());
     }
 
     @Test