Backend: Вебинары в админ панель #902

build.gradle.kts

@@ -48,7 +48,7 @@ dependencies {
     implementation(libs.instancioJunit)
     implementation(libs.jsonunitAssertj)
     implementation(libs.guava)
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2")
+    // implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2")
 
     // MapStruct
     implementation(libs.mapstruct)

src/main/java/io/hexlet/cv/config/JacksonConfig.java

@@ -1,3 +1,4 @@
+
 package io.hexlet.cv.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/io/hexlet/cv/config/SecurityConfig.java

@@ -1,6 +1,10 @@
 package io.hexlet.cv.config;
 
 import io.hexlet.cv.service.CustomUserDetailsService;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
@@ -21,11 +25,6 @@
 import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver;
 import org.springframework.security.web.SecurityFilterChain;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 @Configuration
 @EnableWebSecurity
 @EnableMethodSecurity

src/main/java/io/hexlet/cv/controller/MainPageController.java

@@ -2,6 +2,8 @@
 
 import io.github.inertia4j.spring.Inertia;
 import io.hexlet.cv.service.PageSectionService;
+import java.util.Map;
+import java.util.Set;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -11,9 +13,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import java.util.Map;
-import java.util.Set;
-
 @Controller
 @AllArgsConstructor
 @RequestMapping({"/", "/{locale}"})

src/main/java/io/hexlet/cv/controller/PageSectionController.java

@@ -5,6 +5,8 @@
 import io.hexlet.cv.dto.pagesection.PageSectionUpdateDTO;
 import io.hexlet.cv.service.PageSectionService;
 import jakarta.validation.Valid;
+import java.util.List;
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,9 +21,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
-
 @RestController
 @AllArgsConstructor
 @RequestMapping("/api/pages/sections")

src/main/java/io/hexlet/cv/controller/UserPageController.java

@@ -3,7 +3,7 @@
 import io.github.inertia4j.spring.Inertia;
 import io.hexlet.cv.handler.exception.UserNotFoundException;
 import io.hexlet.cv.service.FlashPropsService;
-import io.hexlet.cv.service.UserPageSercive;
+import io.hexlet.cv.service.UserPageService;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.Locale;
 import java.util.Map;
@@ -21,7 +21,7 @@ public class UserPageController {
 
     private final Inertia inertia;
     private final FlashPropsService flashPropsService;
-    private final UserPageSercive userPageService;
+    private final UserPageService userPageService;
 
     private final MessageSource messageSource;
 

src/main/java/io/hexlet/cv/controller/AdminController.java → src/main/java/io/hexlet/cv/controller/admin/AdminController.java

@@ -1,5 +1,5 @@
 
-package io.hexlet.cv.controller;
+package io.hexlet.cv.controller.admin;
 
 import io.github.inertia4j.spring.Inertia;
 import io.hexlet.cv.service.FlashPropsService;
@@ -36,12 +36,14 @@ public ResponseEntity<?> adminMarketingController(@PathVariable("locale") String
         return inertia.render("Admin/Marketing/Index", props);
     }
 
+    /*
     @GetMapping("/webinars")
     public ResponseEntity<?> adminWebinarsController(@PathVariable("locale") String locale,
                                                      HttpServletRequest request) {
         var props = flashPropsService.buildProps(locale, request);
         return inertia.render("Admin/Webinars/Index", props);
     }
+*/
 
     @GetMapping("/knowledgebase")
     public ResponseEntity<?> adminKnowledgebaseController(@PathVariable("locale") String locale,

src/main/java/io/hexlet/cv/controller/admin/AdminWebinarsController.java

@@ -0,0 +1,87 @@
+package io.hexlet.cv.controller.admin;
+
+import io.github.inertia4j.spring.Inertia;
+import io.hexlet.cv.dto.admin.WebinarDTO;
+import io.hexlet.cv.repository.WebinarRepository;
+import io.hexlet.cv.service.AdminWebinarService;
+import io.hexlet.cv.service.FlashPropsService;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.servlet.support.RequestContextUtils;
+
+
+@Controller
+@AllArgsConstructor
+@RequestMapping("/admin/webinars")
+@PreAuthorize("hasRole('ADMIN')")
+public class AdminWebinarsController {
+
+    private final Inertia inertia;
+    private final FlashPropsService flashPropsService;
+    private final WebinarRepository webinarRepository;
+    private final AdminWebinarService adminWebinarService;
+
+    @GetMapping("")
+    public  Object adminWebinarsIndex(@RequestParam(defaultValue = "0") int page,
+                                      @RequestParam(defaultValue = "10") int size,
+                                      @RequestParam(name = "search", required = false) String searchStr,
+                                      HttpServletRequest request) {
+
+        Pageable pageable = PageRequest.of(page, size);
+        var props = adminWebinarService.indexSearchWebinar(pageable, searchStr);
+
+        var flash = RequestContextUtils.getInputFlashMap(request);
+
+        if (flash != null && !flash.isEmpty()) {
+            props.put("flash", flash);
+        }
+
+        return inertia.render("Admin/Webinars/Index", props);
+    }
+
+
+    @PostMapping("/create")
+    public Object createWebinar(@RequestBody WebinarDTO webinarDTO,
+                                            RedirectAttributes redirectAttributes)  {
+
+
+
+        adminWebinarService.createWebinar(webinarDTO);
+
+        redirectAttributes.addFlashAttribute("success", "create.success");
+        return inertia.redirect("/Admin/Webinars/Index");
+    }
+
+    @PutMapping("/{id}/update")
+    public Object updateWebinar(@PathVariable Long id,
+                                 @RequestBody WebinarDTO webinarDTO,
+                                 RedirectAttributes redirectAttributes)  {
+
+        adminWebinarService.updateWebinar(id, webinarDTO);
+
+        redirectAttributes.addFlashAttribute("success", "update.success");
+        return inertia.redirect("/Admin/Webinars/Index");
+    }
+
+    @DeleteMapping("/{id}/delete")
+    public Object deleteWebinar(@PathVariable Long id,
+                                            RedirectAttributes redirectAttributes)  {
+
+        adminWebinarService.deleteWebinar(id);
+        redirectAttributes.addFlashAttribute("success", "delete.success");
+        return inertia.redirect("/Admin/Webinars/Index");
+    }
+}

src/main/java/io/hexlet/cv/dto/admin/WebinarDTO.java

@@ -0,0 +1,31 @@
+package io.hexlet.cv.dto.admin;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class WebinarDTO {
+    private Long id;
+
+    @NotBlank
+    private String webinarName;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime webinarDate;
+
+
+    private String webinarRegLink;
+
+
+    private String webinarRecordLink;
+
+    private boolean feature;
+    private boolean publicated;
+}

src/main/java/io/hexlet/cv/handler/GlobalExceptionHandler.java

@@ -4,8 +4,11 @@
 import io.hexlet.cv.handler.exception.ResourceNotFoundException;
 import io.hexlet.cv.handler.exception.UserAlreadyExistsException;
 import io.hexlet.cv.handler.exception.UserNotFoundException;
+import io.hexlet.cv.handler.exception.WebinarAlreadyExistsException;
 import jakarta.persistence.EntityExistsException;
 import jakarta.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.FieldError;
@@ -15,9 +18,6 @@
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @ControllerAdvice
 public class GlobalExceptionHandler {
 
@@ -58,6 +58,17 @@ public Object handleResourceNotFoundException(ResourceNotFoundException ex,
         return commonHandle(errors, request, redirectAttributes, HttpStatus.NOT_FOUND);
     }
 
+
+    @ExceptionHandler(WebinarAlreadyExistsException.class)
+    public Object handleWebinarAlreadyExistsException(WebinarAlreadyExistsException ex,
+                                                      HttpServletRequest request,
+                                                      RedirectAttributes redirectAttributes) {
+
+        Map<String, String> errors = Map.of("error", ex.getMessage());
+        return commonHandle(errors, request, redirectAttributes, HttpStatus.CONFLICT);
+    }
+
+
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public Object handleValidation(MethodArgumentNotValidException ex,
                                    HttpServletRequest request,
@@ -89,6 +100,7 @@ public Object handleUserNotFound(UserNotFoundException ex,
         return commonHandle(errors, request, redirectAttributes, HttpStatus.UNAUTHORIZED);
     }
 
+
     @ExceptionHandler(InvalidPasswordException.class)
     public Object handleInvalidPasswordException(InvalidPasswordException ex,
                                                  HttpServletRequest request,
@@ -98,6 +110,7 @@ public Object handleInvalidPasswordException(InvalidPasswordException ex,
         return commonHandle(errors, request, redirectAttributes, HttpStatus.UNAUTHORIZED);
     }
 
+
 // это просто ошибки все остальное
     @ExceptionHandler(Exception.class)
     public ResponseEntity<Map<String, Object>> handleAll(Exception ex) {

src/main/java/io/hexlet/cv/handler/exception/WebinarAlreadyExistsException.java

@@ -0,0 +1,12 @@
+package io.hexlet.cv.handler.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.CONFLICT)
+public class WebinarAlreadyExistsException extends RuntimeException {
+
+    public WebinarAlreadyExistsException(String message) {
+        super(message);
+    }
+}

src/main/java/io/hexlet/cv/mapper/AdminWebinarMapper.java

@@ -0,0 +1,25 @@
+package io.hexlet.cv.mapper;
+
+import io.hexlet.cv.dto.admin.WebinarDTO;
+import io.hexlet.cv.model.admin.Webinar;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+import org.mapstruct.ReportingPolicy;
+
+@Mapper(
+        uses = { JsonNullableMapper.class },
+        nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+        componentModel = MappingConstants.ComponentModel.SPRING,
+        unmappedTargetPolicy = ReportingPolicy.IGNORE
+)
+public abstract class AdminWebinarMapper {
+
+    public abstract Webinar map(WebinarDTO dto);
+    public abstract WebinarDTO map(Webinar webinar);
+
+    @Mapping(target = "id", ignore = true)
+    public abstract void update(WebinarDTO dto, @MappingTarget Webinar model);
+}

src/main/java/io/hexlet/cv/model/PageSection.java

@@ -1,5 +1,7 @@
 package io.hexlet.cv.model;
 
+import static jakarta.persistence.GenerationType.IDENTITY;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityListeners;
@@ -14,8 +16,6 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import static jakarta.persistence.GenerationType.IDENTITY;
-
 @Entity
 @Table(name = "page_sections")
 @EntityListeners(AuditingEntityListener.class)