Merge branch 'main' of https://github.com/prgrms-web-devcourse-final-project/WEB5_6_NeogulCoder_BE into feature/EA3-210-aws-s3

Author: pia01190

README.md

@@ -1 +1,12 @@
-# WEB5_6_Neogul_Coder_BE
+# WEB5_6_Neogul_Coder_BE
+
+## 서비스 소개
+
+## 담당파트
+<img width="1238" height="501" alt="image" src="https://github.com/user-attachments/assets/65a7d211-349c-45bf-b5a8-601310ee38bc" />
+
+## 시스템 아키텍처
+<img width="787" height="588" alt="image" src="https://github.com/user-attachments/assets/8c247cc3-0d78-4a2e-b71a-1b2cf69b3778" />
+
+## ERD
+<img width="2780" height="1562" alt="WEB5_6_NeogulCoder_BE (8)" src="https://github.com/user-attachments/assets/5ad5ccad-fd23-4601-8e13-1b2b082e2b4a" />

src/main/java/grep/neogulcoder/domain/admin/controller/AdminController.java

@@ -4,7 +4,10 @@
 import grep.neogulcoder.domain.admin.controller.dto.response.AdminStudyResponse;
 import grep.neogulcoder.domain.admin.controller.dto.response.AdminUserResponse;
 import grep.neogulcoder.domain.admin.service.AdminService;
+import grep.neogulcoder.domain.recruitment.post.service.RecruitmentPostService;
 import grep.neogulcoder.domain.study.enums.Category;
+import grep.neogulcoder.domain.study.service.StudyManagementService;
+import grep.neogulcoder.domain.users.service.UserService;
 import grep.neogulcoder.global.response.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -15,6 +18,7 @@
 import org.springframework.web.bind.annotation.DeleteMapping;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,6 +30,9 @@
 public class AdminController implements AdminSpecification {
 
     private final AdminService adminService;
+    private final UserService userService;
+    private final StudyManagementService studyManagementService;
+    private final RecruitmentPostService recruitmentPostService;
 
     @GetMapping("/users")
     public ResponseEntity<ApiResponse<Page<AdminUserResponse>>> getUsers(
@@ -52,6 +59,24 @@ public ResponseEntity<ApiResponse<Page<AdminRecruitmentPostResponse>>> getRecrui
         return ResponseEntity.ok(ApiResponse.success(adminService.getAllRecruitmentPosts(page, subject)));
     }
 
+    @PostMapping("/reactive/user/{userId}")
+    public ResponseEntity<ApiResponse<Void>> reactiveUser(@PathVariable("userId") Long userId) {
+        userService.reactiveUser(userId);
+        return ResponseEntity.ok(ApiResponse.success("회원이 다시 활성화 되었습니다."));
+    }
+
+    @PostMapping("/reactive/study/{studyId}")
+    public ResponseEntity<ApiResponse<Void>> reactiveStudy(@PathVariable("studyId") Long studyId) {
+        studyManagementService.reactiveStudy(studyId);
+        return ResponseEntity.ok(ApiResponse.success("스터디가 다시 활성화 되었습니다."));
+    }
+
+    @PostMapping("/reactive/study/{recruitmentPostId}")
+    public ResponseEntity<ApiResponse<Void>> reactiveRecruitmentPost(@PathVariable("recruitmentPostId") Long recruitmentPostId) {
+        recruitmentPostService.reactivePost(recruitmentPostId);
+        return ResponseEntity.ok(ApiResponse.success("모집글이 다시 활성화 되었습니다."));
+    }
+
     @DeleteMapping("/users/{userId}")
     public ResponseEntity<ApiResponse<Void>> deleteUser(@PathVariable Long userId) {
         adminService.deleteUser(userId);

src/main/java/grep/neogulcoder/domain/admin/service/AdminService.java

@@ -9,6 +9,7 @@
 import grep.neogulcoder.domain.study.enums.Category;
 import grep.neogulcoder.domain.study.repository.StudyQueryRepository;
 import grep.neogulcoder.domain.study.repository.StudyRepository;
+import grep.neogulcoder.domain.users.entity.User;
 import grep.neogulcoder.domain.users.repository.UserRepository;
 import grep.neogulcoder.domain.users.service.UserService;
 import grep.neogulcoder.global.exception.business.NotFoundException;

src/main/java/grep/neogulcoder/domain/alram/service/AlarmService.java

@@ -126,7 +126,7 @@ public void acceptInvite(Long targetUserId, Long alarmId) {
         Long studyId = alarm.getDomainId();
         Study study = findValidStudy(studyId);
         studyMemberRepository.save(StudyMember.createMember(study, targetUserId));
-        studyManagementServiceFacade.increaseMemberCount(study, targetUserId);
+        studyManagementServiceFacade.increaseMemberCount(studyId, targetUserId);
         alarm.checkAlarm();
     }
 

src/main/java/grep/neogulcoder/domain/recruitment/post/RecruitmentPost.java

@@ -63,4 +63,8 @@ public void updateStatus(RecruitmentPostStatus status) {
     public void delete() {
         this.activated = false;
     }
+
+    public void reactive() {
+        this.activated = true;
+    }
 }

src/main/java/grep/neogulcoder/domain/recruitment/post/repository/RecruitmentPostQueryRepository.java

@@ -157,7 +157,7 @@ private BooleanBuilder equalsStudyCategory(Category category) {
     }
 
     private BooleanBuilder likeContent(String content) {
-        return nullSafeBuilder(() -> recruitmentPost.content.contains(content));
+        return nullSafeBuilder(() -> recruitmentPost.content.contains(content).or(recruitmentPost.subject.contains(content)));
     }
 
     private BooleanBuilder nullSafeBuilder(Supplier<BooleanExpression> supplier) {

src/main/java/grep/neogulcoder/domain/recruitment/post/service/RecruitmentPostService.java

@@ -99,6 +99,13 @@ public void delete(long recruitmentPostId, long userId) {
         recruitmentPost.delete();
     }
 
+    @Transactional
+    public void reactivePost(Long recruitmentPostId) {
+        RecruitmentPost recruitmentPost =  postRepository.findByIdAndActivatedTrue(recruitmentPostId)
+            .orElseThrow(() -> new NotFoundException(NOT_FOUND));
+        recruitmentPost.reactive();
+    }
+
     private List<CommentsWithWriterInfo> findCommentsWithWriterInfo(RecruitmentPost post) {
         List<CommentsWithWriterInfo> comments = commentQueryRepository.findCommentsWithWriterInfo(post.getId());
         List<CommentsWithWriterInfo> withdrawnUserComments = withdrawnUserChangeNameFrom(comments);

src/main/java/grep/neogulcoder/domain/review/controller/ReviewController.java

@@ -27,7 +27,7 @@ public class ReviewController implements ReviewSpecification {
 
     @GetMapping("/studies/{study-id}/targets")
     public ResponseEntity<ApiResponse<ReviewTargetUsersInfo>> getReviewTargetUsersInfo(@PathVariable("study-id") long studyId,
-                                                                                      @AuthenticationPrincipal Principal userDetails) {
+                                                                                       @AuthenticationPrincipal Principal userDetails) {
         ReviewTargetUsersInfo response = reviewService.getReviewTargetUsersInfo(studyId, userDetails.getUserId());
         return ResponseEntity.ok(ApiResponse.success(response));
     }
@@ -44,16 +44,16 @@ public ResponseEntity<ApiResponse<Long>> save(@Valid @RequestBody ReviewSaveRequ
         return ResponseEntity.ok(ApiResponse.noContent());
     }
 
-    @GetMapping("/me/tags")
-    public ResponseEntity<ApiResponse<MyReviewTagsInfo>> getMyReviewTags(@AuthenticationPrincipal Principal userDetails) {
-        MyReviewTagsInfo response = reviewService.getMyReviewTags(userDetails.getUserId());
+    @GetMapping("/users/{user-id}/tags")
+    public ResponseEntity<ApiResponse<MyReviewTagsInfo>> getMyReviewTags(@PathVariable("user-id") long userId) {
+        MyReviewTagsInfo response = reviewService.getMyReviewTags(userId);
         return ResponseEntity.ok(ApiResponse.success(response));
     }
 
-    @GetMapping("/me/contents")
+    @GetMapping("/users/{user-id}/contents")
     public ResponseEntity<ApiResponse<ReviewContentsPagingInfo>> getMyReviewContents(@PageableDefault(size = 4) Pageable pageable,
-                                                                     @AuthenticationPrincipal Principal userDetails) {
-        ReviewContentsPagingInfo response = reviewService.getMyReviewContents(pageable, userDetails.getUserId());
+                                                                                     @PathVariable("user-id") long userId) {
+        ReviewContentsPagingInfo response = reviewService.getMyReviewContents(pageable, userId);
         return ResponseEntity.ok(ApiResponse.success(response));
     }
 }

src/main/java/grep/neogulcoder/domain/review/controller/ReviewSpecification.java

@@ -61,7 +61,7 @@ public interface ReviewSpecification {
     ResponseEntity<ApiResponse<Long>> save(ReviewSaveRequest request, Principal userDetails);
 
     @Operation(
-            summary = "자신이 받은 리뷰 태그 조회",
+            summary = "회원이 받은 리뷰 태그 조회",
             description = """
                     회원이 받은 리뷰 태그의 종류와 개수를 조회합니다.
                     
@@ -86,9 +86,9 @@ public interface ReviewSpecification {
                     - 내부 반환 값은 Map<String, List<ReviewTagCountInfo>> 입니다.
                     """
     )
-    ResponseEntity<ApiResponse<MyReviewTagsInfo>> getMyReviewTags(Principal userDetails);
+    ResponseEntity<ApiResponse<MyReviewTagsInfo>> getMyReviewTags(long userId);
 
-    @Operation(summary = "자신이 받은 주관 리뷰들 조회",
+    @Operation(summary = "회원이 받은 주관 리뷰들 페이징 조회",
             description = """
                     회원이 받은 **주관식 리뷰**를 페이징하여 조회합니다.
                     
@@ -100,5 +100,5 @@ public interface ReviewSpecification {
                     ✅ 예시:
                     `/reviews/me/contents?page=0&size=5`
                     """)
-    ResponseEntity<ApiResponse<ReviewContentsPagingInfo>> getMyReviewContents(Pageable pageable, Principal userDetails);
+    ResponseEntity<ApiResponse<ReviewContentsPagingInfo>> getMyReviewContents(Pageable pageable, long userId);
 }

src/main/java/grep/neogulcoder/domain/study/Study.java

@@ -118,6 +118,10 @@ public void finish() {
         this.finished = true;
     }
 
+    public void reactive() {
+        this.activated = true;
+    }
+
     public boolean isReviewableAt(LocalDateTime currentDateTime) {
         LocalDateTime reviewableDateTime = this.endDate.plusDays(7);