fix synchronization bugs

Author: marcelomonteironosi

.igrpstudio/shared/dto/PermissionDTO.json

@@ -29,7 +29,7 @@
       "isEmail": false,
       "isUrl": false,
       "primaryKey": false,
-      "regex": "^[A-Za-z0-9_-]+$"
+      "regex": "^[A-Za-z0-9._-]+$"
     },
     {
       "name": "description",

pom.xml

@@ -184,7 +184,7 @@
         <dependency>
             <groupId>cv.igrp.framework.auth</groupId>
             <artifactId>core</artifactId>
-            <version>0.1.0-beta-20251008.122918-4</version>
+            <version>0.1.0-beta-20251020.111014-6</version>
         </dependency>
         <dependency>
             <groupId>cv.igrp.framework.auth</groupId>

src/main/java/cv/igrp/platform/access_management/m2m/domain/service/PermissionSyncService.java

@@ -107,7 +107,6 @@ public void synchronizePermissions(List<PermissionDTO> permissions) {
                 newPerm.setStatus(dto.getStatus() != null ? dto.getStatus() : Status.ACTIVE);
                 PermissionEntity savedPerm = permissionRepository.save(newPerm);
                 resource.getPermissions().add(savedPerm);
-                resourceEntityRepository.save(resource);
                 LOGGER.info("[PermissionSync] Created new permission '{}'", dto.getName());
             } else {
                 // Check for difference using structural hash
@@ -125,6 +124,8 @@ public void synchronizePermissions(List<PermissionDTO> permissions) {
             }
         }
 
+        resourceEntityRepository.save(resource);
+
         // Delete permissions not present in the incoming list
         List<PermissionEntity> toDelete = existingPermissions.stream()
                 .filter(p -> !incomingNames.contains(p.getName().toLowerCase(Locale.ROOT)))

src/main/java/cv/igrp/platform/access_management/m2m/domain/service/ResourceSyncService.java

@@ -62,35 +62,29 @@ public void synchronizeResource(ResourceDTO resourceDTO) {
 
     private void updateResource(ResourceEntity existing, ResourceDTO dto) {
         existing.setDescription(dto.getDescription());
-        existing.setStatus(dto.getStatus());
 
-        // Update items
-        Set<String> incomingNames = dto.getItems().stream().map(ResourceItemDTO::getName).collect(Collectors.toSet());
-        existing.getItems().removeIf(item -> !incomingNames.contains(item.getName()));
-
-        for (ResourceItemDTO itemDto : dto.getItems()) {
-            existing.getItems().stream()
-                    .filter(it -> it.getName().equals(itemDto.getName()))
-                    .findFirst()
-                    .ifPresentOrElse(
-                            it -> {
-                                var permissions = permissionRepository.findAllByNameIn(itemDto.getPermissions());
-                                var permissionsToAdd = permissions.stream().filter(permission -> !it.getPermissions().contains(permission)).toList();
-                                it.getPermissions().addAll(permissionsToAdd);
-                                it.getPermissions().removeIf(permission -> !incomingNames.contains(permission.getName()));
-                            },
-                            () -> existing.getItems().add(resourceMapper.toItemEntity(itemDto, existing))
-                    );
-        }
-
-        // Update permissions
-        Set<String> incomingPerms = new HashSet<>(dto.getPermissions());
-        existing.getPermissions().removeIf(p -> !incomingPerms.contains(p.getName()));
+        if(dto.getStatus() != null)
+            existing.setStatus(dto.getStatus());
 
-        for (String perm : dto.getPermissions()) {
-            PermissionEntity permission = permissionRepository.findByNameAndStatusNot(perm, Status.DELETED)
-                    .orElseGet(() -> permissionRepository.save(new PermissionEntity(null, perm, perm, Status.ACTIVE, null, null, null)));
-            existing.getPermissions().add(permission);
+        // Update items
+        if (dto.getItems() != null) {
+            Set<String> incomingNames = dto.getItems().stream().map(ResourceItemDTO::getName).collect(Collectors.toSet());
+            existing.getItems().removeIf(item -> !incomingNames.contains(item.getName()));
+
+            for (ResourceItemDTO itemDto : dto.getItems()) {
+                existing.getItems().stream()
+                        .filter(it -> it.getName().equals(itemDto.getName()))
+                        .findFirst()
+                        .ifPresentOrElse(
+                                it -> {
+                                    var permissions = permissionRepository.findAllByNameIn(itemDto.getPermissions());
+                                    var permissionsToAdd = permissions.stream().filter(permission -> !it.getPermissions().contains(permission)).toList();
+                                    it.getPermissions().addAll(permissionsToAdd);
+                                    it.getPermissions().removeIf(permission -> !incomingNames.contains(permission.getName()));
+                                },
+                                () -> existing.getItems().add(resourceMapper.toItemEntity(itemDto, existing))
+                        );
+            }
         }
 
         resourceRepository.save(existing);

src/main/java/cv/igrp/platform/access_management/shared/application/dto/PermissionDTO.java

@@ -24,7 +24,7 @@ public class PermissionDTO  {
   private Integer id ;
   @NotBlank(message = "The field <name> is required")
 	@Size(max = 60, message = "The field length <name> cannot be more than 60 characters")
-	@Pattern(message = "Invalid value format for field <name>.", regexp = "^[A-Za-z0-9_-]+$")
+	@Pattern(message = "Invalid value format for field <name>.", regexp = "^[A-Za-z0-9._-]+$")
 
   private String name ;
   @Size(max = 255, message = "The field length <description> cannot be more than 255 characters")