fix: 프로젝트 카드 활동 시각 및 프로필 이미지 업로드 지원

.env.example

@@ -38,3 +38,7 @@ AWS_SECRET_ACCESS_KEY=<aws-secret-access-key>
 
 # S3 bucket
 CLOUD_AWS_S3_BUCKET=<cloud-aws-s3-bucket>
+
+# 프로필 이미지 등 공개 파일 URL을 조합할 CDN 또는 공개 S3 base URL
+# 예: https://cdn.slatto.cloud
+CLOUD_AWS_S3_PUBLIC_BASE_URL=<cloud-aws-s3-public-base-url>

build.gradle

@@ -23,6 +23,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.flywaydb:flyway-core'
+	implementation 'org.flywaydb:flyway-mysql'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.16'
 	implementation 'me.paulschwarz:spring-dotenv:4.0.0'
 	implementation 'io.jsonwebtoken:jjwt-api:0.12.6'

src/main/java/com/slatto/domain/notification/repository/ActivityLogRepository.java

@@ -31,4 +31,14 @@ List<ActivityLog> findRecentActivitiesByCursor(
     );
 
     Optional<ActivityLog> findByIdAndProjectId(Long activityId, Long projectId);
+
+    @Query("""
+        select al.project.id as projectId, max(al.createdAt) as lastActivityAt
+        from ActivityLog al
+        where al.project.id in :projectIds
+        group by al.project.id
+        """)
+    List<ProjectLatestActivityProjection> findLatestActivityAtByProjectIds(
+        @Param("projectIds") List<Long> projectIds
+    );
 }

src/main/java/com/slatto/domain/notification/repository/ProjectLatestActivityProjection.java

@@ -0,0 +1,10 @@
+package com.slatto.domain.notification.repository;
+
+import java.time.LocalDateTime;
+
+public interface ProjectLatestActivityProjection {
+
+    Long getProjectId();
+
+    LocalDateTime getLastActivityAt();
+}

src/main/java/com/slatto/domain/project/service/ProjectService.java

@@ -17,6 +17,8 @@
 import com.slatto.domain.project.repository.ProjectPinRepository;
 import com.slatto.domain.project.repository.ProjectRepository;
 import com.slatto.domain.project.repository.ProjectUserRoleRepository;
+import com.slatto.domain.notification.repository.ActivityLogRepository;
+import com.slatto.domain.notification.repository.ProjectLatestActivityProjection;
 import com.slatto.domain.notification.service.ActivityLogService;
 import com.slatto.domain.user.entity.Users;
 import com.slatto.domain.user.enums.RoleName;
@@ -54,6 +56,7 @@ public class ProjectService {
     private final ProjectConverter projectConverter;
     private final ProjectAccessValidator projectAccessValidator;
     private final ActivityLogService activityLogService;
+    private final ActivityLogRepository activityLogRepository;
 
     @Transactional
     public ProjectResponse createProject(Long ownerUserId, ProjectCreateRequest request) {
@@ -97,6 +100,7 @@ public ProjectListResponse getProjects(
         Map<Long, List<RoleName>> roleNamesByMemberId = getRoleNamesByMemberId(currentPageMembers);
         Map<Long, String> previewImageUrlByProjectId = getPreviewImageUrlByProjectId(currentPageMembers);
         Map<Long, LocalDateTime> pinnedAtByProjectId = getPinnedAtByProjectId(currentUserId, currentPageMembers);
+        Map<Long, LocalDateTime> lastActivityAtByProjectId = getLastActivityAtByProjectId(currentPageMembers);
 
         Long nextCursor = hasNext && !currentPageMembers.isEmpty()
             ? currentPageMembers.get(currentPageMembers.size() - 1).getProject().getId()
@@ -111,7 +115,7 @@ public ProjectListResponse getProjects(
                 previewImageUrlByProjectId.get(projectMember.getProject().getId()),
                 pinnedAtByProjectId.get(projectMember.getProject().getId()),
                 projectMember.getPermission(),
-                resolveLastActivityAt(projectMember.getProject())
+                lastActivityAtByProjectId.get(projectMember.getProject().getId())
             ))
             .toList();
 
@@ -311,6 +315,24 @@ private Map<Long, LocalDateTime> getPinnedAtByProjectId(Long userId, List<Projec
             ));
     }
 
+    private Map<Long, LocalDateTime> getLastActivityAtByProjectId(List<ProjectMember> projectMembers) {
+        List<Long> projectIds = projectMembers.stream()
+            .map(ProjectMember::getProject)
+            .map(Project::getId)
+            .toList();
+
+        if (projectIds.isEmpty()) {
+            return Map.of();
+        }
+
+        return activityLogRepository.findLatestActivityAtByProjectIds(projectIds)
+            .stream()
+            .collect(Collectors.toMap(
+                ProjectLatestActivityProjection::getProjectId,
+                ProjectLatestActivityProjection::getLastActivityAt
+            ));
+    }
+
     private LocalDateTime getProjectCursorPinnedAt(Long userId, Long cursor) {
         if (cursor == null) {
             return null;
@@ -321,10 +343,6 @@ private LocalDateTime getProjectCursorPinnedAt(Long userId, Long cursor) {
             .orElse(null);
     }
 
-    private LocalDateTime resolveLastActivityAt(Project project) {
-        return project.getUpdatedAt() != null ? project.getUpdatedAt() : project.getCreatedAt();
-    }
-
     private int normalizePageSize(int size) {
         if (size <= 0) {
             return DEFAULT_PAGE_SIZE;

src/main/java/com/slatto/domain/user/controller/UserController.java

@@ -5,6 +5,7 @@
 import com.slatto.domain.user.dto.UserOnboardingResponse;
 import com.slatto.domain.user.dto.UserProfileUpdateRequest;
 import com.slatto.domain.user.dto.UserProfileUpdateResponse;
+import com.slatto.domain.user.dto.UserProfileImageResponse;
 import com.slatto.domain.user.dto.UserPublicProfileResponse;
 import com.slatto.domain.user.service.UserService;
 import com.slatto.global.response.ApiResponse;
@@ -20,7 +21,11 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.multipart.MultipartFile;
 
 @Tag(name = "User", description = "유저 API")
 @RestController
@@ -60,6 +65,17 @@ public ApiResponse<UserProfileUpdateResponse> updateProfile(
         return ApiResponse.success(CommonSuccessCode.OK, response);
     }
 
+    @Operation(summary = "프로필 이미지 업로드", description = "프로필 이미지를 S3에 업로드하고 CDN 공개 URL로 교체한다.")
+    @PutMapping(value = "/me/profile-image", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ApiResponse<UserProfileImageResponse> uploadProfileImage(
+        @AuthenticationPrincipal Long userId,
+        @RequestPart("file") MultipartFile file
+    ) {
+        UserProfileImageResponse response = userService.uploadProfileImage(userId, file);
+
+        return ApiResponse.success(CommonSuccessCode.OK, response);
+    }
+
     @Operation(summary = "공개 프로필 조회", description = "다른 유저의 공개 프로필을 조회한다. 이메일 등 비공개 필드는 제외된다.")
     @GetMapping("/{userId}")
     public ApiResponse<UserPublicProfileResponse> getPublicProfile(@PathVariable Long userId) {

src/main/java/com/slatto/domain/user/dto/UserProfileImageResponse.java

@@ -0,0 +1,15 @@
+package com.slatto.domain.user.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+public class UserProfileImageResponse {
+
+    private String profileImageUrl;
+
+    private LocalDateTime updatedAt;
+}

src/main/java/com/slatto/domain/user/entity/Users.java

@@ -98,4 +98,8 @@ public void completeOnboarding(String nickname, String bio, String profileImageU
         this.onboardingCompleted = true;
     }
 
-}
+    public void updateProfileImage(String profileImageUrl) {
+        this.profileImageUrl = profileImageUrl;
+    }
+
+}

src/main/java/com/slatto/domain/user/exception/UserErrorCode.java

@@ -9,7 +9,10 @@
 @RequiredArgsConstructor
 public enum UserErrorCode implements BaseCode {
 
-    ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "ONBOARDING409", "이미 온보딩을 완료한 유저입니다.");
+    ONBOARDING_ALREADY_COMPLETED(HttpStatus.CONFLICT, "ONBOARDING409", "이미 온보딩을 완료한 유저입니다."),
+    PROFILE_IMAGE_EMPTY(HttpStatus.BAD_REQUEST, "USER_PROFILE_IMAGE_EMPTY400", "업로드할 프로필 이미지가 비어 있습니다."),
+    PROFILE_IMAGE_INVALID_TYPE(HttpStatus.BAD_REQUEST, "USER_PROFILE_IMAGE_INVALID_TYPE400", "지원하지 않는 프로필 이미지 형식입니다."),
+    PROFILE_IMAGE_SIZE_EXCEEDED(HttpStatus.BAD_REQUEST, "USER_PROFILE_IMAGE_SIZE400", "프로필 이미지는 최대 10MB까지 업로드할 수 있습니다.");
 
     private final HttpStatus httpStatus;
     private final String code;

src/main/java/com/slatto/domain/user/service/UserService.java

@@ -5,6 +5,7 @@
 import com.slatto.domain.user.dto.UserOnboardingResponse;
 import com.slatto.domain.user.dto.UserProfileUpdateRequest;
 import com.slatto.domain.user.dto.UserProfileUpdateResponse;
+import com.slatto.domain.user.dto.UserProfileImageResponse;
 import com.slatto.domain.user.dto.UserPublicProfileResponse;
 import com.slatto.domain.user.entity.Location;
 import com.slatto.domain.user.entity.UserCategory;
@@ -20,21 +21,45 @@
 import com.slatto.domain.user.repository.UserRoleRepository;
 import com.slatto.global.exception.BaseException;
 import com.slatto.global.response.code.CommonErrorCode;
+import com.slatto.global.storage.StorageService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 @Service
+@Slf4j
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class UserService {
 
+    private static final long MAX_PROFILE_IMAGE_SIZE = 10L * 1024 * 1024;
+    private static final String PROFILE_IMAGE_STORAGE_KEY_FORMAT = "users/%d/profile-images/%s.%s";
+    private static final Map<String, Set<String>> ALLOWED_EXTENSIONS_BY_CONTENT_TYPE = Map.of(
+        "image/jpeg", Set.of("jpg", "jpeg"),
+        "image/png", Set.of("png"),
+        "image/webp", Set.of("webp")
+    );
+
     private final UserRepository userRepository;
     private final UserRoleRepository userRoleRepository;
     private final UserCategoryRepository userCategoryRepository;
     private final LocationRepository locationRepository;
+    private final StorageService storageService;
+
+    @Value("${cloud.aws.s3.public-base-url:}")
+    private String publicBaseUrl;
 
     public UserMeResponse getMyInfo(Long userId) {
         Users user = getUserOrThrow(userId);
@@ -185,6 +210,28 @@ public UserProfileUpdateResponse updateProfile(Long userId, UserProfileUpdateReq
             .build();
     }
 
+    @Transactional
+    public UserProfileImageResponse uploadProfileImage(Long userId, MultipartFile file) {
+        Users user = getUserOrThrow(userId);
+        validateProfileImage(file);
+
+        String storageKey = createProfileImageStorageKey(userId, file.getOriginalFilename());
+        String profileImageUrl = createProfileImageUrl(storageKey);
+        String previousStorageKey = extractManagedStorageKey(user.getProfileImageUrl());
+
+        storageService.upload(file, storageKey);
+        registerUploadedFileCleanupOnRollback(storageKey);
+
+        user.updateProfileImage(profileImageUrl);
+        userRepository.flush();
+        registerPreviousFileDeletionAfterCommit(previousStorageKey);
+
+        return UserProfileImageResponse.builder()
+            .profileImageUrl(profileImageUrl)
+            .updatedAt(user.getUpdatedAt())
+            .build();
+    }
+
     public UserPublicProfileResponse getPublicProfile(Long userId) {
         Users user = getUserOrThrow(userId);
 
@@ -215,6 +262,100 @@ public UserPublicProfileResponse getPublicProfile(Long userId) {
             .build();
     }
 
+    private void validateProfileImage(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new BaseException(UserErrorCode.PROFILE_IMAGE_EMPTY);
+        }
+
+        if (file.getSize() > MAX_PROFILE_IMAGE_SIZE) {
+            throw new BaseException(UserErrorCode.PROFILE_IMAGE_SIZE_EXCEEDED);
+        }
+
+        String extension = getExtension(file.getOriginalFilename());
+        String contentType = file.getContentType();
+        if (!isAllowedProfileImage(contentType, extension)) {
+            throw new BaseException(UserErrorCode.PROFILE_IMAGE_INVALID_TYPE);
+        }
+    }
+
+    private boolean isAllowedProfileImage(String contentType, String extension) {
+        if (!StringUtils.hasText(contentType) || !StringUtils.hasText(extension)) {
+            return false;
+        }
+
+        return ALLOWED_EXTENSIONS_BY_CONTENT_TYPE
+            .getOrDefault(contentType.toLowerCase(Locale.ROOT), Set.of())
+            .contains(extension);
+    }
+
+    private String createProfileImageStorageKey(Long userId, String originalFilename) {
+        return PROFILE_IMAGE_STORAGE_KEY_FORMAT.formatted(userId, UUID.randomUUID(), getExtension(originalFilename));
+    }
+
+    private String createProfileImageUrl(String storageKey) {
+        if (!StringUtils.hasText(publicBaseUrl)) {
+            throw new BaseException(CommonErrorCode.INTERNAL_SERVER_ERROR);
+        }
+
+        return publicBaseUrl.replaceAll("/+$", "") + "/" + storageKey;
+    }
+
+    private String extractManagedStorageKey(String profileImageUrl) {
+        if (!StringUtils.hasText(publicBaseUrl) || !StringUtils.hasText(profileImageUrl)) {
+            return null;
+        }
+
+        String normalizedBaseUrl = publicBaseUrl.replaceAll("/+$", "") + "/";
+        if (!profileImageUrl.startsWith(normalizedBaseUrl)) {
+            return null;
+        }
+
+        return profileImageUrl.substring(normalizedBaseUrl.length());
+    }
+
+    private void registerUploadedFileCleanupOnRollback(String storageKey) {
+        if (!TransactionSynchronizationManager.isSynchronizationActive()) {
+            return;
+        }
+
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+            @Override
+            public void afterCompletion(int status) {
+                if (status != STATUS_COMMITTED) {
+                    deleteStorageObjectQuietly(storageKey, "profile image upload rollback");
+                }
+            }
+        });
+    }
+
+    private void registerPreviousFileDeletionAfterCommit(String previousStorageKey) {
+        if (!StringUtils.hasText(previousStorageKey) || !TransactionSynchronizationManager.isSynchronizationActive()) {
+            return;
+        }
+
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+            @Override
+            public void afterCompletion(int status) {
+                if (status == STATUS_COMMITTED) {
+                    deleteStorageObjectQuietly(previousStorageKey, "profile image replacement");
+                }
+            }
+        });
+    }
+
+    private void deleteStorageObjectQuietly(String storageKey, String context) {
+        try {
+            storageService.delete(storageKey);
+        } catch (RuntimeException exception) {
+            log.warn("Failed to delete S3 object after {}. storageKey={}", context, storageKey, exception);
+        }
+    }
+
+    private String getExtension(String fileName) {
+        String extension = StringUtils.getFilenameExtension(fileName);
+        return StringUtils.hasText(extension) ? extension.toLowerCase(Locale.ROOT) : "";
+    }
+
     private Users getUserOrThrow(Long userId) {
         return userRepository.findByIdAndDeletedAtIsNull(userId)
             .orElseThrow(() -> new BaseException(CommonErrorCode.NOT_FOUND));

src/main/resources/application.yml

@@ -23,6 +23,13 @@ spring:
       hibernate:
         format_sql: true
 
+  flyway:
+    # 기존 운영/개발 DB는 수동 반영된 V8 스키마를 기준점으로 등록한 뒤 이후 변경만 적용한다.
+    baseline-on-migrate: true
+    baseline-version: 8
+    baseline-description: legacy-schema
+    validate-on-migrate: true
+
 server:
   forward-headers-strategy: framework
 
@@ -36,6 +43,7 @@ cloud:
   aws:
     s3:
       bucket: ${CLOUD_AWS_S3_BUCKET}
+      public-base-url: ${CLOUD_AWS_S3_PUBLIC_BASE_URL:}
 
 youtube:
   api: