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 index 4e9c0474..0f0cb40e 100644 --- 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 index e5c3362e..367ddbc4 100644 --- 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 index 6fbe94c7..6f06afd2 100644 --- 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 index 68410c42..327d62c4 100644 --- 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("bud.weiser@beers.ca") - .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("bud.weiser@beers.ca"); + 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("t.testerton@test.ca") - .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("t.testerton@test.ca"); + 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("t.testerton@test.ca") - .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("t.testerton@test.ca"); + 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());