refactor v2

src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java

@@ -16,16 +16,16 @@ public interface JenisAnggaranRepository extends JpaRepository<JenisAnggaran, Lo
     @Query(value = "SELECT ja.id as id, " +
             "ja.jenisAnggaran as jenisAnggaran, " +
             "ja.keterangan as keterangan, " +
-            "ja.deleted as deleted " +
+            "ja.isDelete as isDelete " +
             "FROM JenisAnggaran ja " +
-            "WHERE ja.deleted = false " +
+            "WHERE ja.isDelete = false " +
             "AND (:search = '' " +
             "or (UPPER(ja.jenisAnggaran) like :search OR UPPER(ja.keterangan) like :search)) " +
             "ORDER BY ja.id")
     Page<JenisAnggaranView> getAllJenisAnggaran(String search, Pageable pageable);
 
-    Optional<JenisAnggaran> findByIdAndDeletedFalse(Long id);
+    Optional<JenisAnggaran> findByIdAndIsDeleteFalse(Long id);
 
-    Optional<JenisAnggaran> findByJenisAnggaranAndDeletedFalse(String jenisAnggaran);
+    Optional<JenisAnggaran> findByJenisAnggaranAndIsDeleteFalse(String jenisAnggaran);
     
 }

src/main/java/com/iconplus/smartproc/repository/RolesRepository.java

@@ -1,11 +1,15 @@
 package com.iconplus.smartproc.repository;
 
 import com.iconplus.smartproc.model.entity.Roles;
+import com.iconplus.smartproc.model.projection.RolesView;
 import com.iconplus.smartproc.model.projection.UserRoleView;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
@@ -18,13 +22,25 @@ public interface RolesRepository extends JpaRepository<Roles, Long> {
             "r.role as role " +
             "FROM Users u " +
             "join Roles r on r.id=u.roleId " +
-            "WHERE u.deleted = false " +
-            "AND r.deleted = false " +
+            "WHERE u.isDelete = false " +
+            "AND r.isDelete = false " +
             "AND u.username = :userName ")
     Optional<UserRoleView> getUserRoleByUserId(String userName);
 
-    Optional<Roles> findByIdAndDeletedFalse(Long id);
+    @Query(value = "SELECT r.id as id, " +
+            "r.role as role, " +
+            "r.keterangan as keterangan, " +
+            "r.isActive as isActive, " +
+            "r.isDelete as isDelete " +
+            "FROM Roles r " +
+            "WHERE r.isDelete = false " +
+            "AND (:search = '' " +
+            "or (UPPER(r.role) like :search OR UPPER(r.keterangan) like :search)) " +
+            "ORDER BY r.id")
+    Page<RolesView> findAllRolesANdDeletedFalse(String search, Pageable pageable);
 
-    Optional<Roles> findByRoleAndDeletedFalse(Long id);
+    Optional<Roles> findByIdAndIsDeleteFalse(Long id);
+
+    Optional<Roles> findByRoleAndIsDeleteFalse(String role);
     
 }

src/main/java/com/iconplus/smartproc/repository/TokenManagementRepository.java

@@ -13,7 +13,7 @@ public interface TokenManagementRepository extends JpaRepository<TokenManagement
 
     @Query(value = "SELECT access_token as accessToken FROM token_management " +
             "WHERE user_id = :userId " +
-            "AND deleted = false " +
+            "AND isDelete = false " +
             "AND expired_time >= SYSDATE", nativeQuery = true)
     List<TokenManagementView> findAccessTokenByUserIdAndDeletedFalse(String userId);
 }

src/main/java/com/iconplus/smartproc/repository/UsersRepository.java

@@ -1,7 +1,11 @@
 package com.iconplus.smartproc.repository;
 
 import com.iconplus.smartproc.model.entity.Users;
+import com.iconplus.smartproc.model.projection.UserRoleView;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
@@ -9,6 +13,25 @@ import java.util.Optional;
 @Repository
 public interface UsersRepository extends JpaRepository<Users, Long> {
 
-    Optional<Users> findByEmailAndDeletedFalse(String email);
+    @Query("SELECT u.id as id, " +
+            "u.nama as nama, " +
+            "u.jabatan as jabatan, " +
+            "r.role as role, " +
+            "u.email as email, " +
+            "u.isActive as isActive, " +
+            "u.isDelete as isDelete " +
+            "FROM Users u " +
+            "JOIN Roles r ON r.id = u.roleId " +
+            "Where u.isDelete = false " +
+            "AND (:search='' " +
+            "or (UPPER(u.nama) like :search " +
+            "   OR UPPER(u.jabatan) like :search " +
+            "   OR UPPER(r.role) like :search " +
+            "   OR UPPER(u.email) like :search) " +
+            ") " +
+            "ORDER by u.id")
+    Page<UserRoleView> getAllUsersAndDeletedFase(String search, Pageable pageable);
+
+    Optional<Users> findByEmailAndIsDeleteFalse(String email);
     
 }