Merge pull request #156 from prgrms-web-devcourse-final-project/develop

chore: develop → main 브랜치 머지

Author: endorsement0912

src/main/java/grep/neogul_coder/domain/buddy/controller/BuddyEnergyController.java

@@ -1,15 +1,24 @@
 package grep.neogul_coder.domain.buddy.controller;
 
 import grep.neogul_coder.domain.buddy.controller.dto.response.BuddyEnergyResponse;
+import grep.neogul_coder.domain.buddy.enums.BuddyEnergyReason;
+import grep.neogul_coder.domain.buddy.service.BuddyEnergyService;
 import grep.neogul_coder.global.response.ApiResponse;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/buddy-energy")
 public class BuddyEnergyController implements BuddyEnergySpecification {
 
+    private final BuddyEnergyService buddyEnergyService;
+
     @GetMapping("/{userId}")
     public ApiResponse<BuddyEnergyResponse> get(@PathVariable("userId") Long userId) {
-        return ApiResponse.success(new BuddyEnergyResponse());
+        return ApiResponse.success(buddyEnergyService.getBuddyEnergy(userId));
     }
+
+
+
 }

src/main/java/grep/neogul_coder/domain/buddy/controller/dto/response/BuddyEnergyResponse.java

@@ -1,5 +1,6 @@
 package grep.neogul_coder.domain.buddy.controller.dto.response;
 
+import grep.neogul_coder.domain.buddy.entity.BuddyEnergy;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Getter;
@@ -14,5 +15,18 @@ public class BuddyEnergyResponse {
     @Schema(description = "현재 버디에너지 수치", example = "61")
     private int level;
 
+    @Builder
+    protected BuddyEnergyResponse(Long userId, int level) {
+        this.userId = userId;
+        this.level = level;
+    }
+
+    public static BuddyEnergyResponse from(BuddyEnergy energy) {
+        return BuddyEnergyResponse.builder()
+            .userId(energy.getUserId())
+            .level(energy.getLevel())
+            .build();
+    }
+
 
 }

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

@@ -1,5 +1,7 @@
 package grep.neogul_coder.domain.buddy.entity;
 
+import grep.neogul_coder.domain.buddy.enums.BuddyEnergyReason;
+import grep.neogul_coder.domain.review.ReviewType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -20,4 +22,30 @@ public class BuddyEnergy {
 
     private int level;
 
+    protected BuddyEnergy() {
+
+    }
+
+
+    private BuddyEnergy(Long userId, int level) {
+        this.userId = userId;
+        this.level = level;
+    }
+
+    public static BuddyEnergy createDefault(Long userId) {
+        return new BuddyEnergy(userId, BuddyEnergyReason.SIGN_UP.getPoint());
+    }
+
+    public void updateLevel(int newLevel) {
+        this.level = newLevel;
+    }
+
+    // 리뷰 타입 기반 에너지 변경 //
+    public void updateEnergy(ReviewType reviewType) {
+        if (reviewType == ReviewType.GOOD || reviewType == ReviewType.EXCELLENT) {
+            this.level += 1;
+        } else if (reviewType == ReviewType.BAD) {
+            this.level -= 1;
+        }
+    }
 }

src/main/java/grep/neogul_coder/domain/buddy/entity/BuddyLog.java

@@ -12,6 +12,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import lombok.Builder;
 
 @Entity
 public class BuddyLog {
@@ -27,4 +28,21 @@ public class BuddyLog {
     @JoinColumn(name = "buddy_energy_id")
     private BuddyEnergy buddyEnergy;
 
+    protected BuddyLog() {
+
+    }
+
+    @Builder
+    private BuddyLog(BuddyEnergy buddyEnergy, BuddyEnergyReason reason) {
+        this.buddyEnergy = buddyEnergy;
+        this.reason = reason;
+    }
+
+    public static BuddyLog of(BuddyEnergy energy, BuddyEnergyReason reason) {
+        return BuddyLog.builder()
+            .buddyEnergy(energy)
+            .reason(reason)
+            .build();
+    }
+
 }

src/main/java/grep/neogul_coder/domain/buddy/exception/BuddyEnergyNotFoundException.java

@@ -0,0 +1,10 @@
+package grep.neogul_coder.domain.buddy.exception;
+
+import grep.neogul_coder.global.exception.business.NotFoundException;
+import grep.neogul_coder.domain.buddy.exception.code.BuddyEnergyErrorCode;
+
+public class BuddyEnergyNotFoundException extends NotFoundException {
+    public BuddyEnergyNotFoundException(BuddyEnergyErrorCode errorCode) {
+        super(errorCode);
+    }
+}

src/main/java/grep/neogul_coder/domain/buddy/exception/code/BuddyEnergyErrorCode.java

@@ -0,0 +1,21 @@
+package grep.neogul_coder.domain.buddy.exception.code;
+
+import grep.neogul_coder.global.response.code.ErrorCode;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public enum BuddyEnergyErrorCode implements ErrorCode {
+
+    BUDDY_ENERGY_NOT_FOUND("BE404", HttpStatus.NOT_FOUND, "해당 유저의 버디 에너지를 찾을 수 없습니다.");
+
+    private final String code;
+    private final HttpStatus status;
+    private final String message;
+
+    BuddyEnergyErrorCode(String code, HttpStatus status, String message) {
+        this.code = code;
+        this.status = status;
+        this.message = message;
+    }
+}

src/main/java/grep/neogul_coder/domain/buddy/repository/BuddyEnergyLogRepository.java

@@ -0,0 +1,15 @@
+package grep.neogul_coder.domain.buddy.repository;
+
+import grep.neogul_coder.domain.buddy.entity.BuddyLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface BuddyEnergyLogRepository extends JpaRepository<BuddyLog, Long> {
+
+    // 특정 유저의 에너지 변동 로그 조회
+    // (BuddyEnergy -> UserId로 매핑 필요할 수 있음)
+    List<BuddyLog> findByBuddyEnergy_BuddyEnergyId(Long buddyEnergyId);
+}

src/main/java/grep/neogul_coder/domain/buddy/service/BuddyEnergyService.java

@@ -0,0 +1,66 @@
+package grep.neogul_coder.domain.buddy.service;
+
+import grep.neogul_coder.domain.buddy.entity.BuddyEnergy;
+import grep.neogul_coder.domain.buddy.entity.BuddyLog;
+import grep.neogul_coder.domain.buddy.enums.BuddyEnergyReason;
+import grep.neogul_coder.domain.buddy.exception.BuddyEnergyNotFoundException;
+import grep.neogul_coder.domain.buddy.exception.code.BuddyEnergyErrorCode;
+import grep.neogul_coder.domain.buddy.repository.BuddyEnergyLogRepository;
+import grep.neogul_coder.domain.buddy.repository.BuddyEnergyRepository;
+import grep.neogul_coder.domain.buddy.controller.dto.response.BuddyEnergyResponse;
+import grep.neogul_coder.domain.review.ReviewType;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import static grep.neogul_coder.domain.buddy.exception.code.BuddyEnergyErrorCode.BUDDY_ENERGY_NOT_FOUND;
+
+@Service
+@RequiredArgsConstructor
+public class BuddyEnergyService {
+
+    private final BuddyEnergyRepository buddyEnergyRepository;
+    private final BuddyEnergyLogRepository buddyEnergyLogRepository;
+
+    // 현재 버디 에너지 조회
+    @Transactional
+    public BuddyEnergyResponse getBuddyEnergy(Long userId) {
+        BuddyEnergy energy = buddyEnergyRepository.findByUserId(userId)
+            .orElseThrow(() -> new BuddyEnergyNotFoundException(BUDDY_ENERGY_NOT_FOUND));
+        return BuddyEnergyResponse.from(energy);
+    }
+
+    // ReviewType 기반 업데이트 //
+    @Transactional
+    public BuddyEnergyResponse updateEnergyByReview(Long userId, ReviewType reviewType) {
+        BuddyEnergy energy = buddyEnergyRepository.findByUserId(userId)
+            .orElseThrow(() -> new BuddyEnergyNotFoundException(BUDDY_ENERGY_NOT_FOUND));
+
+        // ReviewType에 따른 에너지 증감
+        energy.updateEnergy(reviewType);
+
+        buddyEnergyLogRepository.save(BuddyLog.of(energy, toBuddyEnergyReason(reviewType)));
+        buddyEnergyRepository.save(energy);
+
+        return BuddyEnergyResponse.from(energy);
+    }
+
+    // 회원가입 시 기본 에너지 생성
+    @Transactional
+    public BuddyEnergyResponse createDefaultEnergy(Long userId) {
+        BuddyEnergy energy = BuddyEnergy.createDefault(userId);
+        BuddyEnergy saved = buddyEnergyRepository.save(energy);
+
+        buddyEnergyLogRepository.save(BuddyLog.of(saved, BuddyEnergyReason.SIGN_UP));
+        return BuddyEnergyResponse.from(saved);
+    }
+
+
+    // ReviewType → BuddyEnergyReason 매핑 메서드
+    private BuddyEnergyReason toBuddyEnergyReason(ReviewType reviewType) {
+        return switch (reviewType) {
+            case GOOD, EXCELLENT -> BuddyEnergyReason.POSITIVE_REVIEW;
+            case BAD -> BuddyEnergyReason.NEGATIVE_REVIEW;
+        };
+    }
+}

src/main/java/grep/neogul_coder/domain/calender/controller/PersonalCalendarController.java

@@ -20,11 +20,11 @@ public class PersonalCalendarController implements PersonalCalendarSpecification
 
     // 사용자 개인 일정 등록 API
     @PostMapping
-    public ApiResponse<Void> create(
+    public ApiResponse<Long> create(
         @PathVariable("userId") Long userId,
         @Valid @RequestBody PersonalCalendarRequest request) {
-        personalCalendarService.create(userId, request);
-        return ApiResponse.noContent();
+        Long calendarId = personalCalendarService.create(userId, request);
+        return ApiResponse.success(calendarId);  // 생성된 일정 ID 반환
     }
 
     // 사용자 개인 일정 전체 조회 API

src/main/java/grep/neogul_coder/domain/calender/controller/PersonalCalendarSpecification.java

@@ -20,7 +20,7 @@ public interface PersonalCalendarSpecification {
         summary = "개인 일정 생성",
         description = "사용자의 개인 일정을 생성합니다.\n\n예: `/api/users/{userId}/calendar`"
     )
-    ApiResponse<Void> create(
+    ApiResponse<Long> create(
         @Parameter(name = "userId", description = "사용자 ID", required = true, in = ParameterIn.PATH)
         @PathVariable("userId") Long userId,
         @RequestBody PersonalCalendarRequest request