From 861b838102863ecd0e96d2086501ece8405832a7 Mon Sep 17 00:00:00 2001
From: dirgantarasiahaan <siahaandirgantara@gmail.com>
Date: Tue, 6 Jun 2023 11:44:07 +0700
Subject: [PATCH] fix parent menu

---
 .../com/iconplus/smartproc/repository/RksIsiRepository.java | 6 +++---
 .../smartproc/service/authentication/LoginService.java      | 2 ++
 .../service/rksdaftarisi/DeleteRksDaftarIsiService.java     | 3 +++
 .../service/rksdaftarisi/PostCreateRksIsiService.java       | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java b/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java
index 21ba256..3372e89 100644
--- a/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java
+++ b/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java
@@ -30,8 +30,8 @@ public interface RksIsiRepository extends JpaRepository<RksIsi, Long> {
     List<RksIsi> findByRksDaftarIsiIdAndIsDeleteFalse(Long rksDaftarIsiId);
 
     @Modifying
-    @Query(value = "update RksIsi ri " +
-            "set ri.isDelete = true " +
-            "where ri.rksDaftarIsiId = :rksDaftarIsiId")
+    @Query(value = "UPDATE rks_isi " +
+            "SET is_delete = 1 " +
+            "WHERE rks_daftar_isi_id = :rksDaftarIsiId", nativeQuery = true)
     void deleteRksIsi(@Param("rksDaftarIsiId") Long rksDaftarIsiId);
 }
diff --git a/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java b/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java
index 761cac5..08feb88 100644
--- a/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java
+++ b/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java
@@ -118,6 +118,8 @@ public class LoginService implements BaseService<LoginRequest, LoginResponse> {
 
                 menusPermissionResponseList.add(menusPermissionResponse);
             }
+            parentMenusResponseList.removeIf(parentMenusResponse -> parentMenusResponse.getId().equals(menusPermissionView.getId()) &&
+                    BooleanUtils.isFalse(menusPermissionView.getCanView()));
         }
 
         for (ParentMenusResponse parentMenusResponse : parentMenusResponseList) {
diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java
index 73df695..8e03d98 100644
--- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java
+++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java
@@ -9,6 +9,8 @@ import com.iconplus.smartproc.repository.RksIsiRepository;
 import com.iconplus.smartproc.util.Constants;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
+
 @Service
 public class DeleteRksDaftarIsiService implements BaseService<RksDaftarIsiRequest, EmptyResponse> {
 
@@ -20,6 +22,7 @@ public class DeleteRksDaftarIsiService implements BaseService<RksDaftarIsiReques
         this.rksIsiRepository = rksIsiRepository;
     }
 
+    @Transactional
     @Override
     public EmptyResponse execute(RksDaftarIsiRequest input) {
 
diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java
index 567e6fb..9185c53 100644
--- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java
+++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java
@@ -83,10 +83,10 @@ public class PostCreateRksIsiService implements BaseService<RksIsiRequest, RksIs
                 throw new BusinessException(
                         Constants.ERR_CODE_10002,
                         Constants.ERR_TTL_10002,
-                        String.format(Constants.ERR_MSG_10002, "Sub Bab", input.getSubBab()));
+                        String.format(Constants.ERR_MSG_10002, "Sub Bab", input.getKelompok()));
             }
             rksIsi.setParent(input.getParent());
-            rksIsi.setKelompok(input.getSubBab());
+            rksIsi.setKelompok(input.getKelompok());
         }
     }
 }