Refactor: 점수,알림,신고 기능 추가 및 기존 로직 리팩토링

build.gradle

@@ -43,6 +43,7 @@ dependencies {
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9' // 버전을 삭제!
 	implementation 'com.google.firebase:firebase-admin:9.2.0'
 	implementation 'com.amazonaws:aws-java-sdk-s3:1.12.75' // amazonaws 사용
+	implementation 'com.fasterxml.jackson.core:jackson-databind'
 	// JJWT 추가
 	implementation 'io.jsonwebtoken:jjwt-api:0.12.5'
 	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.5'

src/main/java/com/example/cp_main_be/domain/admin/presentation/AdminController.java

@@ -23,9 +23,10 @@
 import com.example.cp_main_be.domain.mission.quiz.domain.QuizOptions;
 import com.example.cp_main_be.domain.reports.domain.Reports;
 import com.example.cp_main_be.domain.reports.enums.ReportStatus;
+import com.example.cp_main_be.global.common.ApiResponse;
 import com.example.cp_main_be.global.dto.ListResponse;
-import com.example.cp_main_be.global.util.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -34,6 +35,7 @@
 @RestController
 @RequestMapping("/api/v1/admin")
 @RequiredArgsConstructor
+@Tag(name = "어드민 API", description = "어드민 권한의 기능을 제공합니다.")
 public class AdminController {
 
   private final AdminService adminService;

src/main/java/com/example/cp_main_be/domain/admin/service/AdminService.java

@@ -7,6 +7,7 @@
 import com.example.cp_main_be.domain.member.user.service.UserService;
 import com.example.cp_main_be.domain.mission.daily_keywords.domain.DailyKeywords;
 import com.example.cp_main_be.domain.mission.daily_keywords.domain.repository.DailyKeywordsRepository;
+import com.example.cp_main_be.domain.mission.daily_mission_master.MissionType;
 import com.example.cp_main_be.domain.mission.daily_mission_master.domain.DailyMissionMaster;
 import com.example.cp_main_be.domain.mission.daily_mission_master.domain.repository.DailyMissionMasterRepository;
 import com.example.cp_main_be.domain.mission.quiz.domain.QuizOptions;
@@ -80,6 +81,10 @@ public QuizOptions createQuizOption(AdminRequestDTO.CreateQuizRequestDTO request
             .findById(requestDTO.getMissionMasterId())
             .orElseThrow(() -> new IllegalStateException("해당 ID를 가진 미션이 존재하지 않습니다."));
 
+    if (dailyMissionMaster.getMissionType() != MissionType.QUIZ) {
+      throw new IllegalArgumentException("퀴즈 타입의 미션에만 선지를 추가할 수 있습니다.");
+    }
+
     return QuizOptions.builder() // QuizOptions 퀴즈의 선지
         .optionText(requestDTO.getOptionText())
         .optionOrder(requestDTO.getOptionOrder())

src/main/java/com/example/cp_main_be/domain/content/avatar/domain/Avatar.java

@@ -17,6 +17,8 @@ public class Avatar {
   @Column(name = "avatar_id")
   private Long id;
 
+  private String name;
+
   @Column(name = "image_url")
   private String imageUrl;
 

src/main/java/com/example/cp_main_be/domain/content/avatar/dto/response/AvatarResponse.java

@@ -1,12 +1,11 @@
 package com.example.cp_main_be.domain.content.avatar.dto.response;
 
-import com.example.cp_main_be.domain.content.avatar.domain.Avatar;
-import java.util.ArrayList;
 import java.util.List;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 
+@Getter
 @AllArgsConstructor
 public class AvatarResponse {
-
-  List<Avatar> avatars = new ArrayList<>();
+  List<AvatarSimpleResponse> avatars;
 }

src/main/java/com/example/cp_main_be/domain/content/avatar/dto/response/AvatarSimpleResponse.java

@@ -0,0 +1,18 @@
+package com.example.cp_main_be.domain.content.avatar.dto.response;
+
+import com.example.cp_main_be.domain.content.avatar.domain.Avatar;
+import lombok.Getter;
+
+@Getter
+public class AvatarSimpleResponse {
+  private Long id;
+  private String name;
+  private String imageUrl;
+
+  // Avatar 엔티티를 AvatarDto로 변환하는 생성자
+  public AvatarSimpleResponse(Avatar avatar) {
+    this.id = avatar.getId();
+    this.name = avatar.getName();
+    this.imageUrl = avatar.getImageUrl();
+  }
+}

src/main/java/com/example/cp_main_be/domain/content/avatar/presentation/AvatarController.java

@@ -1,11 +1,14 @@
 package com.example.cp_main_be.domain.content.avatar.presentation;
 
+import com.example.cp_main_be.domain.content.avatar.domain.Avatar;
 import com.example.cp_main_be.domain.content.avatar.dto.response.AvatarResponse;
+import com.example.cp_main_be.domain.content.avatar.dto.response.AvatarSimpleResponse;
 import com.example.cp_main_be.domain.content.avatar.service.AvatarService;
 import com.example.cp_main_be.domain.member.user.domain.User;
-import com.example.cp_main_be.global.util.ApiResponse;
+import com.example.cp_main_be.global.common.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -19,11 +22,19 @@ public class AvatarController {
 
   private final AvatarService avatarService;
 
-  @Operation(summary = "아바타 선택 목록 조회", description = "선택 가능한 아바타 목록을 반환합니다")
+  @Operation(summary = "선택 가능 아바타들 조회", description = "선택할 아바타 목록을 조회")
   @GetMapping("/register/avatars")
-  public ResponseEntity<AvatarResponse> selectableAvatars() {
-    AvatarResponse avatarResponse = new AvatarResponse(avatarService.getAllAvatar());
-    return ResponseEntity.ok(avatarResponse);
+  public ResponseEntity<ApiResponse<AvatarResponse>> getSelectableAvatars() {
+    // 1. 서비스로부터 Avatar 엔티티 리스트를 받습니다.
+    List<Avatar> avatarEntities = avatarService.getAllAvatar();
+
+    // 2. 엔티티 리스트를 DTO 리스트로 변환합니다.
+    List<AvatarSimpleResponse> avatarDtos =
+        avatarEntities.stream().map(AvatarSimpleResponse::new).toList();
+
+    // 3. DTO 리스트를 최종 응답 객체에 담아 반환합니다.
+    AvatarResponse avatarResponse = new AvatarResponse(avatarDtos);
+    return ResponseEntity.ok(ApiResponse.success(avatarResponse));
   }
 
   @Operation(summary = "꽃가루 주기", description = "남의 아바타에게 꽃가루를 줍니다")

src/main/java/com/example/cp_main_be/domain/delivery/domain/Delivery.java

@@ -0,0 +1,68 @@
+package com.example.cp_main_be.domain.delivery.domain;
+
+import com.example.cp_main_be.domain.member.user.domain.User;
+import jakarta.persistence.*;
+import java.time.LocalDateTime;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Delivery {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "user_id", nullable = false)
+  private User user; // 배송을 요청한 사용자
+
+  @Column(nullable = false)
+  private String recipientName;
+
+  @Column(nullable = false)
+  private String recipientPhone;
+
+  @Column(nullable = false)
+  private String postalCode;
+
+  @Column(nullable = false)
+  private String address;
+
+  private String addressDetail;
+  private String message;
+
+  // 배송 상태를 관리하기 위한 Enum (추후 확장용)
+  // @Enumerated(EnumType.STRING)
+  // private DeliveryStatus status;
+
+  private LocalDateTime createdAt;
+
+  @PrePersist
+  public void prePersist() {
+    this.createdAt = LocalDateTime.now();
+    // this.status = DeliveryStatus.REQUESTED;
+  }
+
+  @Builder
+  public Delivery(
+      User user,
+      String recipientName,
+      String recipientPhone,
+      String postalCode,
+      String address,
+      String addressDetail,
+      String message) {
+    this.user = user;
+    this.recipientName = recipientName;
+    this.recipientPhone = recipientPhone;
+    this.postalCode = postalCode;
+    this.address = address;
+    this.addressDetail = addressDetail;
+    this.message = message;
+  }
+}

src/main/java/com/example/cp_main_be/domain/delivery/domain/repository/DeliveryRepository.java

@@ -0,0 +1,6 @@
+package com.example.cp_main_be.domain.delivery.domain.repository;
+
+import com.example.cp_main_be.domain.delivery.domain.Delivery;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface DeliveryRepository extends JpaRepository<Delivery, Long> {}

src/main/java/com/example/cp_main_be/domain/delivery/dto/request/DeliveryRequest.java

@@ -0,0 +1,25 @@
+package com.example.cp_main_be.domain.delivery.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class DeliveryRequest {
+
+  @NotBlank(message = "수령인 이름은 필수입니다.")
+  private String recipientName;
+
+  @NotBlank(message = "수령인 연락처는 필수입니다.")
+  private String recipientPhone;
+
+  @NotBlank(message = "우편번호는 필수입니다.")
+  private String postalCode;
+
+  @NotBlank(message = "주소는 필수입니다.")
+  private String address;
+
+  private String addressDetail;
+  private String message;
+}

src/main/java/com/example/cp_main_be/domain/delivery/dto/response/DeliveryResponse.java

@@ -0,0 +1,3 @@
+package com.example.cp_main_be.domain.delivery.dto.response;
+
+public class DeliveryResponse {}

src/main/java/com/example/cp_main_be/domain/delivery/presentation/DeliveryController.java

@@ -0,0 +1,37 @@
+package com.example.cp_main_be.domain.delivery.presentation;
+
+import com.example.cp_main_be.domain.delivery.dto.request.DeliveryRequest;
+import com.example.cp_main_be.domain.delivery.service.DeliveryService;
+import com.example.cp_main_be.global.common.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/v1/deliveries")
+@RequiredArgsConstructor
+@Tag(name = "씨앗 배송 api")
+public class DeliveryController {
+
+  private final DeliveryService deliveryService;
+
+  @Operation(summary = "씨앗 배송 정보를 입력받습니다")
+  @PostMapping("/seeds")
+  public ResponseEntity<ApiResponse<Void>> requestDelivery(
+      @AuthenticationPrincipal UserDetails userDetails, // 현재 로그인한 사용자 정보
+      @Valid @RequestBody DeliveryRequest deliveryRequest) {
+
+    // userDetails에서 사용자 ID를 추출하여 서비스에 전달
+    // Long userId = ((CustomUserDetails) userDetails).getId(); // UserDetails 구현체에 맞게 수정
+    Long userId = 1L; // 임시 ID, 실제로는 위와 같이 인증 정보에서 가져와야 합니다.
+
+    deliveryService.createDeliveryRequest(userId, deliveryRequest);
+
+    return ResponseEntity.ok(ApiResponse.success(null));
+  }
+}

src/main/java/com/example/cp_main_be/domain/delivery/service/DeliveryService.java

@@ -0,0 +1,53 @@
+package com.example.cp_main_be.domain.delivery.service;
+
+import com.example.cp_main_be.domain.delivery.domain.Delivery;
+import com.example.cp_main_be.domain.delivery.domain.repository.DeliveryRepository;
+import com.example.cp_main_be.domain.delivery.dto.request.DeliveryRequest;
+import com.example.cp_main_be.domain.member.notification.domain.NotificationType;
+import com.example.cp_main_be.domain.member.notification.service.NotificationService;
+import com.example.cp_main_be.domain.member.user.domain.User;
+import com.example.cp_main_be.domain.member.user.domain.repository.UserRepository;
+import com.example.cp_main_be.global.exception.UserNotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class DeliveryService {
+
+  private final DeliveryRepository deliveryRepository;
+  private final UserRepository userRepository;
+
+  private final NotificationService notificationService; // 👈 NotificationService 주입
+
+  public void createDeliveryRequest(Long userId, DeliveryRequest request) {
+    User user =
+        userRepository
+            .findById(userId)
+            .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다."));
+
+    Delivery delivery =
+        Delivery.builder()
+            .user(user)
+            .recipientName(request.getRecipientName())
+            .recipientPhone(request.getRecipientPhone())
+            .postalCode(request.getPostalCode())
+            .address(request.getAddress())
+            .addressDetail(request.getAddressDetail())
+            .message(request.getMessage())
+            .build();
+
+    Delivery savedDelivery = deliveryRepository.save(delivery); // 👈 저장 후 객체 받기
+
+    // 👈 알림 전송 로직 추가
+    // 알림을 받는 사람(owner)과 보내는 사람(writer)이 자기 자신인 시스템 알림
+    notificationService.send(
+        user,
+        user,
+        NotificationType.SEED_DELIVERY,
+        "/deliveries/" + savedDelivery.getId() // 배송 상세 조회 페이지 URL
+        );
+  }
+}

src/main/java/com/example/cp_main_be/domain/garden/garden/domain/Garden.java

@@ -1,6 +1,7 @@
 package com.example.cp_main_be.domain.garden.garden.domain;
 
 import com.example.cp_main_be.domain.member.user.domain.User;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import jakarta.persistence.*;
 import java.time.LocalDateTime;
 import lombok.AccessLevel;
@@ -24,6 +25,7 @@ public class Garden {
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "user_id", nullable = false)
+  @JsonBackReference
   private User user;
 
   @Column(nullable = false)

src/main/java/com/example/cp_main_be/domain/garden/garden/presentation/GardenController.java

@@ -2,13 +2,15 @@
 
 import com.example.cp_main_be.domain.garden.garden.dto.GardenResponse;
 import com.example.cp_main_be.domain.garden.garden.service.GardenService;
-import com.example.cp_main_be.global.util.ApiResponse;
+import com.example.cp_main_be.global.common.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+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;
 
@@ -26,4 +28,20 @@ public ResponseEntity<ApiResponse<GardenResponse>> getGarden(@PathVariable Long
     GardenResponse gardenResponse = gardenService.findGardenById(gardenId);
     return ResponseEntity.ok(ApiResponse.success(gardenResponse));
   }
+
+  @Operation(summary = "정원에 물 주기", description = "자신 또는 다른 사람의 정원에 물을 줍니다.")
+  @PostMapping("/{gardenId}/water")
+  public ResponseEntity<ApiResponse<Void>> waterGarden(
+      @AuthenticationPrincipal Long userId, @PathVariable Long gardenId) {
+    gardenService.waterGarden(userId, gardenId);
+    return ResponseEntity.ok(ApiResponse.success(null));
+  }
+
+  @Operation(summary = "정원에 햇빛 주기", description = "자신의 정원에 햇빛을 줍니다.")
+  @PostMapping("/{gardenId}/sunlight")
+  public ResponseEntity<ApiResponse<Void>> sunlightGarden(
+      @AuthenticationPrincipal Long userId, @PathVariable Long gardenId) {
+    gardenService.sunlightGarden(userId, gardenId);
+    return ResponseEntity.ok(ApiResponse.success(null));
+  }
 }