Browse Source

BaseCertificate Converters

Andrew Grant 6 tháng trước cách đây
mục cha
commit
7250835e8b

+ 3 - 0
src/main/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateCommandConverterImpl.java

@@ -18,6 +18,9 @@ public class BirthCertificateCommandConverterImpl implements BirthCertificateCom
 
         target.setId(source.getId());
         target.setNewBorn(source.getNewBorn());
+        target.setCertificateNumber(source.getCertificateNumber());
+        target.setCertificateDate(source.getCertificateDate());
+        target.setCertificateIssuedAt(source.getCertificateIssuedAt());
 
         return target;
     }

+ 4 - 0
src/main/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateConverterImpl.java

@@ -22,6 +22,10 @@ public class BirthCertificateConverterImpl implements BirthCertificateConverter
         target.setId(source.getId());
         target.setNewBorn(source.getNewBorn());
 
+        target.setCertificateNumber(source.getCertificateNumber());
+        target.setCertificateDate(source.getCertificateDate());
+        target.setCertificateIssuedAt(source.getCertificateIssuedAt());
+
         return target;
     }
 }

+ 16 - 0
src/test/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateCommandConverterTest.java

@@ -12,10 +12,16 @@ import scot.carricksoftware.grants.commands.certificates.birthcertificates.Birth
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.domains.certificates.BirthCertificate;
 import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.domains.places.Place;
+
+import java.sql.Date;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateRandomDateValues.GetRandomDate;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
 class BirthCertificateCommandConverterTest {
 
@@ -31,9 +37,15 @@ class BirthCertificateCommandConverterTest {
         Long id = GetRandomLong();
         Person person = GetRandomPerson();
         BirthCertificateCommand source = new BirthCertificateCommandImpl();
+        Place issuedAt = GetRandomPlace();
+        String certificateNumber = GetRandomString();
+        Date certificateDate = GetRandomDate();
 
         source.setId(id);
         source.setNewBorn(person);
+        source.setCertificateNumber(certificateNumber);
+        source.setCertificateDate(certificateDate);
+        source.setCertificateIssuedAt(issuedAt);
 
 
         BirthCertificate target = converter.convert(source);
@@ -41,5 +53,9 @@ class BirthCertificateCommandConverterTest {
         assert target != null;
         assertEquals(id, target.getId());
         assertEquals(person, target.getNewBorn());
+        assertEquals(certificateNumber, target.getCertificateNumber());
+        assertEquals(certificateDate, target.getCertificateDate());
+        assertEquals(issuedAt, target.getCertificateIssuedAt());
+
     }
 }

+ 16 - 0
src/test/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateConverterTest.java

@@ -11,10 +11,16 @@ import org.junit.jupiter.api.Test;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.domains.certificates.BirthCertificate;
 import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.domains.places.Place;
+
+import java.sql.Date;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateRandomDateValues.GetRandomDate;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
 class BirthCertificateConverterTest {
 
@@ -30,9 +36,15 @@ class BirthCertificateConverterTest {
         Long id = GetRandomLong();
         Person person = GetRandomPerson();
         BirthCertificate source = new BirthCertificate();
+        Place issuedAt = GetRandomPlace();
+        String certificateNumber = GetRandomString();
+        Date certificateDate = GetRandomDate();
 
         source.setId(id);
         source.setNewBorn(person);
+        source.setCertificateNumber(certificateNumber);
+        source.setCertificateDate(certificateDate);
+        source.setCertificateIssuedAt(issuedAt);
 
 
         BirthCertificateCommand target = converter.convert(source);
@@ -40,5 +52,9 @@ class BirthCertificateConverterTest {
         assert target != null;
         assertEquals(id, target.getId());
         assertEquals(person, target.getNewBorn());
+        assertEquals(certificateNumber, target.getCertificateNumber());
+        assertEquals(certificateDate, target.getCertificateDate());
+        assertEquals(issuedAt, target.getCertificateIssuedAt());
+
     }
 }