Merge pull request #90 from UMC-5th-Notation/feature/38

fix: develop conflict 해결
UMC-5th-Notation · Feb 14, 2024 · 48f6b02 · 48f6b02
2 parents 3043647 + 5ac02e4
commit 48f6b02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/UMC/campusNote/image/converter/ImageConverter.java b/src/main/java/UMC/campusNote/image/converter/ImageConverter.java
@@ -2,7 +2,7 @@
 
 import UMC.campusNote.image.dto.ImageResponseDTO;
 import UMC.campusNote.image.entity.Image;
-import UMC.campusNote.note.Note;
+import UMC.campusNote.note.entity.Note;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 

diff --git a/src/main/java/UMC/campusNote/image/service/ImageService.java b/src/main/java/UMC/campusNote/image/service/ImageService.java
@@ -7,8 +7,8 @@
 import UMC.campusNote.image.dto.ImageResponseDTO;
 import UMC.campusNote.image.entity.Image;
 import UMC.campusNote.image.repository.ImageRepository;
-import UMC.campusNote.note.Note;
-import UMC.campusNote.note.NoteRepository;
+import UMC.campusNote.note.entity.Note;
+import UMC.campusNote.note.repository.NoteRepository;
 import UMC.campusNote.user.entity.User;
 import UMC.campusNote.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
@@ -24,9 +24,9 @@
 @Service
 @RequiredArgsConstructor
 public class ImageService {
-    private final NoteRepository noteRepository;
     private final UserRepository userRepository;
     private final S3Provider s3Provider;
+    private final NoteRepository noteRepository;
     private final ImageRepository imageRepository;
 
     public Image createImage(Long noteId, MultipartFile file, Long userId) throws IOException{