Revize 15c7afbe

re #8153 Assembly -> Configuration synchronization

src/main/java/vldc/aswi/domain/Assembly.java

@@ -39 +39 @@
     private List<Configuration> configurations;
 
     /** List of parameters, which using this assembly. */
-    @OneToMany(mappedBy = "assembly", fetch = FetchType.EAGER, orphanRemoval = true)
+    @OneToMany(mappedBy = "assembly", fetch = FetchType.EAGER)
     private List<Parameter> parameters;
 
     /**

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

@@ -1 +1 @@
 package vldc.aswi.service.parameter;
 
+import vldc.aswi.domain.parameter.Parameter;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -21 +23 @@
      * @return List of deleted parameters in configuration.
      */
     boolean deleteParametersInConfiguration(Long id, boolean configurationUsed);
+
+    /**
+     * Add newly created parameters to all configurations, which are created from current assembly
+     * @param assemblyId - ID of current assembly.
+     */
+    void addParameterIntoConfigurations(Long assemblyId, ArrayList<Parameter> parameters);
+
+    /**
+     * Update all parameter in configurations orders.
+     * @param parameters - list of parameters for current assembly.
+     */
+    void updateParameterInConfigurationsOrder(List<Parameter> parameters);
 }

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

@@ -7 +7 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.stereotype.Service;
+import vldc.aswi.dao.AssemblyRepository;
 import vldc.aswi.dao.parameter.ParameterInConfigurationRepository;
+import vldc.aswi.domain.Assembly;
+import vldc.aswi.domain.Configuration;
 import vldc.aswi.domain.Function;
+import vldc.aswi.domain.parameter.Parameter;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
 
 import javax.transaction.Transactional;
@@ -27 +31 @@
     @Autowired
     private ParameterInConfigurationRepository parameterInConfigurationRepository;
 
+    /** Autowired assembly repository. */
+    @Autowired
+    private AssemblyRepository assemblyRepository;
+
     /**
      * Initialization setup for parameter in configuration manager.
      * Check if table "Parametr_konfigurace" exists.
@@ -59 +67 @@
         return retVal;
     }
 
+    /**
+     * Add newly created parameters to all configurations, which are created from current assembly
+     * @param assemblyId - ID of current assembly.
+     */
+    @Override
+    public void addParameterIntoConfigurations(Long assemblyId, ArrayList<Parameter> parameters) {
+
+        Assembly assembly = this.assemblyRepository.getById(assemblyId);
+        List<Configuration> configurations = assembly.getConfigurations();
+
+        for (Parameter parameter : parameters) {
+
+            for (Configuration configuration : configurations) {
+                ParameterInConfiguration parameterInConfiguration = new ParameterInConfiguration();
+
+                parameterInConfiguration.setParameter(parameter);
+                parameterInConfiguration.setConfiguration(configuration);
+                parameterInConfiguration.setColumnName(parameter.getName());
+                // Set temporary parameter order.
+                parameterInConfiguration.setParameterOrder(0);
+
+                this.parameterInConfigurationRepository.save(parameterInConfiguration);
+            }
+        }
+    }
+
     /**
      * Delete all parameters in configuration by configuration id.
      * @param id - ID of parameter / configuration.
@@ -106 +140 @@
             return false;
         }
     }
+
+    /**
+     * Update all parameter in configurations orders.
+     * @param parameters - list of parameters for current assembly.
+     */
+    @Override
+    public void updateParameterInConfigurationsOrder(List<Parameter> parameters) {
+
+        // Update all parameters in configuration order.
+        for (Parameter parameter : parameters) {
+
+            for (ParameterInConfiguration parameterInConfiguration : this.parameterInConfigurationRepository.getAllByParameterId(parameter.getId())) {
+
+                parameterInConfiguration.setParameterOrder(parameter.getParameterOrder());
+                this.parameterInConfigurationRepository.save(parameterInConfiguration);
+            }
+        }
+    }
 }

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

@@ -2 +2 @@
 
 import vldc.aswi.domain.parameter.Parameter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20 +21 @@
      * @param assemblyId - Assembly in which parameter is presented.
      * @param parameterValuesList - Parameter values.
      */
-    void addParameters(Long assemblyId, List<Parameter> parameterValuesList);
+    ArrayList<Parameter> addParameters(Long assemblyId, List<Parameter> parameterValuesList);
 
     /**
      * Update parameter with given values.

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);
         }
     }
 

src/main/java/vldc/aswi/web/controller/AssemblyController.java

@@ -175 +175 @@
 
         if (generateTable != null)
         {
+            Assembly assembly = this.assemblyManager.getAssemblyById(Long.parseLong(id));
+            newConfiguration.setAssembly(assembly);
+            newConfiguration.setTableName(assembly.getName());
+
+            // If configuration name is empty, then replace it by assembly name.
+            if (newConfiguration.getName().equals("")) {
+                newConfiguration.setName(assembly.getName());
+            }
+
             System.out.println("Generuj tabulku");
             prepareForTable(newConfiguration);
             System.out.println("Generuj tabulku");
@@ -183 +192 @@
             modelMap.addAttribute("contingencyTableRows", this.sqlQueryManager.getContingencyTableRow(newConfiguration));
             Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
             initializeFields(newConfiguration);
+
             modelMap.addAttribute("configuration", newConfiguration);
             modelMap.addAttribute("comparator", comparator);
             modelMap.addAttribute("formAction", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
@@ -310 +320 @@
 
             // TODO: chybí defaultValue.
             Long assemblyID = this.assemblyManager.updateAssembly(assembly);
+
             this.parameterManager.updateParameters(assemblyID, assembly.getParameters());
             Assembly updatedAssembly = this.assemblyManager.getAssemblyById(assemblyID);