From ed88afcdde1b42308eba5a2cebb411f83531aa23 Mon Sep 17 00:00:00 2001
From: dirgantarasiahaan <siahaandirgantara@gmail.com>
Date: Tue, 23 May 2023 23:21:07 +0700
Subject: [PATCH] fix query

---
 .../repository/JenisAnggaranRepository.java         | 13 ++-----------
 .../jenisanggaran/GetListJenisAnggaranService.java  |  9 +--------
 src/main/resources/application-local.yml            |  5 ++---
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java b/src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java
index 78dcd40..d601d1c 100644
--- a/src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java
+++ b/src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java
@@ -19,19 +19,10 @@ public interface JenisAnggaranRepository extends JpaRepository<JenisAnggaran, Lo
             "ja.deleted as deleted " +
             "FROM JenisAnggaran ja " +
             "WHERE ja.deleted = false " +
-            "ORDER BY ja.id")
-    Page<JenisAnggaranView> getAllJenisAnggaran(Pageable pageable);
-
-    @Query(value = "SELECT ja.id as id, " +
-            "ja.jenisAnggaran as jenisAnggaran, " +
-            "ja.keterangan as keterangan, " +
-            "ja.deleted as deleted " +
-            "FROM JenisAnggaran ja " +
-            "WHERE ja.deleted = false " +
-            "AND (:search is null " +
+            "AND (:search = '' " +
             "or (UPPER(ja.jenisAnggaran) like :search OR UPPER(ja.keterangan) like :search)) " +
             "ORDER BY ja.id")
-    Page<JenisAnggaranView> getAllJenisAnggaranBySearch(String search, Pageable pageable);
+    Page<JenisAnggaranView> getAllJenisAnggaran(String search, Pageable pageable);
 
     Optional<JenisAnggaran> findByIdAndDeletedFalse(Long id);
 
diff --git a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetListJenisAnggaranService.java b/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetListJenisAnggaranService.java
index a59ce59..a313097 100644
--- a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetListJenisAnggaranService.java
+++ b/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetListJenisAnggaranService.java
@@ -27,14 +27,7 @@ public class GetListJenisAnggaranService implements BaseService<JenisAnggaranReq
     public GetListJenisAnggaranResponse execute(JenisAnggaranRequest input) {
         validateRequest(input);
         List<JenisAnggaranResponse> jenisAnggaranResponseList = new ArrayList<>();
-        Page<JenisAnggaranView>  jenisAnggaranViews;
-        if (StringUtils.isBlank(input.getSearch())) {
-            jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaran(input.getPageable());
-        } else {
-            jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaranBySearch(input.getSearch(), input.getPageable());
-        }
-
-
+        Page<JenisAnggaranView> jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaran(input.getSearch(), input.getPageable());
 
         for (JenisAnggaranView jenisAnggaranView : jenisAnggaranViews) {
             JenisAnggaranResponse jenisAnggaranResponse = JenisAnggaranResponse.builder()
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index 891eb04..4340c9d 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -3,9 +3,8 @@ jwt:
   public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx3MRA7zxvaWKrtmPl2hRJLFiyryvj0ZUlmWw9OZIgqwJUDBTsg5yFX4hCQrANV1yy5ibTqAn2APdNCdhGgp8R2YLWrUR2vVGbmnKXXzEDsFpT6cgo+/a+lWaUq8aYEhzVg8Xjmy9oG1s521LklEz/jKD2xNE4OgY2Y1SgfUH+bexs84ZEyUhcSpCrcZenjCns7Ubp9zsWPrXa/j6kr7ZuFWH7nXN/i+oYF0HFhc+hDaVr2R9Q7s56wAQNE8XfI2Q+h4iRI1hWa5Vva9ha1DnCN9McJDLBHoGy1coIUEoQKkDhCNQmdHlubIJYDoFIyfDTrSQIXw2gzrrC9sOgYU64wIDAQAB
   private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHcxEDvPG9pYqu2Y+XaFEksWLKvK+PRlSWZbD05kiCrAlQMFOyDnIVfiEJCsA1XXLLmJtOoCfYA900J2EaCnxHZgtatRHa9UZuacpdfMQOwWlPpyCj79r6VZpSrxpgSHNWDxeObL2gbWznbUuSUTP+MoPbE0Tg6BjZjVKB9Qf5t7GzzhkTJSFxKkKtxl6eMKeztRun3OxY+tdr+PqSvtm4VYfudc3+L6hgXQcWFz6ENpWvZH1DuznrABA0Txd8jZD6HiJEjWFZrlW9r2FrUOcI30xwkMsEegbLVyghQShAqQOEI1CZ0eW5sglgOgUjJ8NOtJAhfDaDOusL2w6BhTrjAgMBAAECggEAL8SPPqXx/8m1/Up96XVCeddCIewu39GoUJzqVL0SgLlTQbFRWkO7bwpWPyQkBKPs6nYSPDJ/WG0UfXkw+FuqiC8YaREUxawYwjj0Do/jJOWNo1YTqy+28l2uKD9nwceYV/QlYCcLA3Exs/upLdHk8eyHR+DFjlgIG5KNQDK/Rj8cLdQGJjAZjHUGzaRq/HhDi+0LVkOoUvzbzle8RSiiZnNrxCt0UV1CambQzvyxXzqLgtGe4s+qItwk/zzkvXDRnRju3+/AyaFaToA2Wnp9gdV2rT4cRGHhj0Dqh0vwrBH4RiPtEfLQjIa9DhTPHfpr6ACGe6GF96fJ889WIEl4gQKBgQDrGgYKGwIhY9j2V7tu6eHmLxYFGzxSPOtfBZPzSLUyQXrcd6wFlb+Fsae2bgBFZJzilIv4lG0wNaGSFjAjteyXMoqVCTIUKJCjzWs+g3qjuA5fu9IAeWEEaXuKSVvkV5tJrnwhmqYdH1jQx5xhpO434W2a4wuEgOnU6SzNjvS/TwKBgQDZLb3Q9KRwlMcyt/rgjeTOf2SD1jvlKD2t+YRuaxlzBs7j99hCEP3GLaTz6/rIptfkutwk10FM/piO5PCyoPXNc2A1Z73ukmsirMRy2G06PfqKBQrV/B9vtIqPW1Agz7KUpXARrHL8Bb6T2ljKl2HU+kC4Pgx2GZQgYnbEvNBGLQKBgQCNf3grFN5PYlzuxxbURofjlmtWX3IKvQechSrqvdPwj2B22L/8DIjc2nPqZIJdQZT6+hTUY+DjpyO7XQdUNuZSieTGlmZBo7iKHdRyJ4fkiZ59F/notyUhFqt4K3bXE7MuwYmMYBuiY399COaiDjYiA9eH5SbFdSFHN5/ziBreGQKBgGZHNG2DyS1745PvMScvq+HT/PJZojt5iBK2v7eAmKujOSwDPMVgWyNJu7VkHOcCLAp8NdDjzs0D2bTx/KkjRJ9NBrIf+UKxkeLymlG7uzUCm0sEtOWxptxkmhyJVGMfbWqzvuOT41LtIaNf4REH2fsDIBekoRm9UhUuSeC9SxjBAoGAP6pdT7HlMsr++XJFqs9+dj7tRsX+a6Coi3T8BFaf2Nl9YxMFFaSBbNOO4QfZWyCUcfbkLrcdEka5VTVt/HwckDKzckxWqH3hMn2+kAKJnHhAvB1M38KAyvdpA54vNgVyID+vL5VbqpHk8wsUbVWZc8F/ERELfuHwzcD0rt6Opnc=
   expired-time :
-    service-account:
-      access-token: 480
-      refresh-token: 720
+    access-token: 480
+    refresh-token: 720
 
 spring:
   datasource: