Fix null body response to 404

api/src/main/java/ca/bc/gov/educ/api/course/config/RestErrorHandler.java

@@ -1,5 +1,10 @@
 package ca.bc.gov.educ.api.course.config;
 
+import ca.bc.gov.educ.api.course.exception.EntityNotFoundException;
+import ca.bc.gov.educ.api.course.exception.GradBusinessRuleException;
+import ca.bc.gov.educ.api.course.util.ApiResponseMessage.MessageTypeEnum;
+import ca.bc.gov.educ.api.course.util.ApiResponseModel;
+import ca.bc.gov.educ.api.course.util.GradValidation;
 import org.hibernate.dialect.lock.OptimisticEntityLockException;
 import org.hibernate.exception.ConstraintViolationException;
 import org.jboss.logging.Logger;
@@ -15,11 +20,6 @@
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
-import ca.bc.gov.educ.api.course.util.ApiResponseMessage.MessageTypeEnum;
-import ca.bc.gov.educ.api.course.util.ApiResponseModel;
-import ca.bc.gov.educ.api.course.exception.GradBusinessRuleException;
-import ca.bc.gov.educ.api.course.util.GradValidation;
-
 @ControllerAdvice
 public class RestErrorHandler extends ResponseEntityExceptionHandler {
 
@@ -55,16 +55,17 @@ protected ResponseEntity<Object> handleAuthorizationErrors(Exception ex, WebRequ
 		return new ResponseEntity<>(ApiResponseModel.ERROR(null, message), HttpStatus.FORBIDDEN);
 	}
 
-	@ExceptionHandler(value = { GradBusinessRuleException.class })
-	protected ResponseEntity<Object> handleIrisBusinessException(Exception ex, WebRequest request) {
-		ApiResponseModel<?> response = ApiResponseModel.ERROR(null);
+	@ExceptionHandler(value = { GradBusinessRuleException.class, EntityNotFoundException.class })
+	protected ResponseEntity<Object> handleGradBusinessException(Exception ex, WebRequest request) {
+		ApiResponseModel<?> response = ApiResponseModel.ERROR(request.toString());
 		validation.ifErrors(response::addErrorMessages);
 		validation.ifWarnings(response::addWarningMessages);
 		if (response.getMessages().isEmpty()) {
 			response.addMessageItem(ex.getLocalizedMessage(), MessageTypeEnum.ERROR);
 		}
 		validation.clear();
-		return new ResponseEntity<>(response, HttpStatus.UNPROCESSABLE_ENTITY);
+		HttpStatus httpStatus = (ex instanceof EntityNotFoundException) ? HttpStatus.NOT_FOUND : HttpStatus.UNPROCESSABLE_ENTITY;
+		return new ResponseEntity<>(response, httpStatus);
 	}
 
 	@ExceptionHandler(value = { OptimisticEntityLockException.class })

api/src/main/java/ca/bc/gov/educ/api/course/exception/EntityNotFoundException.java

@@ -1,6 +1,7 @@
 package ca.bc.gov.educ.api.course.exception;
 
 import org.apache.commons.lang3.StringUtils;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.IntStream;
@@ -17,6 +18,10 @@ public EntityNotFoundException(Class<?> clazz, String... searchParamsMap) {
         super(EntityNotFoundException.generateMessage(clazz.getSimpleName(), toMap(String.class, String.class, searchParamsMap)));
     }
 
+    public EntityNotFoundException(String message) {
+        super(message);
+    }
+
     private static String generateMessage(String entity, Map<String, String> searchParams) {
         return StringUtils.capitalize(entity) +
                 " was not found for parameters " +

api/src/main/java/ca/bc/gov/educ/api/course/model/transformer/EquivalentOrChallengeCodeTransformer.java

@@ -21,12 +21,11 @@ public EquivalentOrChallengeCode transformToDTO (EquivalentOrChallengeCodeEntity
     }
 
     public EquivalentOrChallengeCode transformToDTO ( Optional<EquivalentOrChallengeCodeEntity> equivalentOrChallengeCode ) {
-        EquivalentOrChallengeCodeEntity cae = new EquivalentOrChallengeCodeEntity();
-
-        if (equivalentOrChallengeCode.isPresent())
-            cae = equivalentOrChallengeCode.get();
-
-        return modelMapper.map(cae, EquivalentOrChallengeCode.class);
+        if (equivalentOrChallengeCode.isPresent()) {
+            EquivalentOrChallengeCodeEntity cae = equivalentOrChallengeCode.get();
+            return modelMapper.map(cae, EquivalentOrChallengeCode.class);
+        }
+        return null;
     }
 
 	public List<EquivalentOrChallengeCode> transformToDTO (Iterable<EquivalentOrChallengeCodeEntity> EquivalentOrChallengeCodeEntities ) {

api/src/main/java/ca/bc/gov/educ/api/course/model/transformer/ExamSpecialCaseCodeTransformer.java

@@ -21,12 +21,11 @@ public ExamSpecialCaseCode transformToDTO (ExamSpecialCaseCodeEntity examSpecial
     }
 
     public ExamSpecialCaseCode transformToDTO ( Optional<ExamSpecialCaseCodeEntity> examSpecialCaseCodeEntity ) {
-        ExamSpecialCaseCodeEntity cae = new ExamSpecialCaseCodeEntity();
-
-        if (examSpecialCaseCodeEntity.isPresent())
-            cae = examSpecialCaseCodeEntity.get();
-
-        return modelMapper.map(cae, ExamSpecialCaseCode.class);
+        if (examSpecialCaseCodeEntity.isPresent()) {
+            ExamSpecialCaseCodeEntity cae = examSpecialCaseCodeEntity.get();
+            return modelMapper.map(cae, ExamSpecialCaseCode.class);
+        }
+        return null;
     }
 
 	public List<ExamSpecialCaseCode> transformToDTO (Iterable<ExamSpecialCaseCodeEntity> ExamSpecialCaseCodeEntities ) {

api/src/main/java/ca/bc/gov/educ/api/course/model/transformer/FineArtsAppliedSkillsCodeTransformer.java

@@ -21,12 +21,11 @@ public FineArtsAppliedSkillsCode transformToDTO (FineArtsAppliedSkillsCodeEntity
     }
 
     public FineArtsAppliedSkillsCode transformToDTO ( Optional<FineArtsAppliedSkillsCodeEntity> fineArtsAppliedSkillsCode ) {
-        FineArtsAppliedSkillsCodeEntity cae = new FineArtsAppliedSkillsCodeEntity();
-
-        if (fineArtsAppliedSkillsCode.isPresent())
-            cae = fineArtsAppliedSkillsCode.get();
-
-        return modelMapper.map(cae, FineArtsAppliedSkillsCode.class);
+        if (fineArtsAppliedSkillsCode.isPresent()) {
+            FineArtsAppliedSkillsCodeEntity cae = fineArtsAppliedSkillsCode.get();
+            return modelMapper.map(cae, FineArtsAppliedSkillsCode.class);
+        }
+        return null;
     }
 
 	public List<FineArtsAppliedSkillsCode> transformToDTO (Iterable<FineArtsAppliedSkillsCodeEntity> fineArtsAppliedSkillsCodes ) {

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

@@ -1,6 +1,8 @@
 package ca.bc.gov.educ.api.course.service;
 
+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;
@@ -9,6 +11,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class EquivalentOrChallengeCodeService {
@@ -39,8 +42,12 @@ public List<EquivalentOrChallengeCode> getEquivalentOrChallengeCodeList() {
      * @return EquivalentOrChallengeCode
      */
 	@Retry(name = "generalgetcall")
-    public EquivalentOrChallengeCode getEquivalentOrChallengeCode(String equivalentOrChallengeCode) {
-		return equivalentOrChallengeCodeTransformer.transformToDTO(equivalentOrChallengeCodeRepository.findById(equivalentOrChallengeCode));
+    public EquivalentOrChallengeCode getEquivalentOrChallengeCode(String equivalentOrChallengeCode) throws EntityNotFoundException  {
+		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));
     }
 
     private List<EquivalentOrChallengeCode> sort(List<EquivalentOrChallengeCode> equivalentOrChallengeCodes) {

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

@@ -1,6 +1,8 @@
 package ca.bc.gov.educ.api.course.service;
 
+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;
@@ -9,6 +11,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class ExamSpecialCaseCodeService {
@@ -40,7 +43,11 @@ public List<ExamSpecialCaseCode> getExamSpecialCaseCodeList() {
      */
 	@Retry(name = "generalgetcall")
     public ExamSpecialCaseCode getExamSpecialCaseCode(String examSpecialCaseCode) {
-		return examSpecialCaseCodeTransformer.transformToDTO(examSpecialCaseCodeRepository.findById(examSpecialCaseCode));
+		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));
     }
 
     private List<ExamSpecialCaseCode> sort(List<ExamSpecialCaseCode> examSpecialCaseCodes) {

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

@@ -1,6 +1,8 @@
 package ca.bc.gov.educ.api.course.service;
 
+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;
@@ -9,6 +11,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class FineArtsAppliedSkillsCodeService {
@@ -40,7 +43,11 @@ public List<FineArtsAppliedSkillsCode> getFineArtsAppliedSkillsCodeList() {
      */
 	@Retry(name = "generalgetcall")
     public FineArtsAppliedSkillsCode getFineArtsAppliedSkillsCode(String fineArtsAppliedSkillsCode) {
-		return fineArtsAppliedSkillsCodeTransformer.transformToDTO(fineArtsAppliedSkillsCodeRepository.findById(fineArtsAppliedSkillsCode));
+		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));
     }
 
     private List<FineArtsAppliedSkillsCode> sort(List<FineArtsAppliedSkillsCode> fineArtsAppliedSkillsCodes) {

api/src/test/java/ca/bc/gov/educ/api/course/controller/EquivalentOrChallengeCodeControllerTest.java

@@ -58,11 +58,4 @@ public void testGetEquivalentOrChallengeCode() {
 		equivalentOrChallengeCodeController.getEquivalentOrChallengeCode("equivalentOrChallengeCode");
 		Mockito.verify(equivalentOrChallengeCodeService).getEquivalentOrChallengeCode("equivalentOrChallengeCode");
 	}
-
-	@Test
-	public void testGetEquivalentOrChallengeCode_noContent() {
-		Mockito.when(equivalentOrChallengeCodeService.getEquivalentOrChallengeCode("equivalentOrChallengeCode")).thenReturn(null);
-		equivalentOrChallengeCodeController.getEquivalentOrChallengeCode("equivalentOrChallengeCode");
-		Mockito.verify(equivalentOrChallengeCodeService).getEquivalentOrChallengeCode("equivalentOrChallengeCode");
-	}
 }

api/src/test/java/ca/bc/gov/educ/api/course/controller/ExamSpecialCaseCodeControllerTest.java

@@ -56,11 +56,4 @@ public void testGetExamSpecialCaseCode() {
 		examSpecialCaseCodeController.getExamSpecialCaseCode("examSpecialCaseCode");
 		Mockito.verify(examSpecialCaseCodeService).getExamSpecialCaseCode("examSpecialCaseCode");
 	}
-
-	@Test
-	public void testGetExamSpecialCaseCode_noContent() {
-		Mockito.when(examSpecialCaseCodeService.getExamSpecialCaseCode("examSpecialCaseCode")).thenReturn(null);
-		examSpecialCaseCodeController.getExamSpecialCaseCode("examSpecialCaseCode");
-		Mockito.verify(examSpecialCaseCodeService).getExamSpecialCaseCode("examSpecialCaseCode");
-	}
 }

api/src/test/java/ca/bc/gov/educ/api/course/controller/FineArtsAppliedSkillsCodeControllerTest.java

@@ -56,11 +56,5 @@ public void testGetFineArtsAppliedSkillsCode() {
 		fineArtsAppliedSkillsCodeController.getFineArtsAppliedSkillsCode("fineArtsAppliedSkillsCode");
 		Mockito.verify(fineArtsAppliedSkillsCodeService).getFineArtsAppliedSkillsCode("fineArtsAppliedSkillsCode");
 	}
-
-	@Test
-	public void testGetFineArtsAppliedSkillsCode_noContent() {
-		Mockito.when(fineArtsAppliedSkillsCodeService.getFineArtsAppliedSkillsCode("fineArtsAppliedSkillsCode")).thenReturn(null);
-		fineArtsAppliedSkillsCodeController.getFineArtsAppliedSkillsCode("fineArtsAppliedSkillsCode");
-		Mockito.verify(fineArtsAppliedSkillsCodeService).getFineArtsAppliedSkillsCode("fineArtsAppliedSkillsCode");
-	}
+
 }

api/src/test/java/ca/bc/gov/educ/api/course/service/EquivalentOrChallengeCodeServiceTest.java

@@ -1,5 +1,6 @@
 package ca.bc.gov.educ.api.course.service;
 
+import ca.bc.gov.educ.api.course.exception.EntityNotFoundException;
 import ca.bc.gov.educ.api.course.model.entity.EquivalentOrChallengeCodeEntity;
 import ca.bc.gov.educ.api.course.repository.EquivalentOrChallengeCodeRepository;
 import org.junit.Test;
@@ -61,10 +62,9 @@ public void testGetEquivalentOrChallengeCode() {
 		assertNotNull(result);
 	}
 
-	@Test
+	@Test(expected=EntityNotFoundException.class)
 	public void testGetEquivalentOrChallengeCode_noContent() {
 		Mockito.when(equivalentOrChallengeCodeRepository.findById("equivalentOrChallengeCode")).thenReturn(Optional.empty());
-		var result = equivalentOrChallengeCodeService.getEquivalentOrChallengeCode("equivalentOrChallengeCode");
-		assertNotNull(result);
+		equivalentOrChallengeCodeService.getEquivalentOrChallengeCode("equivalentOrChallengeCode");
 	}
 }

api/src/test/java/ca/bc/gov/educ/api/course/service/ExamSpecialCaseCodeServiceTest.java

@@ -1,5 +1,6 @@
 package ca.bc.gov.educ.api.course.service;
 
+import ca.bc.gov.educ.api.course.exception.EntityNotFoundException;
 import ca.bc.gov.educ.api.course.model.entity.ExamSpecialCaseCodeEntity;
 import ca.bc.gov.educ.api.course.repository.ExamSpecialCaseCodeRepository;
 import org.junit.Test;
@@ -60,11 +61,10 @@ public void testGetExamSpecialCaseCode() {
 		var result = examSpecialCaseCodeService.getExamSpecialCaseCode("examSpecialCaseCode");
 		assertNotNull(result);
 	}
-	
-	@Test
+
+	@Test(expected= EntityNotFoundException.class)
 	public void testGetExamSpecialCaseCode_noContent() {
 		Mockito.when(examSpecialCaseCodeRepository.findById("examSpecialCaseCode")).thenReturn(Optional.empty());
-		var result = examSpecialCaseCodeService.getExamSpecialCaseCode("examSpecialCaseCode");
-		assertNotNull(result);
+		examSpecialCaseCodeService.getExamSpecialCaseCode("examSpecialCaseCode");
 	}
 }

api/src/test/java/ca/bc/gov/educ/api/course/service/FineArtsAppliedSkillsCodeServiceTest.java

@@ -1,5 +1,6 @@
 package ca.bc.gov.educ.api.course.service;
 
+import ca.bc.gov.educ.api.course.exception.EntityNotFoundException;
 import ca.bc.gov.educ.api.course.model.entity.FineArtsAppliedSkillsCodeEntity;
 import ca.bc.gov.educ.api.course.repository.FineArtsAppliedSkillsCodeRepository;
 import org.junit.Test;
@@ -60,11 +61,10 @@ public void testGetFineArtsAppliedSkillsCode() {
 		var result = fineArtsAppliedSkillsCodeService.getFineArtsAppliedSkillsCode("fineArtsAppliedSkillsCode");
 		assertNotNull(result);
 	}
-	
-	@Test
+
+	@Test(expected= EntityNotFoundException.class)
 	public void testGetFineArtsAppliedSkillsCode_noContent() {
 		Mockito.when(fineArtsAppliedSkillsCodeRepository.findById("fineArtsAppliedSkillsCode")).thenReturn(Optional.empty());
-		var result = fineArtsAppliedSkillsCodeService.getFineArtsAppliedSkillsCode("fineArtsAppliedSkillsCode");
-		assertNotNull(result);
+		fineArtsAppliedSkillsCodeService.getFineArtsAppliedSkillsCode("fineArtsAppliedSkillsCode");
 	}
 }