[T3-124] S3 설정 추가 및 감정구슬 전체 조회 수정 (#38)

* feat: s3 config 생성

* fix: 감정구슬 전체 조회 API 수정

* feat: EmotionMarbleMapper 추가 및 서비스 로직 수정

Author: thisishwan2

build.gradle

@@ -59,6 +59,9 @@ dependencies {
 
 	// bouncycastle
 	implementation 'org.bouncycastle:bcpkix-jdk18on:1.80'
+
+	// aws
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }
 
 tasks.named('test') {

src/main/java/bitnagil/bitnagil_backend/emotionMarble/controller/EmotionMarbleController.java

@@ -1,8 +1,6 @@
 package bitnagil.bitnagil_backend.emotionMarble.controller;
 
 import bitnagil.bitnagil_backend.emotionMarble.controller.spec.EmotionMarbleSpec;
-import bitnagil.bitnagil_backend.emotionMarble.domain.EmotionMarble;
-import bitnagil.bitnagil_backend.emotionMarble.domain.enums.EmotionMarbleType;
 import bitnagil.bitnagil_backend.emotionMarble.request.RegisterEmotionMarbleRequest;
 import bitnagil.bitnagil_backend.emotionMarble.response.EmotionMarbleTypeResponse;
 import bitnagil.bitnagil_backend.emotionMarble.response.RegisterEmotionMarbleResponse;
@@ -13,6 +11,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "/api/v1/emotion-marbles")
@@ -21,7 +21,7 @@ public class EmotionMarbleController implements EmotionMarbleSpec {
 
     // 감정구슬 조회 API
     @GetMapping("")
-    public CustomResponseDto<EmotionMarbleTypeResponse> getEmotionMarbles() {
+    public CustomResponseDto<List<EmotionMarbleTypeResponse>> getEmotionMarbles() {
         return CustomResponseDto.from(emotionMarbleService.getEmotionMarbles());
     }
 

src/main/java/bitnagil/bitnagil_backend/emotionMarble/controller/spec/EmotionMarbleSpec.java

@@ -11,11 +11,13 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import java.util.List;
+
 @Tag(name = ApiTags.EMOTION_MARBLE)
 public interface EmotionMarbleSpec {
 
     @Operation(summary = "감정 구슬을 조회합니다")
-    public CustomResponseDto<EmotionMarbleTypeResponse> getEmotionMarbles();
+    public CustomResponseDto<List<EmotionMarbleTypeResponse>> getEmotionMarbles();
 
     @Operation(summary = "감정 구슬을 등록합니다. 감정 구슬에 따른 추천 루틴을 응답합니다.")
     @ApiErrorCodeExamples({ErrorCode.NOT_FOUND_RECOMMENDED_ROUTINE})

src/main/java/bitnagil/bitnagil_backend/emotionMarble/domain/enums/EmotionMarbleType.java

@@ -7,14 +7,16 @@
 @RequiredArgsConstructor
 @Getter
 public enum EmotionMarbleType implements EnumType {
-    CALM("평온함", 5L),
-    VITALITY("활기참", 6L),
-    LETHARGY("무기력함", 7L),
-    ANXIETY("불안함", 8L),
-    SATISFACTION("만족함", 9L),
-    FATIGUE("피로함", 10L)
+    CALM("평온함", 5L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_calm.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_calm.png"),
+    VITALITY("활기참", 6L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_vitality.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_vitality.png"),
+    LETHARGY("무기력함", 7L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_lethargy.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_lethargy.png"),
+    ANXIETY("불안함", 8L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_anxiety.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_anxiety.png"),
+    SATISFACTION("만족함", 9L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_satisfaction.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_satisfaction.png"),
+    FATIGUE("피로함", 10L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_fatigue.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_fatigue.png")
     ;
 
     private final String description;
     private final Long caseId;
+    private final String homeMarbleImageUrl;
+    private final String marbleImageUrl;
 }

src/main/java/bitnagil/bitnagil_backend/emotionMarble/response/EmotionMarbleTypeResponse.java

@@ -11,10 +11,12 @@
 @Builder
 @Schema(description = "감정 구슬 조회 DTO")
 public class EmotionMarbleTypeResponse {
-    @Schema(
-            description = "감정 구슬 enum 배열",
-            type = "array",
-            example = "[\"CALM\", \"VITALITY\", \"LETHARGY\", \"ANXIETY\", \"SATISFACTION\", \"FATIGUE\"]"
-    )
-    private EmotionMarbleType[] emotionMarbleTypes;
+    @Schema(description = "감정 구슬 타입", example = "CALM")
+    private EmotionMarbleType emotionMarbleType;
+
+    @Schema(description = "감정 구슬 명칭", example = "평온함")
+    private String emotionMarbleName;
+
+    @Schema(description = "감정 구슬 이미지 URL", example = "https://example.com/image/calm.png")
+    private String imageUrl;
 }

src/main/java/bitnagil/bitnagil_backend/emotionMarble/service/EmotionMarbleMapper.java

@@ -0,0 +1,22 @@
+package bitnagil.bitnagil_backend.emotionMarble.service;
+
+import bitnagil.bitnagil_backend.emotionMarble.domain.enums.EmotionMarbleType;
+import bitnagil.bitnagil_backend.emotionMarble.response.EmotionMarbleTypeResponse;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 감정구슬에 대한 가공된 데이터를 DTO로 변환하는 Mapper 클래스입니다.
+ */
+@Component
+public class EmotionMarbleMapper {
+
+    public EmotionMarbleTypeResponse toEmotionMarbleTypeResponse(EmotionMarbleType emotionMarbleType) {
+        return EmotionMarbleTypeResponse.builder()
+                .emotionMarbleName(emotionMarbleType.getDescription())
+                .emotionMarbleType(emotionMarbleType)
+                .imageUrl(emotionMarbleType.getMarbleImageUrl())
+                .build();
+    }
+}

src/main/java/bitnagil/bitnagil_backend/emotionMarble/service/EmotionMarbleService.java

@@ -20,7 +20,9 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 감정 구슬에 대한 로직을 관리하는 클래스입니다.
@@ -33,11 +35,13 @@ public class EmotionMarbleService {
 
     private final RecommendedRoutineManager recommendedRoutineManager;
     private final EmotionMarbleFactory emotionMarbleFactory;
+    private final EmotionMarbleMapper emotionMarbleMapper;
 
     // 감정 구술 조회(enum의 value를 가져온다.)
-    public EmotionMarbleTypeResponse getEmotionMarbles() {
-        EmotionMarbleType[] values = EmotionMarbleType.values();
-        return EmotionMarbleTypeResponse.builder().emotionMarbleTypes(values).build();
+    public List<EmotionMarbleTypeResponse> getEmotionMarbles() {
+        return Arrays.stream(EmotionMarbleType.values())
+                .map(emotionMarbleType -> emotionMarbleMapper.toEmotionMarbleTypeResponse(emotionMarbleType))
+                .collect(Collectors.toList());
     }
 
     // 감정 구슬 등록(1일 1회)

src/main/java/bitnagil/bitnagil_backend/global/config/S3Config.java

@@ -0,0 +1,28 @@
+package bitnagil.bitnagil_backend.global.config;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class S3Config {
+    @Value("${cloud.aws.credentials.access-key}")
+    private String accessKey;
+    @Value("${cloud.aws.credentials.secret-key}")
+    private String secretKey;
+    @Value("${cloud.aws.region.static}")
+    private String region;
+
+    @Bean
+    public AmazonS3Client amazonS3Client() {
+        BasicAWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
+        return (AmazonS3Client) AmazonS3ClientBuilder.standard()
+                .withRegion(region)
+                .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+                .build();
+    }
+}