[EA3-68] chore: develop → main 브랜치 머지

src/main/java/grep/neogulcoder/domain/alram/controller/AlarmController.java

@@ -0,0 +1,48 @@
+package grep.neogulcoder.domain.alram.controller;
+
+import grep.neogulcoder.domain.alram.controller.dto.response.AlarmResponse;
+import grep.neogulcoder.domain.alram.service.AlarmService;
+import grep.neogulcoder.global.auth.Principal;
+import grep.neogulcoder.global.response.ApiResponse;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+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.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/alarm")
+public class AlarmController implements AlarmSpecification {
+
+    private final AlarmService alarmService;
+
+    @GetMapping("/my")
+    public ApiResponse<List<AlarmResponse>> getAllAlarm(
+        @AuthenticationPrincipal Principal userDetails) {
+        return ApiResponse.success(alarmService.getAllAlarms(userDetails.getUserId()));
+    }
+
+    @PostMapping("/my/check/all")
+    public ApiResponse<Void> checkAlarm(@AuthenticationPrincipal Principal userDetails) {
+        alarmService.checkAllAlarm(userDetails.getUserId());
+        return ApiResponse.noContent();
+    }
+
+    @PostMapping("/choose/{alarmId}/response")
+    public ApiResponse<Void> respondToInvite(@AuthenticationPrincipal Principal principal,
+        @PathVariable Long alarmId,
+        boolean accepted) {
+        if (accepted) {
+            alarmService.acceptInvite(principal.getUserId(), alarmId);
+        } else {
+            alarmService.rejectInvite(principal.getUserId());
+        }
+
+        return ApiResponse.success(accepted ? "스터디 초대를 수락했습니다." : "스터디 초대를 거절했습니다.");
+    }
+
+}

src/main/java/grep/neogulcoder/domain/alram/controller/AlarmSpecification.java

@@ -0,0 +1,19 @@
+package grep.neogulcoder.domain.alram.controller;
+
+import grep.neogulcoder.domain.alram.controller.dto.response.AlarmResponse;
+import grep.neogulcoder.global.auth.Principal;
+import grep.neogulcoder.global.response.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
+@Tag(name = "Alarm", description = "알림 관련 API 명세")
+public interface AlarmSpecification {
+
+    @Operation(summary = "내 알림 목록 조회", description = "로그인한 사용자의 알림 목록을 조회합니다.")
+    ApiResponse<List<AlarmResponse>> getAllAlarm(@AuthenticationPrincipal Principal userDetails);
+
+    @Operation(summary = "내 알림 전체 읽음 처리", description = "로그인한 사용자의 모든 알림을 읽음 처리합니다.")
+    ApiResponse<Void> checkAlarm(@AuthenticationPrincipal Principal userDetails);
+}

src/main/java/grep/neogulcoder/domain/alram/controller/dto/response/AlarmResponse.java

@@ -0,0 +1,46 @@
+package grep.neogulcoder.domain.alram.controller.dto.response;
+
+import grep.neogulcoder.domain.alram.entity.Alarm;
+import grep.neogulcoder.domain.alram.type.AlarmType;
+import grep.neogulcoder.domain.alram.type.DomainType;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+public class AlarmResponse {
+
+    private Long id;
+
+    private Long receiverUserId;
+
+    private AlarmType alarmType;
+
+    private DomainType domainType;
+
+    private Long domainId;
+
+    private String message;
+
+    public static AlarmResponse toResponse(Long id, Long receiverUserId, AlarmType alarmType, DomainType domainType,
+        Long domainId, String message) {
+        return AlarmResponse.builder()
+            .id(id)
+            .receiverUserId(receiverUserId)
+            .alarmType(alarmType)
+            .domainType(domainType)
+            .domainId(domainId)
+            .message(message)
+            .build();
+    }
+
+    @Builder
+    private AlarmResponse(Long id, Long receiverUserId, AlarmType alarmType, DomainType domainType,
+        Long domainId, String message) {
+        this.id = id;
+        this.receiverUserId = receiverUserId;
+        this.alarmType = alarmType;
+        this.domainType = domainType;
+        this.domainId = domainId;
+        this.message = message;
+    }
+}

src/main/java/grep/neogulcoder/domain/alram/entity/Alarm.java

@@ -0,0 +1,67 @@
+package grep.neogulcoder.domain.alram.entity;
+
+import grep.neogulcoder.domain.alram.type.AlarmType;
+import grep.neogulcoder.domain.alram.type.DomainType;
+import grep.neogulcoder.global.entity.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Builder;
+import lombok.Getter;
+
+@Entity
+@Getter
+@Schema(description = "알림 정보")
+public class Alarm extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Long receiverUserId;
+
+    @Enumerated(EnumType.STRING)
+    private AlarmType alarmType;
+
+    @Enumerated(EnumType.STRING)
+    private DomainType domainType;
+
+    private Long domainId;
+
+    private String message;
+
+    private boolean checked = false;
+
+    public void checkAlarm() {
+        this.checked = true;
+    }
+
+    public static Alarm init(AlarmType alarmType, Long receiverUserId , DomainType domainType, Long domainId, String message) {
+        return Alarm.builder()
+            .alarmType(alarmType)
+            .receiverUserId(receiverUserId)
+            .domainType(domainType)
+            .domainId(domainId)
+            .message(message)
+            .build();
+    }
+
+    @Builder
+    private Alarm(Long id, Long receiverUserId, AlarmType alarmType, DomainType domainType,
+        Long domainId, String message) {
+        this.id = id;
+        this.receiverUserId = receiverUserId;
+        this.alarmType = alarmType;
+        this.domainType = domainType;
+        this.domainId = domainId;
+        this.message = message;
+    }
+
+    protected Alarm() {
+    }
+
+}

src/main/java/grep/neogulcoder/domain/alram/exception/code/AlarmErrorCode.java

@@ -0,0 +1,22 @@
+package grep.neogulcoder.domain.alram.exception.code;
+
+import grep.neogulcoder.global.response.code.ErrorCode;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public enum AlarmErrorCode implements ErrorCode {
+
+    ALARM_NOT_FOUND("A001",HttpStatus.NOT_FOUND,"알람을 찾을 수 없습니다.");
+
+
+    private final String code;
+    private final HttpStatus status;
+    private final String message;
+
+    AlarmErrorCode(String code, HttpStatus status, String message) {
+        this.code = code;
+        this.status = status;
+        this.message = message;
+    }
+}

src/main/java/grep/neogulcoder/domain/alram/repository/AlarmRepository.java

@@ -0,0 +1,10 @@
+package grep.neogulcoder.domain.alram.repository;
+
+import grep.neogulcoder.domain.alram.entity.Alarm;
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface AlarmRepository  extends JpaRepository<Alarm, Long> {
+    List<Alarm> findAllByReceiverUserIdAndCheckedFalse(Long receiverUserId);
+
+}

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

@@ -0,0 +1,105 @@
+package grep.neogulcoder.domain.alram.service;
+
+import grep.neogulcoder.domain.alram.controller.dto.response.AlarmResponse;
+import grep.neogulcoder.domain.alram.entity.Alarm;
+import grep.neogulcoder.domain.alram.exception.code.AlarmErrorCode;
+import grep.neogulcoder.domain.alram.repository.AlarmRepository;
+import grep.neogulcoder.domain.alram.type.AlarmType;
+import grep.neogulcoder.domain.alram.type.DomainType;
+import grep.neogulcoder.domain.study.Study;
+import grep.neogulcoder.domain.study.StudyMember;
+import grep.neogulcoder.domain.study.event.StudyInviteEvent;
+import grep.neogulcoder.domain.study.repository.StudyMemberQueryRepository;
+import grep.neogulcoder.domain.study.repository.StudyRepository;
+import grep.neogulcoder.global.exception.business.BusinessException;
+import grep.neogulcoder.global.exception.business.NotFoundException;
+import grep.neogulcoder.global.provider.finder.MessageFinder;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import static grep.neogulcoder.domain.study.exception.code.StudyErrorCode.STUDY_NOT_FOUND;
+import static grep.neogulcoder.domain.studyapplication.exception.code.ApplicationErrorCode.APPLICATION_PARTICIPANT_LIMIT_EXCEEDED;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class AlarmService {
+
+    private final AlarmRepository alarmRepository;
+    private final MessageFinder messageFinder;
+    private final StudyRepository studyRepository;
+    private final StudyMemberQueryRepository studyMemberQueryRepository;
+
+    @Transactional
+    public void saveAlarm(Long receiverId, AlarmType alarmType, DomainType domainType, Long domainId) {
+        String message = messageFinder.findMessage(alarmType, domainType, domainId);
+        alarmRepository.save(Alarm.init(alarmType, receiverId, domainType, domainId, message));
+    }
+
+    public List<AlarmResponse> getAllAlarms(Long receiverUserId) {
+        return alarmRepository.findAllByReceiverUserIdAndCheckedFalse(receiverUserId).stream()
+            .map(alarm -> AlarmResponse.toResponse(
+                alarm.getId(),
+                alarm.getReceiverUserId(),
+                alarm.getAlarmType(),
+                alarm.getDomainType(),
+                alarm.getDomainId(),
+                alarm.getMessage()))
+            .toList();
+    }
+
+    @Transactional
+    public void checkAllAlarm(Long receiverUserId) {
+        List<Alarm> alarms = alarmRepository.findAllByReceiverUserIdAndCheckedFalse(receiverUserId);
+        alarms.stream()
+            .filter(alarm -> alarm.getAlarmType() != AlarmType.INVITE)
+            .forEach(Alarm::checkAlarm);
+    }
+
+    @EventListener
+    public void handleStudyInviteEvent(StudyInviteEvent event) {
+        saveAlarm(
+            event.targetUserId(),
+            AlarmType.INVITE,
+            DomainType.STUDY,
+            event.studyId()
+        );
+    }
+
+    @Transactional
+    public void acceptInvite(Long targetUserId, Long alarmId) {
+
+        validateParticipantStudyLimit(targetUserId);
+
+        Alarm alarm = findValidAlarm(alarmId);
+        Long studyId = alarm.getDomainId();
+        Study study = findValidStudy(studyId);
+        StudyMember.createMember(study,targetUserId);
+        alarm.checkAlarm();
+    }
+
+    @Transactional
+    public void rejectInvite(Long alarmId) {
+        Alarm alarm = findValidAlarm(alarmId);
+        alarm.checkAlarm();
+    }
+
+    private Alarm findValidAlarm(Long alarmId) {
+        return alarmRepository.findById(alarmId).orElseThrow(() -> new NotFoundException(AlarmErrorCode.ALARM_NOT_FOUND));
+    }
+
+    private Study findValidStudy(Long studyId) {
+        return studyRepository.findById(studyId)
+            .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+    }
+
+    private void validateParticipantStudyLimit(Long userId) {
+        int count = studyMemberQueryRepository.countActiveUnfinishedStudies(userId);
+        if (count >= 10) {
+            throw new BusinessException(APPLICATION_PARTICIPANT_LIMIT_EXCEEDED);
+        }
+    }
+}

src/main/java/grep/neogulcoder/domain/alram/type/AlarmType.java

@@ -0,0 +1,7 @@
+package grep.neogulcoder.domain.alram.type;
+
+public enum AlarmType {
+
+    INVITE
+
+}

src/main/java/grep/neogulcoder/domain/alram/type/DomainType.java

@@ -0,0 +1,5 @@
+package grep.neogulcoder.domain.alram.type;
+
+public enum DomainType {
+    STUDY
+}

src/main/java/grep/neogulcoder/domain/buddy/entity/BuddyEnergy.java

@@ -48,4 +48,11 @@ public void updateEnergy(ReviewType reviewType) {
             this.level -= 1;
         }
     }
+
+    public BuddyEnergyReason findReasonFrom(ReviewType reviewType) {
+        if(reviewType.isPositive()){
+            return BuddyEnergyReason.POSITIVE_REVIEW;
+        }
+        return BuddyEnergyReason.NEGATIVE_REVIEW;
+    }
 }

src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatRestController.java

@@ -16,15 +16,15 @@ public class GroupChatRestController implements GroupChatRestSpecification {
 
     // 과거 채팅 메시지 페이징 조회 (무한 스크롤용)
     @Override
-    @GetMapping("/room/{roomId}/messages")
+    @GetMapping("/study/{studyId}/messages")
     public ApiResponse<PageResponse<GroupChatMessageResponseDto>> getMessages(
-        @PathVariable("roomId") Long roomId,
+        @PathVariable("studyId") Long studyId,
         @RequestParam(defaultValue = "0") int page,
         @RequestParam(defaultValue = "20") int size
     ) {
         // 서비스에서 페이징된 메시지 조회
         PageResponse<GroupChatMessageResponseDto> pageResponse =
-            groupChatService.getMessages(roomId, page, size);
+            groupChatService.getMessages(studyId, page, size);
 
         return ApiResponse.success(pageResponse);
     }