Changed the output of pages at startup, and added the ability for the user to add, edit, and delete todo. Changed font colors when displaying the message. Corrected the authorization and registration form. And much more.

Author: mistaru

.idea/compiler.xml

@@ -16,6 +16,7 @@
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+
     @Autowired
     private UserServiceImpl userServiceImpl;
 
@@ -36,9 +37,11 @@ protected void configure(HttpSecurity http) throws Exception {
                 .and()
                     .formLogin()
                     .loginPage("/login")
-                    .permitAll()
+                    .defaultSuccessUrl("/main", true)
+                .permitAll()
                 .and()
                     .logout()
+                    .logoutSuccessUrl("/")
                     .permitAll();
     }
 

.idea/workspace.xml

@@ -0,0 +1,12 @@
+package org.example.argen.constants;
+
+public final class Constants {
+
+    public static final String TODO_ERROR_EDIT = "TODO_ERROR_EDIT";
+    public static final String  CANT_EDIT_TODO = "You can't edit this todo!";
+    public static final String TODO_ERROR_DELETE = "TODO_ERROR_DELETE";
+    public static final String CANT_DELETE_TODO = "You can't delete this todo!";
+    public static final String USER_ERROR_ADD = "USER_ERROR_ADD";
+    public static final String  CANT_ADD_NEW_USER = "There is already a user with this username, enter a different username!";
+
+}

src/main/java/org/example/argen/configuration/WebSecurityConfig.java

@@ -18,13 +18,11 @@ public class AdminController {
     @Autowired
     private UserServiceImpl userServiceImpl;
 
-
     @PreAuthorize("hasAuthority('ADMIN')")
     @GetMapping
     public String userList(Model model) {
         model.addAttribute("users", userServiceImpl.findAllUsers());
-
-        return "userList";
+        return "user/userList";
     }
 
 
@@ -33,7 +31,7 @@ public String userList(Model model) {
     public String userEditForm(@PathVariable User user, Model model) {
         model.addAttribute("user", user);
         model.addAttribute("roles", Role.values());
-        return "userEdit";
+        return "user/userEdit";
     }
 
 
@@ -47,4 +45,5 @@ public String userSave(
         userServiceImpl.saveUser(user,active, form);
         return "redirect:/user";
     }
+
 }

src/main/java/org/example/argen/constants/Constants.java

@@ -3,20 +3,28 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import java.util.Map;
 
 @Controller
 public class MainController {
 
     @GetMapping("/")
-    public String greeting(Map<String, Object> model) {
+    public String greeting() {
         return "greeting";
     }
 
     @GetMapping("/main")
-    public String mainPage(Map<String, Object> model) {
+    public String mainPage() {
         return "main";
     }
 
+/*    @GetMapping("/todoEdit")
+    public String todoEdit() {
+        return "todo/todoEdit";
+    }
+
+    @GetMapping("/todoDelete")
+    public String todoDelete() {
+        return "todo/todoDelete";
+    }*/
 
 }

src/main/java/org/example/argen/controller/AdminController.java

@@ -10,6 +10,9 @@
 
 import javax.validation.Valid;
 
+import static org.example.argen.constants.Constants.CANT_ADD_NEW_USER;
+import static org.example.argen.constants.Constants.USER_ERROR_ADD;
+
 @Controller
 public class RegistrationController {
 
@@ -25,7 +28,7 @@ public String registration() {
     public String registerUser(@Valid User user, Model model) {
 
         if (!userServiceImpl.registerUser(user)) {
-            model.addAttribute("usernameError", "This user exists, enter a different user name");
+            model.addAttribute(USER_ERROR_ADD, CANT_ADD_NEW_USER);
             return "registration";
         }
         return "redirect:/login";

src/main/java/org/example/argen/controller/MainController.java

@@ -1,9 +1,92 @@
 package org.example.argen.controller;
 
+import org.example.argen.entity.Todo;
+import org.example.argen.entity.User;
+import org.example.argen.enums.Status;
+import org.example.argen.repository.TodoRepository;
+import org.example.argen.serviceImp.TodoServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.validation.Valid;
+
+import static org.example.argen.constants.Constants.*;
 
 @Controller
 @RequestMapping("/todo")
 public class TodoController {
+
+    @Autowired
+    private TodoServiceImpl todoService;
+
+    @Autowired
+    private TodoRepository todoRepository;
+
+    @GetMapping()
+    public ModelAndView todoList(@AuthenticationPrincipal User user) {
+        return new ModelAndView("todo/todoList")
+                .addObject("newTodo", todoService.listTodo(Status.NEW, user))
+                .addObject("doingTodo", todoService.listTodo(Status.DOING, user))
+                .addObject("doneTodo", todoService.listTodo(Status.DONE, user));
+    }
+
+    @PreAuthorize("hasAuthority('USER')")
+    @PostMapping("todoList")
+    public String addNewTodo(@AuthenticationPrincipal User user, @Valid Todo todo) {
+        todoService.addNewTodo(user, todo);
+        return "redirect:/todo";
+    }
+
+
+    @PreAuthorize("hasAuthority('USER')")
+    @GetMapping("{id}")
+    public String todoEditForm(@PathVariable Long id, Model model) {
+        Todo todo = todoService.findTodoById(id);
+        model.addAttribute("todo", todo);
+        return "todo/todoEdit";
+    }
+
+
+    @PreAuthorize("hasAuthority('USER')")
+    @PostMapping()
+    public String saveTodo(
+            @AuthenticationPrincipal User user,
+            @RequestParam("todoId") Long id,
+            @RequestParam String title,
+            @RequestParam String description,
+            @RequestParam Status status,
+            Model model
+
+    ) {
+        Todo todo = todoService.findTodoById(id);
+        if (!todoService.saveTodo(user, todo, title, description, status)){
+            model.addAttribute(TODO_ERROR_EDIT, CANT_EDIT_TODO);
+            return "todo/todoEdit";
+        }
+        return "redirect:/todo";
+    }
+
+
+    @PreAuthorize("hasAuthority('USER')")
+    @PostMapping("deleteTodo")
+    @Transactional
+    public String  deleteTodo(
+            @AuthenticationPrincipal User user,
+            @RequestParam("todoId") Long id,
+            Model model
+    ) {
+        Todo todo = todoService.findTodoById(id);
+        if (!todoService.deleteTodo(user, todo)) {
+            model.addAttribute(TODO_ERROR_DELETE, CANT_DELETE_TODO);
+            return "todo/todoEdit";
+        }
+        return "redirect:/todo";
+    }
+
 }

src/main/java/org/example/argen/controller/RegistrationController.java

@@ -1,5 +1,6 @@
 package org.example.argen.entity;
 
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import org.example.argen.enums.Status;
@@ -8,9 +9,7 @@
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "users")
-@Getter
-@Setter
+@Table(name = "todo")
 public class Todo {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -26,4 +25,52 @@ public class Todo {
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "user_id")
     private User author;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public LocalDateTime getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(LocalDateTime createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    public User getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(User author) {
+        this.author = author;
+    }
 }

src/main/java/org/example/argen/controller/TodoController.java

@@ -3,7 +3,8 @@
 import org.springframework.security.core.GrantedAuthority;
 
 public enum Role implements GrantedAuthority {
-    USER, ADMIN;
+    USER,
+    ADMIN;
 
     @Override
     public String getAuthority() {