Revize 74a73b3b

re #7887 Deleting configurations and assemblies, Minor restructuralization.

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

@@ -22 +22 @@
 import vldc.aswi.service.parameter.ParameterManager;
 import vldc.aswi.service.parameter.ParameterTypeManager;
 import vldc.aswi.validators.AssemblyValidator;
+import vldc.aswi.utils.Utils;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
@@ -68 +69 @@
     @Autowired
     private AssemblyValidator assemblyValidator;
 
-    @Autowired
-    private ConfigurationManager configurationManager;
-
     /** Name of thymeleaf parameter, which will contain text in assembly form. */
     private String assemblyTitleName = "title";
 
@@ -92 +90 @@
         binder.addValidators(this.assemblyValidator);
     }
 
+    /**
+     * Get method for form, where configuration is created from assembly.
+     * @param id - ID of assembly.
+     * @return ModelAndView for assembly.
+     */
     @GetMapping("/assembly")
-    public ModelAndView assemblyIndex(@Valid @ModelAttribute("assemblyID") String id) {
+    public ModelAndView assemblyGet(@Valid @ModelAttribute("assemblyID") String id) {
         ModelAndView modelAndView = new ModelAndView("assembly");
 
         ModelMap modelMap = modelAndView.getModelMap();
@@ -119 +122 @@
         return modelAndView;
     }
 
-    /**
-     * Opens an configuration page after configuration name was clicked
-     * @param id ID of configuration
-     * @return modelAndView of page to be shown
-     */
-    @GetMapping("/configuration")
-    public ModelAndView configurationIndex(@Valid @ModelAttribute("configurationID") String id) {
-        ModelAndView modelAndView = new ModelAndView("assembly");
-
-        ModelMap modelMap = modelAndView.getModelMap();
-
-        Configuration configuration = configurationManager.getConfigurationById(Long.parseLong(id));
-
-        initializeFields(configuration);
-
-        modelMap.addAttribute("configuration", configuration);
-        modelMap.addAttribute("isAssembly", "0");
-
-        return modelAndView;
-    }
 
     /**
-     * Saves or edits configuration and redirects to the page with configuration
-     * @param newConfiguration contained with configuration data
-     * @param id ID of configuration, if empty new configuration is created
-     * @param bindingResult binding result
-     * @return modelAndView with redirection
+     * Post method for form, where configuration is created from assembly.
+     * @param assembly - Assembly values.
+     * @param bindingResult - Error results from assembly validators.
+     * @param atts - Redirect attributes.
+     * @return ModelAndView for assembly.
      */
-    @PostMapping("/configuration")
-    public ModelAndView saveConfiguration(@Valid Configuration newConfiguration, BindingResult bindingResult,
-                                          @RequestParam("configurationID") String id) {
-        ModelAndView modelAndView = new ModelAndView();
-
-        if (bindingResult.hasErrors()) {
-            modelAndView.setViewName("redirect:/");
-
-            return modelAndView;
-        }
-
-        Configuration configuration = configurationManager.saveConfiguration(newConfiguration, id);
-
-        initializeFields(configuration);
-
-        modelAndView.setViewName("redirect:/configuration?configurationID=" + configuration.getId());
-
-        return modelAndView;
-    }
-
     @PostMapping("/assembly")
-    public ModelAndView indexPost(@Valid Assembly assembly, BindingResult bindingResult, RedirectAttributes atts) {
+    public ModelAndView assemblyPost(@Valid Assembly assembly, BindingResult bindingResult, RedirectAttributes atts) {
         ModelAndView modelAndView = new ModelAndView();
 
         ModelMap modelMap = modelAndView.getModelMap();
@@ -185 +148 @@
         return modelAndView;
     }
 
+    /**
+     * Get method for assembly delete.
+     * @param id - ID of assembly.
+     * @return ModelAndView for index.
+     */
+    @GetMapping("/assembly_delete")
+    public ModelAndView assemblyDeleteGet(@RequestParam("assemblyID") String id) {
+        ModelAndView modelAndView = new ModelAndView("redirect:/");
+
+        Long assemblyId = Utils.tryParseLong(id);
+
+        if (assemblyId == null) {
+            // TODO: print error in index.
+        }
+        boolean success = this.assemblyManager.deleteAssembly(assemblyId);
+        // TODO: check success.
+
+        return modelAndView;
+    }
+
     /**
      * Get method for assembly edit.
      * @param id - Id of assembly.
      * @return ModelAndView for assembly edit.
      */
     @GetMapping("/assembly_edit")
-    public ModelAndView assemblyEditIndex(@Valid @ModelAttribute("assemblyID") String id) {
+    public ModelAndView assemblyEditGet(@Valid @ModelAttribute("assemblyID") String id) {
         ModelAndView modelAndView = new ModelAndView("assembly_manage");
 
         ModelMap modelMap = modelAndView.getModelMap();
@@ -219 +202 @@
      * @return ModelAndView for assembly edit.
      */
     @PostMapping("/assembly_edit")
-    public ModelAndView assemblyEditPostIndex(@Valid @ModelAttribute("assembly") Assembly assembly, BindingResult result,
+    public ModelAndView assemblyEditPost(@Valid @ModelAttribute("assembly") Assembly assembly, BindingResult result,
                                               @Valid @ModelAttribute("checkboxPublic") String assemblyIsPublic) {
 
         ModelAndView modelAndView = new ModelAndView("assembly_manage");
@@ -258 +241 @@
      * @return ModelAndView for new assembly.
      */
     @GetMapping("/assembly_new")
-    public ModelAndView assemblyNewIndex() {
+    public ModelAndView assemblyNewGet() {
         ModelAndView modelAndView = new ModelAndView("assembly_manage");
 
         ModelMap modelMap = modelAndView.getModelMap();
@@ -283 +266 @@
      * @return
      */
     @PostMapping("/assembly_new")
-    public ModelAndView assemblyNewIndexPost(@Valid @ModelAttribute("assembly") Assembly assembly, BindingResult result) {
+    public ModelAndView assemblyNewPost(@Valid @ModelAttribute("assembly") Assembly assembly, BindingResult result) {
         ModelAndView modelAndView = new ModelAndView();
+        ModelMap modelMap = modelAndView.getModelMap();
 
         if (result.hasErrors()) {
-            ModelMap modelMap = modelAndView.getModelMap();
             modelAndView.setViewName("assembly_manage");
-
             modelMap.addAttribute("assembly", assembly);
 
-            modelMap.addAttribute(assemblyTitleName, assemblyNewTitleText);
             modelMap.addAttribute(assemblyErrorName, getFullErrorMessage(result));
-
-            modelMap.addAttribute("allRoles", this.roleManager.getRoles());
-            modelMap.addAttribute("allParameterTypes", this.parameterTypeManager.getParameterTypes());
-            modelMap.addAttribute("allFunctions", this.functionManager.getFunctions());
-            modelMap.addAttribute("allOperators", this.operatorManager.getOperators());
-            modelMap.addAttribute("allLocations", this.locationManager.getLocations());
+            modelMap.addAttribute(assemblyTitleName, assemblyNewTitleText);
         }
+        else {
+            // TODO: chybí získání default value.
+            Long assemblyId = this.assemblyManager.createAssembly(assembly);
+            this.parameterManager.addParameters(assemblyId, assembly.getParameters());
 
-        ModelMap modelMap = modelAndView.getModelMap();
-
-        // TODO: chybí získání default value.
-        Long assemblyId = this.assemblyManager.createAssembly(assembly);
-        this.parameterManager.addParameters(assemblyId, assembly.getParameters());
-
-        modelAndView.setViewName("redirect:/assembly_edit?assemblyID=" + assemblyId);
+            modelAndView.setViewName("redirect:/assembly_edit?assemblyID=" + assemblyId);
+        }
 
         return modelAndView;
     }
-
-    /**
-     * Initializes fields of a given configuration
-     * @param configuration configuration which fields should be initialized
-     */
-    private void initializeFields(Configuration configuration) {
-        for(ParameterInConfiguration parameterInConfiguration : configuration.getParametersInConfiguration()) {
-            if(parameterInConfiguration.getLocation() == null) {
-                parameterInConfiguration.setLocation(new Location());
-            }
-            if(parameterInConfiguration.getOperator() == null) {
-                parameterInConfiguration.setOperator(new Operator());
-            }
-            if(parameterInConfiguration.getFunctions() == null) {
-                parameterInConfiguration.setFunctions(new ArrayList<>());
-            }
-        }
-    }
 }