Skip to content

Feature/refactor post handler #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions internal/server/handlers/post_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,28 @@ import (
"strconv"

"github.com/nix-united/golang-echo-boilerplate/internal/models"
"github.com/nix-united/golang-echo-boilerplate/internal/repositories"
"github.com/nix-united/golang-echo-boilerplate/internal/requests"
"github.com/nix-united/golang-echo-boilerplate/internal/responses"
s "github.com/nix-united/golang-echo-boilerplate/internal/server"
postservice "github.com/nix-united/golang-echo-boilerplate/internal/services/post"
"github.com/nix-united/golang-echo-boilerplate/internal/services/token"

"github.com/golang-jwt/jwt/v5"
"github.com/labstack/echo/v4"
)

type postService interface {
Create(post *models.Post)
GetPosts(posts *[]models.Post)
GetPost(post *models.Post, id int)
Update(post *models.Post, updatePostRequest *requests.UpdatePostRequest)
Delete(post *models.Post)
}

type PostHandlers struct {
server *s.Server
postService postService
}

func NewPostHandlers(server *s.Server) *PostHandlers {
return &PostHandlers{server: server}
func NewPostHandlers(postService postService) PostHandlers {
return PostHandlers{postService: postService}
}

// CreatePost godoc
Expand All @@ -37,7 +42,7 @@ func NewPostHandlers(server *s.Server) *PostHandlers {
// @Failure 400 {object} responses.Error
// @Security ApiKeyAuth
// @Router /posts [post]
func (p *PostHandlers) CreatePost(c echo.Context) error {
func (p PostHandlers) CreatePost(c echo.Context) error {
createPostRequest := new(requests.CreatePostRequest)

if err := c.Bind(createPostRequest); err != nil {
Expand All @@ -58,9 +63,7 @@ func (p *PostHandlers) CreatePost(c echo.Context) error {
UserID: id,
}

postRepository := repositories.NewPostRepository(p.server.DB)
postService := postservice.NewPostService(postRepository)
postService.Create(&post)
p.postService.Create(&post)

return responses.MessageResponse(c, http.StatusCreated, "Post successfully created")
}
Expand All @@ -76,20 +79,18 @@ func (p *PostHandlers) CreatePost(c echo.Context) error {
// @Failure 404 {object} responses.Error
// @Security ApiKeyAuth
// @Router /posts/{id} [delete]
func (p *PostHandlers) DeletePost(c echo.Context) error {
func (p PostHandlers) DeletePost(c echo.Context) error {
id, _ := strconv.Atoi(c.Param("id"))

post := models.Post{}
post := new(models.Post)

postRepository := repositories.NewPostRepository(p.server.DB)
postRepository.GetPost(&post, id)
p.postService.GetPost(post, id)

if post.ID == 0 {
return responses.ErrorResponse(c, http.StatusNotFound, "Post not found")
}

postService := postservice.NewPostService(postRepository)
postService.Delete(&post)
p.postService.Delete(post)

return responses.MessageResponse(c, http.StatusNoContent, "Post deleted successfully")
}
Expand All @@ -104,11 +105,10 @@ func (p *PostHandlers) DeletePost(c echo.Context) error {
// @Success 200 {array} responses.PostResponse
// @Security ApiKeyAuth
// @Router /posts [get]
func (p *PostHandlers) GetPosts(c echo.Context) error {
func (p PostHandlers) GetPosts(c echo.Context) error {
var posts []models.Post

postRepository := repositories.NewPostRepository(p.server.DB)
postRepository.GetPosts(&posts)
p.postService.GetPosts(&posts)

response := responses.NewPostResponse(posts)
return responses.Response(c, http.StatusOK, response)
Expand All @@ -129,7 +129,7 @@ func (p *PostHandlers) GetPosts(c echo.Context) error {
// @Failure 404 {object} responses.Error
// @Security ApiKeyAuth
// @Router /posts/{id} [put]
func (p *PostHandlers) UpdatePost(c echo.Context) error {
func (p PostHandlers) UpdatePost(c echo.Context) error {
updatePostRequest := new(requests.UpdatePostRequest)
id, _ := strconv.Atoi(c.Param("id"))

Expand All @@ -143,15 +143,13 @@ func (p *PostHandlers) UpdatePost(c echo.Context) error {

post := models.Post{}

postRepository := repositories.NewPostRepository(p.server.DB)
postRepository.GetPost(&post, id)
p.postService.GetPost(&post, id)

if post.ID == 0 {
return responses.ErrorResponse(c, http.StatusNotFound, "Post not found")
}

postService := postservice.NewPostService(postRepository)
postService.Update(&post, updatePostRequest)
p.postService.Update(&post, updatePostRequest)

return responses.MessageResponse(c, http.StatusOK, "Post successfully updated")
}
7 changes: 6 additions & 1 deletion internal/server/routes/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ package routes
import (
"fmt"

"github.com/nix-united/golang-echo-boilerplate/internal/repositories"
s "github.com/nix-united/golang-echo-boilerplate/internal/server"
"github.com/nix-united/golang-echo-boilerplate/internal/server/handlers"
"github.com/nix-united/golang-echo-boilerplate/internal/services/post"
"github.com/nix-united/golang-echo-boilerplate/internal/services/token"

"github.com/golang-jwt/jwt/v5"
Expand All @@ -15,7 +17,10 @@ import (
)

func ConfigureRoutes(server *s.Server) {
postHandler := handlers.NewPostHandlers(server)
postRepository := repositories.NewPostRepository(server.DB)
postService := post.NewPostService(postRepository)

postHandler := handlers.NewPostHandlers(postService)
authHandler := handlers.NewAuthHandler(server)
registerHandler := handlers.NewRegisterHandler(server)

Expand Down
8 changes: 8 additions & 0 deletions internal/services/post/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ func (s Service) Create(post *models.Post) {
s.postRepository.Create(post)
}

func (s Service) GetPosts(posts *[]models.Post) {
s.postRepository.GetPosts(posts)
}

func (s Service) GetPost(post *models.Post, id int) {
s.postRepository.GetPost(post, id)
}

func (s Service) Update(post *models.Post, updatePostRequest *requests.UpdatePostRequest) {
post.Content = updatePostRequest.Content
post.Title = updatePostRequest.Title
Expand Down
22 changes: 18 additions & 4 deletions tests/post_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import (
"net/http"
"testing"

"github.com/nix-united/golang-echo-boilerplate/internal/repositories"
"github.com/nix-united/golang-echo-boilerplate/internal/requests"
"github.com/nix-united/golang-echo-boilerplate/internal/server"
"github.com/nix-united/golang-echo-boilerplate/internal/server/handlers"
"github.com/nix-united/golang-echo-boilerplate/internal/services/post"
"github.com/nix-united/golang-echo-boilerplate/internal/services/token"
"github.com/nix-united/golang-echo-boilerplate/tests/helpers"

Expand Down Expand Up @@ -51,16 +53,28 @@ func TestWalkPostsCrud(t *testing.T) {
},
}
handlerFuncCreate := func(s *server.Server, c echo.Context) error {
return handlers.NewPostHandlers(s).CreatePost(c)
postRepository := repositories.NewPostRepository(s.DB)
postService := post.NewPostService(postRepository)

return handlers.NewPostHandlers(postService).CreatePost(c)
}
handlerFuncGet := func(s *server.Server, c echo.Context) error {
return handlers.NewPostHandlers(s).GetPosts(c)
postRepository := repositories.NewPostRepository(s.DB)
postService := post.NewPostService(postRepository)

return handlers.NewPostHandlers(postService).GetPosts(c)
}
handlerFuncUpdate := func(s *server.Server, c echo.Context) error {
return handlers.NewPostHandlers(s).UpdatePost(c)
postRepository := repositories.NewPostRepository(s.DB)
postService := post.NewPostService(postRepository)

return handlers.NewPostHandlers(postService).UpdatePost(c)
}
handlerFuncDelete := func(s *server.Server, c echo.Context) error {
return handlers.NewPostHandlers(s).DeletePost(c)
postRepository := repositories.NewPostRepository(s.DB)
postService := post.NewPostService(postRepository)

return handlers.NewPostHandlers(postService).DeletePost(c)
}

claims := &token.JwtCustomClaims{
Expand Down