Merge pull request #21 from edsonmartins/develop

edsonmartins · web-flow · commit adda314e61ef · 2025-05-23T15:56:04.000-03:00
Develop
diff --git a/archbase-security/src/main/java/br/com/archbase/security/domain/dto/ResourceDto.java b/archbase-security/src/main/java/br/com/archbase/security/domain/dto/ResourceDto.java
@@ -1,6 +1,7 @@
 package br.com.archbase.security.domain.dto;
 
 import br.com.archbase.security.domain.entity.Resource;
+import br.com.archbase.security.domain.entity.TipoRecurso;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import lombok.*;
@@ -28,6 +29,7 @@ public class ResourceDto {
 	protected String name;
 	protected String description;
 	protected Boolean active;
+	protected TipoRecurso type;
 
 	public static ResourceDto fromDomain(Resource resource) {
 		if (resource == null) {
@@ -45,6 +47,7 @@ public static ResourceDto fromDomain(Resource resource) {
 				.name(resource.getName())
 				.description(resource.getDescription())
 				.active(resource.getActive())
+				.type(resource.getType())
 				.build();
 	}
 
@@ -60,6 +63,7 @@ public Resource toDomain() {
 				.name(this.name)
 				.active(this.active)
 				.description(this.description)
+				.type(this.type)
 				.build();
 	}
 }
diff --git a/archbase-security/src/main/java/br/com/archbase/security/domain/entity/Resource.java b/archbase-security/src/main/java/br/com/archbase/security/domain/entity/Resource.java
@@ -19,13 +19,15 @@ public class Resource extends DomainAggregatorBase<Resource> {
     protected String name;
     protected String description;
     protected Boolean active;
+    protected TipoRecurso type;
 
     @Builder
-    public Resource(String id, String code, Long version, LocalDateTime updateEntityDate, LocalDateTime createEntityDate, String createdByUser, String lastModifiedByUser, String name, String description, Boolean active) {
+    public Resource(String id, String code, Long version, LocalDateTime updateEntityDate, LocalDateTime createEntityDate, String createdByUser, String lastModifiedByUser, String name, String description, Boolean active, TipoRecurso type) {
         super(id, code, version, updateEntityDate, createEntityDate, createdByUser, lastModifiedByUser);
         this.name = name;
         this.description = description;
         this.active = active;
+        this.type = type;
     }
 
     static class Validator extends AbstractArchbaseValidator<Resource> {
diff --git a/archbase-security/src/main/java/br/com/archbase/security/domain/entity/TipoRecurso.java b/archbase-security/src/main/java/br/com/archbase/security/domain/entity/TipoRecurso.java
@@ -0,0 +1,6 @@
+package br.com.archbase.security.domain.entity;
+
+public enum TipoRecurso {
+    VIEW,
+    API
+}
diff --git a/archbase-security/src/main/java/br/com/archbase/security/persistence/ResourceEntity.java b/archbase-security/src/main/java/br/com/archbase/security/persistence/ResourceEntity.java
@@ -1,20 +1,16 @@
 package br.com.archbase.security.persistence;
 
 import br.com.archbase.ddd.domain.base.TenantPersistenceEntityBase;
-import br.com.archbase.security.domain.dto.ActionDto;
 import br.com.archbase.security.domain.dto.ResourceDto;
-import br.com.archbase.security.domain.entity.Action;
 import br.com.archbase.security.domain.entity.Resource;
+import br.com.archbase.security.domain.entity.TipoRecurso;
 import br.com.archbase.shared.kernel.converters.BooleanToSNConverter;
 import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
 
 @Entity
 @Table(name="SEGURANCA_RECURSO", uniqueConstraints = @UniqueConstraint(columnNames = {"TENANT_ID", "NOME"}))
@@ -38,15 +34,21 @@ public class ResourceEntity extends TenantPersistenceEntityBase {
     @Convert(converter = BooleanToSNConverter.class)
     private Boolean active;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = "TIPO_RECURSO", length = 50)
+    private TipoRecurso type;
+
     public ResourceEntity() {
         // Default empty constructor
     }
 
     @Builder
-    public ResourceEntity(String id, String code, Long version, LocalDateTime createEntityDate, String createdByUser, LocalDateTime updateEntityDate, String lastModifiedByUser, String tenantId, String name, String description) {
+    public ResourceEntity(String id, String code, Long version, LocalDateTime createEntityDate, String createdByUser, LocalDateTime updateEntityDate, String lastModifiedByUser, String tenantId, String name, String description, Boolean active, TipoRecurso type) {
         super(id, code, version, createEntityDate, createdByUser, updateEntityDate, lastModifiedByUser, tenantId);
         this.name = name;
         this.description = description;
+        this.active = active;
+        this.type = type;
     }
 
 
@@ -66,6 +68,7 @@ public static ResourceEntity fromDomain(Resource resource) {
         resourceEntity.setName(resource.getName());
         resourceEntity.setDescription(resource.getDescription());
         resourceEntity.setActive(resource.getActive());
+        resourceEntity.setType(resource.getType());
         return resourceEntity;
     }
 
@@ -82,6 +85,7 @@ public Resource toDomain() {
                 .name(this.getName())
                 .description(this.getDescription())
                 .active(this.getActive())
+                .type(this.getType())
                 .build();
     }
 
@@ -98,6 +102,7 @@ public ResourceDto toDto() {
                 .name(this.getName())
                 .description(this.getDescription())
                 .active(this.getActive())
+                .type(this.getType())
                 .build();
     }
 }
diff --git a/archbase-security/src/main/java/br/com/archbase/security/service/ArchbaseActionSynchronizationService.java b/archbase-security/src/main/java/br/com/archbase/security/service/ArchbaseActionSynchronizationService.java
@@ -1,9 +1,13 @@
 package br.com.archbase.security.service;
 import br.com.archbase.security.annotation.HasPermission;
+import br.com.archbase.security.domain.entity.TipoRecurso;
 import br.com.archbase.security.persistence.ActionEntity;
+import br.com.archbase.security.persistence.QActionEntity;
+import br.com.archbase.security.persistence.QResourceEntity;
 import br.com.archbase.security.persistence.ResourceEntity;
 import br.com.archbase.security.repository.ActionJpaRepository;
 import br.com.archbase.security.repository.ResourceJpaRepository;
+import com.querydsl.core.types.dsl.BooleanExpression;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.reflections.Reflections;
@@ -74,7 +78,17 @@ private ResourceEntity ensureResourceExists(String resourceName) {
             resource.setDescription(resourceName);
             resource.setCreateEntityDate(LocalDateTime.now());
             resource.setCreatedByUser("archbase");
+            resource.setActive(true);
+            resource.setType(TipoRecurso.API);
             resourceRepository.save(resource);
+        } else {
+            if (!resource.getActive()) {
+                resource.setUpdateEntityDate(LocalDateTime.now());
+                resource.setActive(true);
+                resource.setLastModifiedByUser("archbase");
+                resource.setType(TipoRecurso.API);
+                resource = resourceRepository.save(resource);
+            }
         }
         return resource;
     }
@@ -90,18 +104,29 @@ private void synchronizeAction(String actionName, String description, ResourceEn
             action.setActive(true);
             action.setCreateEntityDate(LocalDateTime.now());
             action.setCreatedByUser("archbase");
+            actionRepository.save(action);
         } else {
             action = actionEntityOptional.get();
+            if (!action.getActive()) {
+                action.setActive(true);
+                action.setUpdateEntityDate(LocalDateTime.now());
+                action.setLastModifiedByUser("archbase");
+                actionRepository.save(action);
+            }
         }
-        actionRepository.save(action);
     }
 
     private void disableUnusedActionsAndResources() {
-        List<ActionEntity> allActions = actionRepository.findAll();
-        List<ResourceEntity> allResources = resourceRepository.findAll();
+        QActionEntity qAction = QActionEntity.actionEntity;
+        BooleanExpression actionPredicate = qAction.resource.type.eq(TipoRecurso.API);
+        List<ActionEntity> allAPIActions = actionRepository.findAll(actionPredicate);
+
+        QResourceEntity qResource = QResourceEntity.resourceEntity;
+        BooleanExpression resourcePredicate = qResource.type.eq(TipoRecurso.API);
+        List<ResourceEntity> allAPIResources = resourceRepository.findAll(resourcePredicate);
 
         // Desativar ações e recursos não encontrados
-        allActions.forEach(action -> {
+        allAPIActions.forEach(action -> {
             if (!actionStillExists(action)) {
                 action.setActive(false);
                 action.setUpdateEntityDate(LocalDateTime.now());
@@ -110,7 +135,7 @@ private void disableUnusedActionsAndResources() {
             }
         });
 
-        allResources.forEach(resource -> {
+        allAPIResources.forEach(resource -> {
             if (!resourceStillExists(resource)) {
                 resource.setActive(false);
                 resource.setUpdateEntityDate(LocalDateTime.now());
diff --git a/archbase-security/src/main/java/br/com/archbase/security/service/ResourceService.java b/archbase-security/src/main/java/br/com/archbase/security/service/ResourceService.java
@@ -5,6 +5,7 @@
 import br.com.archbase.security.adapter.ActionPersistenceAdapter;
 import br.com.archbase.security.adapter.SecurityAdapter;
 import br.com.archbase.security.domain.dto.*;
+import br.com.archbase.security.domain.entity.TipoRecurso;
 import br.com.archbase.security.domain.entity.User;
 import com.google.common.collect.Lists;
 import br.com.archbase.security.domain.dto.ResourcePermissionsDto;
@@ -75,6 +76,7 @@ public ResourcePermissionsDto registerResource(ResourceRegisterDto resourceRegis
                     .createdByUser("archbase")
                     .version(0L)
                     .active(true)
+                    .type(TipoRecurso.VIEW)
                     .build();
 
             resourceDto = adapter.createResource(resourceDto);
diff --git a/archbase-security/src/main/java/br/com/archbase/security/service/UserService.java b/archbase-security/src/main/java/br/com/archbase/security/service/UserService.java
@@ -52,7 +52,7 @@ public Page<UserDto> findAll(int page, int size, String[] sort) {
     public Optional<User> getUserByEmail(String email)  {
         Optional<User> usuarioOptional = persistenceAdapter.getUserByEmail(email);
         if(usuarioOptional.isEmpty()) {
-            throw new ArchbaseValidationException(String.format("Usuário com email %s  não foi encontrado.",email));
+            throw new ArchbaseValidationException(String.format("Usuário com email %s não foi encontrado.",email));
         }
         return usuarioOptional;
     }
@@ -86,7 +86,10 @@ public Optional<UserDto> findGroupById(String id) {
     public UserDto createUser(UserDto userDto) {
         UserDto originalUserDto = new UserDto();
         BeanUtils.copyProperties(userDto, originalUserDto);
-
+        Optional<User> usuarioOptional = persistenceAdapter.getUserByEmail(userDto.getEmail());
+        if (usuarioOptional.isPresent()) {
+            throw new ArchbaseValidationException(String.format("Usuário com email %s já cadastrado.",userDto.getEmail()));
+        }
         userServiceListener.onBeforeCreate(originalUserDto);
         userDto.setPassword(passwordEncoder.encode(userDto.getPassword()));
         UserDto user = persistenceAdapter.createUser(userDto);
@@ -98,14 +101,17 @@ public UserDto createUser(UserDto userDto) {
     public Optional<UserDto> updateUser(String id, UserDto userDto) {
         UserDto originalUserDto = new UserDto();
         BeanUtils.copyProperties(userDto, originalUserDto);
-
+        Optional<User> usuarioOptional = persistenceAdapter.getUserByEmail(userDto.getEmail());
+        if (usuarioOptional.isPresent() && !usuarioOptional.get().getId().toString().equals(id)) {
+            throw new ArchbaseValidationException(String.format("Usuário com email %s já cadastrado.",userDto.getEmail()));
+        }
         userServiceListener.onBeforeUpdate(originalUserDto);
         if (!StringUtils.isBlank(userDto.getPassword())) {
             userDto.setPassword(passwordEncoder.encode(userDto.getPassword()));
         }
         UserDto currentUserDto = findById(id);
         if (currentUserDto==null){
-            throw new ArchbaseValidationException("Usuário não encontrada.");
+            throw new ArchbaseValidationException("Usuário não encontrado.");
         }
         Optional<UserDto> result = persistenceAdapter.updateUser(id, userDto);
         userServiceListener.onAfterUpdate(originalUserDto, currentUserDto, result.get());

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +package br.com.archbase.security.domain.entity;
++
 +public enum TipoRecurso {
 +    VIEW,
 +    API
 +}