From 93353f135244222878a4737e1880b0e00796d592 Mon Sep 17 00:00:00 2001 From: dirgantarasiahaan Date: Tue, 23 May 2023 22:31:34 +0700 Subject: [PATCH] fix null find all --- .../smartproc/model/request/RolesRequest.java | 21 +++++++++++++++++ .../model/response/RolesResponse.java | 21 +++++++++++++++++ .../repository/JenisAnggaranRepository.java | 11 ++++++++- .../smartproc/repository/RolesRepository.java | 4 ++++ .../GetListJenisAnggaranService.java | 10 +++++++- .../service/role/DeleteRoleService.java | 23 +++++++++++++++++++ .../service/role/GetRoleByIdService.java | 7 ++++++ .../service/role/GetRolesService.java | 7 ++++++ .../service/role/PostCreateRoleService.java | 7 ++++++ .../service/role/PutUpdateRoleService.java | 8 +++++++ 10 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/iconplus/smartproc/model/request/RolesRequest.java create mode 100644 src/main/java/com/iconplus/smartproc/model/response/RolesResponse.java create mode 100644 src/main/java/com/iconplus/smartproc/service/role/DeleteRoleService.java create mode 100644 src/main/java/com/iconplus/smartproc/service/role/GetRoleByIdService.java create mode 100644 src/main/java/com/iconplus/smartproc/service/role/GetRolesService.java create mode 100644 src/main/java/com/iconplus/smartproc/service/role/PostCreateRoleService.java create mode 100644 src/main/java/com/iconplus/smartproc/service/role/PutUpdateRoleService.java diff --git a/src/main/java/com/iconplus/smartproc/model/request/RolesRequest.java b/src/main/java/com/iconplus/smartproc/model/request/RolesRequest.java new file mode 100644 index 0000000..c03828c --- /dev/null +++ b/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; + +} diff --git a/src/main/java/com/iconplus/smartproc/model/response/RolesResponse.java b/src/main/java/com/iconplus/smartproc/model/response/RolesResponse.java new file mode 100644 index 0000000..012c815 --- /dev/null +++ b/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; + +} diff --git a/src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java b/src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java index 8f7d4e1..78dcd40 100644 --- a/src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java @@ -13,6 +13,15 @@ import java.util.Optional; @Repository public interface JenisAnggaranRepository extends JpaRepository { + @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 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 getAllJenisAnggaran(String search, Pageable pageable); + Page getAllJenisAnggaranBySearch(String search, Pageable pageable); Optional findByIdAndDeletedFalse(Long id); diff --git a/src/main/java/com/iconplus/smartproc/repository/RolesRepository.java b/src/main/java/com/iconplus/smartproc/repository/RolesRepository.java index 9b55ea3..470cc0e 100644 --- a/src/main/java/com/iconplus/smartproc/repository/RolesRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/RolesRepository.java @@ -22,5 +22,9 @@ public interface RolesRepository extends JpaRepository { "AND r.deleted = false " + "AND u.username = :userName ") Optional getUserRoleByUserId(String userName); + + Optional findByIdAndDeletedFalse(Long id); + + Optional findByRoleAndDeletedFalse(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 e20f1d7..a59ce59 100644 --- a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetListJenisAnggaranService.java +++ b/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 jenisAnggaranResponseList = new ArrayList<>(); - var jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaran(input.getSearch(), input.getPageable()); + Page 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() diff --git a/src/main/java/com/iconplus/smartproc/service/role/DeleteRoleService.java b/src/main/java/com/iconplus/smartproc/service/role/DeleteRoleService.java new file mode 100644 index 0000000..92cc5a0 --- /dev/null +++ b/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 { + + private RolesRepository rolesRepository; + + public DeleteRoleService(RolesRepository rolesRepository) { + this.rolesRepository = rolesRepository; + } + + @Override + public RolesResponse execute(RolesRequest input) { + + return null; + } +} diff --git a/src/main/java/com/iconplus/smartproc/service/role/GetRoleByIdService.java b/src/main/java/com/iconplus/smartproc/service/role/GetRoleByIdService.java new file mode 100644 index 0000000..c23af74 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/iconplus/smartproc/service/role/GetRolesService.java b/src/main/java/com/iconplus/smartproc/service/role/GetRolesService.java new file mode 100644 index 0000000..86f1589 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/iconplus/smartproc/service/role/PostCreateRoleService.java b/src/main/java/com/iconplus/smartproc/service/role/PostCreateRoleService.java new file mode 100644 index 0000000..0c4c47e --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/iconplus/smartproc/service/role/PutUpdateRoleService.java b/src/main/java/com/iconplus/smartproc/service/role/PutUpdateRoleService.java new file mode 100644 index 0000000..9e57ba2 --- /dev/null +++ b/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<> { +//}