EGC-581 - updates exception handling

Author: mightycox

api/src/main/java/ca/bc/gov/educ/api/trax/service/BaseStudentMergeEventHandlerService.java

@@ -12,6 +12,7 @@
 import ca.bc.gov.educ.api.trax.struct.StudentMerge;
 import ca.bc.gov.educ.api.trax.struct.GradStudent;
 import ca.bc.gov.educ.api.trax.util.JsonUtil;
+import ca.bc.gov.educ.api.trax.exception.NotificationApiException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -150,14 +151,18 @@ protected boolean checkStudentExistsInGradStudentApi(final String studentId) {
           log.info("Student {} not found in GRAD-STUDENT-API", studentId);
           return false;
         } else {
-          throw new RuntimeException("GRAD-STUDENT-API error for student " + studentId + ": " + gradStudent.getException());
+          throw new NotificationApiException("GRAD-STUDENT-API error for student " + studentId + ": " + gradStudent.getException());
         }
       }
       log.info("Student {} found in GRAD-STUDENT-API", studentId);
       return true;
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      log.error("Interrupted while checking student {}: {}", studentId, e.getMessage());
+      throw new NotificationApiException("Interrupted while checking student " + studentId, e);
     } catch (Exception e) {
       log.error("Error checking student {}: {}", studentId, e.getMessage());
-      throw new RuntimeException("Failed to check student " + studentId, e);
+      throw new NotificationApiException("Failed to check student " + studentId, e);
     }
   }
 

api/src/main/java/ca/bc/gov/educ/api/trax/service/StudentCreateMergeEventHandlerService.java

@@ -6,6 +6,7 @@
 import ca.bc.gov.educ.api.trax.rest.RestUtils;
 import ca.bc.gov.educ.api.trax.struct.EventType;
 import ca.bc.gov.educ.api.trax.struct.Student;
+import ca.bc.gov.educ.api.trax.exception.NotificationApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,7 +63,7 @@ protected void processStudentsMergeInfo(final Student student, final Student tru
       }
     } catch (Exception e) {
       log.error("Error checking student existence in GRAD-STUDENT-API for Student IDs: {} and {}", studentId, mergedToStudentId, e);
-      throw new RuntimeException("Failed to check students. This should not have happened and will be retried.");
+      throw new NotificationApiException("Failed to check students. This should not have happened and will be retried.", e);
     }
   }
 

api/src/main/java/ca/bc/gov/educ/api/trax/service/StudentDeleteMergeEventHandlerService.java

@@ -6,6 +6,7 @@
 import ca.bc.gov.educ.api.trax.rest.RestUtils;
 import ca.bc.gov.educ.api.trax.struct.EventType;
 import ca.bc.gov.educ.api.trax.struct.Student;
+import ca.bc.gov.educ.api.trax.exception.NotificationApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,7 +63,7 @@ protected void processStudentsMergeInfo(final Student student, final Student tru
       }
     } catch (Exception e) {
       log.error("Error checking student existence in GRAD-STUDENT-API for Student IDs: {} and {}", studentId, mergedToStudentId, e);
-      throw new RuntimeException("Failed to check students. This should not have happened and will be retried.");
+      throw new NotificationApiException("Failed to check students. This should not have happened and will be retried.", e);
     }
   }