Deploy / Merge to Main

.github/workflows/deploy-to-prod-server.yml

@@ -66,9 +66,10 @@ jobs:
           script: |
             cd ${{ secrets.PROD_SERVER_DEPLOY_PATH }}
 
-            # 최신 이미지 pull
-            docker compose -f docker-compose.prod.yml pull
+            # 최신 이미지 pull (spring만)
+            docker compose -f docker-compose.prod.yml pull redot-server
 
-            # 컨테이너 재시작
-            docker compose -f docker-compose.prod.yml down
-            docker compose -f docker-compose.prod.yml --env-file .env up -d
+            # spring만 재시작
+            docker compose -f docker-compose.prod.yml stop redot-server
+            docker compose -f docker-compose.prod.yml rm -f redot-server
+            docker compose -f docker-compose.prod.yml --env-file .env up -d redot-server

src/main/java/redot/redot_server/RedotServerApplication.java

@@ -4,10 +4,11 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import redot.redot_server.global.email.EmailVerificationProperties;
+import redot.redot_server.global.s3.config.ImageUploadProperties;
 import redot.redot_server.global.security.social.config.AuthRedirectProperties;
 
 @SpringBootApplication
-@EnableConfigurationProperties({AuthRedirectProperties.class, EmailVerificationProperties.class})
+@EnableConfigurationProperties({AuthRedirectProperties.class, EmailVerificationProperties.class, ImageUploadProperties.class})
 public class RedotServerApplication {
     public static void main(String[] args) {
         SpringApplication.run(RedotServerApplication.class, args);

src/main/java/redot/redot_server/domain/admin/controller/AdminController.java

@@ -2,6 +2,7 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpHeaders;
@@ -15,12 +16,15 @@
 import org.springframework.web.bind.annotation.PutMapping;
 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.web.multipart.MultipartFile;
 import redot.redot_server.domain.admin.dto.request.AdminCreateRequest;
 import redot.redot_server.domain.admin.dto.request.AdminResetPasswordRequest;
 import redot.redot_server.domain.admin.dto.response.AdminResponse;
 import redot.redot_server.domain.admin.dto.request.AdminUpdateRequest;
 import redot.redot_server.domain.admin.service.AdminService;
+import redot.redot_server.global.s3.dto.UploadedImageUrlResponse;
 import redot.redot_server.global.util.dto.response.PageResponse;
 import redot.redot_server.global.jwt.cookie.TokenCookieFactory;
 import redot.redot_server.global.jwt.token.TokenType;
@@ -78,4 +82,12 @@ public ResponseEntity<Void> deleteCurrentAdmin(HttpServletRequest request, @Auth
                 .header(HttpHeaders.SET_COOKIE, deleteRefresh.toString())
                 .build();
     }
+
+    @PostMapping("/upload-profile-image")
+    public ResponseEntity<UploadedImageUrlResponse> uploadProfileImage(
+            @AuthenticationPrincipal JwtPrincipal jwtPrincipal,
+            @RequestPart("image") @NotNull MultipartFile image
+    ) {
+        return ResponseEntity.ok(adminService.uploadProfileImage(jwtPrincipal.id(), image));
+    }
 }

src/main/java/redot/redot_server/domain/admin/service/AdminService.java

@@ -1,6 +1,7 @@
 package redot.redot_server.domain.admin.service;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -9,21 +10,28 @@
 import org.springframework.transaction.annotation.Transactional;
 import redot.redot_server.domain.admin.dto.request.AdminCreateRequest;
 import redot.redot_server.domain.admin.dto.request.AdminResetPasswordRequest;
-import redot.redot_server.domain.admin.dto.response.AdminResponse;
+import org.springframework.web.multipart.MultipartFile;
 import redot.redot_server.domain.admin.dto.request.AdminUpdateRequest;
+import redot.redot_server.domain.admin.dto.response.AdminResponse;
 import redot.redot_server.domain.admin.entity.Admin;
 import redot.redot_server.domain.admin.repository.AdminRepository;
 import redot.redot_server.domain.auth.exception.AuthErrorCode;
 import redot.redot_server.domain.auth.exception.AuthException;
-import redot.redot_server.global.util.dto.response.PageResponse;
+import redot.redot_server.global.s3.dto.UploadedImageUrlResponse;
+import redot.redot_server.global.s3.event.ImageDeletionEvent;
+import redot.redot_server.global.s3.service.ImageStorageService;
+import redot.redot_server.global.s3.util.ImageDirectory;
 import redot.redot_server.global.util.EmailUtils;
+import redot.redot_server.global.util.dto.response.PageResponse;
 
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class AdminService {
     private final AdminRepository adminRepository;
     private final PasswordEncoder passwordEncoder;
+    private final ImageStorageService imageStorageService;
+    private final ApplicationEventPublisher eventPublisher;
 
     @Transactional
     public AdminResponse createAdmin(AdminCreateRequest request) {
@@ -70,6 +78,8 @@ public AdminResponse updateAdmin(Long adminId, AdminUpdateRequest request) {
                 throw new AuthException(AuthErrorCode.EMAIL_ALREADY_EXISTS);
             }
 
+            deleteOldProfileImageUrlIfChanged(request, admin);
+
             admin.update(request.name(), normalizedEmail, request.profileImageUrl());
 
             return AdminResponse.from(admin);
@@ -78,6 +88,13 @@ public AdminResponse updateAdmin(Long adminId, AdminUpdateRequest request) {
         }
     }
 
+    private void deleteOldProfileImageUrlIfChanged(AdminUpdateRequest request, Admin admin) {
+        String oldProfileImageUrl = admin.getProfileImageUrl();
+        if (oldProfileImageUrl != null && !oldProfileImageUrl.equals(request.profileImageUrl())) {
+            eventPublisher.publishEvent(new ImageDeletionEvent(oldProfileImageUrl));
+        }
+    }
+
     @Transactional
     public void resetAdminPassword(Long adminId, AdminResetPasswordRequest request) {
         Admin admin = adminRepository.findById(adminId)
@@ -101,4 +118,13 @@ public void deleteCurrentAdmin(Long id) {
         Admin admin = adminRepository.findById(id).orElseThrow(() -> new AuthException(AuthErrorCode.ADMIN_NOT_FOUND));
         admin.delete();
     }
+
+    @Transactional
+    public UploadedImageUrlResponse uploadProfileImage(Long adminId, MultipartFile imageFile) {
+        adminRepository.findById(adminId)
+                .orElseThrow(() -> new AuthException(AuthErrorCode.ADMIN_NOT_FOUND));
+
+        String imageUrl = imageStorageService.upload(ImageDirectory.ADMIN_PROFILE, adminId, imageFile);
+        return new UploadedImageUrlResponse(imageUrl);
+    }
 }

src/main/java/redot/redot_server/domain/auth/service/RedotMemberAuthService.java

@@ -53,7 +53,7 @@ public RedotMemberResponse signUp(RedotMemberCreateRequest request) {
         );
 
         RedotMember savedMember = redotMemberRepository.save(redotMember);
-        return RedotMemberResponse.from(savedMember);
+        return RedotMemberResponse.fromEntity(savedMember);
     }
 
     public AuthResult signIn(HttpServletRequest request, RedotMemberSignInRequest signInRequest) {
@@ -107,7 +107,7 @@ public RedotMemberResponse getCurrentMember(Long memberId) {
         RedotMember member = redotMemberRepository.findById(memberId)
                 .orElseThrow(() -> new AuthException(AuthErrorCode.REDOT_MEMBER_NOT_FOUND));
 
-        return RedotMemberResponse.from(member);
+        return RedotMemberResponse.fromEntity(member);
     }
 
     @Transactional

src/main/java/redot/redot_server/domain/cms/member/controller/CMSMemberController.java

@@ -2,6 +2,7 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -18,20 +19,23 @@
 import org.springframework.web.bind.annotation.PutMapping;
 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.web.multipart.MultipartFile;
 import redot.redot_server.domain.cms.member.dto.request.CMSMemberCreateRequest;
-import redot.redot_server.domain.cms.member.dto.response.CMSMemberResponse;
 import redot.redot_server.domain.cms.member.dto.request.CMSMemberRoleRequest;
 import redot.redot_server.domain.cms.member.dto.request.CMSMemberSearchCondition;
 import redot.redot_server.domain.cms.member.dto.request.CMSMemberUpdateRequest;
+import redot.redot_server.domain.cms.member.dto.response.CMSMemberResponse;
 import redot.redot_server.domain.cms.member.exception.CMSMemberErrorCode;
 import redot.redot_server.domain.cms.member.exception.CMSMemberException;
 import redot.redot_server.domain.cms.member.service.CMSMemberService;
-import redot.redot_server.global.util.dto.response.PageResponse;
-import redot.redot_server.global.redotapp.resolver.annotation.CurrentRedotApp;
 import redot.redot_server.global.jwt.cookie.TokenCookieFactory;
 import redot.redot_server.global.jwt.token.TokenType;
+import redot.redot_server.global.redotapp.resolver.annotation.CurrentRedotApp;
+import redot.redot_server.global.s3.dto.UploadedImageUrlResponse;
 import redot.redot_server.global.security.principal.JwtPrincipal;
+import redot.redot_server.global.util.dto.response.PageResponse;
 
 @RestController
 @RequiredArgsConstructor
@@ -103,4 +107,13 @@ public ResponseEntity<Void> deleteCurrentCMSMember(HttpServletRequest request,
                 .build();
     }
 
+    @PostMapping("/upload-profile-image")
+    public ResponseEntity<UploadedImageUrlResponse> uploadProfileImage(
+            @CurrentRedotApp Long redotAppId,
+            @AuthenticationPrincipal JwtPrincipal jwtPrincipal,
+            @RequestPart("image") @NotNull MultipartFile image
+    ) {
+        return ResponseEntity.ok(cmsMemberService.uploadProfileImage(redotAppId, jwtPrincipal.id(), image));
+    }
+
 }

src/main/java/redot/redot_server/domain/cms/member/service/CMSMemberService.java

@@ -1,26 +1,33 @@
 package redot.redot_server.domain.cms.member.service;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 import redot.redot_server.domain.cms.member.dto.request.CMSMemberCreateRequest;
-import redot.redot_server.domain.cms.member.dto.response.CMSMemberResponse;
 import redot.redot_server.domain.cms.member.dto.request.CMSMemberRoleRequest;
 import redot.redot_server.domain.cms.member.dto.request.CMSMemberSearchCondition;
 import redot.redot_server.domain.cms.member.dto.request.CMSMemberUpdateRequest;
+import redot.redot_server.domain.cms.member.dto.response.CMSMemberResponse;
 import redot.redot_server.domain.cms.member.entity.CMSMember;
-import redot.redot_server.domain.redot.app.entity.RedotApp;
 import redot.redot_server.domain.cms.member.exception.CMSMemberErrorCode;
 import redot.redot_server.domain.cms.member.exception.CMSMemberException;
+import redot.redot_server.domain.cms.member.repository.CMSMemberRepository;
+import redot.redot_server.domain.redot.app.entity.RedotApp;
 import redot.redot_server.domain.redot.app.exception.RedotAppErrorCode;
 import redot.redot_server.domain.redot.app.exception.RedotAppException;
-import redot.redot_server.domain.cms.member.repository.CMSMemberRepository;
 import redot.redot_server.domain.redot.app.repository.RedotAppRepository;
+import redot.redot_server.global.s3.dto.UploadedImageUrlResponse;
+import redot.redot_server.global.s3.event.ImageDeletionEvent;
+import redot.redot_server.global.s3.service.ImageStorageService;
+import redot.redot_server.global.s3.util.ImageDirectory;
 import redot.redot_server.global.util.dto.response.PageResponse;
 
+
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -29,6 +36,8 @@ public class CMSMemberService {
     private final CMSMemberRepository cmsMemberRepository;
     private final RedotAppRepository redotAppRepository;
     private final PasswordEncoder passwordEncoder;
+    private final ImageStorageService imageStorageService;
+    private final ApplicationEventPublisher eventPublisher;
 
     @Transactional
     public CMSMemberResponse createCMSMember(Long redotAppId, CMSMemberCreateRequest request) {
@@ -64,11 +73,20 @@ public CMSMemberResponse updateCMSMember(Long redotAppId, Long memberId, CMSMemb
         CMSMember cmsMember = cmsMemberRepository.findByIdAndRedotApp_Id(memberId, redotAppId)
                 .orElseThrow(() -> new CMSMemberException(CMSMemberErrorCode.CMS_MEMBER_NOT_FOUND));
 
+        deleteOldProfileImageUrlIfChanged(request, cmsMember);
+
         cmsMember.updateProfile(request.name(), request.profileImageUrl());
 
         return CMSMemberResponse.fromEntity(redotAppId, cmsMember);
     }
 
+    private void deleteOldProfileImageUrlIfChanged(CMSMemberUpdateRequest request, CMSMember cmsMember) {
+        String oldProfileImageUrl = cmsMember.getProfileImageUrl();
+        if (oldProfileImageUrl != null && !oldProfileImageUrl.equals(request.profileImageUrl())) {
+            eventPublisher.publishEvent(new ImageDeletionEvent(oldProfileImageUrl));
+        }
+    }
+
     @Transactional
     public void deleteCMSMember(Long redotAppId, Long memberId) {
         CMSMember cmsMember = cmsMemberRepository.findByIdAndRedotApp_Id(memberId, redotAppId)
@@ -86,4 +104,13 @@ public PageResponse<CMSMemberResponse> getCMSMemberListBySearchCondition(Long re
 
         return PageResponse.from(page);
     }
+
+    @Transactional
+    public UploadedImageUrlResponse uploadProfileImage(Long redotAppId, Long memberId, MultipartFile imageFile) {
+        cmsMemberRepository.findByIdAndRedotApp_Id(memberId, redotAppId)
+                .orElseThrow(() -> new CMSMemberException(CMSMemberErrorCode.CMS_MEMBER_NOT_FOUND));
+
+        String imageUrl = imageStorageService.upload(ImageDirectory.CMS_MEMBER_PROFILE, memberId, imageFile);
+        return new UploadedImageUrlResponse(imageUrl);
+    }
 }

src/main/java/redot/redot_server/domain/cms/site/setting/service/SiteSettingService.java

@@ -3,22 +3,24 @@
 
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import redot.redot_server.domain.cms.site.setting.dto.request.SiteSettingUpdateRequest;
+import redot.redot_server.domain.cms.site.setting.dto.response.SiteSettingResponse;
 import redot.redot_server.domain.site.domain.entity.Domain;
 import redot.redot_server.domain.site.domain.exception.DomainErrorCode;
 import redot.redot_server.domain.site.domain.exception.DomainException;
 import redot.redot_server.domain.site.domain.repository.DomainRepository;
-import redot.redot_server.domain.cms.site.setting.dto.response.SiteSettingResponse;
-import redot.redot_server.domain.cms.site.setting.dto.request.SiteSettingUpdateRequest;
 import redot.redot_server.domain.site.setting.entity.SiteSetting;
 import redot.redot_server.domain.site.setting.exception.SiteSettingErrorCode;
 import redot.redot_server.domain.site.setting.exception.SiteSettingException;
 import redot.redot_server.domain.site.setting.repository.SiteSettingRepository;
-import redot.redot_server.domain.site.setting.util.LogoPathGenerator;
 import redot.redot_server.global.s3.dto.UploadedImageUrlResponse;
-import redot.redot_server.global.s3.util.S3Manager;
+import redot.redot_server.global.s3.event.ImageDeletionEvent;
+import redot.redot_server.global.s3.service.ImageStorageService;
+import redot.redot_server.global.s3.util.ImageDirectory;
 
 @Service
 @RequiredArgsConstructor
@@ -27,7 +29,8 @@ public class SiteSettingService {
 
     private final SiteSettingRepository siteSettingRepository;
     private final DomainRepository domainRepository;
-    private final S3Manager s3Manager;
+    private final ImageStorageService imageStorageService;
+    private final ApplicationEventPublisher eventPublisher;
 
     @Transactional
     public SiteSettingResponse updateSiteSetting(Long redotAppId, SiteSettingUpdateRequest request) {
@@ -36,29 +39,34 @@ public SiteSettingResponse updateSiteSetting(Long redotAppId, SiteSettingUpdateR
         Domain domain = domainRepository.findByRedotAppId(redotAppId)
                 .orElseThrow(() -> new DomainException(DomainErrorCode.DOMAIN_NOT_FOUND));
 
-        if(isCustomDomainExists(request, domain)) {
+        if (isCustomDomainExists(request, domain)) {
             throw new DomainException(DomainErrorCode.CUSTOM_DOMAIN_ALREADY_EXISTS);
         }
 
+        deleteOldLogoUrlIfChanged(request, siteSetting);
+
         siteSetting.updateSiteName(request.siteName());
         siteSetting.updateLogoUrl(request.logoUrl());
         siteSetting.updateGaInfo(request.gaInfo());
         domain.updateCustomDomain(request.customDomain());
 
-        deleteOldLogoIfChanged(siteSetting, request.logoUrl());
-
         return SiteSettingResponse.fromEntity(siteSetting, domain);
     }
 
+    private void deleteOldLogoUrlIfChanged(SiteSettingUpdateRequest request, SiteSetting siteSetting) {
+        String oldLogoUrl = siteSetting.getLogoUrl();
+
+        if (oldLogoUrl != null && !oldLogoUrl.equals(request.logoUrl())) {
+            eventPublisher.publishEvent(new ImageDeletionEvent(oldLogoUrl));
+        }
+    }
+
     public UploadedImageUrlResponse uploadLogoImage(Long redotAppId, MultipartFile logoFile) {
         if (logoFile == null || logoFile.isEmpty()) {
             throw new SiteSettingException(SiteSettingErrorCode.LOGO_FILE_REQUIRED);
         }
 
-        String logoUrl = s3Manager.uploadFile(
-                logoFile,
-                LogoPathGenerator.generateLogoPath(redotAppId, logoFile.getOriginalFilename())
-        );
+        String logoUrl = imageStorageService.upload(ImageDirectory.APP_LOGO, redotAppId, logoFile);
 
         return new UploadedImageUrlResponse(logoUrl);
     }
@@ -78,15 +86,6 @@ private boolean isCustomDomainExists(SiteSettingUpdateRequest request, Domain do
         return domainRepository.existsByCustomDomain(requestedCustomDomain);
     }
 
-    private void deleteOldLogoIfChanged(SiteSetting siteSetting, String newLogoUrl) {
-        String currentLogoUrl = siteSetting.getLogoUrl();
-        if(currentLogoUrl == null) {
-            return;
-        }
-        if (newLogoUrl == null || !newLogoUrl.equals(currentLogoUrl)) {
-            s3Manager.deleteFile(currentLogoUrl);
-        }
-    }
 
     public SiteSettingResponse getSiteSetting(Long redotAppId) {
         SiteSetting siteSetting = siteSettingRepository.findByRedotAppId(redotAppId)