Merge pull request #69 from bandalgomsu/main

main
Jolvre · Jun 5, 2024 · 6ac122a · 6ac122a
2 parents a80830d + 0031b76
commit 6ac122a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 33 deletions.
diff --git a/src/main/java/com/example/jolvre/auth/api/AuthController.java b/src/main/java/com/example/jolvre/auth/api/AuthController.java
@@ -17,6 +17,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -62,4 +63,13 @@ public ResponseEntity<FindPwEmailVerifyResponse> verifyPwFindAuthEmail(@RequestB
 
         return ResponseEntity.ok().body(response);
     }
+
+    @Operation(summary = "비밀번호 수정", description = "비밀번호 찾기 인증 메일을 검증합니다")
+    @PutMapping("/pw")
+    public ResponseEntity<Void> verifyPwFindAuthEmai(@RequestBody EmailVerifyRequest request) {
+        FindPwEmailVerifyResponse response = mailVerifyService.CheckFindPwAuthNum(request.getEmail(),
+                request.getAuthNum());
+
+        return ResponseEntity.ok().build();
+    }
 }
diff --git a/src/main/java/com/example/jolvre/exhibition/api/DiaryController.java b/src/main/java/com/example/jolvre/exhibition/api/DiaryController.java
@@ -33,9 +33,9 @@ public class DiaryController {
 
     @Operation(summary = "일기장 업로드")
     @PostMapping(path = "/{exhibitId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<?> uploadDiary(@AuthenticationPrincipal PrincipalDetails principalDetails,
-                                         @PathVariable Long exhibitId,
-                                         @ModelAttribute DiaryUploadRequest request) {
+    public ResponseEntity<Void> uploadDiary(@AuthenticationPrincipal PrincipalDetails principalDetails,
+                                            @PathVariable Long exhibitId,
+                                            @ModelAttribute DiaryUploadRequest request) {
         diaryService.uploadDiary(principalDetails.getId(), exhibitId, request);
 
         return ResponseEntity.ok().build();
@@ -61,18 +61,18 @@ public ResponseEntity<DiaryInfoResponse> getDiary(
 
     @Operation(summary = "일기장 업데이트")
     @PatchMapping(path = "/user/{exhibitId}/{diaryId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<?> updateDiary(@PathVariable Long diaryId, @PathVariable Long exhibitId,
-                                         @AuthenticationPrincipal PrincipalDetails principalDetails,
-                                         @ModelAttribute DiaryUpdateRequest request) {
+    public ResponseEntity<Void> updateDiary(@PathVariable Long diaryId, @PathVariable Long exhibitId,
+                                            @AuthenticationPrincipal PrincipalDetails principalDetails,
+                                            @ModelAttribute DiaryUpdateRequest request) {
         diaryService.updateDiary(diaryId, exhibitId, principalDetails.getId(), request);
 
         return ResponseEntity.ok().build();
     }
 
     @Operation(summary = "일기장 삭제")
     @DeleteMapping("/user/{exhibitId}/{diaryId}")
-    public ResponseEntity<?> deleteDiary(@PathVariable Long diaryId, @PathVariable Long exhibitId,
-                                         @AuthenticationPrincipal PrincipalDetails principalDetails) {
+    public ResponseEntity<Void> deleteDiary(@PathVariable Long diaryId, @PathVariable Long exhibitId,
+                                            @AuthenticationPrincipal PrincipalDetails principalDetails) {
 
         diaryService.deleteDiary(diaryId, exhibitId, principalDetails.getId());
 

diff --git a/src/main/java/com/example/jolvre/exhibition/api/ExhibitionController.java b/src/main/java/com/example/jolvre/exhibition/api/ExhibitionController.java
@@ -75,8 +75,8 @@ public void updateExhibit(@AuthenticationPrincipal PrincipalDetails principalDet
 
     @Operation(summary = "전시 배포")
     @PostMapping("/user/{exhibitId}/distribute")
-    public ResponseEntity<?> distributeExhibit(@AuthenticationPrincipal PrincipalDetails principalDetails,
-                                               @PathVariable Long exhibitId) {
+    public ResponseEntity<Void> distributeExhibit(@AuthenticationPrincipal PrincipalDetails principalDetails,
+                                                  @PathVariable Long exhibitId) {
         exhibitService.distributeExhibit(exhibitId, principalDetails.getId());
 
         return ResponseEntity.ok().build();
@@ -125,9 +125,9 @@ public ResponseEntity<ExhibitInvitationResponse> createInvitation(@PathVariable
 
     @Operation(summary = "해당 전시 코멘트 업로드", description = "해당 전시에 코멘트를 업로드 한다")
     @PostMapping("/{exhibitId}/comment")
-    public ResponseEntity<?> uploadComment(@PathVariable Long exhibitId,
-                                           @AuthenticationPrincipal PrincipalDetails principalDetails,
-                                           @RequestBody ExhibitCommentUploadRequest request) {
+    public ResponseEntity<Void> uploadComment(@PathVariable Long exhibitId,
+                                              @AuthenticationPrincipal PrincipalDetails principalDetails,
+                                              @RequestBody ExhibitCommentUploadRequest request) {
         exhibitService.uploadComment(exhibitId, principalDetails.getId(), request);
 
         return ResponseEntity.ok().build();
@@ -143,20 +143,20 @@ public ResponseEntity<ExhibitCommentInfoResponses> getAllComment(@PathVariable L
 
     @Operation(summary = "코멘트 수정", description = "해당 전시에 특정 코멘트를 수정한다")
     @PatchMapping("/{exhibitId}/comment/{commentId}")
-    public ResponseEntity<?> updateComment(@PathVariable Long exhibitId,
-                                           @PathVariable Long commentId,
-                                           @AuthenticationPrincipal PrincipalDetails principalDetails,
-                                           @RequestBody ExhibitCommentUpdateRequest request) {
+    public ResponseEntity<Void> updateComment(@PathVariable Long exhibitId,
+                                              @PathVariable Long commentId,
+                                              @AuthenticationPrincipal PrincipalDetails principalDetails,
+                                              @RequestBody ExhibitCommentUpdateRequest request) {
         exhibitService.updateComment(commentId, principalDetails.getId(), request);
 
         return ResponseEntity.ok().build();
     }
 
     @Operation(summary = "코멘트 삭제", description = "해당 전시에 특정 코멘트를 삭제한다")
     @DeleteMapping("/{exhibitId}/comment/{commentId}")
-    public ResponseEntity<?> deleteComment(@PathVariable Long exhibitId,
-                                           @PathVariable Long commentId,
-                                           @AuthenticationPrincipal PrincipalDetails principalDetails) {
+    public ResponseEntity<Void> deleteComment(@PathVariable Long exhibitId,
+                                              @PathVariable Long commentId,
+                                              @AuthenticationPrincipal PrincipalDetails principalDetails) {
         exhibitService.deleteComment(commentId, principalDetails.getId());
 
         return ResponseEntity.ok().build();

diff --git a/src/main/java/com/example/jolvre/group/api/GroupExhibitController.java b/src/main/java/com/example/jolvre/group/api/GroupExhibitController.java
@@ -40,7 +40,7 @@ public class GroupExhibitController {
 
     @Operation(summary = "단체 전시 생성")
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<?> createGroup(@ModelAttribute GroupExhibitCreateRequest request
+    public ResponseEntity<Void> createGroup(@ModelAttribute GroupExhibitCreateRequest request
             , @AuthenticationPrincipal PrincipalDetails principalDetails) {
 
         groupExhibitService.createGroupExhibit(principalDetails.getId(), request);
@@ -75,8 +75,8 @@ public ResponseEntity<GroupExhibitInfoResponses> getAllUserGroupExhibit(
 
     @Operation(summary = "단체 전시 전시 추가")
     @PostMapping("/{groupId}/exhibit/{exhibitId}")
-    public ResponseEntity<?> addExhibit(@AuthenticationPrincipal PrincipalDetails principalDetails,
-                                        @PathVariable Long groupId, @PathVariable Long exhibitId
+    public ResponseEntity<Void> addExhibit(@AuthenticationPrincipal PrincipalDetails principalDetails,
+                                           @PathVariable Long groupId, @PathVariable Long exhibitId
     ) {
         groupExhibitService.addExhibit(principalDetails.getId(), groupId, exhibitId);
 
@@ -85,8 +85,9 @@ public ResponseEntity<?> addExhibit(@AuthenticationPrincipal PrincipalDetails pr
 
     @Operation(summary = "단체 전시 회원 조회")
     @GetMapping("/groups/{groupId}/users")
-    public ResponseEntity<?> getGroupExhibitUsers(@AuthenticationPrincipal PrincipalDetails principalDetails,
-                                                  @PathVariable Long groupId) {
+    public ResponseEntity<GroupExhibitUserResponses> getGroupExhibitUsers(
+            @AuthenticationPrincipal PrincipalDetails principalDetails,
+            @PathVariable Long groupId) {
         GroupExhibitUserResponses responses =
                 groupExhibitService.getGroupExhibitUsers(principalDetails.getId(), groupId);
 
@@ -95,8 +96,8 @@ public ResponseEntity<?> getGroupExhibitUsers(@AuthenticationPrincipal Principal
 
     @Operation(summary = "단체 전시 삭제", description = "단체 전시를 삭제합니다")
     @DeleteMapping("/groups/{groupId}")
-    public ResponseEntity<?> deleteGroupExhibit(@AuthenticationPrincipal PrincipalDetails principalDetails,
-                                                @PathVariable Long groupId) {
+    public ResponseEntity<Void> deleteGroupExhibit(@AuthenticationPrincipal PrincipalDetails principalDetails,
+                                                   @PathVariable Long groupId) {
 
         groupExhibitService.deleteGroup(groupId, principalDetails.getId());
 
@@ -105,9 +106,9 @@ public ResponseEntity<?> deleteGroupExhibit(@AuthenticationPrincipal PrincipalDe
 
     @Operation(summary = "매니저 추가")
     @PostMapping("/{groupId}/manager/{toUserId}")
-    public ResponseEntity<?> addManager(@AuthenticationPrincipal PrincipalDetails principalDetails,
-                                        @PathVariable Long toUserId,
-                                        @PathVariable Long groupId
+    public ResponseEntity<Void> addManager(@AuthenticationPrincipal PrincipalDetails principalDetails,
+                                           @PathVariable Long toUserId,
+                                           @PathVariable Long groupId
     ) {
         groupExhibitService.addManager(principalDetails.getId(), toUserId, groupId);
 
@@ -116,9 +117,9 @@ public ResponseEntity<?> addManager(@AuthenticationPrincipal PrincipalDetails pr
 
     @Operation(summary = "단체 전시 수정", description = "단체 전시를 수정합니다")
     @PatchMapping(path = "/groups/{groupId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<?> updateGroupExhibit(@AuthenticationPrincipal PrincipalDetails principalDetails,
-                                                @PathVariable Long groupId,
-                                                @ModelAttribute GroupUpdateRequest request) {
+    public ResponseEntity<Void> updateGroupExhibit(@AuthenticationPrincipal PrincipalDetails principalDetails,
+                                                   @PathVariable Long groupId,
+                                                   @ModelAttribute GroupUpdateRequest request) {
 
         groupExhibitService.updateGroup(groupId, principalDetails.getId(), request);