diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindLecturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindLecturePort.java index 2d1f97a4..f65700b8 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindLecturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindLecturePort.java @@ -9,4 +9,6 @@ public interface FindLecturePort { List findLecturesByLectureCodes(List lectureCodes); List findLecturesByIds(List lectureIds); + + Lecture findLectureById(Long lectureId); } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapter.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapter.java index 7cce0595..334f7652 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapter.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapter.java @@ -4,13 +4,13 @@ import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.SearchLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.mapper.LectureMapper; import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureQueryRepository; import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.SearchLecturePort; -import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import lombok.RequiredArgsConstructor; @@ -18,6 +18,7 @@ @RequiredArgsConstructor public class LecturePersistenceAdapter implements FindLecturePort, SearchLecturePort { + private final static String NOT_FOUND_LECTURE_ERROR_MESSAGE = "해당 과목을 찾을 수 없습니다."; private final LectureQueryRepository lectureQueryRepository; private final LectureRepository lectureRepository; private final LectureMapper lectureMapper; @@ -38,6 +39,13 @@ public List findLecturesByIds(List lectureIds) { .collect(Collectors.toList()); } + @Override + public Lecture findLectureById(final Long lectureId) { + LectureJpaEntity lectureJpaEntity = lectureRepository.findById(lectureId) + .orElseThrow(() -> new IllegalArgumentException(NOT_FOUND_LECTURE_ERROR_MESSAGE)); + return lectureMapper.mapToLectureModel(lectureJpaEntity); + } + @Override public List searchLectureByNameOrCode(String type, String keyword) { List lectureJpaEntities = lectureQueryRepository.searchByNameOrCode(type, keyword); diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextService.java index 10c83fac..f9bd5867 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextService.java @@ -15,7 +15,7 @@ import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextUseCase; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingInformation; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTakenLectureDto; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureUseCase; import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureFromParsingTextUseCase; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLectureInformation; import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; @@ -35,7 +35,7 @@ class ParsingTextService implements ParsingTextUseCase { private final FindUserUseCase findUserUseCase; private final UpdateStudentInformationUseCase updateStudentInformationUseCase; private final SaveTakenLectureFromParsingTextUseCase saveTakenLectureFromParsingTextUseCase; - private final DeleteTakenLectureByUserUseCase deleteTakenLectureByUserUseCase; + private final DeleteTakenLectureUseCase deleteTakenLectureByUserUseCase; private final GenerateOrModifyCompletedCreditUseCase generateOrModifyCompletedCreditUseCase; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureApiPresentation.java index 55d4fc8c..ce892149 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureApiPresentation.java @@ -2,10 +2,11 @@ import javax.validation.Valid; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; -import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.UpdateTakenLectureRequest; +import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.GenerateCustomizedTakenLectureRequest; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -14,5 +15,11 @@ public interface UpdateTakenLectureApiPresentation { @Parameter(name = "userId", description = "로그인한 유저의 PK값") - void updateTakenLectures(@LoginUser Long userId, @Valid @RequestBody UpdateTakenLectureRequest updateTakenLectureRequest); + void generateCustomizedTakenLecture(@LoginUser Long userId, + @Valid @RequestBody GenerateCustomizedTakenLectureRequest generateCustomizedTakenLectureRequest); + + @Parameter(name = "userId", description = "로그인한 유저의 PK값") + @Parameter(name = "takenLectureId", description = "삭제할 수강 과목 ID") + void deleteCustomizedTakenLecture(@LoginUser Long userId, + @Valid @PathVariable Long takenLectureId); } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureController.java index 9c78b296..72cb17e3 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureController.java @@ -2,14 +2,17 @@ import javax.validation.Valid; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.UpdateTakenLectureRequest; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.GenerateCustomizedTakenLectureRequest; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.GenerateCustomizedTakenLectureUseCase; import lombok.RequiredArgsConstructor; @@ -17,13 +20,20 @@ @RequestMapping("/api/v1/taken-lectures") @RequiredArgsConstructor public class UpdateTakenLectureController implements UpdateTakenLectureApiPresentation { - private final UpdateTakenLectureUseCase updateTakenLectureUseCase; - @PostMapping("/update") - public void updateTakenLectures(@LoginUser Long userId, - @Valid @RequestBody UpdateTakenLectureRequest updateTakenLectureRequest) { - updateTakenLectureUseCase.modifyTakenLecture(userId, updateTakenLectureRequest.getDeletedTakenLectures(), - updateTakenLectureRequest.getAddedTakenLectures()); + private final GenerateCustomizedTakenLectureUseCase generateCustomizedTakenLectureUseCase; + private final DeleteTakenLectureUseCase deleteTakenLectureUseCase; + + @PostMapping() + public void generateCustomizedTakenLecture(@LoginUser Long userId, + @Valid @RequestBody GenerateCustomizedTakenLectureRequest generateCustomizedTakenLectureRequest) { + generateCustomizedTakenLectureUseCase.generateCustomizedTakenLecture(userId, + generateCustomizedTakenLectureRequest.getLectureId()); } + @DeleteMapping("{takenLectureId}") + public void deleteCustomizedTakenLecture(@LoginUser Long userId, + @Valid @PathVariable Long takenLectureId) { + deleteTakenLectureUseCase.deleteTakenLecture(userId, takenLectureId); + } } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/GenerateCustomizedTakenLectureRequest.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/GenerateCustomizedTakenLectureRequest.java new file mode 100644 index 00000000..af1c74fd --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/GenerateCustomizedTakenLectureRequest.java @@ -0,0 +1,19 @@ +package com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class GenerateCustomizedTakenLectureRequest { + + @Schema(name = "lectureId", example = "103") + private Long lectureId; + + @Builder + private GenerateCustomizedTakenLectureRequest(Long lectureId) { + this.lectureId = lectureId; + } +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/UpdateTakenLectureRequest.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/UpdateTakenLectureRequest.java deleted file mode 100644 index 0836bf63..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/UpdateTakenLectureRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request; - -import java.util.List; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@NoArgsConstructor -public class UpdateTakenLectureRequest { - - @Schema(name = "deletedTakenLectures", example = "102, 2") - private List deletedTakenLectures; - - @Schema(name = "addedTakenLectures", example = "103, 104") - private List addedTakenLectures; - - @Builder - private UpdateTakenLectureRequest(List deletedTakenLectures, List addedTakenLectures) { - this.deletedTakenLectures = deletedTakenLectures; - this.addedTakenLectures = addedTakenLectures; - } - -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/DeleteTakenLecturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/DeleteTakenLecturePort.java index c6d8d796..a507487c 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/DeleteTakenLecturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/DeleteTakenLecturePort.java @@ -7,5 +7,5 @@ public interface DeleteTakenLecturePort { void deleteAllTakenLecturesByUser(User user); - void deleteTakenLecturesByIds(List deleteIds); + void deleteTakenLectureById(Long deleteId); } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/SaveTakenLecturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/SaveTakenLecturePort.java index 88006c26..8dc5e3d6 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/SaveTakenLecturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/SaveTakenLecturePort.java @@ -7,4 +7,6 @@ public interface SaveTakenLecturePort { void saveTakenLectures(List takenLectures); + + void saveTakenLecture(TakenLecture takenLecture); } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserService.java deleted file mode 100644 index f1e5a943..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.service.delete; - -import org.springframework.transaction.annotation.Transactional; - -import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.user.domain.model.User; - -import lombok.RequiredArgsConstructor; - -@UseCase -@Transactional -@RequiredArgsConstructor -class DeleteTakenLectureByUserService implements DeleteTakenLectureByUserUseCase { - - private final DeleteTakenLecturePort deleteTakenLecturePort; - @Override - public void deleteAllTakenLecturesByUser(User user) { - deleteTakenLecturePort.deleteAllTakenLecturesByUser(user); - } -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureService.java new file mode 100644 index 00000000..5a7e0a13 --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureService.java @@ -0,0 +1,34 @@ +package com.plzgraduate.myongjigraduatebe.takenlecture.application.service.delete; + +import org.springframework.transaction.annotation.Transactional; + +import com.plzgraduate.myongjigraduatebe.completedcredit.application.usecase.GenerateOrModifyCompletedCreditUseCase; +import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.domain.model.User; + +import lombok.RequiredArgsConstructor; + +@UseCase +@Transactional +@RequiredArgsConstructor +class DeleteTakenLectureService implements DeleteTakenLectureUseCase { + + private final FindUserUseCase findUserUseCase; + private final DeleteTakenLecturePort deleteTakenLecturePort; + private final GenerateOrModifyCompletedCreditUseCase generateOrModifyCompletedCreditUseCase; + + @Override + public void deleteAllTakenLecturesByUser(User user) { + deleteTakenLecturePort.deleteAllTakenLecturesByUser(user); + } + + @Override + public void deleteTakenLecture(Long userId, Long deletedTakenLectureId) { + User user = findUserUseCase.findUserById(userId); + deleteTakenLecturePort.deleteTakenLectureById(deletedTakenLectureId); + generateOrModifyCompletedCreditUseCase.generateOrModifyCompletedCredit(user); + } +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/GenerateCustomizedTakenLectureService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/GenerateCustomizedTakenLectureService.java new file mode 100644 index 00000000..64631adb --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/GenerateCustomizedTakenLectureService.java @@ -0,0 +1,39 @@ +package com.plzgraduate.myongjigraduatebe.takenlecture.application.service.save; + +import org.springframework.transaction.annotation.Transactional; + +import com.plzgraduate.myongjigraduatebe.completedcredit.application.usecase.GenerateOrModifyCompletedCreditUseCase; +import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.GenerateCustomizedTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.domain.model.User; + +import lombok.RequiredArgsConstructor; + +@UseCase +@Transactional +@RequiredArgsConstructor +public class GenerateCustomizedTakenLectureService implements GenerateCustomizedTakenLectureUseCase { + + private final FindUserUseCase findUserUseCase; + private final FindLecturePort findLecturePort; + private final SaveTakenLecturePort saveTakenLecturePort; + private final GenerateOrModifyCompletedCreditUseCase generateOrModifyCompletedCreditUseCase; + + @Override + public void generateCustomizedTakenLecture(final Long userId, final Long addedTakenLectureId) { + User user = findUserUseCase.findUserById(userId); + Lecture lecture = findLecturePort.findLectureById(addedTakenLectureId); + addCustomTakenLecture(user, lecture); + generateOrModifyCompletedCreditUseCase.generateOrModifyCompletedCredit(user); + } + + private void addCustomTakenLecture(User user, Lecture addedLecture) { + TakenLecture addedTakenLecture = TakenLecture.custom(user, addedLecture); + saveTakenLecturePort.saveTakenLecture(addedTakenLecture); + } +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureService.java deleted file mode 100644 index 3f2ccea9..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.service.update; - -import java.util.List; -import java.util.stream.Collectors; - -import org.springframework.transaction.annotation.Transactional; - -import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesUseCase; -import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.domain.model.User; - -import lombok.RequiredArgsConstructor; - -@UseCase -@Transactional -@RequiredArgsConstructor -class UpdateTakenLectureService implements UpdateTakenLectureUseCase { - - private final FindUserUseCase findUserUseCase; - private final FindLecturesUseCase findLecturesUseCase; - private final DeleteTakenLecturePort deleteTakenLecturePort; - private final SaveTakenLecturePort saveTakenLecturePort; - - @Override - public void modifyTakenLecture(Long userId, List deletedTakenLectureIds, List addedTakenLectureIds) { - User user = findUserUseCase.findUserById(userId); - deleteTakenLecturePort.deleteTakenLecturesByIds(deletedTakenLectureIds); - List addedLectures = findLecturesUseCase.findLecturesByIds(addedTakenLectureIds); - addCustomTakenLectures(user, addedLectures); - } - - private void addCustomTakenLectures(User user, List addedLectures) { - List addedTakenLectures = addedLectures.stream() - .map(addedLecture -> TakenLecture.custom(user, addedLecture)) - .collect(Collectors.toList()); - saveTakenLecturePort.saveTakenLectures(addedTakenLectures); - } -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureByUserUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureUseCase.java similarity index 63% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureByUserUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureUseCase.java index 1012f5a3..e6164c71 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureByUserUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureUseCase.java @@ -2,6 +2,9 @@ import com.plzgraduate.myongjigraduatebe.user.domain.model.User; -public interface DeleteTakenLectureByUserUseCase { +public interface DeleteTakenLectureUseCase { void deleteAllTakenLecturesByUser(User user); + + void deleteTakenLecture(Long userId, Long deletedTakenLectureId); + } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/GenerateCustomizedTakenLectureUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/GenerateCustomizedTakenLectureUseCase.java new file mode 100644 index 00000000..c2b2f78f --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/GenerateCustomizedTakenLectureUseCase.java @@ -0,0 +1,6 @@ +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save; + + +public interface GenerateCustomizedTakenLectureUseCase { + void generateCustomizedTakenLecture(Long userId, Long addedTakenLectureId); +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureUseCase.java deleted file mode 100644 index 5a193906..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureUseCase.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update; - -import java.util.List; - -import lombok.extern.java.Log; - -public interface UpdateTakenLectureUseCase { - - void modifyTakenLecture(Long userId, List deletedTakenLectureIds, List addedTakenLectureIds); -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapter.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapter.java index 55751fa4..054d7035 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapter.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapter.java @@ -5,14 +5,14 @@ import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity.TakenLectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.mapper.TakenLectureMapper; import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.FindTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity.TakenLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.mapper.TakenLectureMapper; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; import lombok.RequiredArgsConstructor; @@ -52,13 +52,19 @@ public void saveTakenLectures(List takenLectures) { takenLectureRepository.saveAll(takenLecturesJpaEntities); } + @Override + public void saveTakenLecture(final TakenLecture takenLecture) { + TakenLectureJpaEntity takenLectureJpaEntity = takenLectureMapper.mapToJpaEntity(takenLecture); + takenLectureRepository.save(takenLectureJpaEntity); + } + @Override public void deleteAllTakenLecturesByUser(User user) { takenLectureRepository.deleteAllByUser(takenLectureMapper.mapToUserJpaEntity(user)); } @Override - public void deleteTakenLecturesByIds(List deleteIds) { - takenLectureRepository.deleteAllByIdInBatch(deleteIds); + public void deleteTakenLectureById(Long deleteId) { + takenLectureRepository.deleteById(deleteId); } } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/entity/TakenLectureJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/entity/TakenLectureJpaEntity.java index 521624b1..73dbd543 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/entity/TakenLectureJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/entity/TakenLectureJpaEntity.java @@ -1,6 +1,8 @@ package com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -37,6 +39,7 @@ public class TakenLectureJpaEntity extends TimeBaseEntity { private Integer year; + @Enumerated(EnumType.STRING) private Semester semester; } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdApiPresentation.java index aad23168..fd8e89a0 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdApiPresentation.java @@ -12,5 +12,5 @@ public interface FindAuthIdApiPresentation { UserAuthIdResponse findUserAuthId( - @Parameter(name = "studentNumber", description = "학번", in = ParameterIn.PATH) @PathVariable("student-number") String studentNumber); + @Parameter(name = "studentNumber", description = "학번", in = ParameterIn.PATH) @PathVariable String studentNumber); } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdController.java index 31154e3a..423d8253 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdController.java @@ -17,8 +17,8 @@ public class FindAuthIdController implements FindAuthIdApiPresentation { private final FindUserAuthIdUseCase findUserAuthIdUseCase; - @GetMapping("/{student-number}/auth-id") - public UserAuthIdResponse findUserAuthId(@PathVariable("student-number") String studentNumber) { + @GetMapping("/{studentNumber}/auth-id") + public UserAuthIdResponse findUserAuthId(@PathVariable String studentNumber) { String foundUserAuthId = findUserAuthIdUseCase.findUserAuthId(studentNumber); return UserAuthIdResponse.of(foundUserAuthId, studentNumber); } diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordApiPresentation.java index 507f7913..888a50bf 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordApiPresentation.java @@ -22,7 +22,7 @@ public interface ResetPasswordApiPresentation { @Parameter(name = "auth-id", description = "아이디") ValidateUserResponse validateUser( @Parameter(name = "studentNumber", description = "학번", in = ParameterIn.PATH) - @PathVariable("student-number") String studentNumber, + @PathVariable String studentNumber, @RequestParam("auth-id") String authId); @PatchMapping("/password") diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordController.java index 0ef71b1d..83fd7f33 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordController.java @@ -25,9 +25,9 @@ public class ResetPasswordController implements ResetPasswordApiPresentation { private final ValidateUserUseCase validateUserUseCase; private final ResetPasswordUseCase resetPasswordUseCase; - @GetMapping("/{student-number}/validate") + @GetMapping("/{studentNumber}/validate") public ValidateUserResponse validateUser( - @PathVariable("student-number") String studentNumber, + @PathVariable String studentNumber, @RequestParam("auth-id") String authId) { boolean validated = validateUserUseCase.validateUser(studentNumber, authId); return ValidateUserResponse.builder().passedUserValidation(validated).build(); diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserService.java index 88097858..5a923142 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserService.java @@ -5,7 +5,7 @@ import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; import com.plzgraduate.myongjigraduatebe.parsing.application.port.DeleteParsingTextHistoryPort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureUseCase; import com.plzgraduate.myongjigraduatebe.user.application.port.DeleteUserPort; import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw.WithDrawUserUseCase; @@ -19,7 +19,7 @@ class WithDrawUserService implements WithDrawUserUseCase { private final FindUserUseCase findUserUseCase; - private final DeleteTakenLectureByUserUseCase deleteTakenLectureByUserUseCase; + private final DeleteTakenLectureUseCase deleteTakenLectureByUserUseCase; private final DeleteParsingTextHistoryPort deleteParsingTextHistoryPort; private final DeleteUserPort deleteUserPort; private final PasswordEncoder passwordEncoder; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapterTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapterTest.java index 1861c4fd..9f6be87d 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapterTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapterTest.java @@ -1,7 +1,6 @@ package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.tuple; +import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.List; @@ -11,11 +10,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.LecturePersistenceAdapter; +import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureQueryRepository; import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; class LecturePersistenceAdapterTest extends PersistenceTestSupport { @@ -88,6 +86,26 @@ void findLecturesByIds() { ); } + @DisplayName("아이디로 과목을 찾는다.") + @Test + void findLectureById() { + //given + String lectureCode = "code"; + String lectureName = "name"; + LectureJpaEntity lectureJpaEntity = lectureRepository.save(createLectureJpaEntity(lectureCode, lectureName)); + + //when + Lecture lecture = lecturePersistenceAdapter.findLectureById(lectureJpaEntity.getId()); + + //then + Long expectedLectureId = lectureJpaEntity.getId(); + String expectedLectureCode = "code"; + String expectedLectureName = "name"; + assertThat(lecture.getId()).isEqualTo(expectedLectureId); + assertThat(lecture.getLectureCode()).isEqualTo(expectedLectureCode); + assertThat(lecture.getName()).isEqualTo(expectedLectureName); + } + @DisplayName("과목명이나 과목코드를 포함하는 과목들을 찾는다.") @Test void searchLectureByNameOrCode() { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextServiceTest.java index 293ca9bc..45652ccf 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextServiceTest.java @@ -17,7 +17,7 @@ import com.plzgraduate.myongjigraduatebe.completedcredit.application.usecase.GenerateOrModifyCompletedCreditUseCase; import com.plzgraduate.myongjigraduatebe.core.exception.InvalidPdfException; import com.plzgraduate.myongjigraduatebe.core.exception.PdfParsingException; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureUseCase; import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureFromParsingTextUseCase; import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.application.usecase.update.UpdateStudentInformationCommand; @@ -35,7 +35,7 @@ class ParsingTextServiceTest{ @Mock private SaveTakenLectureFromParsingTextUseCase saveTakenLectureFromParsingTextUseCase; @Mock - private DeleteTakenLectureByUserUseCase deleteTakenLectureByUserUseCase; + private DeleteTakenLectureUseCase deleteTakenLectureByUserUseCase; @Mock private GenerateOrModifyCompletedCreditUseCase generateOrModifyCompletedCreditUseCase; @InjectMocks diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/support/WebAdaptorTestSupport.java b/src/test/java/com/plzgraduate/myongjigraduatebe/support/WebAdaptorTestSupport.java index 66ba82b3..78138a5b 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/support/WebAdaptorTestSupport.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/support/WebAdaptorTestSupport.java @@ -1,6 +1,6 @@ package com.plzgraduate.myongjigraduatebe.support; -import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; +import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; @@ -32,8 +32,9 @@ import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextUseCase; import com.plzgraduate.myongjigraduatebe.takenlecture.api.FindTakenLectureController; import com.plzgraduate.myongjigraduatebe.takenlecture.api.UpdateTakenLectureController; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureUseCase; import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.GenerateCustomizedTakenLectureUseCase; import com.plzgraduate.myongjigraduatebe.user.api.findauthid.FindAuthIdController; import com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.FindUserInformationController; import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.ResetPasswordController; @@ -96,7 +97,10 @@ public abstract class WebAdaptorTestSupport { protected SearchLectureUseCase searchLectureUseCase; @MockBean - protected UpdateTakenLectureUseCase updateTakenLectureUseCase; + protected DeleteTakenLectureUseCase deleteTakenLectureUseCase; + + @MockBean + protected GenerateCustomizedTakenLectureUseCase generateCustomizedTakenLectureUseCase; @MockBean protected FindTakenLectureUseCase findTakenLectureUseCase; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/update/UpdateTakenLectureControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/update/UpdateTakenLectureControllerTest.java index 886bc96b..99245006 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/update/UpdateTakenLectureControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/update/UpdateTakenLectureControllerTest.java @@ -1,11 +1,9 @@ package com.plzgraduate.myongjigraduatebe.takenlecture.api.update; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.List; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -13,29 +11,41 @@ import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; import com.plzgraduate.myongjigraduatebe.support.WithMockAuthenticationUser; -import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.UpdateTakenLectureRequest; +import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.GenerateCustomizedTakenLectureRequest; class UpdateTakenLectureControllerTest extends WebAdaptorTestSupport { @WithMockAuthenticationUser - @DisplayName("수강과목을 수정한다.") + @DisplayName("수강과목을 생성한다.") @Test - void updateTakenLectures() throws Exception{ + void generateTakenLecture() throws Exception { //given - UpdateTakenLectureRequest request = UpdateTakenLectureRequest.builder() - .addedTakenLectures(List.of(1L, 2L)) - .deletedTakenLectures(List.of(1L, 2L)) + GenerateCustomizedTakenLectureRequest request = GenerateCustomizedTakenLectureRequest.builder() + .lectureId(1L) .build(); //when //then mockMvc.perform( - post("/api/v1/taken-lectures/update") - .content(objectMapper.writeValueAsString(request)) - .contentType(MediaType.APPLICATION_JSON) - .with(csrf()) - ) + post("/api/v1/taken-lectures") + .content(objectMapper.writeValueAsString(request)) + .contentType(MediaType.APPLICATION_JSON) + .with(csrf()) + ) .andDo(print()) .andExpect(status().isOk()); } + @WithMockAuthenticationUser + @DisplayName("수강과목을 삭제한다.") + @Test + void deleteTakenLecture() throws Exception { + //given + Long takenLectureId = 1L; + + //when //then + mockMvc.perform( + delete("/api/v1/taken-lectures/{taken-lecture-id}", takenLectureId)) + .andDo(print()) + .andExpect(status().isOk()); + } } diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureServiceTest.java similarity index 51% rename from src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserServiceTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureServiceTest.java index 329560cd..978caf20 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureServiceTest.java @@ -9,16 +9,39 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import com.plzgraduate.myongjigraduatebe.completedcredit.application.usecase.GenerateOrModifyCompletedCreditUseCase; import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) -class DeleteTakenLectureByUserServiceTest { +class DeleteTakenLectureServiceTest { + + @Mock + private FindUserUseCase findUserUseCase; @Mock private DeleteTakenLecturePort deleteTakenLecturePort; + + @Mock + private GenerateOrModifyCompletedCreditUseCase generateOrModifyCompletedCreditUseCase; + @InjectMocks - private DeleteTakenLectureByUserService deleteTakenLectureByUserService; + private DeleteTakenLectureService deleteTakenLectureService; + + @DisplayName("수강과목을 삭제한다.") + @Test + void deleteTakenLecture() { + //given + Long userId = 1L; + Long deletedTakenLectureId = 102L; + + //when + deleteTakenLectureService.deleteTakenLecture(userId, deletedTakenLectureId); + + //then + then(deleteTakenLecturePort).should().deleteTakenLectureById(102L); + } @DisplayName("사용자의 모든 수강과목을 삭제한다.") @Test @@ -27,9 +50,9 @@ void deleteAllTakenLecturesByUser() { User user = User.builder().build(); //when - deleteTakenLectureByUserService.deleteAllTakenLecturesByUser(user); + deleteTakenLectureService.deleteAllTakenLecturesByUser(user); //then then(deleteTakenLecturePort).should().deleteAllTakenLecturesByUser(eq(user)); } -} +} \ No newline at end of file diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/GenerateTakenLectureServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/GenerateTakenLectureServiceTest.java new file mode 100644 index 00000000..a07ec064 --- /dev/null +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/GenerateTakenLectureServiceTest.java @@ -0,0 +1,58 @@ +package com.plzgraduate.myongjigraduatebe.takenlecture.application.service.save; + +import static org.mockito.BDDMockito.*; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import com.plzgraduate.myongjigraduatebe.completedcredit.application.usecase.GenerateOrModifyCompletedCreditUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.domain.model.User; + +@ExtendWith(MockitoExtension.class) +class GenerateTakenLectureServiceTest { + @Mock + private FindUserUseCase findUserUseCase; + @Mock + private FindLecturePort findLecturePort; + @Mock + private SaveTakenLecturePort saveTakenLecturePort; + @Mock + private GenerateOrModifyCompletedCreditUseCase generateOrModifyCompletedCreditUseCase; + @InjectMocks + private GenerateCustomizedTakenLectureService generateTakenLectureService; + + @DisplayName("새로운 custom 과목을 추가한다.") + @Test + void saveTakenLecture() { + //given + User user = User.builder().id(1L).build(); + Lecture lecture = createLecture(1L); + given(findLecturePort.findLectureById(1L)) + .willReturn(lecture); + + ArgumentCaptor takenLectureCaptor = ArgumentCaptor.forClass(TakenLecture.class); + + //when + generateTakenLectureService.generateCustomizedTakenLecture(user.getId(), 1L); + generateOrModifyCompletedCreditUseCase.generateOrModifyCompletedCredit(user); + + //then + then(saveTakenLecturePort).should().saveTakenLecture(takenLectureCaptor.capture()); + } + + private Lecture createLecture(Long id) { + return Lecture.builder() + .id(id) + .build(); + } +} diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureServiceTest.java deleted file mode 100644 index 28d35f77..00000000 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureServiceTest.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.service.update; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.tuple; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.then; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentCaptor; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesUseCase; -import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.domain.model.User; - -@ExtendWith(MockitoExtension.class) -class UpdateTakenLectureServiceTest { - @Mock - private FindUserUseCase findUserUseCase; - @Mock - private FindLecturesUseCase findLecturesUseCase; - @Mock - private DeleteTakenLecturePort deleteTakenLecturePort; - @Mock - private SaveTakenLecturePort saveTakenLecturePort; - @InjectMocks - private UpdateTakenLectureService updateTakenLectureService; - - @DisplayName("수강과목을 삭제하고 새로운 수강정보를 추가한다.") - @Test - void modifyTakenLecture() { - //given - User user = User.builder().id(1L).build(); - Lecture lecture1 = createLecture(1L); - Lecture lecture2 = createLecture(2L); - given(findLecturesUseCase.findLecturesByIds(List.of(1L, 2L))) - .willReturn(new ArrayList<>(List.of(lecture1, lecture2))); - - ArgumentCaptor> takenLectureListCaptor = ArgumentCaptor.forClass(List.class); - //when - updateTakenLectureService.modifyTakenLecture(user.getId(), List.of(21L, 22L), List.of(1L, 2L)); - - //then - then(deleteTakenLecturePort).should().deleteTakenLecturesByIds(List.of(21L, 22L)); - then(saveTakenLecturePort).should().saveTakenLectures(takenLectureListCaptor.capture()); - - List captureLectures = takenLectureListCaptor.getValue(); - assertThat(captureLectures).hasSize(2) - .extracting("year", "semester") - .containsExactlyInAnyOrder( - tuple(2099, null), - tuple(2099, null) - ); - } - - - private Lecture createLecture(Long id) { - return Lecture.builder() - .id(id) - .build(); - } -} diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapterTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapterTest.java new file mode 100644 index 00000000..87817d8c --- /dev/null +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapterTest.java @@ -0,0 +1,53 @@ +package com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence; + +import static org.assertj.core.api.Assertions.*; + +import java.util.Optional; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; +import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.Semester; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity.TakenLectureJpaEntity; + +class TakenLecturePersistenceAdapterTest extends PersistenceTestSupport { + + @Autowired + private TakenLectureRepository takenLectureRepository; + + @Autowired + private TakenLecturePersistenceAdapter takenLecturePersistenceAdapter; + + @AfterEach + void afterEach() { + this.takenLectureRepository.deleteAllInBatch(); + this.entityManager + .createNativeQuery("ALTER TABLE lecture auto_increment 1") + .executeUpdate(); + } + + @DisplayName("수강과목을 삭제합니다.") + @Test + public void deleteTakenLectureById() throws Exception { + // given + TakenLectureJpaEntity takenLectureJpaEntity = createTakenLectureJpaEntity(2099, Semester.FIRST); + takenLectureRepository.save(takenLectureJpaEntity); + + // when + takenLecturePersistenceAdapter.deleteTakenLectureById(takenLectureJpaEntity.getId()); + + // then + Optional result = takenLectureRepository.findById(takenLectureJpaEntity.getId()); + assertThat(result.isPresent()).isFalse(); + } + + private TakenLectureJpaEntity createTakenLectureJpaEntity(Integer year, Semester semester) { + return TakenLectureJpaEntity.builder() + .year(year) + .semester(semester) + .build(); + } +} \ No newline at end of file diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserServiceTest.java index fc5d0816..c380a037 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserServiceTest.java @@ -15,7 +15,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import com.plzgraduate.myongjigraduatebe.parsing.application.port.DeleteParsingTextHistoryPort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureUseCase; import com.plzgraduate.myongjigraduatebe.user.application.port.DeleteUserPort; import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @@ -26,7 +26,7 @@ class WithDrawUserServiceTest { @Mock private FindUserUseCase findUserUseCase; @Mock - private DeleteTakenLectureByUserUseCase deleteTakenLectureByUserUseCase; + private DeleteTakenLectureUseCase deleteTakenLectureByUserUseCase; @Mock private DeleteParsingTextHistoryPort deleteParsingTextHistoryPort; @Mock