Fix: [Photo] base/64로 저장 안되게 수정 (#69)

kjunh972 · web-flow · commit 95dede169d89 · 2025-10-16T19:13:05.000+09:00
diff --git a/runtracker/src/main/java/com/runtracker/domain/course/service/CourseService.java b/runtracker/src/main/java/com/runtracker/domain/course/service/CourseService.java
@@ -35,6 +35,7 @@
 import com.runtracker.domain.record.exception.CourseNotFoundForRecordException;
 import com.runtracker.domain.record.exception.RecordNotFoundException;
 import com.runtracker.domain.record.repository.RecordRepository;
+import com.runtracker.global.util.ImageUpload;
 import com.runtracker.global.client.FastAPIClient;
 import com.runtracker.global.vo.Coordinate;
 import lombok.RequiredArgsConstructor;
@@ -70,6 +71,7 @@ public class CourseService {
     private final FastAPIClient fastAPIClient;
     private final ObjectMapper objectMapper;
     private final CourseCacheService courseCacheService;
+    private final ImageUpload imageUploadHelper;
 
     private void checkAlreadyRunning(Long memberId) {
         List<RunningRecord> activeRecords = recordRepository.findAllByMemberIdAndFinishedAtIsNull(memberId);
@@ -369,6 +371,12 @@ public void finishRunning(Long memberId, FinishRunning finishRunning) {
 
         long runningTimeSeconds = Duration.between(startedAt, finishedAt).getSeconds();
 
+        // Base64 이미지를 URL로 변환
+        if (finishRunning.getPhoto() != null) {
+            String photoUrl = imageUploadHelper.convertBase64ToUrlIfNeeded(finishRunning.getPhoto());
+            finishRunning.setPhoto(photoUrl);
+        }
+
         Long courseId = existingRecord.getCourseId();
 
         existingRecord.updateFinishRunning(
diff --git a/runtracker/src/main/java/com/runtracker/domain/crew/service/CrewService.java b/runtracker/src/main/java/com/runtracker/domain/crew/service/CrewService.java
@@ -40,16 +40,19 @@
 import com.runtracker.domain.member.entity.Member;
 import com.runtracker.domain.member.entity.enums.MemberRole;
 import com.runtracker.domain.member.repository.MemberRepository;
+import com.runtracker.global.util.ImageUpload;
 import com.runtracker.global.security.UserDetailsImpl;
 import com.runtracker.global.security.CrewAuthorizationUtil;
 import com.runtracker.global.jwt.service.TokenBlacklistService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -61,26 +64,48 @@ public class CrewService {
     private final CrewAuthorizationUtil authorizationUtil;
     private final TokenBlacklistService tokenBlacklistService;
     private final ApplicationEventPublisher eventPublisher;
+    private final ImageUpload imageUploadHelper;
 
     public void createCrew(CrewCreateDTO.Request request, UserDetailsImpl userDetails) {
         memberRepository.findById(userDetails.getMemberId())
                 .orElseThrow(MemberNotFoundException::new);
-        
+
         List<Crew> existingCrews = crewRepository.findByLeaderId(userDetails.getMemberId());
         if (!existingCrews.isEmpty()) {
             throw new CrewAlreadyExistsException();
         }
-        
-        Crew crew = request.toEntity(userDetails.getMemberId());
-        crewRepository.save(crew);
-        
-        CrewMember crewLeader = CrewMember.builder()
-                .crewId(crew.getId())
-                .memberId(userDetails.getMemberId())
-                .role(MemberRole.CREW_LEADER)
-                .status(CrewMemberStatus.ACTIVE)
-                .build();
-        crewMemberRepository.save(crewLeader);
+
+        if (request.getPhoto() != null) {
+            String photoUrl = imageUploadHelper.convertBase64ToUrlIfNeeded(request.getPhoto());
+            CrewCreateDTO.Request updatedRequest = CrewCreateDTO.Request.builder()
+                    .title(request.getTitle())
+                    .photo(photoUrl)
+                    .introduce(request.getIntroduce())
+                    .region(request.getRegion())
+                    .difficulty(request.getDifficulty())
+                    .build();
+            Crew crew = updatedRequest.toEntity(userDetails.getMemberId());
+            crewRepository.save(crew);
+
+            CrewMember crewLeader = CrewMember.builder()
+                    .crewId(crew.getId())
+                    .memberId(userDetails.getMemberId())
+                    .role(MemberRole.CREW_LEADER)
+                    .status(CrewMemberStatus.ACTIVE)
+                    .build();
+            crewMemberRepository.save(crewLeader);
+        } else {
+            Crew crew = request.toEntity(userDetails.getMemberId());
+            crewRepository.save(crew);
+
+            CrewMember crewLeader = CrewMember.builder()
+                    .crewId(crew.getId())
+                    .memberId(userDetails.getMemberId())
+                    .role(MemberRole.CREW_LEADER)
+                    .status(CrewMemberStatus.ACTIVE)
+                    .build();
+            crewMemberRepository.save(crewLeader);
+        }
     }
     
     public void applyToJoinCrew(Long crewId, UserDetailsImpl userDetails) {
@@ -238,15 +263,16 @@ public void updateCrewMemberRole(Long crewId, CrewMemberUpdateDTO.Request reques
     
     public void updateCrew(Long crewId, CrewUpdateDTO.Request request, UserDetailsImpl userDetails) {
         authorizationUtil.validateCrewLeaderPermission(userDetails, crewId);
-        
+
         Crew crew = crewRepository.findById(crewId)
                 .orElseThrow(CrewNotFoundException::new);
-        
+
         if (request.getTitle() != null) {
             crew.updateTitle(request.getTitle());
         }
         if (request.getPhoto() != null) {
-            crew.updatePhoto(request.getPhoto());
+            String photoUrl = imageUploadHelper.convertBase64ToUrlIfNeeded(request.getPhoto());
+            crew.updatePhoto(photoUrl);
         }
         if (request.getIntroduce() != null) {
             crew.updateIntroduce(request.getIntroduce());
@@ -257,7 +283,7 @@ public void updateCrew(Long crewId, CrewUpdateDTO.Request request, UserDetailsIm
         if (request.getDifficulty() != null) {
             crew.updateDifficulty(request.getDifficulty());
         }
-        
+
         crewRepository.save(crew);
     }
     
diff --git a/runtracker/src/main/java/com/runtracker/domain/member/service/MemberService.java b/runtracker/src/main/java/com/runtracker/domain/member/service/MemberService.java
@@ -32,6 +32,7 @@
 import com.runtracker.domain.member.enums.BackupType;
 import com.runtracker.domain.member.enums.MapStyle;
 import com.runtracker.domain.course.enums.Difficulty;
+import com.runtracker.global.util.ImageUpload;
 import com.runtracker.global.jwt.JwtUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -66,6 +67,7 @@ public class MemberService {
     private final ScheduleRepository scheduleRepository;
     private final ObjectMapper objectMapper;
     private final JwtUtil jwtUtil;
+    private final ImageUpload imageUploadHelper;
 
     @Transactional
     public Member createOrUpdateMember(String socialAttr, String socialId,
@@ -145,8 +147,25 @@ public Member updateProfile(Long memberId, MemberUpdateDTO.Request memberUpdateD
         if (memberUpdateDTO.getDifficulty() != null) {
             validateDifficulty(memberUpdateDTO.getDifficulty());
         }
-        
-        member.updateProfile(memberUpdateDTO);
+
+        if (memberUpdateDTO.getPhoto() != null) {
+            String photoUrl = imageUploadHelper.convertBase64ToUrlIfNeeded(memberUpdateDTO.getPhoto());
+            MemberUpdateDTO.Request updatedDTO = MemberUpdateDTO.Request.builder()
+                    .photo(photoUrl)
+                    .name(memberUpdateDTO.getName())
+                    .introduce(memberUpdateDTO.getIntroduce())
+                    .region(memberUpdateDTO.getRegion())
+                    .difficulty(memberUpdateDTO.getDifficulty())
+                    .age(memberUpdateDTO.getAge())
+                    .gender(memberUpdateDTO.getGender())
+                    .searchBlock(memberUpdateDTO.getSearchBlock())
+                    .profileBlock(memberUpdateDTO.getProfileBlock())
+                    .build();
+            member.updateProfile(updatedDTO);
+        } else {
+            member.updateProfile(memberUpdateDTO);
+        }
+
         return member;
     }
     
diff --git a/runtracker/src/main/java/com/runtracker/domain/upload/service/FileStorageService.java b/runtracker/src/main/java/com/runtracker/domain/upload/service/FileStorageService.java
@@ -11,13 +11,15 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.util.Base64;
 import java.util.UUID;
 
 @Slf4j
@@ -66,6 +68,36 @@ private String storeFile(MultipartFile file) {
         }
     }
 
+    // Base64 인코딩된 이미지를 파일로 저장하고 URL을 반환
+    public String uploadBase64Image(String base64Data) {
+        if (base64Data == null || base64Data.trim().isEmpty()) {
+            return null;
+        }
+
+        try {
+            String base64Image = base64Data;
+            if (base64Data.contains(",")) {
+                base64Image = base64Data.split(",")[1];
+            }
+
+            byte[] imageBytes = Base64.getDecoder().decode(base64Image);
+
+            String storedFilename = UUID.randomUUID() + ".webp";
+            Path targetLocation = Paths.get(fileUploadConfig.getUploadDir()).resolve(storedFilename);
+
+            InputStream imageInputStream = new ByteArrayInputStream(imageBytes);
+            InputStream webpInputStream = ImageConverter.convertToWebP(imageInputStream);
+
+            Files.copy(webpInputStream, targetLocation, StandardCopyOption.REPLACE_EXISTING);
+
+            return fileUploadConfig.getBaseUrl() + "/api/upload/image/" + storedFilename;
+
+        } catch (Exception ex) {
+            log.error("Failed to store base64 image", ex);
+            throw new FileStorageFailedException("base64-image");
+        }
+    }
+
     public Resource loadFileAsResource(String filename) {
         try {
             Path filePath = Paths.get(fileUploadConfig.getUploadDir()).resolve(filename).normalize();
diff --git a/runtracker/src/main/java/com/runtracker/global/util/ImageConverter.java b/runtracker/src/main/java/com/runtracker/global/util/ImageConverter.java
@@ -7,6 +7,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 
 
@@ -26,24 +27,55 @@ public static InputStream convertToWebP(MultipartFile file) {
     public static InputStream convertToWebP(MultipartFile file, int quality) {
         try {
             ImmutableImage image = ImmutableImage.loader().fromBytes(file.getBytes());
+            return processImageConversion(image, quality);
+        } catch (Exception e) {
+            log.error("Failed to convert image to WebP: {}", file.getOriginalFilename(), e);
+            throw new ImageConversionFailedException(file.getOriginalFilename());
+        }
+    }
+
+    // InputStream을 WebP 포맷의 InputStream으로 변환
+    public static InputStream convertToWebP(InputStream inputStream) {
+        return convertToWebP(inputStream, DEFAULT_QUALITY);
+    }
+
+    // InputStream을 WebP 포맷의 InputStream으로 변환
+    public static InputStream convertToWebP(InputStream inputStream, int quality) {
+        try {
+            ImmutableImage image = ImmutableImage.loader().fromStream(inputStream);
+            return processImageConversion(image, quality);
+        } catch (Exception e) {
+            log.error("Failed to convert image to WebP from InputStream", e);
+            throw new ImageConversionFailedException("input-stream");
+        }
+    }
 
-            if (image.width > MAX_WIDTH || image.height > MAX_HEIGHT) {
-                double scale = Math.min((double) MAX_WIDTH / image.width, (double) MAX_HEIGHT / image.height);
-                int newWidth = (int) (image.width * scale);
-                int newHeight = (int) (image.height * scale);
-                image = image.scaleTo(newWidth, newHeight);
-                log.info("Image resized from {}x{} to {}x{}",
-                    image.width, image.height, newWidth, newHeight);
-            }
+    // 이미지 처리 및 변환
+    private static InputStream processImageConversion(ImmutableImage image, int quality) throws Exception {
+        image = resizeIfNeeded(image);
+        return convertImageToWebP(image, quality);
+    }
 
-            WebpWriter writer = WebpWriter.DEFAULT.withQ(quality);
-            byte[] webpBytes = image.bytes(writer);
+    // 이미지 리사이징이 필요한 경우 리사이징 수행
+    private static ImmutableImage resizeIfNeeded(ImmutableImage image) {
+        if (image.width > MAX_WIDTH || image.height > MAX_HEIGHT) {
+            int originalWidth = image.width;
+            int originalHeight = image.height;
 
-            return new ByteArrayInputStream(webpBytes);
+            double scale = Math.min((double) MAX_WIDTH / image.width, (double) MAX_HEIGHT / image.height);
+            int newWidth = (int) (image.width * scale);
+            int newHeight = (int) (image.height * scale);
 
-        } catch (Exception e) {
-            log.error("Failed to convert image to WebP: {}", file.getOriginalFilename(), e);
-            throw new ImageConversionFailedException(file.getOriginalFilename());
+            image = image.scaleTo(newWidth, newHeight);
+            log.info("Image resized from {}x{} to {}x{}", originalWidth, originalHeight, newWidth, newHeight);
         }
+        return image;
+    }
+
+    // ImmutableImage를 WebP 포맷의 InputStream으로 변환
+    private static InputStream convertImageToWebP(ImmutableImage image, int quality) throws IOException {
+        WebpWriter writer = WebpWriter.DEFAULT.withQ(quality);
+        byte[] webpBytes = image.bytes(writer);
+        return new ByteArrayInputStream(webpBytes);
     }
 }
diff --git a/runtracker/src/main/java/com/runtracker/global/util/ImageUpload.java b/runtracker/src/main/java/com/runtracker/global/util/ImageUpload.java
@@ -0,0 +1,33 @@
+package com.runtracker.global.util;
+
+import com.runtracker.domain.upload.service.FileStorageService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ImageUpload {
+
+    private final FileStorageService fileStorageService;
+
+    // Base64 이미지 데이터를 URL로 변환
+    public String convertBase64ToUrlIfNeeded(String data) {
+        if (data == null || data.trim().isEmpty()) {
+            return null;
+        }
+
+        try {
+            // Base64 데이터인지 확인
+            if (data.startsWith("data:image") || data.length() > 500) {
+                return fileStorageService.uploadBase64Image(data);
+            }
+            // 이미 URL인 경우 그대로 반환
+            return data;
+        } catch (Exception e) {
+            log.error("Failed to convert Base64 image to URL", e);
+            return data;
+        }
+    }
+}
