Merge pull request #122 from team-Ollie/develop

[develop] 프로그램 등록 로직 개선

src/main/java/ollie/wecare/program/controller/ProgramController.java

@@ -9,11 +9,11 @@
 import ollie.wecare.program.dto.PostProgramReq;
 import ollie.wecare.program.dto.ProgramListResponse;
 import ollie.wecare.program.service.ProgramService;
+import ollie.wecare.user.service.AuthService;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import static ollie.wecare.common.base.BaseResponseStatus.SUCCESS;
 import static ollie.wecare.common.constants.RequestURI.program;
 
 @RestController
@@ -22,6 +22,7 @@
 @Slf4j
 public class ProgramController {
     private final ProgramService programService;
+    private final AuthService authService;
 
     // 프로그램 조회 (월별)
     @GetMapping
@@ -44,7 +45,6 @@ public BaseResponse<GetProgramDetailRes> getProgram(@PathVariable(value = "progr
     // 프로그램 등록
     @PostMapping
     public BaseResponse<String> saveProgram(@RequestBody PostProgramReq postProgramReq) throws BaseException {
-        programService.saveTag(postProgramReq, programService.saveProgram(postProgramReq).getProgram());
-        return new BaseResponse<>(SUCCESS);
+        return programService.saveProgram(authService.getUserIdx(), postProgramReq);
     }
 }

src/main/java/ollie/wecare/program/dto/PostProgramReq.java

@@ -8,29 +8,21 @@
 @Getter
 public class PostProgramReq {
     private String name;
-
     private DateDto dueDate;
-
     private DateDto openDate;
-
     private String location;
-
     private String locatedPlace;
-
     private String host;
-
     private String schedule;
-
     private String description;
-
     private String category;
 
     public static Program toProgram(PostProgramReq postProgramReq) {
         return Program.builder().name(postProgramReq.getName())
                 .dueDate(convertToLocalDateTime(postProgramReq.getDueDate()))
                 .openDate(convertToLocalDateTime(postProgramReq.getOpenDate()))
-                .host(postProgramReq.getHost())
                 .locatedPlace(postProgramReq.getLocatedPlace())
+                .host(postProgramReq.getHost())
                 .schedule(postProgramReq.getSchedule())
                 .description(postProgramReq.getDescription())
                 .build();
@@ -40,7 +32,5 @@ private static LocalDateTime convertToLocalDateTime(DateDto dateDto) {
         if(dateDto == null) return null;
         return LocalDateTime.of(dateDto.year(), dateDto.month(), dateDto.day(), 0, 0, 0);
     }
-
-
 }
 

src/main/java/ollie/wecare/program/service/ProgramService.java

@@ -17,7 +17,7 @@
 import ollie.wecare.program.repository.ProgramRepository;
 import ollie.wecare.program.repository.TagRepository;
 import ollie.wecare.user.entity.User;
-import ollie.wecare.user.service.UserService;
+import ollie.wecare.user.repository.UserRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,10 +36,10 @@
 @Transactional
 public class ProgramService {
 
-    private final UserService userService;
     private final ProgramRepository programRepository;
     private final ChallengeRepository challengeRepository;
     private final TagRepository tagRepository;
+    private final UserRepository userRepository;
 
     // 프로그램 월별 조회
     public List<GetProgramRes> getPrograms(Long year, Long month) {
@@ -68,22 +68,36 @@ public GetProgramDetailRes getProgram(Long programIdx) {
                 programRepository.findById(programIdx).orElseThrow(()-> new BaseException(INVALID_PROGRAM_IDX)));
     }
 
-    //TODO : 연관관계 수정
-    public Challenge saveProgram(PostProgramReq postProgramReq) {
-        User user = userService.getUserWithValidation();
-        if(!user.getRole().equals(Role.Admin)) throw new BaseException(INVALID_ROLE);
-        return this.saveChallenge(PostProgramReq.toProgram(postProgramReq), user);
+    // 프로그램 등록
+    @Transactional(rollbackFor = Exception.class)
+    public BaseResponse<String> saveProgram(Long userIdx, PostProgramReq postProgramReq) {
+        User user = userRepository.findByUserIdx(userIdx).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        if (!user.getRole().equals(Role.Admin)) throw new BaseException(INVALID_ROLE);
+
+        Program newProgram = PostProgramReq.toProgram(postProgramReq);
+        programRepository.save(newProgram);
+
+        saveChallenge(newProgram, user);
+        saveTag(postProgramReq, newProgram);
+        return new BaseResponse<>(SUCCESS);
     }
 
-    public void saveTag(PostProgramReq postProgramReq, Program program) {
+    private void saveTag(PostProgramReq postProgramReq, Program program) {
         tagRepository.save(Tag.builder().name(TagEnum.getEnumByName(postProgramReq.getCategory())).program(program).build());
         tagRepository.save(Tag.builder().name(TagEnum.getEnumByName(postProgramReq.getLocation())).program(program).build());
     }
 
-    public Challenge saveChallenge(Program program, User user) {
+    private void saveChallenge(Program program, User user) {
         Duration duration = Duration.between(program.getOpenDate(), program.getDueDate());
-        Integer totalNum = Math.toIntExact(duration.toDays() / 7);//TODO : 특정 요일 횟수 반영
-        return challengeRepository.save(Challenge.builder().program(program).name(program.getName()).attendanceRate(0)
-                .admin(user).host(program.getHost()).totalNum(totalNum).build());
+        Integer totalNum = Math.toIntExact(duration.toDays() / 7); //TODO : 특정 요일 횟수 반영
+        Challenge newChallenge = Challenge.builder()
+                .program(program)
+                .name(program.getName())
+                .attendanceRate(0)
+                .admin(user)
+                .host(program.getHost())
+                .totalNum(totalNum).build();
+        challengeRepository.save(newChallenge);
     }
+
 }