Merge pull request #183 from Link-MIND/test

[Merge] 버그 fix
Link-MIND · Jan 18, 2024 · 92f5252 · 92f5252
2 parents ebc0286 + 9278c37
commit 92f5252
Show file tree

Hide file tree

Showing 2 changed files with 192 additions and 163 deletions.
diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/ToastRepository.java b/linkmind/src/main/java/com/app/toaster/infrastructure/ToastRepository.java
@@ -1,14 +1,15 @@
 package com.app.toaster.infrastructure;
 
-
 import com.app.toaster.domain.Category;
 import com.app.toaster.domain.User;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
 import com.app.toaster.domain.Category;
 import com.app.toaster.domain.Toast;
 import com.app.toaster.domain.User;
+
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -18,40 +19,46 @@
 import java.util.List;
 
 public interface ToastRepository extends JpaRepository<Toast, Long> {
-    ArrayList<Toast> getAllByCategory(Category category);
-    ArrayList<Toast> findByIsReadAndCategory(Boolean isRead, Category category);
+	ArrayList<Toast> getAllByCategory(Category category);
+
+	ArrayList<Toast> findByIsReadAndCategory(Boolean isRead, Category category);
+
+	ArrayList<Toast> getAllByUser(User user);
+
+	ArrayList<Toast> getAllByUserAndIsReadIsTrue(User user);
+
+	@Modifying
+	@Query("UPDATE Toast t SET t.category = null WHERE t.category.categoryId IN :categoryIds")
+	void updateCategoryIdsToNull(@Param("categoryIds") List<Long> categoryIds);
 
-    ArrayList<Toast> getAllByUser(User user);
+	@Query("SELECT t FROM Toast t WHERE " +
+		"t.user.userId = :userId and " +
+		"t.title LIKE CONCAT('%',:query, '%')"
+	)
+	List<Toast> searchToastsByQuery(Long userId, String query);
 
-    ArrayList<Toast> getAllByUserAndIsReadIsTrue(User user);
+	Long countAllByUser(User user);
 
-    @Modifying
-    @Query("UPDATE Toast t SET t.category = null WHERE t.category.categoryId IN :categoryIds")
-    void updateCategoryIdsToNull(@Param("categoryIds") List<Long> categoryIds);
+	Long countALLByUserAndIsReadTrue(User user);
 
-    @Query("SELECT t FROM Toast t WHERE " +
-      "t.user.userId = :userId and " +
-      "t.title LIKE CONCAT('%',:query, '%')"
-    )
-    List<Toast> searchToastsByQuery(Long userId, String query);
+	Long countALLByUserAndIsReadFalse(User user);
 
-    Long countAllByUser(User user);
+	Long countAllByCategory(Category category);
 
-    Long countAllByCategory(Category category);
+	Long countAllByCategoryAndIsReadTrue(Category category);
 
-    Long countALLByUserAndIsReadTrue(User user);
+	Long countAllByCategoryAndIsReadFalse(Category category);
 
-    Long countAllByUserAndIsReadFalse(User user);
+	@Query("SELECT COUNT(t) FROM Toast t WHERE t.user.userId = :userId AND t.isRead = false")
+	Integer getUnReadToastNumber(Long userId);
 
-    @Query("SELECT COUNT(t) FROM Toast t WHERE t.user.userId = :userId AND t.isRead = false")
-    Integer getUnReadToastNumber(Long userId);
 
-    @Query("SELECT COUNT(t) FROM Toast t WHERE t.user=:user AND t.createdAt >= :startOfWeek AND t.createdAt <= :endOfWeek")
-    Long countAllByCreatedAtThisWeek(@Param("startOfWeek") LocalDateTime startOfWeek,
+  @Query("SELECT COUNT(t) FROM Toast t WHERE t.user=:user AND t.createdAt >= :startOfWeek AND t.createdAt <= :endOfWeek")
+  Long countAllByCreatedAtThisWeek(@Param("startOfWeek") LocalDateTime startOfWeek,
                             @Param("endOfWeek") LocalDateTime endOfWeek, @Param("user") User user);
 
-    @Query("SELECT COUNT(t) FROM Toast t WHERE t.user=:user AND t.isRead = true AND t.updateAt >= :startOfWeek AND t.updateAt <= :endOfWeek")
-    Long countAllByUpdateAtThisWeek(@Param("startOfWeek") LocalDateTime startOfWeek,
+  @Query("SELECT COUNT(t) FROM Toast t WHERE t.user=:user AND t.isRead = true AND t.updateAt >= :startOfWeek AND t.updateAt <= :endOfWeek")
+  Long countAllByUpdateAtThisWeek(@Param("startOfWeek") LocalDateTime startOfWeek,
                                      @Param("endOfWeek") LocalDateTime endOfWeek,
                                         @Param("user") User user);