Merge pull request #119 from kkn1125/kkn1125/be/diary

Kkn1125/be/diary
kkn1125 · Aug 8, 2022 · 1f6ea71 · 1f6ea71
2 parents c39402b + cf0a0b1
commit 1f6ea71
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 16 deletions.
diff --git a/...73285f3a47/6199fa6416a5f317d16331dafbf3f55b14fbe9e578e9989c94d816c3f1c5cc81.jpg b/...73285f3a47/6199fa6416a5f317d16331dafbf3f55b14fbe9e578e9989c94d816c3f1c5cc81.jpg
diff --git a/src/main/java/com/narang/web/repository/DiaryRepositoryCustom.java b/src/main/java/com/narang/web/repository/DiaryRepositoryCustom.java
@@ -3,5 +3,5 @@
 import com.narang.web.entity.Diary;
 
 public interface DiaryRepositoryCustom {
-    public Boolean update(Diary diary);
+    public Diary update(Diary diary);
 }
diff --git a/src/main/java/com/narang/web/repository/DiaryRepositoryCustomImpl.java b/src/main/java/com/narang/web/repository/DiaryRepositoryCustomImpl.java
@@ -15,10 +15,9 @@ public class DiaryRepositoryCustomImpl implements DiaryRepositoryCustom {
     }
 
     @Override
-    public Boolean update(Diary diary) {
+    public Diary update(Diary diary) {
         Diary foundDiary = diaryTemplate.findById(diary.getId(), Diary.class);
         foundDiary.replaceIfNotNull(diary);
-        diaryTemplate.save(foundDiary, "diary");
-        return true;
+        return diaryTemplate.save(foundDiary, "diary");
     }
 }
diff --git a/src/main/java/com/narang/web/repository/LikeRepositoryCustom.java b/src/main/java/com/narang/web/repository/LikeRepositoryCustom.java
@@ -2,12 +2,13 @@
 
 import com.narang.web.entity.Like;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface LikeRepositoryCustom {
     public Optional<Like> findByUid(String uid);
 
-    public Optional<Like> findByDid(String did);
+    public List<Like> findByDid(String did);
 
     public Boolean deleteByUid(String uid);
 

diff --git a/src/main/java/com/narang/web/repository/LikeRepositoryCustomImpl.java b/src/main/java/com/narang/web/repository/LikeRepositoryCustomImpl.java
@@ -6,6 +6,7 @@
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 
+import java.util.List;
 import java.util.Optional;
 
 public class LikeRepositoryCustomImpl implements LikeRepositoryCustom {
@@ -25,11 +26,11 @@ public Optional<Like> findByUid(String uid) {
     }
 
     @Override
-    public Optional<Like> findByDid(String did) {
+    public List<Like> findByDid(String did) {
         Criteria cr = new Criteria("did").is(did);
         Query q = new Query(cr);
-        Like foundLike = likeTemplate.findOne(q, Like.class);
-        return Optional.of(foundLike);
+        List<Like> foundLike = likeTemplate.find(q, Like.class);
+        return foundLike;
     }
 
     @Override

diff --git a/src/main/java/com/narang/web/repository/UserRepositoryCustom.java b/src/main/java/com/narang/web/repository/UserRepositoryCustom.java
@@ -13,4 +13,6 @@ public interface UserRepositoryCustom {
     public Optional<User> findByEmail(String email);
 
     public Boolean update(User user);
+
+    public User removeProfileImageById(String id);
 }
diff --git a/src/main/java/com/narang/web/repository/UserRepositoryCustomImpl.java b/src/main/java/com/narang/web/repository/UserRepositoryCustomImpl.java
@@ -37,4 +37,11 @@ public Boolean update(User user) {
         userTemplate.save(foundUser, "user");
         return true;
     }
+
+    @Override
+    public User removeProfileImageById(String id) {
+        User foundedUser = userTemplate.findById(id, User.class);
+        foundedUser.setProfileImg("");
+        return userTemplate.save(foundedUser, "user");
+    }
 }
diff --git a/src/main/java/com/narang/web/restController/DiaryRestController.java b/src/main/java/com/narang/web/restController/DiaryRestController.java
@@ -33,7 +33,7 @@ public String insert(Diary diary) {
     }
 
     @PutMapping("/diary")
-    public Boolean update(Diary diary) {
+    public String update(Diary diary) {
         return diaryService.update(diary);
     }
 

diff --git a/src/main/java/com/narang/web/restController/LikeRestController.java b/src/main/java/com/narang/web/restController/LikeRestController.java
@@ -34,7 +34,6 @@ public String findById(@PathVariable("id") String id) throws JsonProcessingExcep
     @GetMapping("/like/did/{did}")
     public String findByDid(@PathVariable("did") String did) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
-
         return mapper.writeValueAsString(likeService.findByDid(did));
     }
 

diff --git a/src/main/java/com/narang/web/restController/UserRestController.java b/src/main/java/com/narang/web/restController/UserRestController.java
@@ -96,15 +96,38 @@ public Map<String, Object> fileupload(MultipartFile multipartFile, String id, St
         return m;
     }
 
+    @PostMapping("/profile/fileupload")
+    public Map<String, Object> profileFileupload(MultipartFile multipartFile, String id, String hashName) {
+        File targetFile = new File("src/main/frontend/src/profiles/"
+                + id
+                + "/" + hashName);
+        try {
+            InputStream fileStream = multipartFile.getInputStream();
+            FileUtils.copyInputStreamToFile(fileStream, targetFile);
+        } catch (IOException e) {
+            FileUtils.deleteQuietly(targetFile);
+            e.printStackTrace();
+        }
+        Map<String, Object> m = new HashMap<>();
+        return m;
+    }
+
     @PutMapping("/user")
-    public Boolean update(User user) {
-        return userService.update(user);
+    public String update(User user) throws JsonProcessingException {
+        userService.update(user);
+        return mapper(userService.findById(user.getId()));
     }
 
     @DeleteMapping("/user/{id}")
     public Boolean delete(@PathVariable("id") String id) {
         return userService.deleteById(id);
     }
+
+    @DeleteMapping("/user/profile/{id}")
+    public Boolean removeUserProfile(@PathVariable("id") String id) {
+        return userService.removeProfileImageById(id);
+    }
+
 }
 
 // [UnAuthorized error 날 때] https://subbak2.com/11

diff --git a/src/main/java/com/narang/web/service/DiaryService.java b/src/main/java/com/narang/web/service/DiaryService.java
@@ -29,8 +29,9 @@ public String insert(Diary diary) {
         return newDiary.getId();
     }
 
-    public Boolean update(Diary diary){
-        return diaryRepository.update(diary);
+    public String update(Diary diary){
+        Diary updatedDiary = diaryRepository.update(diary);
+        return updatedDiary.getId();
     }
 
     public Boolean deleteById(String id) {

diff --git a/src/main/java/com/narang/web/service/LikeService.java b/src/main/java/com/narang/web/service/LikeService.java
@@ -28,8 +28,8 @@ public Like findByUid(String uid) {
         return likeRepository.findByUid(uid).orElseThrow();
     }
 
-    public Like findByDid(String did) {
-        return likeRepository.findByDid(did).orElseThrow();
+    public List<Like> findByDid(String did) {
+        return likeRepository.findByDid(did);
     }
 
     public String insert(Like like){

diff --git a/src/main/java/com/narang/web/service/UserService.java b/src/main/java/com/narang/web/service/UserService.java
@@ -6,7 +6,10 @@
 import com.narang.web.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 
+import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -107,6 +110,22 @@ public Boolean checkPassword(String password, String id) {
         }
     }
 
+    public Boolean removeProfileImageById(String id) {
+        File file = new File("src/main/frontend/src/profiles/"+id);
+        if(file.isDirectory()) {
+            File[] files = file.listFiles();
+            for(File f : files) {
+                if(f.delete()) {
+                    System.out.println("파일을 성공적으로 삭제 했습니다.");
+                } else {
+                    System.out.println("없는 파일 입니다.");
+                }
+            }
+        }
+        userRepository.removeProfileImageById(id);
+        return true;
+    }
+
     public Boolean update(User user) {
         return userRepository.update(user);
     }