Revize 15c7afbe

re #8153 Assembly -> Configuration synchronization

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

@@ -102 +102 @@
      * @param parameterValuesList - Parameter values.
      */
     @Override
-    public void addParameters(Long assemblyId, List<Parameter> parameterValuesList) {
+    public ArrayList<Parameter> addParameters(Long assemblyId, List<Parameter> parameterValuesList) {
         Assembly assembly = this.assemblyRepository.getById(assemblyId);
-        if (parameterValuesList == null) return;
+        ArrayList<Parameter> newParameters = new ArrayList<>();
 
         for (Parameter parameterValues : parameterValuesList) {
             // Create new parameter and assign him all values.
@@ -159 +159 @@
             parameter.setOperators(operatorList);
 
             // Insert parameter into database.
-            this.parameterRepository.save(parameter);
+            Parameter newParameter = this.parameterRepository.save(parameter);
+            newParameters.add(newParameter);
         }
+        return newParameters;
     }
 
     /**
@@ -193 +195 @@
             newAssemblyParametersUpdated.retainAll(currentAssemblyParametersUpdated);
 
             // If no parameter has been deleted or added, then updating is unnecessary.
-            if (newAssemblyParametersNew.size() == 0 && currentAssemblyParametersDeleted.size() == 0 && newAssemblyParametersUpdated.size() == 0)
+            if (newAssemblyParametersNew.size() == 0 && currentAssemblyParametersDeleted.size() == 0 && newAssemblyParametersUpdated.size() == 0) {
                 return;
+            }
 
-            // Remove deleted parameters.
-            for (Parameter parameterWithValues : currentAssemblyParametersDeleted) {
-                deleteParameter(parameterWithValues.getId());
+            if (currentAssemblyParametersDeleted.size() > 0) {
+                // Remove deleted parameters.
+                for (Parameter parameterWithValues : currentAssemblyParametersDeleted) {
+                    deleteParameter(parameterWithValues.getId());
+                }
             }
 
-            // Update rest parameters.
-            updateParameters(newAssemblyParametersUpdated);
+            if (newAssemblyParametersUpdated.size() > 0) {
+                // Update rest parameters.
+                updateParameters(newAssemblyParametersUpdated);
+            }
+
+            if (newAssemblyParametersNew.size() > 0) {
+                // Add new parameters.
+                ArrayList<Parameter> newParameters = addParameters(assemblyId, newAssemblyParametersNew);
+
+                // Create new parameters in configuration in all configurations, which are created from current assembly.
+                this.parameterInConfigurationManager.addParameterIntoConfigurations(assemblyId, newParameters);
+            }
 
-            // Add new parameters
-            addParameters(assemblyId, newAssemblyParametersNew);
+            List<Parameter> newParameters = this.parameterRepository.getByAssemblyId(assemblyId);
+            assembly.setParameters(newParameters);
 
-            assembly.setParameters(this.parameterRepository.getByAssemblyId(assemblyId));
+            this.parameterInConfigurationManager.updateParameterInConfigurationsOrder(newParameters);
         }
     }