add template isi

src/main/java/com/iconplus/smartproc/controller/RksDaftarIsiController.java

@@ -45,8 +45,8 @@ public class RksDaftarIsiController {
 
 
     @GetMapping()
-    public ListRksDaftarIsiResponse getAllRksDaftarIsi(@RequestParam(name = "page", defaultValue = "1") Integer page,
+    public ListRksDaftarResponse getAllRksDaftarIsi(@RequestParam(name = "page", defaultValue = "1") Integer page,
-                                                       @RequestParam(name = "size", defaultValue = "5") Integer size){
+                                                    @RequestParam(name = "size", defaultValue = "5") Integer size){
 
         Pageable pageable = PageRequest.of((page - 1), size);
         RksDaftarRequest rksDaftarRequest = RksDaftarRequest.builder()
@@ -77,11 +77,10 @@ public class RksDaftarIsiController {
 
     }
 
-//    perlu enhance
     @GetMapping("/{id}/isi")
-    public ListRksIsiResponse getListRksIsi(@PathVariable(name = "id") Long id,
+    public ListRksDaftarIsiResponse getListRksIsi(@PathVariable(name = "id") Long id,
-                                            @RequestParam(name = "page", defaultValue = "1") Integer page,
+                                                  @RequestParam(name = "page", defaultValue = "1") Integer page,
-                                            @RequestParam(name = "size", defaultValue = "5") Integer size) {
+                                                  @RequestParam(name = "size", defaultValue = "5") Integer size) {
 
         Pageable pageable = PageRequest.of((page - 1), size);
         RksDaftarIsiRequest rksDaftarIsiRequest = RksDaftarIsiRequest.builder()
@@ -92,7 +91,7 @@ public class RksDaftarIsiController {
     }
 
     @GetMapping("/{id}/parent")
-    public ListRksIsiResponse getParentRksIsi(@PathVariable(name = "id") Long id) {
+    public ListRksDaftarIsiResponse getParentRksIsi(@PathVariable(name = "id") Long id) {
         return getListRksParentService.execute(RksDaftarIsiRequest.builder()
                 .rksDaftarId(id)
                 .build());

src/main/java/com/iconplus/smartproc/controller/RksTemplateController.java

@@ -1,13 +1,10 @@
 package com.iconplus.smartproc.controller;
 
 import com.iconplus.smartproc.helper.model.EmptyResponse;
+import com.iconplus.smartproc.model.request.RksDaftarIsiRequest;
 import com.iconplus.smartproc.model.request.RksTemplateRequest;
-import com.iconplus.smartproc.model.response.ListRksTemplateResponse;
+import com.iconplus.smartproc.model.response.*;
-import com.iconplus.smartproc.model.response.RksTemplateResponse;
+import com.iconplus.smartproc.service.rkstemplate.*;
-import com.iconplus.smartproc.service.rkstemplate.DeleteRksTemplateService;
-import com.iconplus.smartproc.service.rkstemplate.GetListRksTemplateService;
-import com.iconplus.smartproc.service.rkstemplate.PostCreateRksTemplateService;
-import com.iconplus.smartproc.service.rkstemplate.PutUpdateRksTemplateService;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
@@ -21,14 +18,17 @@ public class RksTemplateController {
     private final GetListRksTemplateService getListRksTemplateService;
     private final PutUpdateRksTemplateService putUpdateRksTemplateService;
     private final DeleteRksTemplateService deleteRksTemplateService;
+    private GetTemplateListRksDaftarIsiService getTemplateListRksDaftarIsiService;
     public RksTemplateController(PostCreateRksTemplateService postCreateRksTemplateService,
                                  GetListRksTemplateService getListRksTemplateService,
                                  PutUpdateRksTemplateService putUpdateRksTemplateService,
-                                 DeleteRksTemplateService deleteRksTemplateService) {
+                                 DeleteRksTemplateService deleteRksTemplateService,
+                                 GetTemplateListRksDaftarIsiService getTemplateListRksDaftarIsiService) {
         this.postCreateRksTemplateService = postCreateRksTemplateService;
         this.getListRksTemplateService = getListRksTemplateService;
         this.putUpdateRksTemplateService = putUpdateRksTemplateService;
         this.deleteRksTemplateService = deleteRksTemplateService;
+        this.getTemplateListRksDaftarIsiService = getTemplateListRksDaftarIsiService;
     }
 
     @PostMapping()
@@ -63,4 +63,19 @@ public class RksTemplateController {
                 .build());
 
     }
+
+
+    @GetMapping("/{id}")
+    public ListRksDaftarIsiResponse getRksDaftarIsiResponse(@PathVariable(name = "id") Long id,
+                                                            @RequestParam(name = "page", defaultValue = "1") Integer page,
+                                                            @RequestParam(name = "size", defaultValue = "5") Integer size) {
+
+        Pageable pageable = PageRequest.of((page - 1), size);
+        RksTemplateRequest rksTemplateRequest = RksTemplateRequest.builder()
+                .id(id)
+                .pageable(pageable)
+                .build();
+
+        return getTemplateListRksDaftarIsiService.execute(rksTemplateRequest);
+    }
 }

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

@@ -15,6 +15,6 @@ import java.util.List;
 @NoArgsConstructor
 public class ListRksDaftarIsiResponse extends BaseResponse {
 
-    private List<RksDaftarResponse> data;
+    private List<RksDaftarIsiResponse> data;
     private Pagination pagination;
 }

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

@@ -13,8 +13,8 @@ import java.util.List;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class ListRksIsiResponse extends BaseResponse {
+public class ListRksDaftarResponse extends BaseResponse {
 
-    private List<RksDaftarIsiResponse> data;
+    private List<RksDaftarResponse> data;
     private Pagination pagination;
 }

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

@@ -17,6 +17,7 @@ public class RksDaftarIsiResponse extends BaseResponse {
     private Integer parentId;
     private String title;
     private String urutan;
+    private Integer level;
     private Boolean isKontrak;
     private Boolean isActive;
     private Boolean isDelete;

src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksDaftarIsiService.java

@@ -4,7 +4,7 @@ import com.iconplus.smartproc.helper.model.Pagination;
 import com.iconplus.smartproc.helper.service.BaseService;
 import com.iconplus.smartproc.model.projection.RksDaftarIsiView;
 import com.iconplus.smartproc.model.request.RksDaftarRequest;
-import com.iconplus.smartproc.model.response.ListRksDaftarIsiResponse;
+import com.iconplus.smartproc.model.response.ListRksDaftarResponse;
 import com.iconplus.smartproc.model.response.RksDaftarResponse;
 import com.iconplus.smartproc.repository.RksDaftarRepository;
 import org.springframework.stereotype.Service;
@@ -13,7 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class GetListRksDaftarIsiService implements BaseService<RksDaftarRequest, ListRksDaftarIsiResponse> {
+public class GetListRksDaftarIsiService implements BaseService<RksDaftarRequest, ListRksDaftarResponse> {
 
     private final RksDaftarRepository rksDaftarRepository;
     public GetListRksDaftarIsiService(RksDaftarRepository rksDaftarRepository) {
@@ -21,7 +21,7 @@ public class GetListRksDaftarIsiService implements BaseService<RksDaftarRequest,
     }
 
     @Override
-    public ListRksDaftarIsiResponse execute(RksDaftarRequest input) {
+    public ListRksDaftarResponse execute(RksDaftarRequest input) {
 
         List<RksDaftarResponse> rksDaftarResponseList = new ArrayList<>();
         var rksDaftarIsiViews= rksDaftarRepository.getListRksDaftarIsi(input.getPageable());
@@ -37,7 +37,7 @@ public class GetListRksDaftarIsiService implements BaseService<RksDaftarRequest,
             rksDaftarResponseList.add(rksDaftarResponse);
         }
 
-        return ListRksDaftarIsiResponse.builder()
+        return ListRksDaftarResponse.builder()
                 .data(rksDaftarResponseList)
                 .pagination(Pagination.builder()
                         .pageSize(input.getPageable().getPageSize())

src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksIsiService.java

@@ -4,7 +4,7 @@ import com.iconplus.smartproc.helper.model.Pagination;
 import com.iconplus.smartproc.helper.service.BaseService;
 import com.iconplus.smartproc.model.entity.RksDaftarIsi;
 import com.iconplus.smartproc.model.request.RksDaftarIsiRequest;
-import com.iconplus.smartproc.model.response.ListRksIsiResponse;
+import com.iconplus.smartproc.model.response.ListRksDaftarIsiResponse;
 import com.iconplus.smartproc.model.response.RksDaftarIsiResponse;
 import com.iconplus.smartproc.repository.RksDaftarIsiRepository;
 import org.springframework.stereotype.Service;
@@ -13,7 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class GetListRksIsiService implements BaseService<RksDaftarIsiRequest, ListRksIsiResponse> {
+public class GetListRksIsiService implements BaseService<RksDaftarIsiRequest, ListRksDaftarIsiResponse> {
 
     private final RksDaftarIsiRepository rksDaftarIsiRepository;
 
@@ -22,7 +22,7 @@ public class GetListRksIsiService implements BaseService<RksDaftarIsiRequest, Li
     }
 
     @Override
-    public ListRksIsiResponse execute(RksDaftarIsiRequest input) {
+    public ListRksDaftarIsiResponse execute(RksDaftarIsiRequest input) {
 
         List<RksDaftarIsiResponse> rksDaftarIsiResponseList = new ArrayList<>();
         var rksIsis = rksDaftarIsiRepository.findByRksDaftarIdAndIsDeleteFalse(input.getRksDaftarId(), input.getPageable());
@@ -33,13 +33,15 @@ public class GetListRksIsiService implements BaseService<RksDaftarIsiRequest, Li
                     .nomor(rksDaftarIsi.getNomor())
                     .parentId(rksDaftarIsi.getParentId())
                     .title(rksDaftarIsi.getTitle())
+                    .level(rksDaftarIsi.getLevel())
                     .urutan(rksDaftarIsi.getUrutan())
                     .isKontrak(rksDaftarIsi.getIsKontrak())
+                    .isActive(rksDaftarIsi.getIsActive())
                     .build();
             rksDaftarIsiResponseList.add(rksDaftarIsiResponse);
         }
 
-        return ListRksIsiResponse.builder()
+        return ListRksDaftarIsiResponse.builder()
                 .data(rksDaftarIsiResponseList)
                 .pagination(Pagination.builder()
                         .pageSize(input.getPageable().getPageSize())

src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java

@@ -3,7 +3,7 @@ package com.iconplus.smartproc.service.rksdaftarisi;
 import com.iconplus.smartproc.helper.service.BaseService;
 import com.iconplus.smartproc.model.entity.RksDaftarIsi;
 import com.iconplus.smartproc.model.request.RksDaftarIsiRequest;
-import com.iconplus.smartproc.model.response.ListRksIsiResponse;
+import com.iconplus.smartproc.model.response.ListRksDaftarIsiResponse;
 import com.iconplus.smartproc.model.response.RksDaftarIsiResponse;
 import com.iconplus.smartproc.repository.RksDaftarIsiRepository;
 import org.springframework.stereotype.Service;
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class GetListRksParentService implements BaseService<RksDaftarIsiRequest, ListRksIsiResponse> {
+public class GetListRksParentService implements BaseService<RksDaftarIsiRequest, ListRksDaftarIsiResponse> {
 
     private final RksDaftarIsiRepository rksDaftarIsiRepository;
     public GetListRksParentService(RksDaftarIsiRepository rksDaftarIsiRepository) {
@@ -20,7 +20,7 @@ public class GetListRksParentService implements BaseService<RksDaftarIsiRequest,
     }
 
     @Override
-    public ListRksIsiResponse execute(RksDaftarIsiRequest input) {
+    public ListRksDaftarIsiResponse execute(RksDaftarIsiRequest input) {
 
         List<RksDaftarIsiResponse> rksDaftarIsiResponseList = new ArrayList<>();
         var rksIsiList = rksDaftarIsiRepository.findByParentRksDaftarIsi(input.getRksDaftarId());
@@ -33,7 +33,7 @@ public class GetListRksParentService implements BaseService<RksDaftarIsiRequest,
             rksDaftarIsiResponseList.add(rksDaftarIsiResponse);
         }
 
-        return ListRksIsiResponse.builder()
+        return ListRksDaftarIsiResponse.builder()
                 .data(rksDaftarIsiResponseList)
                 .build();
     }

src/main/java/com/iconplus/smartproc/service/rkstemplate/GetTemplateListRksDaftarIsiService.java

@@ -0,0 +1,42 @@
+package com.iconplus.smartproc.service.rkstemplate;
+
+import com.iconplus.smartproc.exception.BusinessException;
+import com.iconplus.smartproc.helper.service.BaseService;
+import com.iconplus.smartproc.model.request.RksDaftarIsiRequest;
+import com.iconplus.smartproc.model.request.RksTemplateRequest;
+import com.iconplus.smartproc.model.response.ListRksDaftarIsiResponse;
+import com.iconplus.smartproc.repository.RksDaftarIsiRepository;
+import com.iconplus.smartproc.repository.RksTemplateRepository;
+import com.iconplus.smartproc.service.rksdaftarisi.GetListRksIsiService;
+import com.iconplus.smartproc.util.Constants;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GetTemplateListRksDaftarIsiService implements BaseService<RksTemplateRequest, ListRksDaftarIsiResponse> {
+
+    private final GetListRksIsiService getListRksIsiService;
+    private final RksTemplateRepository rksTemplateRepository;
+    public GetTemplateListRksDaftarIsiService(GetListRksIsiService getListRksIsiService,
+                                              RksTemplateRepository rksTemplateRepository) {
+        this.getListRksIsiService = getListRksIsiService;
+        this.rksTemplateRepository = rksTemplateRepository;
+    }
+
+    @Override
+    public ListRksDaftarIsiResponse execute(RksTemplateRequest input) {
+
+        var rksTemplate = rksTemplateRepository.findByIdAndIsDeleteFalse(input.getId())
+                .orElseThrow(() -> new BusinessException(
+                        Constants.ERR_CODE_10001,
+                        Constants.ERR_TTL_10001,
+                        String.format(Constants.ERR_MSG_10001, "RKS Template", input.getId())
+                ));
+
+        return getListRksIsiService.execute(RksDaftarIsiRequest.builder()
+                .rksDaftarId(rksTemplate.getRksDaftarId())
+                .pageable(input.getPageable())
+                .build());
+    }
+}