Reflected changed from nova-framework

Author: MarcelCoding

admin-panel/src/main/java/net/cryptic_game/backend/admin/controller/website/BlogController.java

@@ -1,9 +1,11 @@
 package net.cryptic_game.backend.admin.controller.website;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+
+import java.util.List;
+
 import net.cryptic_game.backend.dto.website.BlogPost;
 import net.cryptic_game.backend.dto.website.BlogPostSmall;
-import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -12,28 +14,22 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.validation.Valid;
-import java.util.Set;
-
 @Tag(name = "Blog")
 @RequestMapping("website/blog")
 public interface BlogController {
 
     @GetMapping("{language}")
-    Set<BlogPostSmall> findPosts(@PathVariable("language") String language);
+    List<BlogPostSmall> findPosts(@PathVariable("language") String language);
 
     @GetMapping("{language}/{postId}")
     BlogPost findPost(@PathVariable("language") String language, @PathVariable("postId") String postId);
 
     @PostMapping
-    @Secured("ROLE_WEBSITE")
-    BlogPost postPost(@RequestBody @Valid BlogPost post);
+    BlogPost postPost(@RequestBody BlogPost post);
 
     @PutMapping("{language}/{postId}")
-    @Secured("ROLE_WEBSITE")
-    BlogPost putPost(@PathVariable("language") String language, @PathVariable("postId") String postId, @RequestBody @Valid BlogPost post);
+    BlogPost putPost(@PathVariable("language") String language, @PathVariable("postId") String postId, @RequestBody BlogPost post);
 
     @DeleteMapping("{language}/{postId}")
-    @Secured("ROLE_WEBSITE")
     void deletePost(@PathVariable("language") String language, @PathVariable("postId") String postId);
 }

admin-panel/src/main/java/net/cryptic_game/backend/admin/controller/website/BlogControllerImpl.java

@@ -1,45 +1,48 @@
 package net.cryptic_game.backend.admin.controller.website;
 
+import java.util.List;
+
 import lombok.RequiredArgsConstructor;
+import net.cryptic_game.backend.admin.service.website.BlogService;
 import net.cryptic_game.backend.dto.website.BlogPost;
 import net.cryptic_game.backend.dto.website.BlogPost.Id;
 import net.cryptic_game.backend.dto.website.BlogPostSmall;
-import net.cryptic_game.backend.admin.exception.NotFoundException;
-import net.cryptic_game.backend.admin.service.website.BlogService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Set;
-
 @RestController
 @RequiredArgsConstructor
 public class BlogControllerImpl implements BlogController {
 
     private final BlogService blogService;
 
     @Override
-    public Set<BlogPostSmall> findPosts(final String language) {
+    @Transactional(readOnly = true)
+    public List<BlogPostSmall> findPosts(final String language) {
         return this.blogService.findPosts(language);
     }
 
     @Override
+    @Transactional(readOnly = true)
     public BlogPost findPost(final String language, final String postId) {
-        final Id id = new Id(language, postId);
-        return this.blogService.findPost(id)
-                .orElseThrow(() -> new NotFoundException(id.toString(), "POST_NOT_FOUND"));
+        return this.blogService.findById(new Id(language, postId));
     }
 
     @Override
+    @Transactional
     public BlogPost postPost(final BlogPost post) {
-        return this.blogService.savePost(post);
+        return this.blogService.save(post);
     }
 
     @Override
+    @Transactional
     public BlogPost putPost(final String language, final String postId, final BlogPost post) {
-        return this.blogService.savePost(new Id(language, postId), post);
+        return this.blogService.save(new Id(language, postId), post);
     }
 
     @Override
+    @Transactional
     public void deletePost(final String language, final String postId) {
-        this.blogService.deletePost(new Id(language, postId));
+        this.blogService.delete(new Id(language, postId));
     }
 }

admin-panel/src/main/java/net/cryptic_game/backend/admin/controller/website/TeamController.java

@@ -0,0 +1,15 @@
+package net.cryptic_game.backend.admin.controller.website;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import java.util.UUID;
+
+import net.cryptic_game.backend.dto.website.TeamDepartment;
+import net.cryptic_game.backend.dto.website.TeamMember;
+import net.getnova.framework.core.controller.CrudController;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "Team")
+@RequestMapping("website/team/department")
+public interface TeamDepartmentController extends CrudController<TeamDepartment, UUID> {
+}

admin-panel/src/main/java/net/cryptic_game/backend/admin/controller/website/TeamControllerImpl.java

@@ -0,0 +1,20 @@
+package net.cryptic_game.backend.admin.controller.website;
+
+import net.cryptic_game.backend.admin.service.website.TeamDepartmentService;
+import net.cryptic_game.backend.dto.website.TeamDepartment;
+import net.getnova.framework.core.controller.AbstractCrudController;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.UUID;
+
+@RestController
+public class TeamDepartmentControllerImpl
+        extends AbstractCrudController<TeamDepartment, UUID>
+        implements TeamDepartmentController {
+
+    public TeamDepartmentControllerImpl(
+            final TeamDepartmentService service
+    ) {
+        super(service);
+    }
+}

admin-panel/src/main/java/net/cryptic_game/backend/admin/controller/website/TeamDepartmentController.java

@@ -0,0 +1,13 @@
+package net.cryptic_game.backend.admin.controller.website;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import net.cryptic_game.backend.dto.website.TeamMember;
+import net.getnova.framework.core.controller.CrudController;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.UUID;
+
+@Tag(name = "Team")
+@RequestMapping("website/team")
+public interface TeamMemberController extends CrudController<TeamMember, UUID> {
+}

admin-panel/src/main/java/net/cryptic_game/backend/admin/controller/website/TeamDepartmentControllerImpl.java

@@ -0,0 +1,20 @@
+package net.cryptic_game.backend.admin.controller.website;
+
+import net.cryptic_game.backend.admin.service.website.TeamMemberService;
+import net.cryptic_game.backend.dto.website.TeamMember;
+import net.getnova.framework.core.controller.AbstractCrudController;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.UUID;
+
+@RestController
+public class TeamMemberControllerImpl
+        extends AbstractCrudController<TeamMember, UUID>
+        implements TeamMemberController {
+
+    public TeamMemberControllerImpl(
+            final TeamMemberService service
+    ) {
+        super(service);
+    }
+}

admin-panel/src/main/java/net/cryptic_game/backend/admin/controller/website/TeamMemberController.java

@@ -1,21 +1,13 @@
 package net.cryptic_game.backend.admin.service.website;
 
+import java.util.List;
+
 import net.cryptic_game.backend.dto.website.BlogPost;
 import net.cryptic_game.backend.dto.website.BlogPost.Id;
 import net.cryptic_game.backend.dto.website.BlogPostSmall;
+import net.getnova.framework.core.service.SmallCrudService;
 
-import java.util.Optional;
-import java.util.Set;
-
-public interface BlogService {
-
-    Set<BlogPostSmall> findPosts(String language);
-
-    Optional<BlogPost> findPost(Id id);
-
-    BlogPost savePost(Id id, BlogPost post);
-
-    BlogPost savePost(BlogPost post);
+public interface BlogService extends SmallCrudService<BlogPost, BlogPostSmall, Id> {
 
-    void deletePost(Id id);
+    List<BlogPostSmall> findPosts(String language);
 }