Changes to ignore "schoolOfRecordId", "schoolAtGradId" during deseria…

api/src/main/java/ca/bc/gov/educ/api/graduation/service/ReportService.java

@@ -199,8 +199,7 @@ public ReportData prepareTranscriptData(ca.bc.gov.educ.api.graduation.model.dto.
     public ReportData prepareTranscriptData(String pen, boolean xml, ExceptionMessage exception) {
         try {
             GraduationStudentRecord graduationStudentRecord = getGraduationStudentRecordByPen(pen);
-            ca.bc.gov.educ.api.graduation.model.dto.GraduationData graduationData = (ca.bc.gov.educ.api.graduation.model.dto.GraduationData) jsonTransformer.unmarshall(graduationStudentRecord.getStudentGradData(), ca.bc.gov.educ.api.graduation.model.dto.GraduationData.class);
-            return prepareTranscriptData(graduationData, graduationStudentRecord, xml, exception);
+            return prepareTranscriptData(unmarshallForReport(graduationStudentRecord), graduationStudentRecord, xml, exception);
         } catch (Exception e) {
             exception.setExceptionName("PREPARE TRANSCRIPT REPORT DATA FROM PEN");
             exception.setExceptionDetails(e.getCause() == null ? e.getLocalizedMessage() : e.getCause().getLocalizedMessage());
@@ -954,8 +953,7 @@ private String getEncodedStringFromBytes(byte[] bytes) {
     public ReportData prepareCertificateData(String pen, ExceptionMessage exception) {
         try {
             GraduationStudentRecord graduationStudentRecord = getGraduationStudentRecordByPen(pen);
-            ca.bc.gov.educ.api.graduation.model.dto.GraduationData graduationData = (ca.bc.gov.educ.api.graduation.model.dto.GraduationData) jsonTransformer.unmarshall(graduationStudentRecord.getStudentGradData(), ca.bc.gov.educ.api.graduation.model.dto.GraduationData.class);
-            return prepareCertificateData(graduationStudentRecord, graduationData);
+            return prepareCertificateData(graduationStudentRecord, unmarshallForReport(graduationStudentRecord));
         } catch (Exception e) {
             exception.setExceptionName("PREPARE CERTIFICATE REPORT DATA FROM PEN");
             exception.setExceptionDetails(e.getCause() == null ? e.getLocalizedMessage() : e.getCause().getLocalizedMessage());
@@ -1270,5 +1268,11 @@ Date toLastDayOfMonth(Date date) {
         }
         return null;
     }
+
+    private ca.bc.gov.educ.api.graduation.model.dto.GraduationData unmarshallForReport(GraduationStudentRecord graduationStudentRecord) {
+        Map<Class, List<String>> ignoreFields = new HashMap<>();
+        ignoreFields.put(GradAlgorithmGraduationStudentRecord.class, Arrays.asList("schoolOfRecordId"));
+        return (ca.bc.gov.educ.api.graduation.model.dto.GraduationData) jsonTransformer.unmarshall(graduationStudentRecord.getStudentGradData(), ca.bc.gov.educ.api.graduation.model.dto.GraduationData.class, ignoreFields);
+    }
 }
 

api/src/main/java/ca/bc/gov/educ/api/graduation/util/JsonTransformer.java

@@ -2,13 +2,17 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class JsonTransformer implements Transformer {
@@ -50,6 +54,27 @@ public Object unmarshall(String input, Class<?> clazz) {
         return result;
     }
 
+    @Override
+    public Object unmarshall(String input, Class<?> clazz, Map<Class, List<String>> additionalIgnoreFields) {
+        ObjectMapper mapper = objectMapper.copy();
+        Object result = null;
+        long start = System.currentTimeMillis();
+        try {
+            mapper.setAnnotationIntrospector(new JacksonAnnotationIntrospector() {
+                @Override
+                public boolean hasIgnoreMarker(final AnnotatedMember m) {
+                    List<String> ignoreFields = additionalIgnoreFields.getOrDefault(m.getDeclaringClass(), List.of());
+                    return ignoreFields.contains(m.getName()) || super.hasIgnoreMarker(m);
+                }
+            });
+            result = mapper.readValue(input, clazz);
+        } catch (IOException e) {
+            log.error(e.getLocalizedMessage(), e);
+        }
+        log.debug(MARSHALLING_MSG, clazz.getName(), (System.currentTimeMillis() - start));
+        return result;
+    }
+
     @Override
     public Object unmarshall(String input, TypeReference<?> valueTypeRef) {
         Object result = null;

api/src/main/java/ca/bc/gov/educ/api/graduation/util/Transformer.java

@@ -3,12 +3,15 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 
 import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
 
 public interface Transformer {
 
     public Object unmarshall(byte[] input, Class<?> clazz);
 
     public Object unmarshall(String input, Class<?> clazz);
+    public Object unmarshall(String input, Class<?> clazz, Map<Class, List<String>> additionalIgnoreFields);
 
     public Object unmarshall(InputStream input, Class<?> clazz);