По сути готовая 5 лаба

src/main/java/com/example/demo/directions/api/DirectionsAdminController.java

@@ -0,0 +1,127 @@
+package com.example.demo.directions.api;
+
+import java.util.List;
+
+import org.modelmapper.ModelMapper;
+import org.modelmapper.TypeToken;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.example.demo.core.configuration.Constants;
+import com.example.demo.department.api.DepartmentDto;
+import com.example.demo.department.service.DepartmentService;
+import com.example.demo.directions.model.DirectionsEntity;
+import com.example.demo.directions.service.DirectionsService;
+
+import jakarta.validation.Valid;
+
+@Controller
+@RequestMapping(DirectionsAdminController.URL)
+public class DirectionsAdminController {
+    public static final String URL = Constants.ADMIN_PREFIX + "/directions";
+    private static final String DIRECTIONS_URL = DirectionsController.URL;
+    private static final String DIRECTIONS_EDIT_VIEW = "direction-edit";
+    private static final String DIRECTIONS_ATTRIBUTE = "directions";
+    private static final String DEPARTMENT_ATTRIBUTE = "departments";
+    private static final String PAGE_ATTRIBUTE = "page";
+    private final DirectionsService directionsService;
+    private final ModelMapper modelMapper;
+    private final DepartmentService departmentService;
+
+    public DirectionsAdminController(DirectionsService directionsService, ModelMapper modelMapper,
+            DepartmentService departmentService) {
+        this.directionsService = directionsService;
+        this.modelMapper = modelMapper;
+        this.departmentService = departmentService;
+    }
+
+    private DirectionsDto toDto(DirectionsEntity entity) {
+        return modelMapper.map(entity, DirectionsDto.class);
+    }
+
+    private DirectionsEntity toEntity(DirectionsDto dto) {
+        final DirectionsEntity entity = modelMapper.map(dto, DirectionsEntity.class);
+        entity.setDepartment(departmentService.get(dto.getDepartmentId()));
+        return entity;
+    }
+
+    private List<DepartmentDto> getDepartments(){
+       return modelMapper.map(departmentService.getAll(), new TypeToken<List<DepartmentDto>>(){}.getType());
+    }
+
+    @GetMapping("/edit/")
+    public String create(Model model,
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page) {
+        model.addAttribute(DIRECTIONS_ATTRIBUTE, new DirectionsDto());
+        model.addAttribute(DEPARTMENT_ATTRIBUTE, getDepartments());
+        model.addAttribute(PAGE_ATTRIBUTE, page);
+        return DIRECTIONS_EDIT_VIEW;
+    }
+
+    @PostMapping("/edit/")
+    public String create(
+            @ModelAttribute(name = DIRECTIONS_ATTRIBUTE) @Valid DirectionsDto direction,
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            BindingResult bindingResult,
+            Model model,
+            RedirectAttributes redirectAttributes) {
+        if (bindingResult.hasErrors()) {
+            model.addAttribute(PAGE_ATTRIBUTE, page);
+            return DIRECTIONS_EDIT_VIEW;
+        }
+        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
+        directionsService.create(toEntity(direction));
+        return Constants.REDIRECT_VIEW + DIRECTIONS_URL;
+    }
+
+    @GetMapping("/edit/{id}")
+    public String update(
+            @PathVariable(name = "id") Long id,
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            Model model) {
+        if (id <= 0) {
+            throw new IllegalArgumentException();
+        }
+        model.addAttribute(DIRECTIONS_ATTRIBUTE, toDto(directionsService.get(id)));
+        model.addAttribute(DEPARTMENT_ATTRIBUTE, getDepartments());
+        model.addAttribute(PAGE_ATTRIBUTE, page);
+        return DIRECTIONS_EDIT_VIEW;
+    }
+
+    @PostMapping("/edit/{id}")
+    public String update(
+            @PathVariable(name = "id") Long id,
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            @ModelAttribute(name = DIRECTIONS_ATTRIBUTE) @Valid DirectionsDto direction,
+            BindingResult bindingResult,
+            Model model,
+            RedirectAttributes redirectAttributes) {
+        if (bindingResult.hasErrors()) {
+            return DIRECTIONS_EDIT_VIEW;
+        }
+        if (id <= 0) {
+            throw new IllegalArgumentException();
+        }
+        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
+        directionsService.update(id, toEntity(direction));
+        return Constants.REDIRECT_VIEW + DIRECTIONS_URL;
+    }
+
+    @PostMapping("/delete/{id}")
+    public String delete(
+            @PathVariable(name = "id") Long id,
+            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
+            RedirectAttributes redirectAttributes) {
+        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
+        directionsService.delete(id);
+        return Constants.REDIRECT_VIEW + DIRECTIONS_URL;
+    }
+}

src/main/java/com/example/demo/directions/api/DirectionsController.java

@@ -1,69 +1,37 @@
 package com.example.demo.directions.api;
 
-import java.util.List;
 import java.util.Map;
 
 import org.modelmapper.ModelMapper;
-import org.modelmapper.TypeToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.example.demo.core.api.PageAttributesMapper;
 import com.example.demo.core.configuration.Constants;
-import com.example.demo.department.api.DepartmentDto;
-import com.example.demo.department.service.DepartmentService;
-import com.example.demo.directions.model.DirectionsEntity;
 import com.example.demo.directions.model.DirectionsGrouped;
 import com.example.demo.directions.service.DirectionsService;
 
-import jakarta.validation.Valid;
-
 @Controller
 @RequestMapping(DirectionsController.URL)
 public class DirectionsController {
     public static final String URL = "/directions";
     private static final String DIRECTIONS_VIEW = "directions";
-    private static final String DIRECTIONS_EDIT_VIEW = "direction-edit";
-    private static final String DIRECTIONS_ATTRIBUTE = "directions";
-    private static final String DEPARTMENT_ATTRIBUTE = "departments";
     private static final String PAGE_ATTRIBUTE = "page";
     private final DirectionsService directionsService;
     private final ModelMapper modelMapper;
-    private final DepartmentService departmentService;
 
-    public DirectionsController(DirectionsService directionsService, ModelMapper modelMapper,
+    public DirectionsController(DirectionsService directionsService, ModelMapper modelMapper) {
-            DepartmentService departmentService) {
         this.directionsService = directionsService;
         this.modelMapper = modelMapper;
-        this.departmentService = departmentService;
-    }
-
-    private DirectionsDto toDto(DirectionsEntity entity) {
-        return modelMapper.map(entity, DirectionsDto.class);
-    }
-
-    private DirectionsEntity toEntity(DirectionsDto dto) {
-        final DirectionsEntity entity = modelMapper.map(dto, DirectionsEntity.class);
-        entity.setDepartment(departmentService.get(dto.getDepartmentId()));
-        return entity;
     }
 
     private DirectionsGroupedDto toGroupedDto(DirectionsGrouped entity){
         return modelMapper.map(entity, DirectionsGroupedDto.class);
     }
     
-    private List<DepartmentDto> getDepartments(){
-       return modelMapper.map(departmentService.getAll(), new TypeToken<List<DepartmentDto>>(){}.getType());
-    }
-    
     @GetMapping
     public String getAllWithDepartment(
             @RequestParam(name=PAGE_ATTRIBUTE, defaultValue = "0") int page,
@@ -76,72 +44,4 @@ public class DirectionsController {
         model.addAttribute("name", name);
         return DIRECTIONS_VIEW;
     }
-    
-    @GetMapping("/edit/")
-    public String create(Model model,
-            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page) {
-        model.addAttribute(DIRECTIONS_ATTRIBUTE, new DirectionsDto());
-        model.addAttribute(DEPARTMENT_ATTRIBUTE, getDepartments());
-        model.addAttribute(PAGE_ATTRIBUTE, page);
-        return DIRECTIONS_EDIT_VIEW;
-    }
-
-    @PostMapping("/edit/")
-    public String create(
-            @ModelAttribute(name = DIRECTIONS_ATTRIBUTE) @Valid DirectionsDto direction,
-            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
-            BindingResult bindingResult,
-            Model model,
-            RedirectAttributes redirectAttributes) {
-        if (bindingResult.hasErrors()) {
-            model.addAttribute(PAGE_ATTRIBUTE, page);
-            return DIRECTIONS_EDIT_VIEW;
-        }
-        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
-        directionsService.create(toEntity(direction));
-        return Constants.REDIRECT_VIEW + URL;
-    }
-
-    @GetMapping("/edit/{id}")
-    public String update(
-            @PathVariable(name = "id") Long id,
-            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
-            Model model) {
-        if (id <= 0) {
-            throw new IllegalArgumentException();
-        }
-        model.addAttribute(DIRECTIONS_ATTRIBUTE, toDto(directionsService.get(id)));
-        model.addAttribute(DEPARTMENT_ATTRIBUTE, getDepartments());
-        model.addAttribute(PAGE_ATTRIBUTE, page);
-        return DIRECTIONS_EDIT_VIEW;
-    }
-
-    @PostMapping("/edit/{id}")
-    public String update(
-            @PathVariable(name = "id") Long id,
-            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
-            @ModelAttribute(name = DIRECTIONS_ATTRIBUTE) @Valid DirectionsDto direction,
-            BindingResult bindingResult,
-            Model model,
-            RedirectAttributes redirectAttributes) {
-        if (bindingResult.hasErrors()) {
-            return DIRECTIONS_EDIT_VIEW;
-        }
-        if (id <= 0) {
-            throw new IllegalArgumentException();
-        }
-        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
-        directionsService.update(id, toEntity(direction));
-        return Constants.REDIRECT_VIEW + URL;
-    }
-
-    @PostMapping("/delete/{id}")
-    public String delete(
-            @PathVariable(name = "id") Long id,
-            @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page,
-            RedirectAttributes redirectAttributes) {
-        redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page);
-        directionsService.delete(id);
-        return Constants.REDIRECT_VIEW + URL;
-    }
 }

src/main/java/com/example/demo/entrysData/api/EntrysDataSignupDto.java

@@ -1,6 +1,6 @@
 package com.example.demo.entrysData.api;
 
-import groovyjarjarantlr4.v4.runtime.misc.NotNull;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 
@@ -8,7 +8,8 @@ public class EntrysDataSignupDto {
     @NotBlank
     @Size(min = 3, max = 20)
     private String login;
-    @NotNull
+    private Long Id;
+    @Min(1)
     private Long departmentId;
     @NotBlank
     @Size(min = 3, max = 20)
@@ -29,6 +30,14 @@ public class EntrysDataSignupDto {
         return password;
     }
 
+    public Long getId(){
+        return Id;
+    }
+    
+    public void setId(Long Id){
+        this.Id = Id;
+    }
+
     public Long getDepartmentId(){
         return departmentId;
     }

src/main/resources/templates/default.html

@@ -46,7 +46,12 @@
                             </a>
                         </th:block>
                     </ul>
-                    <ul class="navbar-nav">
+                    <ul class="navbar-nav" th:if="${not #strings.isEmpty(userName)}">
+                        <form th:action="@{/logout}" method="post">
+                            <button type="submit" class="navbar-brand nav-link" onclick="return confirm('Вы уверены?')">
+                                Выход ([[${userName}]])
+                            </button>
+                        </form>
                     </ul>
                 </div>
             </th:block>

src/main/resources/templates/direction-edit.html

@@ -7,7 +7,7 @@
 
 <body>
     <main layout:fragment="content">
-        <form action="#" th:action="@{/directions/edit/{id}(id=${directions.id},(page=${page}))}"
+        <form action="#" th:action="@{/admin/directions/edit/{id}(id=${directions.id},(page=${page}))}"
             th:object="${directions}" method="post">
             <div class="mb-3">
                 <label for="id" class="form-label">ID</label>

src/main/resources/templates/directions.html

@@ -23,9 +23,12 @@
                 </div>
             </form>
         </div>
+        <th:block sec:authorize="hasRole('ADMIN')">
             <div>
-            <a th:href="@{/admin/directions/edit/(page=${page})}" class="btn btn-danger mt-4">Добавить направление</a>
+                <a th:href="@{/admin/directions/edit/(page=${page})}" class="btn btn-danger mt-4">Добавить
+                    направление</a>
             </div>
+        </th:block>
         <th:block th:switch="${items.size()}">
             <h2 th:case="0">Данные отсутствуют</h2>
             <th:block th:case="*">
@@ -38,8 +41,10 @@
                             <th scope="col" class="w-25">Направление</th>
                             <th scope="col" class="w-25">Кафедра</th>
                             <th scope="col" class="w-25">Предметы ЕГЭ</th>
+                            <th:block sec:authorize="hasRole('ADMIN')">
                                 <th scope="col" class="w-5"></th>
                                 <th scope="col" class="w-5"></th>
+                            </th:block>
                         </tr>
                     </thead>
                     <tbody>
@@ -49,6 +54,7 @@
                             <td th:text="${direction.name}"></td>
                             <td th:text="${direction.departmentName}"></td>
                             <td th:text="${direction.things}"></td>
+                            <th:block sec:authorize="hasRole('ADMIN')">
                                 <td>
                                     <form th:action="@{/admin/directions/edit/{id}(id=${direction.id})}" method="get">
                                         <input type="hidden" th:name="page" th:value="${page}">
@@ -58,7 +64,8 @@
                                     </form>
                                 </td>
                                 <td>
-                                <form th:action="@{/admin/directions/delete/{id}(id=${direction.id})}" method="post">
+                                    <form th:action="@{/admin/directions/delete/{id}(id=${direction.id})}"
+                                        method="post">
                                         <input type="hidden" th:name="page" th:value="${page}">
                                         <button type="submit" class="btn btn-link button-link"
                                             onclick="return confirm('Вы уверены?')">
@@ -66,6 +73,7 @@
                                         </button>
                                     </form>
                                 </td>
+                            </th:block>
                         </tr>
                     </tbody>
                 </table>