fix null find all

src/main/java/com/iconplus/smartproc/model/request/RolesRequest.java

@@ -0,0 +1,21 @@
+package com.iconplus.smartproc.model.request;
+
+import com.iconplus.smartproc.helper.base.BaseRequest;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RolesRequest extends BaseRequest {
+
+    private Long id;
+    private String role;
+    private String keterangan;
+    private Boolean isActive;
+    private Boolean deleted;
+
+}

src/main/java/com/iconplus/smartproc/model/response/RolesResponse.java

@@ -0,0 +1,21 @@
+package com.iconplus.smartproc.model.response;
+
+import com.iconplus.smartproc.helper.base.BaseResponse;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class RolesResponse extends BaseResponse {
+
+    private Long id;
+    private String role;
+    private String keterangan;
+    private Boolean isActive;
+    private Boolean deleted;
+
+}

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

@@ -13,6 +13,15 @@ import java.util.Optional;
 @Repository
 public interface JenisAnggaranRepository extends JpaRepository<JenisAnggaran, Long> {
 
+    @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 " +
+            "ORDER BY ja.id")
+    Page<JenisAnggaranView> getAllJenisAnggaran(Pageable pageable);
+
     @Query(value = "SELECT ja.id as id, " +
             "ja.jenisAnggaran as jenisAnggaran, " +
             "ja.keterangan as keterangan, " +
@@ -22,7 +31,7 @@ public interface JenisAnggaranRepository extends JpaRepository<JenisAnggaran, Lo
             "AND (:search is null " +
             "or (UPPER(ja.jenisAnggaran) like :search OR UPPER(ja.keterangan) like :search)) " +
             "ORDER BY ja.id")
-    Page<JenisAnggaranView> getAllJenisAnggaran(String search, Pageable pageable);
+    Page<JenisAnggaranView> getAllJenisAnggaranBySearch(String search, Pageable pageable);
 
     Optional<JenisAnggaran> findByIdAndDeletedFalse(Long id);
 

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

@@ -22,5 +22,9 @@ public interface RolesRepository extends JpaRepository<Roles, Long> {
             "AND r.deleted = false " +
             "AND u.username = :userName ")
     Optional<UserRoleView> getUserRoleByUserId(String userName);
+
+    Optional<Roles> findByIdAndDeletedFalse(Long id);
+
+    Optional<Roles> findByRoleAndDeletedFalse(Long id);
     
 }

src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetListJenisAnggaranService.java

@@ -8,6 +8,7 @@ import com.iconplus.smartproc.model.response.GetListJenisAnggaranResponse;
 import com.iconplus.smartproc.model.response.JenisAnggaranResponse;
 import com.iconplus.smartproc.repository.JenisAnggaranRepository;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -26,7 +27,14 @@ public class GetListJenisAnggaranService implements BaseService<JenisAnggaranReq
     public GetListJenisAnggaranResponse execute(JenisAnggaranRequest input) {
         validateRequest(input);
         List<JenisAnggaranResponse> jenisAnggaranResponseList = new ArrayList<>();
-        var jenisAnggaranViews =  jenisAnggaranRepository.getAllJenisAnggaran(input.getSearch(), input.getPageable());
+        Page<JenisAnggaranView>  jenisAnggaranViews;
+        if (StringUtils.isBlank(input.getSearch())) {
+            jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaran(input.getPageable());
+        } else {
+            jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaranBySearch(input.getSearch(), input.getPageable());
+        }
+
+
 
         for (JenisAnggaranView jenisAnggaranView : jenisAnggaranViews) {
             JenisAnggaranResponse jenisAnggaranResponse = JenisAnggaranResponse.builder()

src/main/java/com/iconplus/smartproc/service/role/DeleteRoleService.java

@@ -0,0 +1,23 @@
+package com.iconplus.smartproc.service.role;
+
+import com.iconplus.smartproc.helper.service.BaseService;
+import com.iconplus.smartproc.model.request.RolesRequest;
+import com.iconplus.smartproc.model.response.RolesResponse;
+import com.iconplus.smartproc.repository.RolesRepository;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DeleteRoleService implements BaseService<RolesRequest, RolesResponse> {
+
+    private RolesRepository rolesRepository;
+
+    public DeleteRoleService(RolesRepository rolesRepository) {
+        this.rolesRepository = rolesRepository;
+    }
+
+    @Override
+    public RolesResponse execute(RolesRequest input) {
+
+     return null;
+    }
+}

src/main/java/com/iconplus/smartproc/service/role/GetRoleByIdService.java

@@ -0,0 +1,7 @@
+package com.iconplus.smartproc.service.role;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class GetRoleByIdService {
+}

src/main/java/com/iconplus/smartproc/service/role/GetRolesService.java

@@ -0,0 +1,7 @@
+package com.iconplus.smartproc.service.role;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class GetRolesService {
+}

src/main/java/com/iconplus/smartproc/service/role/PostCreateRoleService.java

@@ -0,0 +1,7 @@
+package com.iconplus.smartproc.service.role;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class PostCreateRoleService {
+}

src/main/java/com/iconplus/smartproc/service/role/PutUpdateRoleService.java

@@ -0,0 +1,8 @@
+package com.iconplus.smartproc.service.role;
+
+import com.iconplus.smartproc.helper.service.BaseService;
+import org.springframework.stereotype.Service;
+
+//@Service
+//public class PutUpdateRoleService implements BaseService<> {
+//}