Feature/refactor post service

internal/errors/storage_errors.go

@@ -1,6 +1,10 @@
 package errors
 
+import "errors"
+
 type ErrInvalidStorageOperation interface {
 	Error() string
 	Operation() string
 }
+
+var ErrPostNotFound = errors.New("post not found")

internal/handler/post_handler.go

@@ -1,13 +1,14 @@
 package handler
 
 import (
+	"errors"
 	"net/http"
 	"strconv"
 
+	operrors "github.com/nix-united/golang-gin-boilerplate/internal/errors"
 	"github.com/nix-united/golang-gin-boilerplate/internal/model"
 	"github.com/nix-united/golang-gin-boilerplate/internal/request"
 	"github.com/nix-united/golang-gin-boilerplate/internal/response"
-	"github.com/nix-united/golang-gin-boilerplate/internal/service"
 
 	jwt "github.com/appleboy/gin-jwt/v2"
 	"github.com/gin-gonic/gin"
@@ -16,12 +17,12 @@ import (
 //go:generate mockgen -source=$GOFILE -destination=post_handler_mock_test.go -package=${GOPACKAGE}_test -typed=true
 
 type postService interface {
-	CreatePost(title, content string, userID uint) (*model.Post, *service.RestError)
-	GetAll(posts *[]model.Post) *service.RestError
-	GetByID(id int, post *model.Post) *service.RestError
-	Create(post *model.Post) *service.RestError
-	Save(post *model.Post) *service.RestError
-	Delete(post *model.Post) *service.RestError
+	CreatePost(title, content string, userID uint) (*model.Post, error)
+	GetAll() ([]model.Post, error)
+	GetByID(id int) (*model.Post, error)
+	Create(post *model.Post) error
+	Save(post *model.Post) error
+	Delete(post *model.Post) error
 }
 
 type PostHandler struct {
@@ -52,14 +53,13 @@ func (h PostHandler) GetPostByID(c *gin.Context) {
 		return
 	}
 
-	var post model.Post
-	if err := h.postService.GetByID(id, &post); err != nil {
-		response.ErrorResponse(c, err.Status, "Server error")
+	post, err := h.postService.GetByID(id)
+	if errors.Is(err, operrors.ErrPostNotFound) {
+		response.ErrorResponse(c, http.StatusNotFound, "Post not found")
 		return
 	}
-
-	if post.ID == 0 {
-		response.ErrorResponse(c, http.StatusNotFound, "Post not found")
+	if err != nil {
+		response.ErrorResponse(c, http.StatusInternalServerError, "Server error")
 		return
 	}
 
@@ -98,7 +98,7 @@ func (h PostHandler) SavePost(c *gin.Context) {
 
 	newPost, restError := h.postService.CreatePost(createPostRequest.Title, createPostRequest.Content, uint(id))
 	if restError != nil {
-		response.ErrorResponse(c, restError.Status, "Post can't be created")
+		response.ErrorResponse(c, http.StatusInternalServerError, "Post can't be created")
 		return
 	}
 
@@ -136,22 +136,21 @@ func (h PostHandler) UpdatePost(c *gin.Context) {
 		return
 	}
 
-	var post model.Post
-	if err := h.postService.GetByID(id, &post); err != nil {
-		response.ErrorResponse(c, err.Status, "Server error")
+	post, err := h.postService.GetByID(id)
+	if errors.Is(err, operrors.ErrPostNotFound) {
+		response.ErrorResponse(c, http.StatusNotFound, "Post not found")
 		return
 	}
-
-	if post.ID == 0 {
-		response.ErrorResponse(c, http.StatusNotFound, "Post not found")
+	if err != nil {
+		response.ErrorResponse(c, http.StatusInternalServerError, "Server error")
 		return
 	}
 
 	post.Title = updatePostRequest.Title
 	post.Content = updatePostRequest.Content
 
-	if err := h.postService.Save(&post); err != nil {
-		response.ErrorResponse(c, err.Status, "Data was not saved")
+	if err := h.postService.Save(post); err != nil {
+		response.ErrorResponse(c, http.StatusInternalServerError, "Data was not saved")
 		return
 	}
 
@@ -173,8 +172,8 @@ func (h PostHandler) UpdatePost(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Router /posts [get]
 func (h PostHandler) GetPosts(c *gin.Context) {
-	var posts []model.Post
-	if err := h.postService.GetAll(&posts); err != nil {
+	posts, err := h.postService.GetAll()
+	if err != nil {
 		response.ErrorResponse(c, http.StatusInternalServerError, "Server error")
 		return
 	}
@@ -199,19 +198,18 @@ func (h PostHandler) DeletePost(c *gin.Context) {
 		return
 	}
 
-	var post model.Post
-	if err := h.postService.GetByID(id, &post); err != nil {
-		response.ErrorResponse(c, err.Status, "Server error")
+	post, err := h.postService.GetByID(id)
+	if errors.Is(err, operrors.ErrPostNotFound) {
+		response.ErrorResponse(c, http.StatusNotFound, "Post not found")
 		return
 	}
-
-	if post.ID == 0 {
-		response.ErrorResponse(c, http.StatusNotFound, "Post not found")
+	if err != nil {
+		response.ErrorResponse(c, http.StatusInternalServerError, "Server error")
 		return
 	}
 
-	if err := h.postService.Delete(&post); err != nil {
-		response.ErrorResponse(c, err.Status, "Server error")
+	if err := h.postService.Delete(post); err != nil {
+		response.ErrorResponse(c, http.StatusInternalServerError, "Server error")
 		return
 	}