Skip to content

Commit

Permalink
Batch Lesson Note Entry | SIS-176 (#90)
Browse files Browse the repository at this point in the history 
* Note Requests DTOs Have Been Updated and Renamed for Batch Lesson Note Entry

* generateMidtermNoteUpdateEntity/generateFinalNoteUpdateEntity/generateResitNoteUpdateEntity Methods Have Been Updated and Renamed for Batch Lesson Note Entry in StudentLessonNoteInfoConverter Class

* updateStudentsLessonMidtermNotes/updateStudentsLessonFinalNotes/updateStudentsLessonResitNotes Methods Have Been Updated and Renamed for Batch Lesson Note Entry in StudentLessonNoteService Class

* updateStudentsLessonMidtermNotes/updateStudentsLessonFinalNotes/updateStudentsLessonResitNotes Methods Have Been Updated and Renamed for Batch Lesson Note Entry in StudentLessonNoteController Class

* NotNull Annotation Has Been Changed to NotEmpty in NotesUpdateRequests
  • Loading branch information
@agitrubard
agitrubard committed Apr 23, 2022
1 parent f608f6b commit dd4a956
Show file tree
Hide file tree
Showing 7 changed files with 141 additions and 115 deletions.
30 changes: 15 additions & 15 deletions ...ject/studentinformationsystem/university/note/controller/StudentLessonNoteController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.graduationproject.studentinformationsystem.common.util.controller.response.SisBaseApiResponse;
import com.graduationproject.studentinformationsystem.common.util.exception.SisNotExistException;
import com.graduationproject.studentinformationsystem.university.note.controller.endpoint.StudentLessonNoteControllerEndpoint;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonFinalNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonMidtermNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonResitNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentsLessonFinalNotesUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentsLessonMidtermNotesUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentsLessonResitNotesUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.response.StudentLessonNoteResponse;
import com.graduationproject.studentinformationsystem.university.note.service.StudentLessonNoteService;
import io.swagger.annotations.Api;
Expand Down Expand Up @@ -52,31 +52,31 @@ public ResponseEntity<SisBaseApiResponse<List<StudentLessonNoteResponse>>> getAl

@PutMapping(StudentLessonNoteControllerEndpoint.MIDTERM)
@ApiOperation(value = "Update Student Lesson Midterm Note")
public ResponseEntity<SisBaseApiResponse<StudentLessonNoteResponse>> updateStudentLessonMidtermNote(
@RequestBody @Valid final StudentLessonMidtermNoteUpdateRequest updateRequest)
public ResponseEntity<SisBaseApiResponse<List<StudentLessonNoteResponse>>> updateStudentsLessonMidtermNotes(
@RequestBody @Valid final StudentsLessonMidtermNotesUpdateRequest updateRequest)
throws SisNotExistException {

final StudentLessonNoteResponse noteResponse = studentLessonNoteService.updateStudentLessonMidtermNote(updateRequest);
return successResponse(noteResponse);
final List<StudentLessonNoteResponse> noteResponses = studentLessonNoteService.updateStudentsLessonMidtermNotes(updateRequest);
return successResponse(noteResponses);
}

@PutMapping(StudentLessonNoteControllerEndpoint.FINAL)
@ApiOperation(value = "Update Student Lesson Final Note")
public ResponseEntity<SisBaseApiResponse<StudentLessonNoteResponse>> updateStudentLessonFinalNote(
@RequestBody @Valid final StudentLessonFinalNoteUpdateRequest updateRequest)
public ResponseEntity<SisBaseApiResponse<List<StudentLessonNoteResponse>>> updateStudentsLessonFinalNotes(
@RequestBody @Valid final StudentsLessonFinalNotesUpdateRequest updateRequest)
throws SisNotExistException {

final StudentLessonNoteResponse noteResponse = studentLessonNoteService.updateStudentLessonFinalNote(updateRequest);
return successResponse(noteResponse);
final List<StudentLessonNoteResponse> noteResponses = studentLessonNoteService.updateStudentsLessonFinalNotes(updateRequest);
return successResponse(noteResponses);
}

@PutMapping(StudentLessonNoteControllerEndpoint.RESIT)
@ApiOperation(value = "Update Student Lesson Resit Note")
public ResponseEntity<SisBaseApiResponse<StudentLessonNoteResponse>> updateStudentLessonResitNote(
@RequestBody final StudentLessonResitNoteUpdateRequest updateRequest)
public ResponseEntity<SisBaseApiResponse<List<StudentLessonNoteResponse>>> updateStudentsLessonResitNotes(
@RequestBody final StudentsLessonResitNotesUpdateRequest updateRequest)
throws SisNotExistException {

final StudentLessonNoteResponse noteResponse = studentLessonNoteService.updateStudentLessonResitNote(updateRequest);
return successResponse(noteResponse);
final List<StudentLessonNoteResponse> noteResponses = studentLessonNoteService.updateStudentsLessonResitNotes(updateRequest);
return successResponse(noteResponses);
}
}
37 changes: 17 additions & 20 deletions ...informationsystem/university/note/model/dto/converter/StudentLessonNoteInfoConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
import com.graduationproject.studentinformationsystem.common.util.SisUtil;
import com.graduationproject.studentinformationsystem.university.lesson.common.model.dto.response.LessonResponse;
import com.graduationproject.studentinformationsystem.university.lesson.common.service.LessonOutService;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonFinalNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonMidtermNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonNoteSaveRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonResitNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.response.StudentLessonNoteResponse;
import com.graduationproject.studentinformationsystem.university.note.model.entity.*;
import com.graduationproject.studentinformationsystem.university.note.model.enums.StudentLessonNoteStatus;
Expand Down Expand Up @@ -46,43 +43,43 @@ public StudentLessonNoteSaveEntity generateSaveEntity(final StudentLessonNoteSav
.build();
}

public StudentLessonMidtermNoteUpdateEntity generateMidtermNoteUpdateEntity(final StudentLessonMidtermNoteUpdateRequest updateRequest) {

final SisOperationInfoRequest operationInfoRequest = updateRequest.getOperationInfoRequest();
public StudentLessonMidtermNoteUpdateEntity generateMidtermNoteUpdateEntity(final String lessonNoteId,
final Double midtermNote,
final SisOperationInfoRequest operationInfoRequest) {

return StudentLessonMidtermNoteUpdateEntity.builder()
.id(updateRequest.getId())
.midtermNote(updateRequest.getMidtermNote())
.id(lessonNoteId)
.midtermNote(midtermNote)
.modifiedUserId(operationInfoRequest.getUserId())
.modifiedDate(new Date())
.build();
}

public StudentLessonFinalNoteUpdateEntity generateFinalNoteUpdateEntity(final Double meanOfNote,
public StudentLessonFinalNoteUpdateEntity generateFinalNoteUpdateEntity(final String lessonNoteId,
final Double finalNote,
final Double meanOfNote,
final StudentLessonNoteStatus status,
final StudentLessonFinalNoteUpdateRequest updateRequest) {

final SisOperationInfoRequest operationInfoRequest = updateRequest.getOperationInfoRequest();
final SisOperationInfoRequest operationInfoRequest) {

return StudentLessonFinalNoteUpdateEntity.builder()
.id(updateRequest.getId())
.finalNote(updateRequest.getFinalNote())
.id(lessonNoteId)
.finalNote(finalNote)
.meanOfNote(meanOfNote)
.status(status)
.modifiedUserId(operationInfoRequest.getUserId())
.modifiedDate(new Date())
.build();
}

public StudentLessonResitNoteUpdateEntity generateResitNoteUpdateEntity(final Double meanOfNote,
public StudentLessonResitNoteUpdateEntity generateResitNoteUpdateEntity(final String lessonNoteId,
final Double finalNote,
final Double meanOfNote,
final StudentLessonNoteStatus status,
final StudentLessonResitNoteUpdateRequest updateRequest) {

final SisOperationInfoRequest operationInfoRequest = updateRequest.getOperationInfoRequest();
final SisOperationInfoRequest operationInfoRequest) {

return StudentLessonResitNoteUpdateEntity.builder()
.id(updateRequest.getId())
.resitNote(updateRequest.getResitNote())
.id(lessonNoteId)
.resitNote(finalNote)
.meanOfNote(meanOfNote)
.status(status)
.modifiedUserId(operationInfoRequest.getUserId())
Expand Down
14 changes: 6 additions & 8 deletions ...tudentLessonMidtermNoteUpdateRequest.java → ...tudentsLessonFinalNotesUpdateRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@
import lombok.experimental.SuperBuilder;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotEmpty;
import java.io.Serial;
import java.io.Serializable;
import java.util.Map;

@Getter
@SuperBuilder
@NoArgsConstructor
public class StudentLessonMidtermNoteUpdateRequest implements Serializable {
public class StudentsLessonFinalNotesUpdateRequest implements Serializable {

@Serial
private static final long serialVersionUID = 7596735869510130790L;
private static final long serialVersionUID = 5093920385984058988L;

@NotNull
private String id;

@NotNull
private Double midtermNote;
@NotEmpty
private Map<String, Double> finalNoteIdsAndNotes;

@Valid
private SisOperationInfoRequest operationInfoRequest;
Expand Down
14 changes: 6 additions & 8 deletions .../StudentLessonResitNoteUpdateRequest.java → ...dentsLessonMidtermNotesUpdateRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@
import lombok.experimental.SuperBuilder;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotEmpty;
import java.io.Serial;
import java.io.Serializable;
import java.util.Map;

@Getter
@SuperBuilder
@NoArgsConstructor
public class StudentLessonResitNoteUpdateRequest implements Serializable {
public class StudentsLessonMidtermNotesUpdateRequest implements Serializable {

@Serial
private static final long serialVersionUID = -6303107915064579379L;
private static final long serialVersionUID = 5142587290257640755L;

@NotNull
private String id;

@NotNull
private Double resitNote;
@NotEmpty
private Map<String, Double> midtermNoteIdsAndNotes;

@Valid
private SisOperationInfoRequest operationInfoRequest;
Expand Down
14 changes: 6 additions & 8 deletions .../StudentLessonFinalNoteUpdateRequest.java → ...tudentsLessonResitNotesUpdateRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@
import lombok.experimental.SuperBuilder;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotEmpty;
import java.io.Serial;
import java.io.Serializable;
import java.util.Map;

@Getter
@SuperBuilder
@NoArgsConstructor
public class StudentLessonFinalNoteUpdateRequest implements Serializable {
public class StudentsLessonResitNotesUpdateRequest implements Serializable {

@Serial
private static final long serialVersionUID = -1731196715166066519L;
private static final long serialVersionUID = 4495180748614571012L;

@NotNull
private String id;

@NotNull
private Double finalNote;
@NotEmpty
private Map<String, Double> resitNoteIdsAndNotes;

@Valid
private SisOperationInfoRequest operationInfoRequest;
Expand Down
15 changes: 9 additions & 6 deletions ...ionproject/studentinformationsystem/university/note/service/StudentLessonNoteService.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.graduationproject.studentinformationsystem.university.note.service;

import com.graduationproject.studentinformationsystem.common.util.exception.SisNotExistException;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonFinalNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonMidtermNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentLessonResitNoteUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentsLessonFinalNotesUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentsLessonMidtermNotesUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.request.StudentsLessonResitNotesUpdateRequest;
import com.graduationproject.studentinformationsystem.university.note.model.dto.response.StudentLessonNoteResponse;

import java.util.List;
Expand All @@ -14,9 +14,12 @@ public interface StudentLessonNoteService {

List<StudentLessonNoteResponse> getAllStudentLessonsNotesByStudentId(Long studentId) throws SisNotExistException;

StudentLessonNoteResponse updateStudentLessonMidtermNote(StudentLessonMidtermNoteUpdateRequest updateRequest) throws SisNotExistException;
List<StudentLessonNoteResponse> updateStudentsLessonMidtermNotes(StudentsLessonMidtermNotesUpdateRequest updateRequest)
throws SisNotExistException;

StudentLessonNoteResponse updateStudentLessonFinalNote(StudentLessonFinalNoteUpdateRequest updateRequest) throws SisNotExistException;
List<StudentLessonNoteResponse> updateStudentsLessonFinalNotes(StudentsLessonFinalNotesUpdateRequest updateRequest)
throws SisNotExistException;

StudentLessonNoteResponse updateStudentLessonResitNote(StudentLessonResitNoteUpdateRequest updateRequest) throws SisNotExistException;
List<StudentLessonNoteResponse> updateStudentsLessonResitNotes(StudentsLessonResitNotesUpdateRequest updateRequest)
throws SisNotExistException;
}
Loading

0 comments on commit dd4a956

Please sign in to comment.