Merge pull request #163 from survey-mate/develop

오류 수정 배포
survey-mate · Feb 18, 2024 · d60e422 · d60e422
2 parents d3f0d8b + 1fe552f
commit d60e422
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/uk/jinhy/survey_mate_api/data/application/service/DataService.java b/src/main/java/uk/jinhy/survey_mate_api/data/application/service/DataService.java
@@ -115,7 +115,7 @@ public Data getData(Long dataId) {
                 .orElseThrow(() -> new GeneralException(Status.DATA_NOT_FOUND));
     }
 
-    public List<Data> getDataList() { return dataRepository.findAll(Sort.by(Sort.Direction.DESC, "createdAt")); }
+    public List<Data> getDataList() { return dataRepository.findAll(); }
 
     public List<Data> getDataListAsBuyer(Member buyer) {
         return dataRepository.findByBuyer(buyer);

diff --git a/src/main/java/uk/jinhy/survey_mate_api/data/domain/repository/DataRepository.java b/src/main/java/uk/jinhy/survey_mate_api/data/domain/repository/DataRepository.java
@@ -13,6 +13,11 @@ public interface DataRepository extends JpaRepository<Data, Long> {
 
     Optional<Data> findByDataId(Long id);
 
+    @Query("select data from Data data "
+            + "where data.isDeleted = false"
+            + " order by data.createdAt desc")
+    List<Data> findAll();
+
     @Query("select data from Data data "
             + "where data.seller = :member and data.isDeleted = false"
             + " order by data.createdAt desc")