GRAD2-2644 (#326)

* Initial commit of Event handling for Institute Events * Replace logger with slf4j * Added model and services for contact updates * Added handler services for institute contact events * Updating events * Minor change * Flyway to expand update and create user in replication table to be in line with edx, institute. * Flyway to expand update and create user in replication table to be in line with edx, institute. * Added unit testing. * Removed TODOs * Added another test. * Bumping test coverage again. * Addressing maintainability issues. * Patch for adding default no args constructors to model. * Code cleanup --------- Co-authored-by: chris.ditcher <[email protected]>
bcgov · May 29, 2024 · cdd2e91 · cdd2e91
1 parent 021f044
commit cdd2e91
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 50 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/AuthorityContact.java b/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/AuthorityContact.java
@@ -1,13 +1,20 @@
 package ca.bc.gov.educ.api.trax.model.dto;
 
-import lombok.Builder;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 @Data
-@Builder
 @EqualsAndHashCode(callSuper = true)
-public class AuthorityContact extends BaseModel {
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AuthorityContact extends BaseModel implements Serializable {
+
+    /**
+     * The constant serialVersionUID.
+     */
+    private static final long serialVersionUID = 1L;
 
     private String authorityContactId;
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/DistrictContact.java b/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/DistrictContact.java
@@ -1,13 +1,20 @@
 package ca.bc.gov.educ.api.trax.model.dto;
 
-import lombok.Builder;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 @Data
-@Builder
 @EqualsAndHashCode(callSuper = true)
-public class DistrictContact extends BaseModel {
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DistrictContact extends BaseModel implements Serializable {
+
+    /**
+     * The constant serialVersionUID.
+     */
+    private static final long serialVersionUID = 1L;
 
     private String districtContactId;
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/SchoolContact.java b/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/SchoolContact.java
@@ -1,13 +1,20 @@
 package ca.bc.gov.educ.api.trax.model.dto;
 
-import lombok.Builder;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 @Data
-@Builder
 @EqualsAndHashCode(callSuper = true)
-public class SchoolContact extends BaseModel {
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class SchoolContact extends BaseModel implements Serializable {
+
+    /**
+     * The constant serialVersionUID.
+     */
+    private static final long serialVersionUID = 1L;
 
     private String schoolContactId;
 
@@ -35,4 +42,5 @@ public class SchoolContact extends BaseModel {
 
     private String expiryDate;
 
+
 }
diff --git a/api/src/test/java/ca/bc/gov/educ/api/trax/support/TestUtils.java b/api/src/test/java/ca/bc/gov/educ/api/trax/support/TestUtils.java
@@ -53,19 +53,18 @@ public static Event createEvent(String eventType, Object payload, EventRepositor
     }
 
     public static AuthorityContact createAuthorityContact() {
-        var auth = AuthorityContact.builder()
-                .independentAuthorityId(UUID.randomUUID().toString())
-                .firstName("Bud")
-                .lastName("Weiser")
-                .phoneNumber("3216549874")
-                .phoneExtension("321")
-                .alternatePhoneNumber("3216547894")
-                .alternatePhoneExtension("555")
-                .email("[email protected]")
-                .authorityContactTypeCode("DIRECTOR")
-                .effectiveDate(LocalDateTime.now().toString())
-                .expiryDate(LocalDateTime.now().plus(1, ChronoUnit.DAYS).toString())
-                .build();
+        var auth = new AuthorityContact();
+        auth.setIndependentAuthorityId(UUID.randomUUID().toString());
+        auth.setFirstName("Bud");
+        auth.setLastName("Weiser");
+        auth.setPhoneNumber("3216549874");
+        auth.setPhoneExtension("321");
+        auth.setAlternatePhoneNumber("3216547894");
+        auth.setAlternatePhoneExtension("555");
+        auth.setEmail("[email protected]");
+        auth.setAuthorityContactTypeCode("DIRECTOR");
+        auth.setEffectiveDate(LocalDateTime.now().toString());
+        auth.setExpiryDate(LocalDateTime.now().plus(1, ChronoUnit.DAYS).toString());
         auth.setCreateDate(LocalDateTime.now().toString());
         auth.setCreateUser("TEST");
         auth.setUpdateDate(LocalDateTime.now().toString());
@@ -74,20 +73,19 @@ public static AuthorityContact createAuthorityContact() {
     }
 
     public static SchoolContact createSchoolContact() {
-        var contact = SchoolContact.builder()
-                .schoolId(UUID.randomUUID().toString())
-                .firstName("Testy")
-                .lastName("MacTesterton")
-                .phoneNumber("3216549874")
-                .phoneExtension("123")
-                .alternatePhoneNumber("3216549874")
-                .alternatePhoneExtension("321")
-                .email("[email protected]")
-                .jobTitle("The Tester")
-                .schoolContactTypeCode("PRINCIPAL")
-                .effectiveDate(LocalDate.now().toString())
-                .expiryDate(LocalDateTime.now().plus(1, ChronoUnit.DAYS).toString())
-                .build();
+        var contact = new SchoolContact();
+        contact.setSchoolId(UUID.randomUUID().toString());
+        contact.setFirstName("Testy");
+        contact.setLastName("MacTesterton");
+        contact.setPhoneNumber("3216549874");
+        contact.setPhoneExtension("123");
+        contact.setAlternatePhoneNumber("3216549874");
+        contact.setAlternatePhoneExtension("321");
+        contact.setEmail("[email protected]");
+        contact.setJobTitle("The Tester");
+        contact.setSchoolContactTypeCode("PRINCIPAL");
+        contact.setEffectiveDate(LocalDate.now().toString());
+        contact.setExpiryDate(LocalDateTime.now().plus(1, ChronoUnit.DAYS).toString());
         contact.setCreateDate(LocalDateTime.now().toString());
         contact.setCreateUser("TEST");
         contact.setUpdateDate(LocalDateTime.now().toString());
@@ -96,20 +94,19 @@ public static SchoolContact createSchoolContact() {
     }
 
     public static DistrictContact createDistrictContact() {
-        var contact = DistrictContact.builder()
-                .districtId(UUID.randomUUID().toString())
-                .firstName("Testy")
-                .lastName("MacTesterton")
-                .phoneNumber("3216549874")
-                .phoneExtension("123")
-                .alternatePhoneNumber("3216549874")
-                .alternatePhoneExtension("321")
-                .email("[email protected]")
-                .jobTitle("The Tester")
-                .districtContactTypeCode("PRINCIPAL")
-                .effectiveDate(LocalDate.now().toString())
-                .expiryDate(LocalDateTime.now().plus(1, ChronoUnit.DAYS).toString())
-                .build();
+        var contact = new DistrictContact();
+        contact.setDistrictId(UUID.randomUUID().toString());
+        contact.setFirstName("Testy");
+        contact.setLastName("MacTesterton");
+        contact.setPhoneNumber("3216549874");
+        contact.setPhoneExtension("123");
+        contact.setAlternatePhoneNumber("3216549874");
+        contact.setAlternatePhoneExtension("321");
+        contact.setEmail("[email protected]");
+        contact.setJobTitle("The Tester");
+        contact.setDistrictContactTypeCode("PRINCIPAL");
+        contact.setEffectiveDate(LocalDate.now().toString());
+        contact.setExpiryDate(LocalDateTime.now().plus(1, ChronoUnit.DAYS).toString());
         contact.setCreateDate(LocalDateTime.now().toString());
         contact.setCreateUser("TEST");
         contact.setUpdateDate(LocalDateTime.now().toString());