Revize ae1ff627

re #7988 Parameters are now deleted from assembly + deleted parametersInConfiguration, which was created by deleted parameter.
re #7989 Added / deleted parameters are now instantly showed in page (refreshing not needed).

src/main/java/vldc/aswi/service/parameter/ParameterManagerImpl.java

@@ -10 +10 @@
 import vldc.aswi.dao.FunctionRepository;
 import vldc.aswi.dao.LocationRepository;
 import vldc.aswi.dao.OperatorRepository;
+import vldc.aswi.dao.parameter.ParameterInConfigurationRepository;
 import vldc.aswi.dao.parameter.ParameterRepository;
 import vldc.aswi.dao.parameter.ParameterTypeRepository;
 import vldc.aswi.dao.parameter.ParameterValueRepository;
 import vldc.aswi.domain.*;
 import vldc.aswi.domain.parameter.Parameter;
+import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.domain.parameter.ParameterValue;
 
 import javax.transaction.Transactional;
@@ -57 +59 @@
     @Autowired
     private ParameterValueRepository parameterValueRepository;
 
+    /** Autowired parameter in configuration manager. */
+    @Autowired
+    private ParameterInConfigurationManager parameterInConfigurationManager;
+
     /**
      * Initialization setup for parameter manager. Check if parameter repository contains
      * records and if not, initialize default values.
@@ -92 +98 @@
     @Override
     public void addParameters(Long assemblyId, List<Parameter> parameterValuesList) {
         Assembly assembly = this.assemblyRepository.getById(assemblyId);
-        // TODO: test it.
         if (parameterValuesList == null) return;
 
         for (Parameter parameterValues : parameterValuesList) {
             // Create new parameter and assign him all values.
             Parameter parameter = new Parameter();
-            parameter.setName(parameterValues.getNameOfSelect());
+            parameter.setName(parameterValues.getName());
             parameter.setNameOfSelect(parameterValues.getNameOfSelect());
             parameter.setAssembly(assembly);
+            parameter.setParameterOrder(parameterValues.getParameterOrder());
             parameter.setParameterType(this.parameterTypeRepository.findByName(parameterValues.getParameterType().getName()));
             parameter.setDefaultValue(parameterValues.getDefaultValue());
 
@@ -130 +136 @@
                 }
             }
 
-            // Try to put all operators into list.
-            if (parameterValues.getParameterValues() != null && parameterValues.getParameterValues().size() > 0) {
-                for (ParameterValue parameterValue : parameterValues.getParameterValues()) {
-                    valueList.add(this.parameterValueRepository.getById(parameterValue.getId()));
+            if (parameter.getParameterType().getName().equals("Výčet")) {
+                // Try to put all values into list.
+                if (parameterValues.getParameterValues() != null && parameterValues.getParameterValues().size() > 0) {
+                    for (ParameterValue parameterValue : parameterValues.getParameterValues()) {
+                        valueList.add(this.parameterValueRepository.getById(parameterValue.getId()));
+                    }
                 }
+
+                parameter.setParameterValues(valueList);
             }
 
             // Set lists of values into parameter.
             parameter.setLocations(locationList);
             parameter.setFunctions(functionList);
             parameter.setOperators(operatorList);
-            parameter.setParameterValues(valueList);
 
             // Insert parameter into database.
             this.parameterRepository.save(parameter);
@@ -159 +168 @@
         List<Parameter> currentAssemblyParameters = assembly.getParameters();
 
         if (newAssemblyParameters != null) {
+            // Remove removed parameters.
+            newAssemblyParameters = removeRemovedParametersFromList(newAssemblyParameters);
+
             // Find new parameters.
             List<Parameter> currentAssemblyParametersNew = new LinkedList<>(currentAssemblyParameters);
             List<Parameter> newAssemblyParametersNew = new LinkedList<>(newAssemblyParameters);
@@ -179 +191 @@
                 return;
 
             // Remove deleted parameters.
-            for (Parameter parameter : currentAssemblyParametersDeleted) {
-                for (ParameterValue parameterValue : parameter.getParameterValues()) {
-                    // Remove parameters values.
-                    this.parameterValueRepository.delete(parameterValue);
-                }
-
-                // Remove parameter.
-                this.parameterRepository.delete(parameter);
+            for (Parameter parameterWithValues : currentAssemblyParametersDeleted) {
+                deleteParameter(parameterWithValues.getId());
             }
 
             // Update rest parameters.
@@ -194 +200 @@
 
             // Add new parameters
             addParameters(assemblyId, newAssemblyParametersNew);
+
+            assembly.setParameters(this.parameterRepository.getByAssemblyId(assemblyId));
+        }
+    }
+
+    /**
+     * Remove removed parameters by web application.
+     * Web page returns list of parameters, even those, which was removed, but those parameters
+     * are empty object (null values in every attribute), so we need to remove them from list.
+     * @param parameterValuesList - List of parameters from web.
+     * @return Filtered list of parameters.
+     */
+    private List<Parameter> removeRemovedParametersFromList(List<Parameter> parameterValuesList) {
+        List<Parameter> filteredParametersWithValues = new ArrayList<Parameter>();
+
+        for (Parameter parameterWithValues : parameterValuesList) {
+            // Because name of parameter is required, then we know that parameter
+            // with name == null is just empty object.
+            if (parameterWithValues.getName() != null) {
+                filteredParametersWithValues.add(parameterWithValues);
+            }
         }
+
+        return filteredParametersWithValues;
     }
 
     /**
@@ -207 +236 @@
             Parameter parameter = this.parameterRepository.getById(parameterValues.getId());
             // Update current parameter values.
             parameter.setName(parameterValues.getName());
+            parameter.setParameterOrder(parameterValues.getParameterOrder());
             parameter.setNameOfSelect(parameterValues.getNameOfSelect());
             parameter.setAssembly(this.assemblyRepository.getById(parameterValues.getAssembly().getId()));
             parameter.setParameterType(this.parameterTypeRepository.getById(parameterValues.getParameterType().getId()));
@@ -216 +246 @@
             this.parameterRepository.save(parameter);
 
             // Update parameter values, locations, functions and operators.
-            updateParameterValues(parameterValues.getId(), parameterValues.getParameterValues());
+            if (parameter.getParameterType().equals("Výčet")) {
+                updateParameterValues(parameterValues.getId(), parameterValues.getParameterValues());
+            }
+
             updateParameterLocations(parameterValues.getId(), parameterValues.getLocations());
             updateParameterFunctions(parameterValues.getId(), parameterValues.getFunctions());
             updateParameterOperators(parameterValues.getId(), parameterValues.getOperators());
@@ -396 +429 @@
         }
     }
 
+    /**
+     * Delete parameter by id.
+     * @param parameterId - ID of parameter.
+     * @return True if parameter was successfully deleted, false if not.
+     */
+    private boolean deleteParameter(Long parameterId) {
+        try {
+            Parameter parameter = this.parameterRepository.getById(parameterId);
+
+            this.parameterInConfigurationManager.deleteParametersInConfiguration(parameterId, false);
+
+            // Delete removed parameter values.
+            for (ParameterValue parameterValue : parameter.getParameterValues()) {
+                this.parameterValueRepository.delete(parameterValue);
+            }
+
+            // Delete all functions from parameter in table 'Parametr_ma_Funkce'.
+            List<Function> functionList = new ArrayList<>(parameter.getFunctions());
+            for (Function function : functionList) {
+                parameter.removeFunction(function);
+            }
+
+            // Delete all operators from parameter in table 'Parametr_ma_Operator'.
+            List<Operator> operatorList = new ArrayList<>(parameter.getOperators());
+            for (Operator operator : operatorList) {
+                parameter.removeOperator(operator);
+            }
+
+            // Delete all locations from parameter in table 'Parametr_ma_Umisteni'.
+            List<Location> locationList = new ArrayList<>(parameter.getLocations());
+            for (Location location : locationList) {
+                parameter.removeLocation(location);
+            }
+
+            this.parameterRepository.delete(parameter);
+
+            return true;
+        }
+        catch (Exception e) {
+            return false;
+        }
+    }
+
     /**
      * Delete parameters by assembly id.
      * @param assemblyId - ID of assembly.
+     * @return True if all parameters were successfully deleted, false if not.
      */
     @Override
     public boolean deleteParameters(Long assemblyId) {
@@ -406 +483 @@
             List<Parameter> parameters = this.parameterRepository.getByAssemblyId(assemblyId);
 
             for (Parameter parameter : parameters) {
-                // Delete all functions from parameter in table 'Parametr_ma_Funkce'.
-                List<Function> functionList = new ArrayList<>(parameter.getFunctions());
-                for (Function function : functionList) {
-                    parameter.removeFunction(function);
-                }
-
-                // Delete all operators from parameter in table 'Parametr_ma_Operator'.
-                List<Operator> operatorList = new ArrayList<>(parameter.getOperators());
-                for (Operator operator : operatorList) {
-                    parameter.removeOperator(operator);
-                }
-
-                // Delete all locations from parameter in table 'Parametr_ma_Umisteni'.
-                List<Location> locationList = new ArrayList<>(parameter.getLocations());
-                for (Location location : locationList) {
-                    parameter.removeLocation(location);
+                boolean success = deleteParameter(parameter.getId());
+                if (success == false) {
+                    return false;
                 }
             }
-
-            // Delete all parameters.
-            this.parameterRepository.deleteAll(parameters);
             return true;
         } catch (Exception e) {
             return false;