Merge pull request #295 from 42organization/fix-user-image-upload

42organization · Sep 28, 2023 · ca44144 · ca44144
2 parents c3fa5ae + 3d09d66
commit ca44144
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/com/gg/server/domain/user/data/UserRepository.java b/src/main/java/com/gg/server/domain/user/data/UserRepository.java
@@ -5,6 +5,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -33,4 +34,8 @@ public interface UserRepository extends JpaRepository<User, Long> {
     List<User> findEnemyByGameAndUser(@Param("gameId") Long gameId, @Param("userId") Long userId);
 
     List<User> findUsersByIdIn(List<Long> userIds);
+
+    @Modifying(clearAutomatically = true)
+    @Query("update User u set u.imageUri = :imageUri where u.id = :id")
+    void updateUserImage(Long id, String imageUri);
 }
diff --git a/src/main/java/com/gg/server/global/utils/aws/AsyncNewUserImageUploader.java b/src/main/java/com/gg/server/global/utils/aws/AsyncNewUserImageUploader.java
@@ -37,6 +37,7 @@ public AsyncNewUserImageUploader(UserImageHandler userImageHandler, UserReposito
     }
 
     @Async("asyncExecutor")
+    @Transactional
     public void upload(String intraId, String imageUrl) {
         String s3ImageUrl = userImageHandler.uploadAndGetS3ImageUri(intraId, imageUrl);
         if (defaultImageUrl.equals(s3ImageUrl)) {
@@ -46,7 +47,7 @@ public void upload(String intraId, String imageUrl) {
             UserImage userImage = new UserImage(user, (s3ImageUrl != null) ? s3ImageUrl : defaultImageUrl,
                     LocalDateTime.now(), null, true);
             userImageRepository.save(userImage);
-            user.updateImageUri(userImage.getImageUri());
+            userRepository.updateUserImage(user.getId(), userImage.getImageUri());
         });
     }