Merge pull request #112 from bcgov/feature/use-institute

transition from school-api to institute-api

Author: arcshiftsolutions

api/src/main/java/ca/bc/gov/educ/api/pen/services/properties/ApplicationProperties.java

@@ -60,6 +60,6 @@ public class ApplicationProperties {
   @Value("${ramp.up.http}")
   private Boolean isHttpRampUp;
 
-  @Value("${url.api.school}")
-  private String schoolApiURL;
+  @Value("${url.api.institute}")
+  private String instituteApiURL;
 }

api/src/main/java/ca/bc/gov/educ/api/pen/services/rest/RestUtils.java

@@ -4,7 +4,7 @@
 import ca.bc.gov.educ.api.pen.services.struct.*;
 import ca.bc.gov.educ.api.pen.services.struct.v1.GenderCode;
 import ca.bc.gov.educ.api.pen.services.struct.v1.GradeCode;
-import ca.bc.gov.educ.api.pen.services.struct.v1.School;
+import ca.bc.gov.educ.api.pen.services.struct.v1.SchoolTombstone;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -59,6 +59,10 @@ public class RestUtils {
    * The Grade lock.
    */
   private final ReadWriteLock gradeLock = new ReentrantReadWriteLock();
+  /**
+   * The School lock
+   */
+  private final ReadWriteLock schoolLock = new ReentrantReadWriteLock();
   /**
    * The Props.
    */
@@ -69,7 +73,7 @@ public class RestUtils {
    */
   private final WebClient webClient;
 
-  private final Map<String, School> schoolMap = new ConcurrentHashMap<>();
+  private final Map<String, SchoolTombstone> schoolMap = new ConcurrentHashMap<>();
 
   /**
    * Instantiates a new Rest utils.
@@ -103,34 +107,41 @@ public void init() {
    * @param mincode the mincode
    * @return the school by min code
    */
-  public Optional<School> getSchoolByMincode(final String mincode) {
+  public Optional<SchoolTombstone> getSchoolByMincode(final String mincode) {
+    if (this.schoolMap.isEmpty()) {
+      log.info("School map is empty reloading schools");
+      this.populateSchoolMap();
+    }
     return Optional.ofNullable(this.schoolMap.get(mincode));
   }
 
   /**
    * Populate school map.
    */
   public void populateSchoolMap() {
-    for (val school : this.getSchools()) {
-      this.schoolMap.putIfAbsent(school.getDistNo() + school.getSchlNo(), school);
+    val writeLock = this.schoolLock.writeLock();
+    try {
+      writeLock.lock();
+      for (val school : this.getSchools()) {
+        this.schoolMap.putIfAbsent(school.getMincode(), school);
+      }
+    } catch (Exception ex) {
+      log.error("Unable to load map cache school {}", ex);
+    } finally {
+      writeLock.unlock();
     }
     log.info("loaded  {} schools to memory", this.schoolMap.values().size());
   }
 
-  /**
-   * Gets schools.
-   *
-   * @return the schools
-   */
-  public List<School> getSchools() {
-    log.info("calling school api to load schools to memory");
+  public List<SchoolTombstone> getSchools() {
+    log.info("Calling Institute api to load schools to memory");
     return this.webClient.get()
-      .uri(this.props.getSchoolApiURL())
-      .header(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-      .retrieve()
-      .bodyToFlux(School.class)
-      .collectList()
-      .block();
+            .uri(this.props.getInstituteApiURL() + "/school")
+            .header(CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+            .retrieve()
+            .bodyToFlux(SchoolTombstone.class)
+            .collectList()
+            .block();
   }
 
   /**

api/src/main/java/ca/bc/gov/educ/api/pen/services/rules/impl/BirthDateRule.java

@@ -82,19 +82,21 @@ public List<PenRequestStudentValidationIssue> validate(final PenRequestStudentVa
    * <p>
    * Public, Yukon, PSI etc schools – Set to ‘Y’ if
    * <p>
-   * SCHOOL_CATEGORY_CODE OF SCHOOL_MASTER NE "02" and & ; Not Independent
-   * SCHOOL_CATEGORY_CODE OF SCHOOL_MASTER NE "09" and & ; Not Offshore
-   * SCHOOL_CATEGORY_CODE OF SCHOOL_MASTER NE "10"       ; Not Early Learning
+   * SCHOOL_CATEGORY_CODE OF INSTITUTE_API NE "INDEPEND" legacy code "02" and & ; Not Independent
+   * SCHOOL_CATEGORY_CODE OF INSTITUTE_API NE "INDP_FNS" legacy code "02" and & ; Not Independent First Nations
+   * SCHOOL_CATEGORY_CODE OF INSTITUTE_API NE "OFFSHORE" legacy code "09" and & ; Not Offshore
+   * SCHOOL_CATEGORY_CODE OF INSTITUTE NE_API "EAR_LEARN" legacy code "10"      ; Not Early Learning
    *
    * @param results           the error/warning list
    * @param dob               the dob of student
    * @param validationPayload the payload that is being validated.
    */
   private void validateDOBForPublicSchool(final List<PenRequestStudentValidationIssue> results, final LocalDate dob, final PenRequestStudentValidationPayload validationPayload) {
     val schoolCategoryCode = this.getSchoolCategoryCode(validationPayload);
-    if (!StringUtils.equals("02", schoolCategoryCode)
-      && !StringUtils.equals("09", schoolCategoryCode)
-      && !StringUtils.equals("10", schoolCategoryCode)
+    if (!StringUtils.equals("INDEPEND", schoolCategoryCode)
+      && !StringUtils.equals("INDP_FNS", schoolCategoryCode)
+      && !StringUtils.equals("OFFSHORE", schoolCategoryCode)
+      && !StringUtils.equals("EAR_LEARN", schoolCategoryCode)
       && (Period.between(dob, this.getComparisonDate()).toTotalMonths() < 60)) {
       results.add(this.createValidationEntity(ERROR, DOB_TOO_YOUNG, BIRTH_DATE));
     }
@@ -106,8 +108,9 @@ private void validateDOBForPublicSchool(final List<PenRequestStudentValidationIs
    * <p>
    * Independent or Offshore school– Set to ‘Y’ if
    * <p>
-   * SCHOOL_CATEGORY_CODE OF SCHOOL_MASTER = "02" or ; Independent School
-   * SCHOOL_CATEGORY_CODE OF SCHOOL_MASTER = "09"      ; Offshore School
+   * SCHOOL_CATEGORY_CODE OF INSTITUTE_API = "INDEPEND" legacy code "02" or ; Independent School
+   * SCHOOL_CATEGORY_CODE OF INSTITUTE_API = "INDP_FNS" legacy code "02" or ; Independent First Nations School
+   * SCHOOL_CATEGORY_CODE OF INSTITUTE_API = "OFFSHORE" legacy code "09"    ; Offshore School
    * BIRTHDATE	ERROR	ERROR	DOB TOO YOUNG
    *
    * @param results           the error/warning list
@@ -116,7 +119,7 @@ private void validateDOBForPublicSchool(final List<PenRequestStudentValidationIs
    */
   private void validateDOBForOffshoreAndIndependentSchool(final List<PenRequestStudentValidationIssue> results, final LocalDate dob, final PenRequestStudentValidationPayload validationPayload) {
     val schoolCategoryCode = this.getSchoolCategoryCode(validationPayload);
-    if ((StringUtils.equals("02", schoolCategoryCode) || StringUtils.equals("09", schoolCategoryCode))
+    if ((StringUtils.equals("INDEPEND", schoolCategoryCode) || StringUtils.equals("INDP_FNS", schoolCategoryCode) || StringUtils.equals("OFFSHORE", schoolCategoryCode))
       && (Period.between(dob, this.getComparisonDate()).toTotalMonths() < 48)) {
       results.add(this.createValidationEntity(ERROR, DOB_TOO_YOUNG, BIRTH_DATE));
     }

api/src/main/java/ca/bc/gov/educ/api/pen/services/struct/v1/BaseRequest.java

@@ -0,0 +1,32 @@
+package ca.bc.gov.educ.api.pen.services.struct.v1;
+
+import jakarta.validation.constraints.Null;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * The type Base request.
+ */
+@Data
+public abstract class BaseRequest {
+  /**
+   * The Create user.
+   */
+  @Size(max = 100)
+  public String createUser;
+  /**
+   * The Update user.
+   */
+  @Size(max = 100)
+  public String updateUser;
+  /**
+   * The Create date.
+   */
+  @Null(message = "createDate should be null.")
+  public String createDate;
+  /**
+   * The Update date.
+   */
+  @Null(message = "updateDate should be null.")
+  public String updateDate;
+}