Save Student Lesson Notes Fixes (#97)

* getStudentLessonRegistrationDetailByStudentId Method Has Been Created in StudentLessonRegistrationService * getStudentLessonRegistrationDetailByStudentId Method Has Been Created in StudentLessonRegistrationController & GET Endpoints Have Been Updated * midtermNoteState, finalNoteState and resitNoteState Fields Have Been Added to generateSaveEntity Method * midtermNoteState, finalNoteState and resitNoteState Fields Have Been Added to saveStudentLessonNote Method SQL Query Parameters
gradution-project · Apr 28, 2022 · 464f847 · 464f847
1 parent ad616c4
commit 464f847
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/...niversity/lesson/student/registration/controller/StudentLessonRegistrationController.java b/...niversity/lesson/student/registration/controller/StudentLessonRegistrationController.java
@@ -23,6 +23,7 @@
 
 import static com.graduationproject.studentinformationsystem.common.config.SisSwaggerConfiguration.STUDENT_LESSON_REGISTRATION_API_TAG;
 import static com.graduationproject.studentinformationsystem.common.util.controller.endpoint.SisControllerEndpoint.Path.STUDENT_LESSON_REGISTRATION;
+import static com.graduationproject.studentinformationsystem.common.util.controller.response.SisResponseUtil.failResponse;
 import static com.graduationproject.studentinformationsystem.common.util.controller.response.SisResponseUtil.successResponse;
 
 @RestController
@@ -43,8 +44,8 @@ public ResponseEntity<SisBaseApiResponse<List<StudentLessonRegistrationResponse>
         return successResponse(registrationResponses);
     }
 
-    @GetMapping(StudentLessonRegistrationControllerEndpoint.DETAIL_BY_REGISTRATION_ID)
-    @ApiOperation(value = "Get Student Lesson Registration Detail By Registration ID")
+    @GetMapping(StudentLessonRegistrationControllerEndpoint.BY_REGISTRATION_ID)
+    @ApiOperation(value = "Get Student Lesson Registration By Registration ID")
     public ResponseEntity<SisBaseApiResponse<StudentLessonRegistrationDetailResponse>> getStudentLessonRegistrationDetailByRegistrationId(
             @PathVariable final String registrationId) throws SisNotExistException {
 
@@ -53,14 +54,15 @@ public ResponseEntity<SisBaseApiResponse<StudentLessonRegistrationDetailResponse
         return successResponse(registrationDetailResponse);
     }
 
-    @GetMapping(StudentLessonRegistrationControllerEndpoint.ID_BY_STUDENT_ID)
-    @ApiOperation(value = "Get Student Lesson Registration ID By Student ID")
-    public ResponseEntity<SisBaseApiResponse<String>> getStudentLessonRegistrationIdByStudentId(
+    @GetMapping(StudentLessonRegistrationControllerEndpoint.BY_STUDENT_ID)
+    @ApiOperation(value = "Get Student Lesson Registrations Detail By Student ID")
+    public ResponseEntity<SisBaseApiResponse<Object>> getStudentLessonRegistrationDetailByStudentId(
             @PathVariable @StudentID final Long studentId)
             throws SisNotExistException {
 
-        final String registrationId = studentLessonRegistrationService.getStudentLessonRegistrationIdByStudentId(studentId);
-        return successResponse(registrationId);
+        final StudentLessonRegistrationDetailResponse registrationDetailResponse = studentLessonRegistrationService
+                .getStudentLessonRegistrationDetailByStudentId(studentId);
+        return successResponse(registrationDetailResponse);
     }
 
     @PostMapping(StudentLessonRegistrationControllerEndpoint.SAVE)

diff --git a/...student/registration/controller/endpoint/StudentLessonRegistrationControllerEndpoint.java b/...student/registration/controller/endpoint/StudentLessonRegistrationControllerEndpoint.java
@@ -5,8 +5,8 @@ public class StudentLessonRegistrationControllerEndpoint {
     private StudentLessonRegistrationControllerEndpoint() {
     }
 
-    public static final String DETAIL_BY_REGISTRATION_ID = "/detail/{registrationId}";
-    public static final String ID_BY_STUDENT_ID = "/id/{studentId}";
+    public static final String BY_REGISTRATION_ID = "/{registrationId}";
+    public static final String BY_STUDENT_ID = "/{studentId}";
     public static final String SAVE = "/save";
     public static final String APPROVE = "/approve";
     public static final String REJECT = "/reject";

diff --git a/...stem/university/lesson/student/registration/service/StudentLessonRegistrationService.java b/...stem/university/lesson/student/registration/service/StudentLessonRegistrationService.java
@@ -18,7 +18,7 @@ public interface StudentLessonRegistrationService {
     StudentLessonRegistrationDetailResponse getStudentLessonRegistrationDetailByRegistrationId(String registrationId)
             throws SisNotExistException;
 
-    String getStudentLessonRegistrationIdByStudentId(Long studentId)
+    StudentLessonRegistrationDetailResponse getStudentLessonRegistrationDetailByStudentId(Long studentId)
             throws SisNotExistException;
 
     StudentLessonRegistrationDetailResponse saveStudentLessonRegistration(StudentLessonRegistrationSaveRequest saveRequest)

diff --git a/...ersity/lesson/student/registration/service/impl/StudentLessonRegistrationServiceImpl.java b/...ersity/lesson/student/registration/service/impl/StudentLessonRegistrationServiceImpl.java
@@ -58,15 +58,18 @@ public StudentLessonRegistrationDetailResponse getStudentLessonRegistrationDetai
     }
 
     @Override
-    public String getStudentLessonRegistrationIdByStudentId(final Long studentId) throws SisNotExistException {
+    public StudentLessonRegistrationDetailResponse getStudentLessonRegistrationDetailByStudentId(final Long studentId)
+            throws SisNotExistException {
 
         ifStudentIsNotExistThrowNotExistException(studentId);
 
         final String registrationId = studentLessonRegistrationRepository.getRegistrationId(studentId);
-
         ifStudentLessonRegistrationIsNotExistThrowNotExistException(registrationId);
 
-        return registrationId;
+        final StudentLessonRegistrationEntity registrationEntity = studentLessonRegistrationRepository
+                .getStudentLessonRegistrationByRegistrationId(registrationId);
+
+        return studentLessonRegistrationInfoConverter.entityToResponse(registrationEntity);
     }
 
     @Override

diff --git a/...informationsystem/university/note/model/dto/converter/StudentLessonNoteInfoConverter.java b/...informationsystem/university/note/model/dto/converter/StudentLessonNoteInfoConverter.java
@@ -38,6 +38,9 @@ public StudentLessonNoteSaveEntity generateSaveEntity(final StudentLessonNoteSav
                 .teacherId(saveRequest.getTeacherId())
                 .studentId(saveRequest.getStudentId())
                 .lessonId(saveRequest.getLessonId())
+                .midtermNoteState(StudentLessonNoteState.NOT_ENTERED)
+                .finalNoteState(StudentLessonNoteState.NOT_ENTERED)
+                .resitNoteState(StudentLessonNoteState.NOT_ENTERED)
                 .status(StudentLessonNoteStatus.UNFINALISED)
                 .createdUserId(operationInfoRequest.getUserId())
                 .createdDate(new Date())

diff --git a/...entinformationsystem/university/note/repository/impl/StudentLessonNoteRepositoryImpl.java b/...entinformationsystem/university/note/repository/impl/StudentLessonNoteRepositoryImpl.java
@@ -99,6 +99,9 @@ public void saveStudentLessonNote(final StudentLessonNoteSaveEntity saveEntity)
                     .addParameter(TEACHER_ID.getModelName(), saveEntity.getTeacherId())
                     .addParameter(STUDENT_ID.getModelName(), saveEntity.getStudentId())
                     .addParameter(LESSON_ID.getModelName(), saveEntity.getLessonId())
+                    .addParameter(MIDTERM_NOTE_STATE.getModelName(), saveEntity.getMidtermNoteState())
+                    .addParameter(FINAL_NOTE_STATE.getModelName(), saveEntity.getFinalNoteState())
+                    .addParameter(RESIT_NOTE_STATE.getModelName(), saveEntity.getResitNoteState())
                     .addParameter(STATUS.getModelName(), saveEntity.getStatus())
                     .addParameter(CREATED_DATE.getModelName(), saveEntity.getCreatedDate())
                     .addParameter(CREATED_USER_ID.getModelName(), saveEntity.getCreatedUserId())