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/dao/parameter/ParameterInConfigurationRepository.java

@@ -26 +26 @@
      */
     List<ParameterInConfiguration> getAllByConfigurationId(Long configurationId);
 
+    /**
+     * Get all parameters in configuration by parameter id.
+     * @param parameterId - ID of configuration.
+     * @return List of parameters in configuration.
+     */
+    List<ParameterInConfiguration> getAllByParameterId(Long parameterId);
+
     /**
      * Delete all parameters in configuration by configuration id.
      * @param configurationId - ID of configuration.

src/main/java/vldc/aswi/dao/parameter/ParameterRepository.java

@@ -3 +3 @@
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 import vldc.aswi.domain.parameter.Parameter;
-import vldc.aswi.domain.parameter.ParameterValue;
 
 import java.util.List;
 

src/main/java/vldc/aswi/database/DatabaseInterface.java

@@ -53 +53 @@
                         // The column count starts from 1.
                         for (int i = 1; i <= columnCount; i++ ) {
                             String columnName = resultSetMetaData.getColumnName(i);
-                            tableColumnNames.add(columnName);
+                            tableColumnNames.add(columnName.toLowerCase());
                         }
 
                         return tableColumnNames;

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

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

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

@@ -36 +36 @@
     private Assembly assembly;
 
     /** List of parametersInConfiguration, which is part of this configuration. */
-    @OneToMany(mappedBy = "configuration", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "configuration")
     private List<ParameterInConfiguration> parametersInConfiguration;
 
     /**

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

@@ -23 +23 @@
      * @return true if objects are same.
      */
     @Override
-    public boolean equals(Object obj)
-    {
+    public boolean equals(Object obj) {
         if(this == obj) {
             return true;
         }

src/main/java/vldc/aswi/domain/parameter/Parameter.java

@@ -25 +25 @@
     private String nameOfSelect;
 
     /** Specific assembly, in which this parameter will be part of. */
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "sestava_id")
     private Assembly assembly;
 
     /** Specific type of parameter, which represents type of entry. */
-    @ManyToOne(fetch=FetchType.LAZY)
+    @ManyToOne(fetch=FetchType.EAGER)
     @JoinColumn(name = "parametr_typ_id")
     private ParameterType parameterType;
 
@@ -43 +43 @@
     private int parameterOrder;
 
     /** List of parametersInConfiguration, which using this parameter. */
-    @OneToMany(mappedBy = "parameter", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "parameter")
     private List<ParameterInConfiguration> parametersInConfiguration;
 
     /** List of parametersInConfiguration, which using this parameter. */
-    @OneToMany(mappedBy = "parameter", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "parameter")
     private List<ParameterValue> parameterValues;
 
     /**
      * Creating new table with M:N relationship between Parameter and Location.
      * Specify which locations can be used for parameter.
      */
-    @ManyToMany(cascade = CascadeType.PERSIST)
+    @ManyToMany
     @JoinTable(
             name = "Parametr_ma_Umisteni",
             joinColumns = @JoinColumn(name = "parametr_id"),
@@ -66 +66 @@
      * Creating new table with M:N relationship between Parameter and Function.
      * Specify which functions can be used for parameter.
      */
-    @ManyToMany(cascade = CascadeType.PERSIST)
+    @ManyToMany
     @JoinTable(
             name = "Parametr_ma_Funkce",
             joinColumns = @JoinColumn(name = "parametr_id"),
@@ -78 +78 @@
      * Creating new table with M:N relationship between Parameter and Operator.
      * Specify which operators can be used for parameter.
      */
-    @ManyToMany(cascade = CascadeType.PERSIST)
+    @ManyToMany
     @JoinTable(
             name = "Parametr_ma_Operator",
             joinColumns = @JoinColumn(name = "parametr_id"),

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

@@ -122 +122 @@
     @Override
     public boolean deleteConfiguration(Long id) {
         try {
-            this.parameterInConfigurationManager.deleteParametersInConfiguration(id);
+            this.parameterInConfigurationManager.deleteParametersInConfiguration(id, true);
             this.configurationRepository.deleteById(id);
             return true;
         } catch (Exception e) {
@@ -141 +141 @@
             // Delete parameters in current configuration.
             List<Configuration> configurations = this.configurationRepository.getByAssemblyId(assemblyId);
             for (Configuration configuration : configurations) {
-                this.parameterInConfigurationManager.deleteParametersInConfiguration(configuration.getId());
+                this.parameterInConfigurationManager.deleteParametersInConfiguration(configuration.getId(), true);
             }
 
             // Delete configuration.

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

@@ -17 +17 @@
 
     /**
      * Delete all parameters in configuration by configuration id.
-     * @param configurationID - ID of configuration.
-     * @return True if all parameters in configuration was deleted, false if not.
+     * @param id - ID of parameter / configuration.
+     * @return List of deleted parameters in configuration.
      */
-    boolean deleteParametersInConfiguration(Long configurationID);
+    boolean deleteParametersInConfiguration(Long id, boolean configurationUsed);
 }

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

@@ -55 +55 @@
 
     /**
      * Delete all parameters in configuration by configuration id.
-     * @param configurationID - ID of configuration.
+     * @param id - ID of parameter / configuration.
      * @return List of deleted parameters in configuration.
      */
-    public boolean deleteParametersInConfiguration(Long configurationID) {
+    @Override
+    public boolean deleteParametersInConfiguration(Long id, boolean configurationUsed) {
         try {
-            List<ParameterInConfiguration> parameterInConfigurations = this.parameterInConfigurationRepository.getAllByConfigurationId(configurationID);
-            for (ParameterInConfiguration parameterInConfiguration : parameterInConfigurations) {
+            List<ParameterInConfiguration> parameterInConfigurations = null;
 
-                // Delete all functions used in current parameter in table 'Parametr_Konfigurace_ma_Funkce'.
-                List<Function> functionList = new ArrayList<>(parameterInConfiguration.getFunctions());
-                for (Function function : functionList) {
-                    parameterInConfiguration.removeFunction(function);
+            if (configurationUsed) {
+                parameterInConfigurations = this.parameterInConfigurationRepository.getAllByConfigurationId(id);
+            }
+            else {
+                parameterInConfigurations = this.parameterInConfigurationRepository.getAllByParameterId(id);
+            }
+            for (ParameterInConfiguration parameterInConfiguration : parameterInConfigurations) {
+                boolean success = deleteParameterInConfiguration(parameterInConfiguration);
+                if (!success) {
+                    return false;
                 }
             }
 
@@ -77 +83 @@
             return  false;
         }
     }
+
+    private boolean deleteParameterInConfiguration(ParameterInConfiguration parameterInConfiguration) {
+        try {
+
+            // Delete all functions used in current parameter in table 'Parametr_Konfigurace_ma_Funkce'.
+            List<Function> functionList = new ArrayList<>(parameterInConfiguration.getFunctions());
+            for (Function function : functionList) {
+                parameterInConfiguration.removeFunction(function);
+            }
+
+            return true;
+        }
+        catch (Exception e) {
+
+            return false;
+        }
+    }
 }

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;

src/main/java/vldc/aswi/validators/AssemblyValidator.java

@@ -52 +52 @@
             for (int i = 0; i < assembly.getParameters().size(); i++) {
                 Parameter parameter = assembly.getParameters().get(i);
 
+                // If parameter does not have name then it means, that it is deleted parameter.
+                if (parameter.getName() == null) {
+                    continue;
+                }
+
                 // Check if parameter's nameOfSelect is contained in column names of SQL query.
-                if (parameter.getNameOfSelect() == null || !columnNames.stream().anyMatch(parameter.getNameOfSelect()::equalsIgnoreCase)) {
+                if (parameter.getNameOfSelect() == null || !columnNames.stream().anyMatch(n-> n.equalsIgnoreCase(parameter.getNameOfSelect()))) {
                     errors.reject("parameters[" + i + "].nameOfSelect", "Název parametru v SQL query není validní u parametru '" + parameter.getName() + "'!");
                 }
 

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

@@ -175 +175 @@
      */
     @GetMapping("/assembly_edit")
     public ModelAndView assemblyEditGet(@Valid @ModelAttribute("assemblyID") String id) {
+        long startTime = System.currentTimeMillis();
         ModelAndView modelAndView = new ModelAndView("assembly_manage");
 
         ModelMap modelMap = modelAndView.getModelMap();
@@ -190 +191 @@
         modelMap.addAttribute("allFunctions", this.functionManager.getFunctions());
         modelMap.addAttribute("allOperators", this.operatorManager.getOperators());
         modelMap.addAttribute("allLocations", this.locationManager.getLocations());
+        long estimatedTime = System.currentTimeMillis() - startTime;
+        System.out.println("EDIT GET estimated - " + ((double)estimatedTime / 1000) + " sekund ");
 
         return modelAndView;
     }
@@ -204 +207 @@
     @PostMapping("/assembly_edit")
     public ModelAndView assemblyEditPost(@Valid @ModelAttribute("assembly") Assembly assembly, BindingResult result,
                                               @Valid @ModelAttribute("checkboxPublic") String assemblyIsPublic) {
-
+        long startTime = System.currentTimeMillis();
         ModelAndView modelAndView = new ModelAndView("assembly_manage");
         ModelMap modelMap = modelAndView.getModelMap();
 
@@ -221 +224 @@
             // TODO: chybí defaultValue.
             Long assemblyID = this.assemblyManager.updateAssembly(assembly);
             this.parameterManager.updateParameters(assemblyID, assembly.getParameters());
-            Assembly updatedAssembly = this.assemblyManager.getAssemblyById(assembly.getId());
+            Assembly updatedAssembly = this.assemblyManager.getAssemblyById(assemblyID);
 
             modelMap.addAttribute("assembly", updatedAssembly);
             modelMap.addAttribute(assemblyTitleName, assemblyEditTitleText + " " + updatedAssembly.getName());
@@ -232 +235 @@
         modelMap.addAttribute("allFunctions", this.functionManager.getFunctions());
         modelMap.addAttribute("allOperators", this.operatorManager.getOperators());
         modelMap.addAttribute("allLocations", this.locationManager.getLocations());
+        long estimatedTime = System.currentTimeMillis() - startTime;
+        System.out.println("EDIT POST estimated - " + ((double)estimatedTime / 1000) + " sekund ");
 
         return modelAndView;
     }

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

@@ -20 +20 @@
             if (object instanceof FieldError) {
                 FieldError fieldError = (FieldError) object;
 
-                if (fieldError.getCode() == null) message += fieldError.getDefaultMessage() + ", ";
-                else message += fieldError.getCode() + ", ";
+                message += fieldError.getDefaultMessage() + ", ";
                 continue;
             }
 
             if (object instanceof ObjectError) {
                 ObjectError objectError = (ObjectError) object;
 
-                if (objectError.getCode() == null) message += objectError.getDefaultMessage() + ", ";
-                else message += objectError.getCode() + ", ";
+                message += objectError.getDefaultMessage() + ", ";
                 continue;
             }
         }

src/main/webapp/WEB-INF/templates/assembly_manage.html

@@ -108 +108 @@
           <div th:id="'collapse' + ${i.index}" class="panel-collapse collapse">
             <div class="panel-body">
               <div class="form-group row">
-                <label for="name" class="col-sm-2 col-form-label">Název:</label>
+                <label th:for="'parameterName' + ${i.index}" class="col-sm-2 col-form-label">Název:</label>
                 <div class="col-sm-10">
                   <input type="text" class="form-control" th:name="'parameterName' + ${i.index}" th:id="'parameterName' + ${i.index}" th:field="*{parameters[__${i.index}__].name}" th:value="*{parameters[__${i.index}__].name}" required>
                 </div>
               </div>
               <div class="form-group row">
-                <label for="name" class="col-sm-2 col-form-label">V&nbsp;SQL:</label>
+                <label th:for="'parameterSQLName' + ${i.index}" class="col-sm-2 col-form-label">V&nbsp;SQL:</label>
                 <div class="col-sm-10">
                   <input type="text" class="form-control" th:name="'parameterSQLName' + ${i.index}" th:id="'parameterSQLName' + ${i.index}" th:field="*{parameters[__${i.index}__].nameOfSelect}" th:value="*{parameters[__${i.index}__].nameOfSelect}" required>
                 </div>