Fix null response to 404

Author: arybakov-cgi

api/src/main/java/ca/bc/gov/educ/api/course/service/EquivalentOrChallengeCodeService.java

@@ -2,6 +2,7 @@
 
 import ca.bc.gov.educ.api.course.exception.EntityNotFoundException;
 import ca.bc.gov.educ.api.course.model.dto.EquivalentOrChallengeCode;
+import ca.bc.gov.educ.api.course.model.entity.EquivalentOrChallengeCodeEntity;
 import ca.bc.gov.educ.api.course.model.transformer.EquivalentOrChallengeCodeTransformer;
 import ca.bc.gov.educ.api.course.repository.EquivalentOrChallengeCodeRepository;
 import io.github.resilience4j.retry.annotation.Retry;
@@ -10,6 +11,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class EquivalentOrChallengeCodeService {
@@ -41,8 +43,10 @@ public List<EquivalentOrChallengeCode> getEquivalentOrChallengeCodeList() {
      */
 	@Retry(name = "generalgetcall")
     public EquivalentOrChallengeCode getEquivalentOrChallengeCode(String equivalentOrChallengeCode) throws EntityNotFoundException  {
-		EquivalentOrChallengeCode result = equivalentOrChallengeCodeTransformer.transformToDTO(equivalentOrChallengeCodeRepository.findById(equivalentOrChallengeCode));
-		if(result != null) return result;
+		Optional<EquivalentOrChallengeCodeEntity> entity = equivalentOrChallengeCodeRepository.findById(equivalentOrChallengeCode);
+		if(entity.isPresent()) {
+			return equivalentOrChallengeCodeTransformer.transformToDTO(entity.get());
+		}
 		throw new EntityNotFoundException(String.format("Equivalent Or Challenge Code %s not found", equivalentOrChallengeCode));
     }
 

api/src/main/java/ca/bc/gov/educ/api/course/service/ExamSpecialCaseCodeService.java

@@ -2,6 +2,7 @@
 
 import ca.bc.gov.educ.api.course.exception.EntityNotFoundException;
 import ca.bc.gov.educ.api.course.model.dto.ExamSpecialCaseCode;
+import ca.bc.gov.educ.api.course.model.entity.ExamSpecialCaseCodeEntity;
 import ca.bc.gov.educ.api.course.model.transformer.ExamSpecialCaseCodeTransformer;
 import ca.bc.gov.educ.api.course.repository.ExamSpecialCaseCodeRepository;
 import io.github.resilience4j.retry.annotation.Retry;
@@ -10,6 +11,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class ExamSpecialCaseCodeService {
@@ -41,8 +43,10 @@ public List<ExamSpecialCaseCode> getExamSpecialCaseCodeList() {
      */
 	@Retry(name = "generalgetcall")
     public ExamSpecialCaseCode getExamSpecialCaseCode(String examSpecialCaseCode) {
-		ExamSpecialCaseCode result = examSpecialCaseCodeTransformer.transformToDTO(examSpecialCaseCodeRepository.findById(examSpecialCaseCode));
-		if(result != null) return result;
+		Optional<ExamSpecialCaseCodeEntity> entity = examSpecialCaseCodeRepository.findById(examSpecialCaseCode);
+		if(entity.isPresent()) {
+			return examSpecialCaseCodeTransformer.transformToDTO(entity.get());
+		}
 		throw new EntityNotFoundException(String.format("Exam Special Code %s not found", examSpecialCaseCode));
     }
 

api/src/main/java/ca/bc/gov/educ/api/course/service/FineArtsAppliedSkillsCodeService.java

@@ -2,6 +2,7 @@
 
 import ca.bc.gov.educ.api.course.exception.EntityNotFoundException;
 import ca.bc.gov.educ.api.course.model.dto.FineArtsAppliedSkillsCode;
+import ca.bc.gov.educ.api.course.model.entity.FineArtsAppliedSkillsCodeEntity;
 import ca.bc.gov.educ.api.course.model.transformer.FineArtsAppliedSkillsCodeTransformer;
 import ca.bc.gov.educ.api.course.repository.FineArtsAppliedSkillsCodeRepository;
 import io.github.resilience4j.retry.annotation.Retry;
@@ -10,6 +11,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class FineArtsAppliedSkillsCodeService {
@@ -41,8 +43,10 @@ public List<FineArtsAppliedSkillsCode> getFineArtsAppliedSkillsCodeList() {
      */
 	@Retry(name = "generalgetcall")
     public FineArtsAppliedSkillsCode getFineArtsAppliedSkillsCode(String fineArtsAppliedSkillsCode) {
-		FineArtsAppliedSkillsCode result = fineArtsAppliedSkillsCodeTransformer.transformToDTO(fineArtsAppliedSkillsCodeRepository.findById(fineArtsAppliedSkillsCode));
-		if(result != null) return result;
+		Optional<FineArtsAppliedSkillsCodeEntity> entity = fineArtsAppliedSkillsCodeRepository.findById(fineArtsAppliedSkillsCode);
+		if(entity.isPresent()) {
+			return fineArtsAppliedSkillsCodeTransformer.transformToDTO(entity.get());
+		}
 		throw new EntityNotFoundException(String.format("Fine Art Applied Skills Code %s not found", fineArtsAppliedSkillsCode));
     }