fix: update UtmModuleRepository and UtmModuleService to use Optional for findByServerIdAndModuleName method

Author: mjabascal10

backend/src/main/java/com/park/utmstack/repository/application_modules/UtmModuleRepository.java

@@ -10,6 +10,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 
 /**
@@ -19,8 +20,8 @@
 @Repository
 public interface UtmModuleRepository extends JpaRepository<UtmModule, Long>, JpaSpecificationExecutor<UtmModule> {
 
-    @EntityGraph(attributePaths = {"moduleGroups", "moduleGroups.moduleGroupConfigurations"})
-    UtmModule findByServerIdAndModuleName(Long serverId, ModuleName shortName);
+    @EntityGraph(attributePaths = {"server", "filters", "moduleGroups", "moduleGroups.moduleGroupConfigurations"})
+    Optional<UtmModule> findByServerIdAndModuleName(Long serverId, ModuleName shortName);
 
     Integer countAllByModuleNameAndModuleActiveIsTrue(ModuleName shortName);
 

backend/src/main/java/com/park/utmstack/service/application_modules/UtmModuleService.java

@@ -56,30 +56,32 @@ public class UtmModuleService {
     public UtmModule activateDeactivate(ModuleActivationDTO moduleActivationDTO) {
         final String ctx = CLASSNAME + ".activateDeactivate";
 
-            long serverId = moduleActivationDTO.getServerId();
-            ModuleName nameShort = moduleActivationDTO.getModuleName();
-            boolean activationStatus = moduleActivationDTO.getActivationStatus();
+        long serverId = moduleActivationDTO.getServerId();
+        ModuleName nameShort = moduleActivationDTO.getModuleName();
+        boolean activationStatus = moduleActivationDTO.getActivationStatus();
 
-            UtmModule module = moduleRepository.findByServerIdAndModuleName(serverId, nameShort);
+        return moduleRepository.findByServerIdAndModuleName(serverId, nameShort)
+                .map(module -> {
+                    module.setModuleActive(activationStatus);
+                    module = moduleRepository.save(module);
 
-            if (Objects.isNull(module))
-                throw new NoSuchElementException(String.format("Definition of the module %1$s not found for the server ID %2$s", nameShort.name(), serverId));
+                    List<ModuleName> nonRemovableConf = List.of(ModuleName.SOC_AI);
 
-            module.setModuleActive(activationStatus);
-            module = moduleRepository.save(module);
+                    if (!activationStatus && !nonRemovableConf.contains(nameShort))
+                        moduleGroupRepository.deleteAllByModuleId(module.getId());
 
-            List<ModuleName> nonRemovableConf = List.of(ModuleName.SOC_AI);
+                    enableDisableModuleMenus(nameShort, activationStatus);
+                    enableDisableModuleIndexPatterns(nameShort, activationStatus);
+                    enableDisableModuleFilter(nameShort, activationStatus);
 
-            if (!activationStatus && !nonRemovableConf.contains(nameShort))
-                moduleGroupRepository.deleteAllByModuleId(module.getId());
+                    UtmModule detached = SerializationUtils.clone(module);
+                    eventProcessorManagerService.updateModule(detached);
 
-            enableDisableModuleMenus(nameShort, activationStatus);
-            enableDisableModuleIndexPatterns(nameShort, activationStatus);
-            enableDisableModuleFilter(nameShort, activationStatus);
-            UtmModule detached = SerializationUtils.clone(module);
-            eventProcessorManagerService.updateModule(detached);
-
-            return module;
+                    return module;
+                })
+                .orElseThrow(() -> new NoSuchElementException(
+                        String.format("Definition of the module %1$s not found for the server ID %2$s", nameShort.name(), serverId)
+                ));
     }
 
     private void enableDisableModuleMenus(ModuleName nameShort, Boolean activationStatus) {
@@ -186,11 +188,12 @@ public Optional<UtmModule> findOne(Long id) {
 
     public UtmModule findByServerIdAndModuleName(Long serverId, ModuleName shortName) {
         final String ctx = CLASSNAME + ".findByServerIdAndModuleName";
-        try {
-            return moduleRepository.findByServerIdAndModuleName(serverId, shortName);
-        } catch (Exception e) {
-            throw new RuntimeException(ctx + ": " + e.getMessage());
-        }
+
+        return moduleRepository.findByServerIdAndModuleName(serverId, shortName)
+                .orElseThrow(() -> new NoSuchElementException(
+                        String.format("%s: The module %s not found for the server ID %s", ctx, shortName.name(), serverId)
+                ));
+
     }
 
     public boolean isModuleActive(ModuleName shortName) {