check permission fix, remove department code prefix from permissions

Author: marcelomonteironosi

src/main/java/cv/igrp/platform/access_management/authorization/domain/service/PermissionCacheService.java

@@ -51,10 +51,9 @@ public PermissionCacheEntryDTO checkInternal(PermissionCheckRequest request) {
         setFromCacheAsFalse();
 
         String subject = request.getSubject();
-        String resource = request.getResource();
         String action = request.getAction();
 
-        boolean allowed = checkPermission(subject, resource, action);
+        boolean allowed = checkPermission(subject, action);
 
         PermissionCacheEntryDTO response = new PermissionCacheEntryDTO(
                                                 allowed,
@@ -64,7 +63,7 @@ public PermissionCacheEntryDTO checkInternal(PermissionCheckRequest request) {
         return response;
     }
 
-    private Boolean checkPermission(String username, String resourceItem, String permissionName) {
+    private Boolean checkPermission(String username, String permissionName) {
 
         // Verifica se o utilizador existe ou está inativo/deletado
         var userOpt = userRepository.findByUsername(username);
@@ -73,39 +72,17 @@ private Boolean checkPermission(String username, String resourceItem, String per
         }
 
         String sql = """
-                 WITH target_user AS (
-                                     SELECT id
-                                     FROM t_user
-                                     WHERE username = ?
-                                 ),
-                                      user_roles AS (
-                                          SELECT ru.roles_id
-                                          FROM t_role_users ru
-                                                   JOIN target_user tu ON ru.users_id = tu.id
-                                      ),
-                                      role_permissions AS (
-                                          SELECT rp.permission
-                                          FROM t_role_permission rp
-                                                   JOIN user_roles ur ON rp.role_id = ur.roles_id
-                                      ),
-                                      target_permission AS (
-                                          SELECT p.id
-                                          FROM t_permission p
-                                                   JOIN role_permissions rp ON p.id = rp.permission
-                                          WHERE p.name = ?
-                                      ),
-                                      resource_check AS (
-                                          SELECT 1 AS result
-                                          FROM t_resource_item ri
-                                              JOIN t_resource_item_permissions rpp ON ri.id = rpp.resource_item_entity_id
-                                              JOIN target_permission tp ON rpp.permissions_id = tp.id
-                                          WHERE ri.name = ?
-                                      )
-                                 SELECT result FROM resource_check
-                                 LIMIT 1;
+                 SELECT 1 AS result
+                        FROM t_user u
+                        JOIN t_role_users ru ON ru.users_id = u.id
+                        JOIN t_role_permission rp ON rp.role_id = ru.roles_id
+                        JOIN t_permission p ON p.id = rp.permission
+                        WHERE u.username = ?
+                          AND p.name = ?
+                        LIMIT 1;
                 """;
 
-        List<Integer> results = jdbcTemplate.query(sql, (_,_) -> 1, username, permissionName, resourceItem);
+        List<Integer> results = jdbcTemplate.query(sql, (_,_) -> 1, username, permissionName);
 
         return !results.isEmpty();
     }

src/main/java/cv/igrp/platform/access_management/permission/application/commands/CreatePermissionCommandHandler.java

@@ -91,7 +91,7 @@ public ResponseEntity<PermissionDTO> handle(CreatePermissionCommand command) {
                  );
               });
 
-      command.getPermissiondto().setName(PermissionValidator.normalizePermissionName(command.getPermissiondto().getName(), foundDepartment.getCode()));
+      command.getPermissiondto().setName(command.getPermissiondto().getName());
 
       log.info("Create permission with name: {}", command.getPermissiondto().getName());