vinh/fix error code for exam get infomation

AnataAria · Nov 6, 2023 · 90beaad · 90beaad
1 parent 85d0c36
commit 90beaad
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/...ingcouseselling/src/main/java/com/group1/drawingcouseselling/exception/BaseException.java b/...ingcouseselling/src/main/java/com/group1/drawingcouseselling/exception/BaseException.java
@@ -1,6 +1,7 @@
 package com.group1.drawingcouseselling.exception;
 
 import com.group1.drawingcouseselling.model.dto.ErrorMessage;
+import lombok.Builder;
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
 @Getter
@@ -10,5 +11,9 @@ public class BaseException extends RuntimeException {
     public BaseException(String message) {
         super(message);
     }
+    public BaseException(ErrorMessage errorMessage) {
+        super(errorMessage.getErrorList().toString());
+        this.errorMessage = errorMessage;
+    }
 }
 
diff --git a/...lling/src/main/java/com/group1/drawingcouseselling/exception/EntityNotFoundException.java b/...lling/src/main/java/com/group1/drawingcouseselling/exception/EntityNotFoundException.java
@@ -15,4 +15,7 @@ public EntityNotFoundException(String message) {
                 .currentTimeError(new Date(System.currentTimeMillis()))
                 .build();
     }
+    public EntityNotFoundException(ErrorMessage errorMessage) {
+        super(errorMessage);
+    }
 }
diff --git a/...useselling/src/main/java/com/group1/drawingcouseselling/service/impl/ExamServiceImpl.java b/...useselling/src/main/java/com/group1/drawingcouseselling/service/impl/ExamServiceImpl.java
@@ -2,14 +2,18 @@
 
 import com.group1.drawingcouseselling.exception.EntityNotFoundException;
 import com.group1.drawingcouseselling.exception.UserNotFoundException;
+import com.group1.drawingcouseselling.model.dto.ErrorMessage;
 import com.group1.drawingcouseselling.model.dto.ExamDto;
 import com.group1.drawingcouseselling.repository.ExamRepository;
 import com.group1.drawingcouseselling.service.CustomerService;
 import com.group1.drawingcouseselling.service.ExamService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 @Service
 @RequiredArgsConstructor
@@ -19,8 +23,11 @@ public class ExamServiceImpl implements ExamService {
     public ExamDto getExamInformation(BigDecimal courseContentID, String customerEmail){
         var customer = customerService.searchCustomerByEmail(customerEmail).orElseThrow(() -> new UserNotFoundException(""));
         var customerExam = examRepository.getExamByCustomerIdAndCourseContentId(customer.getId(), courseContentID)
-                .orElseThrow(() -> new EntityNotFoundException("Exam not submited"));
-
+                .orElseThrow(() -> new EntityNotFoundException(ErrorMessage.builder()
+                        .errorList(List.of("Exam not submitted"))
+                        .status(HttpStatus.valueOf(420))
+                        .currentTimeError(new Date(System.currentTimeMillis()))
+                        .build()));
         return ExamDto.builder()
                 .score(customerExam.getScore())
                 .id(customerExam.getId())