Merge pull request #48 from goormthon-Univ/develop

Develop

src/main/java/com/beotkkot/qtudy/domain/scrap/Scrap.java

@@ -17,4 +17,6 @@ public class Scrap {
 
  @Id
  private Long postId;
+
+ private String scrapAt;
 }

src/main/java/com/beotkkot/qtudy/repository/posts/PostsRepository.java

@@ -22,9 +22,9 @@ public interface PostsRepository extends JpaRepository<Posts, Long> {
 
  Posts findByPostId(Long postId);
 
- @Query("SELECT p FROM Posts p WHERE p.postId IN :postIds")
+ @Query("SELECT p FROM Posts p JOIN Scrap s ON p.postId = s.postId WHERE s.postId IN :postIds ORDER BY s.scrapAt DESC")
  List<Posts> findAllByPostId(List<Long> postIds);
 
- @Query("SELECT p FROM Posts p WHERE p.postId IN :postIds")
+ @Query("SELECT p FROM Posts p JOIN Scrap s ON p.postId = s.postId WHERE s.postId IN :postIds ORDER BY s.scrapAt DESC")
  Page<Posts> findByPostIds(@Param("postIds") List<Long> postIds, PageRequest pageRequest);
 }

src/main/java/com/beotkkot/qtudy/service/posts/PostsService.java

@@ -22,6 +22,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.*;
 
 @Slf4j
@@ -314,9 +316,13 @@ public ResponseEntity<? super PutScrapResponseDto> putScrap(Long postId, Long ka
 
  Scrap scrap = scrapRepo.findByPostIdAndUserId(postId, kakao_uid);
 
+ Date now = Date.from(Instant.now());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String scrapDatetime = simpleDateFormat.format(now);
+
  // 존재하지 않는다면 추가. 존재한다면 삭제
  if (scrap == null) {
- scrap = new Scrap(kakao_uid, postId);
+ scrap = new Scrap(kakao_uid, postId, scrapDatetime);
  scrapRepo.save(scrap);
  post.increaseScrapCount();
  }