Revize 26c4caa0

re #8101 Bad saving changes for configuration.

src/main/java/vldc/aswi/service/SqlQueryManager.java

@@ -1 +1 @@
 package vldc.aswi.service;
 
-import vldc.aswi.domain.Assembly;
-import vldc.aswi.domain.Configuration;
+import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
 
 import java.util.List;
@@ -13 +12 @@
 
     /**
      * Get list of  contingencyTableRow.
-     * @param configuration - configuration from which table will be created.
+     * @param sqlQuery
+     * @param parameterInConfigurations
      * @return List of contingencyTableRow.
      */
-    List<ContingencyTableRow> getContingencyTableRow(Configuration configuration);
+    List<ContingencyTableRow> getContingencyTableRow(String sqlQuery, List<ParameterInConfiguration> parameterInConfigurations);
 
     /**
      * Validate given SQL query.

src/main/java/vldc/aswi/service/SqlQueryManagerImpl.java

@@ -28 +28 @@
     /** Autowired databaseInterface component. */
     @Autowired
     private DatabaseInterface databaseInterface;
-
+    
     /**
      * Get list of  contingencyTableRow.
-     * @param configuration - configuration from which table will be created.
+     * @param sqlQuery
+     * @param parameterInConfigurations
      * @return List of contingencyTableRow.
      */
     @Override
-    public List<ContingencyTableRow> getContingencyTableRow(Configuration configuration) {
+    public List<ContingencyTableRow> getContingencyTableRow(String sqlQuery, List<ParameterInConfiguration> parameterInConfigurations) {
         long startTime = System.nanoTime();
-        Map<String, TableColumn> tableColumns = this.databaseInterface.executeQueryAndReturnTableColumns(
-                configuration.getAssembly().getSQLQuery()
-        );
+        Map<String, TableColumn> tableColumns = this.databaseInterface.executeQueryAndReturnTableColumns(sqlQuery);
         long stopTime = System.nanoTime();
         System.out.println("Select:" + TimeUnit.MILLISECONDS.convert((stopTime - startTime), TimeUnit.NANOSECONDS));
         List<NameUserName> rowNames = new ArrayList<>();
         List<NameUserName> columnNames = new ArrayList<>();
         List<ValueFunction> valueFunctions = new ArrayList<>();
 
+        // Create a copy of list.
+        List<ParameterInConfiguration> copiedParametersInConfiguration = new ArrayList<>(parameterInConfigurations);
+
         // sort parameters in configuration to have them in order set by user
-        Collections.sort(configuration.getParametersInConfiguration());
+        Collections.sort(copiedParametersInConfiguration);
 
         // TODO: 28.05.2020 map would be better
-        for(ParameterInConfiguration parameterInConfiguration : configuration.getParametersInConfiguration()) {
+        for(ParameterInConfiguration parameterInConfiguration : copiedParametersInConfiguration) {
             if (parameterInConfiguration.getLocation() != null && parameterInConfiguration.getLocation().getName().equals("Řádek")) {
                 rowNames.add(new NameUserName(parameterInConfiguration.getParameter().getNameOfSelect().toUpperCase(),
                         parameterInConfiguration.getColumnName()));

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

@@ -15 +15 @@
 import vldc.aswi.domain.*;
 import vldc.aswi.domain.parameter.Parameter;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
+import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
 import vldc.aswi.service.*;
 import vldc.aswi.service.parameter.ParameterManager;
 import vldc.aswi.service.parameter.ParameterTypeManager;
@@ -25 +26 @@
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -186 +188 @@
 
             System.out.println("Generuj tabulku");
             prepareForTable(newConfiguration);
+
+            List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly().getSQLQuery(),
+                    newConfiguration.getParametersInConfiguration());
+
             System.out.println("Generuj tabulku");
             ModelMap modelMap = modelAndView.getModelMap();
             modelMap.addAttribute("configurationID", id);
-            modelMap.addAttribute("contingencyTableRows", this.sqlQueryManager.getContingencyTableRow(newConfiguration));
+            modelMap.addAttribute("contingencyTableRows", rows);
             Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
             initializeFields(newConfiguration);
 

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

@@ -12 +12 @@
 import vldc.aswi.domain.Location;
 import vldc.aswi.domain.Operator;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
+import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
 import vldc.aswi.service.AssemblyManager;
 import vldc.aswi.service.ConfigurationManager;
 import vldc.aswi.service.LocationManager;
@@ -119 +120 @@
         {
             prepareForTable(newConfiguration);
             System.out.println("Generuj tabulku");
+
+            List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly().getSQLQuery(),
+                    newConfiguration.getParametersInConfiguration());
+
             modelMap.addAttribute("configurationID", id);
-            modelMap.addAttribute("contingencyTableRows", this.sqlQueryManager.getContingencyTableRow(newConfiguration));
+            modelMap.addAttribute("contingencyTableRows", rows);
             Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
             initializeFields(newConfiguration);
             modelMap.addAttribute("configuration", newConfiguration);