Prechádzať zdrojové kódy

In certificates, registration Authority, volume, number added to converters

Andrew Grant 6 mesiacov pred
rodič
commit
23f25f56f6

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

@@ -23,6 +23,9 @@ public class BirthCertificateCommandConverterImpl implements BirthCertificateCom
         target.setCertificateDate(source.getCertificateDate());
         target.setCertificateSource(source.getCertificateSource());
         target.setCertificateType(source.getCertificateType());
+        target.setRegistrationAuthority(source.getRegistrationAuthority());
+        target.setVolume(source.getVolume());
+        target.setNumber(source.getNumber());
 
         return target;
     }

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

@@ -27,6 +27,9 @@ public class BirthCertificateConverterImpl implements BirthCertificateConverter
         target.setCertificateDate(source.getCertificateDate());
         target.setCertificateSource(source.getCertificateSource());
         target.setCertificateType(source.getCertificateType());
+        target.setRegistrationAuthority(source.getRegistrationAuthority());
+        target.setVolume(source.getVolume());
+        target.setNumber(source.getNumber());
 
         return target;
     }

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

@@ -39,6 +39,9 @@ class BirthCertificateCommandConverterTest {
         String certificateNumber = GetRandomString();
         String certificateDate = GetRandomString();
         CertificateType certificateType = CertificateType.EXTRACT;
+        Organisation registrationAuthority = GetRandomOrganisation();
+        String volume = GetRandomString();
+        String number = GetRandomString();
 
 
         source.setId(id);
@@ -47,6 +50,9 @@ class BirthCertificateCommandConverterTest {
         source.setCertificateDate(certificateDate);
         source.setCertificateSource(issuedAt);
         source.setCertificateType(certificateType);
+        source.setVolume(volume);
+        source.setNumber(number);
+        source.setRegistrationAuthority(registrationAuthority);
 
 
         BirthCertificate target = converter.convert(source);
@@ -58,6 +64,9 @@ class BirthCertificateCommandConverterTest {
         assertEquals(certificateDate, target.getCertificateDate());
         assertEquals(issuedAt, target.getCertificateSource());
         assertEquals(certificateType, target.getCertificateType());
+        assertEquals(volume, target.getVolume());
+        assertEquals(number, target.getNumber());
+        assertEquals(registrationAuthority, target.getRegistrationAuthority());
 
     }
 }

+ 9 - 1
src/test/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateConverterTest.java

@@ -38,13 +38,18 @@ class BirthCertificateConverterTest {
         String certificateNumber = GetRandomString();
         String certificateDate = GetRandomString();
         CertificateType certificateType = CertificateType.EXTRACT;
+        Organisation registrationAuthority = GetRandomOrganisation();
+        String volume = GetRandomString();
+        String number = GetRandomString();
 
         source.setId(id);
         source.setNewBorn(person);
         source.setCertificateNumber(certificateNumber);
         source.setCertificateDate(certificateDate);
         source.setCertificateSource(certificateSource);
-        source.setCertificateType(certificateType);
+        source.setCertificateType(certificateType); source.setVolume(volume);
+        source.setNumber(number);
+        source.setRegistrationAuthority(registrationAuthority);
 
 
         BirthCertificateCommand target = converter.convert(source);
@@ -56,6 +61,9 @@ class BirthCertificateConverterTest {
         assertEquals(certificateDate, target.getCertificateDate());
         assertEquals(certificateSource, target.getCertificateSource());
         assertEquals(certificateType, target.getCertificateType());
+        assertEquals(volume, target.getVolume());
+        assertEquals(number, target.getNumber());
+        assertEquals(registrationAuthority, target.getRegistrationAuthority());
 
     }
 }