Merge pull request #146 from codestates-seb/feat_be_postlikes

fix: post delete 로직 수정 #78
codestates-seb · Jan 30, 2023 · bfcfe04 · bfcfe04
2 parents 607aedb + be9bf41
commit bfcfe04
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/server/src/main/java/com/main36/pikcha/domain/attraction/service/AttractionService.java b/server/src/main/java/com/main36/pikcha/domain/attraction/service/AttractionService.java
@@ -2,7 +2,6 @@
 
 import com.main36.pikcha.domain.attraction.entity.Attraction;
 import com.main36.pikcha.domain.attraction.repository.AttractionRepository;
-import com.main36.pikcha.domain.image.service.AttractionImageService;
 import com.main36.pikcha.domain.like.entity.AttractionLikes;
 import com.main36.pikcha.domain.like.repository.AttractionLikesRepository;
 import com.main36.pikcha.domain.member.entity.Member;
@@ -26,7 +25,6 @@
 @RequiredArgsConstructor
 public class AttractionService {
     private final AttractionRepository attractionRepository;
-    private final AttractionImageService attractionImageService;
     private final AttractionLikesRepository attractionLikesRepository;
     private final SaveRepository saveRepository;
 

diff --git a/server/src/main/java/com/main36/pikcha/domain/post/controller/PostController.java b/server/src/main/java/com/main36/pikcha/domain/post/controller/PostController.java
@@ -33,7 +33,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.Positive;
 
 import java.io.IOException;
@@ -267,7 +266,9 @@ public ResponseEntity<HttpStatus> deletePost(Member loginUser,
         String dirName = "images";
         Post post = verifiedById(loginUser.getMemberId(), postId);
         // CascadeType.REMOVE 라서 객체는 지울 필요 없고, s3에서 이미지만 지우면 된다
-        postImageService.deleteOnlyS3Images(post.getPostImages());
+        if(!post.getPostImages().isEmpty()){
+            postImageService.deleteOnlyS3Images(post.getPostImages());
+        }
 
         postService.erasePost(post);
 

diff --git a/server/src/main/java/com/main36/pikcha/global/batch/RankingCalcConfiguration.java b/server/src/main/java/com/main36/pikcha/global/batch/RankingCalcConfiguration.java
@@ -1,3 +1,4 @@
+/*
 package com.main36.pikcha.global.batch;
 
 import com.main36.pikcha.domain.attraction.entity.Attraction;
@@ -86,11 +87,14 @@ public ItemWriter<Attraction> writer(@Value("#{jobParameters[date]}")  String da
         return new JpaItemWriterBuilder<Attraction>()
                 .entityManagerFactory(entityManagerFactory)
                 .build();
-        /*return new JdbcBatchItemWriterBuilder<Attraction>()
+        */
+/*return new JdbcBatchItemWriterBuilder<Attraction>()
                 .dataSource(dataSource)
-                .sql("insert into attraction(rank, rankChange")*/
+                .sql("insert into attraction(rank, rankChange")*//*
+
     }
-    /*@Bean
+    */
+/*@Bean
     @StepScope
     public Step simpleStep2(@Value("#{jobParameters[requestDate]}")String requestDate){
         return stepBuilderFactory.get("simpleJob")
@@ -100,5 +104,7 @@ public Step simpleStep2(@Value("#{jobParameters[requestDate]}")String requestDat
                     return RepeatStatus.FINISHED;
                 }))
                 .build();
-    }*/
+    }*//*
+
 }
+*/