Merge branch 'dev' into feat(#119)-Group-Info-Delete

ghdcksgml1 · Nov 25, 2023 · aa61b76 · aa61b76
2 parents f9d17cd + f8e77b0
commit aa61b76
Show file tree

Hide file tree

Showing 20 changed files with 983 additions and 96 deletions.
diff --git a/heachi-core/auth-api/src/main/java/com/heachi/auth/api/controller/auth/AuthController.java b/heachi-core/auth-api/src/main/java/com/heachi/auth/api/controller/auth/AuthController.java
@@ -13,6 +13,10 @@
 import com.heachi.auth.api.service.state.LoginStateService;
 import com.heachi.mysql.define.user.User;
 import com.heachi.mysql.define.user.constant.UserPlatformType;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -40,6 +44,7 @@ public JsonResult<String> loginPage(
         return JsonResult.successOf(loginPage);
     }
 
+    @ApiResponse(responseCode = "200", description = "로그인 성공", content = @Content(schema = @Schema(implementation = AuthServiceLoginResponse.class)))
     @GetMapping("/{platformType}/login")
     public JsonResult<String> login(
             @PathVariable("platformType") UserPlatformType platformType,
@@ -53,6 +58,7 @@ public JsonResult<String> login(
         return JsonResult.successOf(loginResponse);
     }
 
+    @ApiResponse(responseCode = "200", description = "회원가입 성공", content = @Content(schema = @Schema(implementation = AuthServiceLoginResponse.class)))
     @PostMapping("/register")
     public JsonResult<?> register(
             @Valid @RequestBody AuthRegisterRequest request) {
@@ -62,6 +68,7 @@ public JsonResult<?> register(
         return JsonResult.successOf(registerResponse);
     }
 
+    @ApiResponse(responseCode = "200", description = "회원 정보 불러오기 성공", content = @Content(schema = @Schema(implementation = UserSimpleInfoResponse.class)))
     @GetMapping("/info")
     public JsonResult<UserSimpleInfoResponse> userInfo(@AuthenticationPrincipal User user) {
 
@@ -90,6 +97,7 @@ public JsonResult<?> userDelete(@AuthenticationPrincipal User user) {
         return JsonResult.successOf();
     }
 
+    @ApiResponse(responseCode = "200", description = "토큰 재발급 성공", content = @Content(schema = @Schema(implementation = ReissueAccessTokenResponse.class)))
     @PostMapping("/reissue")
     public JsonResult<?> reissueAccessToken(@RequestHeader(name = "Authorization") String token) {
         List<String> tokens = Arrays.asList(token.split(" "));

diff --git a/heachi-core/auth-api/src/main/java/com/heachi/auth/config/security/SecurityConfig.java b/heachi-core/auth-api/src/main/java/com/heachi/auth/config/security/SecurityConfig.java
@@ -32,7 +32,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 // register
                                 .requestMatchers("/auth/register").hasAnyAuthority("UNAUTH")
                                 // Others
-                                .anyRequest().hasAnyAuthority("USER", "CHEMIST", "CENTER")
+                                .anyRequest().hasAnyAuthority("USER")
                 )
                 .sessionManagement((sessionManagement) ->
                         sessionManagement

diff --git a/heachi-core/housework-api/src/main/java/com/heachi/housework/HeachiHouseworkApplication.java b/heachi-core/housework-api/src/main/java/com/heachi/housework/HeachiHouseworkApplication.java
@@ -3,8 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @SpringBootApplication(scanBasePackages = "com.heachi", exclude = SecurityAutoConfiguration.class)
+@EnableJpaAuditing // JPA Auditing 기능 활성화 - BaseEntity
 public class HeachiHouseworkApplication {
 
     public static void main(String[] args) {

diff --git a/...api/src/main/java/com/heachi/housework/api/controller/group/info/GroupInfoController.java b/...api/src/main/java/com/heachi/housework/api/controller/group/info/GroupInfoController.java
@@ -7,6 +7,10 @@
 import com.heachi.housework.api.service.auth.AuthExternalService;
 import com.heachi.housework.api.service.group.info.GroupInfoService;
 import com.heachi.housework.api.service.group.info.request.GroupInfoUpdateServiceRequest;
+import com.heachi.housework.api.service.group.info.response.GroupInfoUserGroupServiceResponse;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +25,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequiredArgsConstructor
@@ -49,6 +55,7 @@ public JsonResult<?> createGroupInfo(@RequestHeader(name = "Authorization") Stri
     }
 
     // User가 가입한 Group 정보를 리턴한다.
+    @ApiResponse(responseCode = "200", description = "그룹 리스트 조회 성공", content = @Content(schema = @Schema(implementation = GroupInfoUserGroupServiceResponse.class, type = "array")))
     @GetMapping("/list")
     public JsonResult<?> userGroupInfoList(@RequestHeader(name = "Authorization") String authorization) {
         UserInfoResponse userInfo = authExternalService.userAuthenticate(authorization);

diff --git a/...src/main/java/com/heachi/housework/api/controller/group/member/GroupMemberController.java b/...src/main/java/com/heachi/housework/api/controller/group/member/GroupMemberController.java
@@ -4,6 +4,11 @@
 import com.heachi.housework.api.controller.group.member.response.GroupMemberResponse;
 import com.heachi.housework.api.service.auth.AuthExternalService;
 import com.heachi.housework.api.service.group.member.GroupMemberService;
+import com.heachi.redis.define.housework.todo.TodoList;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -18,6 +23,7 @@ public class GroupMemberController {
     private final AuthExternalService authExternalService;
     private final GroupMemberService groupMemberService;
 
+    @ApiResponse(responseCode = "200", description = "Group Member 리스트 조회 성공", content = @Content(array = @ArraySchema(schema = @Schema(implementation = GroupMemberResponse.class))))
     @GetMapping("/{groupId}")
     public JsonResult<?> groupMemberList(@RequestHeader(name = "Authorization") String authorization,
                                          @PathVariable(name = "groupId") Long groupId) {

diff --git a/...a/com/heachi/housework/api/controller/housework/category/HouseworkCategoryController.java b/...a/com/heachi/housework/api/controller/housework/category/HouseworkCategoryController.java
@@ -1,7 +1,13 @@
 package com.heachi.housework.api.controller.housework.category;
 
 import com.heachi.admin.common.response.JsonResult;
+import com.heachi.housework.api.controller.group.member.response.GroupMemberResponse;
 import com.heachi.housework.api.service.housework.category.HouseworkCategoryService;
+import com.heachi.housework.api.service.housework.category.response.HouseworkCategoryResponse;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,6 +22,7 @@ public class HouseworkCategoryController {
 
     private final HouseworkCategoryService houseworkCategoryService;
 
+    @ApiResponse(responseCode = "200", description = "Group Member 리스트 조회 성공", content = @Content(array = @ArraySchema(schema = @Schema(implementation = HouseworkCategoryResponse.class))))
     @GetMapping("/")
     public JsonResult<?> selectCategory() {
 

diff --git a/...main/java/com/heachi/housework/api/controller/housework/info/HouseworkInfoController.java b/...main/java/com/heachi/housework/api/controller/housework/info/HouseworkInfoController.java
@@ -8,7 +8,7 @@
 import com.heachi.housework.api.service.housework.info.HouseworkInfoService;
 import com.heachi.housework.api.service.housework.info.request.HouseworkInfoCreateServiceRequest;
 import com.heachi.housework.api.service.housework.info.request.HouseworkInfoDeleteRequest;
-import com.heachi.housework.api.service.housework.todo.request.TodoSelectRequest;
+import com.heachi.housework.api.service.housework.info.request.HouseworkInfoUpdateServiceRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -51,12 +51,48 @@ public JsonResult<?> deleteHouseworkInfo(@RequestHeader(name = "Authorization")
             // 유저 인증 & 그룹원(ACCEPT)인지 권한 확인
             authExternalService.userAuthenticateAndGroupMatch(authorization, groupId);
             houseworkInfoService.deleteHouseworkInfo(
-                    HouseworkInfoDeleteRequest.builder().groupId(groupId).date(date).todoId(todoId).deleteType(deleteType).build());
+                    HouseworkInfoDeleteRequest.builder()
+                            .groupId(groupId)
+                            .date(date)
+                            .todoId(todoId)
+                            .deleteType(deleteType)
+                            .build());
 
             return JsonResult.successOf("Housework Delete Success.");
         } catch (HeachiException e) {
             return JsonResult.failOf(e.getMessage());
         }
 
     }
+
+    @GetMapping("/update/{groupId}")
+    public JsonResult<?> updateHouseworkInfo(@RequestHeader(name = "Authorization") String authorization,
+                                             @PathVariable(name = "groupId") Long groupId,
+                                             @RequestParam(name = "todoId") Long todoId) {
+        try {
+            // 유저 인증 & 그룹원(ACCEPT)인지 권한 확인
+            authExternalService.userAuthenticateAndGroupMatch(authorization, groupId);
+
+            return JsonResult.successOf(houseworkInfoService.updateHouseworkPage(todoId));
+        } catch (HeachiException e) {
+            return JsonResult.failOf(e.getMessage());
+        }
+    }
+
+    @PostMapping("/update/{groupId}")
+    public JsonResult<?> updateHouseworkInfo(@RequestHeader(name = "Authorization") String authorization,
+                                             @PathVariable(name = "groupId") Long groupId,
+                                             @RequestParam(name = "date") LocalDate date,
+                                             @RequestParam(name = "todoId") Long todoId,
+                                             @Valid @RequestBody HouseworkInfoCreateRequest request) {
+        try {
+            // 유저 인증 & 그룹원(ACCEPT)인지 권한 확인
+            authExternalService.userAuthenticateAndGroupMatch(authorization, groupId);
+            houseworkInfoService.updateHousework(HouseworkInfoUpdateServiceRequest.of(request, groupId, todoId, date));
+
+            return JsonResult.successOf("Housework Update Success.");
+        } catch (HeachiException e) {
+            return JsonResult.failOf(e.getMessage());
+        }
+    }
 }
diff --git a/...-api/src/main/java/com/heachi/housework/api/controller/housework/todo/TodoController.java b/...-api/src/main/java/com/heachi/housework/api/controller/housework/todo/TodoController.java
@@ -4,10 +4,19 @@
 import com.heachi.external.clients.auth.response.UserInfoResponse;
 import com.heachi.housework.api.controller.housework.todo.request.VerifyTodoRequest;
 import com.heachi.housework.api.service.auth.AuthExternalService;
+import com.heachi.housework.api.service.group.info.response.GroupInfoUserGroupServiceResponse;
 import com.heachi.housework.api.service.housework.todo.TodoService;
 import com.heachi.housework.api.service.housework.todo.request.TodoSelectRequest;
 import com.heachi.housework.api.service.housework.todo.request.VerifyTodoServiceRequest;
+import com.heachi.redis.define.housework.todo.TodoList;
 import com.heachi.s3.api.service.AwsS3Service;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +35,7 @@ public class TodoController {
     private final AwsS3Service awsS3Service;
 
     // Todo List 가져오기
+    @ApiResponse(responseCode = "200", description = "성공적으로 Todo List를 조회함", content = @Content(schema = @Schema(implementation = TodoList.class)))
     @GetMapping("/{groupId}")
     public JsonResult<?> selectTodo(@RequestHeader(name = "Authorization") String authorization,
                                     @PathVariable(name = "groupId") Long groupId,