RELEASE 2024/07/25 20:39:00

build.gradle

@@ -61,6 +61,8 @@ dependencies {
 	// AWS
 	implementation platform("io.awspring.cloud:spring-cloud-aws-dependencies:3.0.1")
 	implementation 'io.awspring.cloud:spring-cloud-aws-starter-sqs'
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
 }
 
 tasks.named('bootBuildImage') {

src/main/java/io/sobok/SobokSobok/config/SecurityConfig.java

@@ -37,7 +37,8 @@ public class SecurityConfig {
             "/auth/login",
             "/auth/refresh",
             "/user",
-            "/pill/count/**"
+            "/pill/count/**",
+            "/sticker/image"
     };
 
     private final JwtProvider jwtProvider;

src/main/java/io/sobok/SobokSobok/exception/ErrorCode.java

@@ -58,6 +58,9 @@ public enum ErrorCode {
     UNREGISTERED_STICKER(HttpStatus.NOT_FOUND, "등록되지 않은 스티커입니다."),
     ALREADY_SEND_STICKER(HttpStatus.CONFLICT, "이미 스티커를 전송했습니다."),
     UNREGISTERED_LIKE_SCHEDULE(HttpStatus.NOT_FOUND, "스티커 전송기록이 존재하지 않습니다."),
+    NOT_FOUND_SAVE_IMAGE_EXCEPTION(HttpStatus.NOT_FOUND, "이미지 저장에 실패했습니다."),
+    NOT_FOUND_IMAGE_EXCEPTION(HttpStatus.NOT_FOUND, "이미지 이름을 찾을 수 없습니다."),
+    INVALID_MULTIPART_EXTENSION_EXCEPTION(HttpStatus.BAD_REQUEST, "허용되지 않은 타입의 파일입니다.")
     ;
 
     private final HttpStatus code;

src/main/java/io/sobok/SobokSobok/exception/SuccessCode.java

@@ -27,6 +27,7 @@ public enum SuccessCode {
     GET_PILL_INFO_SUCCESS(HttpStatus.OK, "약 정보 조회에 성공했습니다."),
     SEND_PILL_SUCCESS(HttpStatus.CREATED, "약 전송에 성공했습니다."),
     DELETE_PILL_SUCCESS(HttpStatus.OK, "약 삭제에 성공했습니다."),
+    UPDATE_PILL_SUCCESS(HttpStatus.OK, "약 수정에 성공했습니다."),
 
     // schedule
     CHECK_PILL_SCHEDULE_SUCCESS(HttpStatus.OK, "복용 완료 체크에 성공했습니다."),
@@ -53,6 +54,7 @@ public enum SuccessCode {
     SEND_STICKER_SUCCESS(HttpStatus.OK, "스티커 전송에 성공했습니다."),
     UPDATE_STICKER_SUCCESS(HttpStatus.OK, "보낸 스티커 수정에 성공했습니다."),
     GET_RECEIVED_STICKER_SUCCESS(HttpStatus.OK, "받은 스티커 전체 조회에 성공했습니다."),
+    UPLOAD_STICKER_IMAGE_SUCCESS(HttpStatus.OK, "스티커 이미지 등록에 성공했습니다."),
     ;
 
     private final HttpStatus code;

src/main/java/io/sobok/SobokSobok/external/aws/s3/S3Service.java

@@ -0,0 +1,91 @@
+package io.sobok.SobokSobok.external.aws.s3;
+
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.amazonaws.services.s3.model.PutObjectRequest;
+import io.sobok.SobokSobok.exception.ErrorCode;
+import io.sobok.SobokSobok.exception.model.BadRequestException;
+import io.sobok.SobokSobok.exception.model.NotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.UUID;
+import javax.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+@Service
+@RequiredArgsConstructor
+public class S3Service {
+
+    private AmazonS3 amazonS3;
+
+    @Value("${spring.cloud.aws.credentials.access-key}")
+    private String accessKey;
+
+    @Value("${spring.cloud.aws.credentials.secret-key}")
+    private String secretKey;
+
+    @Value("${spring.cloud.aws.s3.bucket}")
+    private String bucket;
+
+    @Value("${spring.cloud.aws.region.static}")
+    private String region;
+
+    @PostConstruct
+    public void amazonS3Client() {
+        BasicAWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
+        amazonS3 = AmazonS3ClientBuilder.standard()
+            .withRegion(region)
+            .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+            .build();
+    }
+
+    public String uploadImage(MultipartFile multipartFile, String folder) {
+        String fileName = createFileName(multipartFile.getOriginalFilename());
+        ObjectMetadata objectMetadata = new ObjectMetadata();
+        objectMetadata.setContentLength(multipartFile.getSize());
+        objectMetadata.setContentType(multipartFile.getContentType());
+        try (InputStream inputStream = multipartFile.getInputStream()) {
+            amazonS3.putObject(
+                new PutObjectRequest(bucket + "/" + folder + "/image", fileName, inputStream,
+                    objectMetadata)
+                    .withCannedAcl(CannedAccessControlList.PublicRead));
+            return amazonS3.getUrl(bucket + "/" + folder + "/image", fileName).toString();
+        } catch (IOException e) {
+            throw new NotFoundException(ErrorCode.NOT_FOUND_SAVE_IMAGE_EXCEPTION);
+        }
+    }
+
+    // 파일명 (중복 방지)
+    private String createFileName(String fileName) {
+        return UUID.randomUUID().toString().concat(getFileExtension(fileName));
+    }
+
+    // 파일 유효성 검사
+    private String getFileExtension(String fileName) {
+        if (fileName.length() == 0) {
+            throw new NotFoundException(ErrorCode.NOT_FOUND_IMAGE_EXCEPTION);
+        }
+        ArrayList<String> fileValidate = new ArrayList<>();
+        fileValidate.add(".jpg");
+        fileValidate.add(".jpeg");
+        fileValidate.add(".png");
+        fileValidate.add(".JPG");
+        fileValidate.add(".JPEG");
+        fileValidate.add(".PNG");
+        String idxFileName = fileName.substring(fileName.lastIndexOf("."));
+        if (!fileValidate.contains(idxFileName)) {
+            throw new BadRequestException(ErrorCode.INVALID_MULTIPART_EXTENSION_EXCEPTION);
+        }
+        return fileName.substring(fileName.lastIndexOf("."));
+    }
+
+}

src/main/java/io/sobok/SobokSobok/external/firebase/FCMPushService.java

@@ -2,8 +2,11 @@
 
 import com.google.firebase.messaging.*;
 import io.sobok.SobokSobok.auth.application.util.UserServiceUtil;
+import io.sobok.SobokSobok.auth.domain.Platform;
 import io.sobok.SobokSobok.auth.domain.User;
 import io.sobok.SobokSobok.auth.infrastructure.UserRepository;
+import io.sobok.SobokSobok.exception.ErrorCode;
+import io.sobok.SobokSobok.exception.model.BadRequestException;
 import io.sobok.SobokSobok.external.firebase.dto.PushNotificationRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,78 +22,43 @@ public class FCMPushService {
     private final UserRepository userRepository;
 
     public void sendNotificationByToken(PushNotificationRequest request) {
-        User user = UserServiceUtil.findUserById(userRepository, request.userId());
-
-        Message message = Message.builder()
-                .setToken(user.getDeviceToken())
-                .setNotification(
-                        Notification.builder()
-                                .setTitle(request.title())
-                                .setBody(request.body())
-                                .build()
-                )
-                .setAndroidConfig(
-                        AndroidConfig.builder()
-                                .setNotification(
-                                        AndroidNotification.builder()
-                                                .setTitle(request.title())
-                                                .setBody(request.body())
-                                                .setClickAction("push_click")
-                                                .build()
-                                )
-                                .build()
-                )
-                .setApnsConfig(
-                        ApnsConfig.builder()
-                                .setAps(Aps.builder()
-                                        .setCategory("push_click")
-                                        .build())
-                                .build()
-                )
-                .putData("title", request.title())
-                .putData("body", request.body() == null ? "" : request.body())
-                .putData("type", request.type())
-                .build();
-
-        sendMessageToFirebase(message, user.getId());
+        sendNotification(request, null);
     }
 
     public void sendNotificationByTokenWithFriendData(PushNotificationRequest request) {
+        sendNotification(request, request.data().get("friendId"));
+    }
+
+    private void sendNotification(PushNotificationRequest request, String friendId) {
         User user = UserServiceUtil.findUserById(userRepository, request.userId());
+        Message.Builder messageBuilder;
+        if (user.getPlatform().equals(Platform.ANDROID)) {
+            messageBuilder = Message.builder()
+                    .setToken(user.getDeviceToken())
+                    .putData("title", request.title())
+                    .putData("body", request.body() == null ? "" : request.body())
+                    .putData("type", request.type());
+        } else if (user.getPlatform().equals(Platform.iOS)) {
+            messageBuilder = Message.builder()
+                    .setToken(user.getDeviceToken())
+                    .setNotification(buildNotification(request))
+                    .putData("type", request.type());
+        } else {
+            throw new BadRequestException(ErrorCode.INVALID_PLATFORM);
+        }
 
-        Message message = Message.builder()
-                .setToken(user.getDeviceToken())
-                .setNotification(
-                        Notification.builder()
-                                .setTitle(request.title())
-                                .setBody(request.body())
-                                .build()
-                )
-                .setAndroidConfig(
-                        AndroidConfig.builder()
-                                .setNotification(
-                                        AndroidNotification.builder()
-                                                .setTitle(request.title())
-                                                .setBody(request.body())
-                                                .setClickAction("push_click")
-                                                .build()
-                                )
-                                .build()
-                )
-                .setApnsConfig(
-                        ApnsConfig.builder()
-                                .setAps(Aps.builder()
-                                        .setCategory("push_click")
-                                        .build())
-                                .build()
-                )
-                .putData("title", request.title())
-                .putData("body", request.body() == null ? "" : request.body())
-                .putData("type", request.type())
-                .putData("friendId", request.data().get("friendId"))
-                .build();
+        if (friendId != null) {
+            messageBuilder.putData("friendId", friendId);
+        }
 
-        sendMessageToFirebase(message, user.getId());
+        sendMessageToFirebase(messageBuilder.build(), user.getId());
+    }
+
+    private Notification buildNotification(PushNotificationRequest request) {
+        return Notification.builder()
+                .setTitle(request.title())
+                .setBody(request.body())
+                .build();
     }
 
     private void sendMessageToFirebase(Message message, Long userId) {

src/main/java/io/sobok/SobokSobok/pill/application/PillService.java

@@ -21,6 +21,7 @@
 import io.sobok.SobokSobok.pill.ui.dto.PillListResponse;
 import io.sobok.SobokSobok.pill.ui.dto.PillRequest;
 import io.sobok.SobokSobok.pill.ui.dto.PillResponse;
+import io.sobok.SobokSobok.pill.ui.dto.PillUpdateRequest;
 import io.sobok.SobokSobok.utils.PillUtil;
 import lombok.RequiredArgsConstructor;
 import io.sobok.SobokSobok.pill.infrastructure.PillQueryRepository;
@@ -30,6 +31,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -152,6 +154,41 @@ public Integer getPillCount(Long userId) {
         return pillQueryRepository.getPillCount(userId);
     }
 
+    @Transactional
+    public void updatePill(Long userId, Long pillId, PillUpdateRequest request) {
+        UserServiceUtil.existsUserById(userRepository, userId);
+        Pill pill = PillServiceUtil.findPillById(pillRepository, pillId);
+        boolean isTimeListChanged = false;
+
+        if (!pill.isPillUser(userId)) {
+            throw new ForbiddenException(ErrorCode.UNAUTHORIZED_PILL);
+        }
+
+        if (!pill.getPillName().equals(request.pillName())) {
+            pill.updatePillName(request.pillName());
+        }
+
+        List<String> timeList = Arrays.asList(request.timeList());
+        if (!timeList.equals(pillScheduleQueryRepository.getPillScheduleTime(pillId))) {
+            isTimeListChanged = true;
+        }
+
+        if (PillUtil.checkChangePillSchedule(pill, request) || isTimeListChanged) {
+            pillScheduleRepository.deleteAllByPillId(pillId);
+            LocalDate[] scheduleDate = PillUtil.getScheduleDateList(request.startDate(), request.endDate(), request.day().split(", "));
+            for (LocalDate date : scheduleDate) {
+                for (String time : request.timeList()) {
+                    pillScheduleRepository.save(PillSchedule.builder()
+                            .scheduleDate(date)
+                            .scheduleTime(time)
+                            .pillId(pillId)
+                            .build()
+                    );
+                }
+            }
+        }
+    }
+
     @Transactional
     public void deletePill(Long userId, Long pillId) {
 

src/main/java/io/sobok/SobokSobok/pill/domain/Pill.java

@@ -59,6 +59,10 @@ public void receivePill(Long userId) {
         this.userId = userId;
     }
 
+    public void updatePillName(String newPillName) {
+        this.pillName = newPillName;
+    }
+
     public boolean isPillUser(Long userId) {
         return Objects.equals(this.userId, userId);
     }

src/main/java/io/sobok/SobokSobok/pill/infrastructure/PillScheduleQueryRepository.java

@@ -1,23 +1,21 @@
 package io.sobok.SobokSobok.pill.infrastructure;
 
 import com.querydsl.core.Tuple;
-import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import io.sobok.SobokSobok.pill.domain.PillSchedule;
 import io.sobok.SobokSobok.pill.domain.QPill;
 import io.sobok.SobokSobok.pill.domain.QPillSchedule;
 import io.sobok.SobokSobok.pill.ui.dto.DateScheduleResponse;
 import io.sobok.SobokSobok.pill.ui.dto.MonthScheduleResponse;
 import io.sobok.SobokSobok.pill.ui.dto.PillScheduleInfo;
+import io.sobok.SobokSobok.pill.ui.dto.StickerInfo;
 import io.sobok.SobokSobok.sticker.domain.QLikeSchedule;
 import io.sobok.SobokSobok.sticker.domain.QSticker;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
-
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
 
 @Repository
 @RequiredArgsConstructor
@@ -106,17 +104,22 @@ public List<DateScheduleResponse> getDateSchedule(Long userId, LocalDate date) {
                     .where(pillSchedule.scheduleDate.eq(date), pillSchedule.scheduleTime.eq(time))
                     .fetch();
 
-            Map<Long, List<Long>> stickerIdMap = pillScheduleIds.stream()
+            Map<Long, List<StickerInfo>> stickerIdMap = pillScheduleIds.stream()
                     .collect(Collectors.toMap(id -> id, id -> queryFactory
-                            .select(likeSchedule.stickerId)
+                            .select(likeSchedule.stickerId, likeSchedule.id)
                             .from(likeSchedule)
                             .where(likeSchedule.scheduleId.eq(id))
-                            .fetch()));
+                            .fetch().stream()
+                            .map(tuple -> StickerInfo.builder()
+                                .stickerId(tuple.get(0, Long.class))
+                                .likeScheduleId(tuple.get(1, Long.class))
+                                .build()
+                            ).collect(Collectors.toList())));
 
             // 결과 매핑
             List<PillScheduleInfo> pillScheduleInfoList = pillScheduleIds.stream()
                     .flatMap(scheduleId -> {
-                        List<Long> stickerIds = stickerIdMap.getOrDefault(scheduleId, Collections.emptyList());
+                        List<StickerInfo> stickerIds = stickerIdMap.getOrDefault(scheduleId, Collections.emptyList());
                         return queryFactory
                                 .select(
                                         pillSchedule.id,