Revize cc39413d

re #7885 added SUM and ability to work with multiple values and sorted parameters in configuration, optimization

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

@@ -4 +4 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import vldc.aswi.database.DatabaseInterface;
+import vldc.aswi.domain.Assembly;
+import vldc.aswi.domain.Configuration;
+import vldc.aswi.domain.Function;
+import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.model.table.NameUserName;
 import vldc.aswi.model.table.TableColumn;
 import vldc.aswi.model.table.ValueFunction;
@@ -11 +15 @@
 import vldc.aswi.utils.Converter;
 
 import javax.sql.DataSource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Manager for SqlQuery.
@@ -28 +31 @@
 
     /**
      * Get list of  contingencyTableRow.
-     * @param sqlQuery - SQL query.
+     * @param configuration - configuration from which table will be created.
      * @return List of contingencyTableRow.
      */
     @Override
-    public List<ContingencyTableRow> getContingencyTableRow(String sqlQuery) {
-        Map<String, TableColumn> tableColumns = this.databaseInterface.executeQueryAndReturnTableColumns(sqlQuery);
+    public List<ContingencyTableRow> getContingencyTableRow(Configuration configuration) {
+        long startTime = System.nanoTime();
+        Map<String, TableColumn> tableColumns = this.databaseInterface.executeQueryAndReturnTableColumns(
+                configuration.getAssembly().getSQLQuery()
+        );
+        long stopTime = System.nanoTime();
+        System.out.println("Select:" + TimeUnit.MILLISECONDS.convert((stopTime - startTime), TimeUnit.NANOSECONDS));
         List<NameUserName> rowNames = new ArrayList<>();
-        rowNames.add(new NameUserName("PROGRAM_STUDIA", "d"));
-        rowNames.add(new NameUserName("TYP_STUDIA", "d"));
-
         List<NameUserName> columnNames = new ArrayList<>();
-        columnNames.add(new NameUserName("FAKULTA_STUDIA", "d"));
-        columnNames.add(new NameUserName("FORMA_STUDIA", "d"));
-
         List<ValueFunction> valueFunctions = new ArrayList<>();
-        valueFunctions.add(new ValueFunction("VEK", "d"));
-        Converter c = new Converter();
-        return c.convertTableColumnsToContingencyTableRows(tableColumns, rowNames, columnNames, valueFunctions);
+
+        // sort parameters in configuration to have them in order set by user
+        Collections.sort(configuration.getParametersInConfiguration());
+
+        // TODO: 28.05.2020 map would be better
+        for(ParameterInConfiguration parameterInConfiguration : configuration.getParametersInConfiguration()) {
+            if (parameterInConfiguration.getLocation() != null && parameterInConfiguration.getLocation().getName().equals("Řádek")) {
+                rowNames.add(new NameUserName(parameterInConfiguration.getParameter().getNameOfSelect().toUpperCase(),
+                        parameterInConfiguration.getColumnName()));
+            }
+            else if (parameterInConfiguration.getLocation() != null && parameterInConfiguration.getLocation().getName().equals("Sloupec")) {
+                columnNames.add(new NameUserName(parameterInConfiguration.getParameter().getNameOfSelect().toUpperCase(),
+                        parameterInConfiguration.getColumnName()));
+            }
+            else if(parameterInConfiguration.getLocation() != null && parameterInConfiguration.getLocation().getName().equals("Hodnota")) {
+                for (Function function : parameterInConfiguration.getFunctions()) {
+                    valueFunctions.add(new ValueFunction(parameterInConfiguration.getParameter().getNameOfSelect().toUpperCase(),
+                            function.getName().toUpperCase()));
+                }
+            }
+        }
+
+        Converter converter = new Converter();
+        return converter.convertTableColumnsToContingencyTableRows(tableColumns, rowNames, columnNames, valueFunctions);
     }
 
     /**