Skip to content
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.

Sign up for GitHub

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

Add Pagination #44 #50

Merged
merged 3 commits into from
Mar 16, 2024
Merged

Add Pagination #44 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2150335
adding pagination
ali-assar Mar 13, 2024
9df5258
adding pagination
ali-assar Mar 16, 2024
74da431
Merge branch 'main' into main
ali-assar Mar 16, 2024
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
20 changes: 18 additions & 2 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import (
"bytes"
"net/http"
"strconv"
"time"

"github.com/gin-gonic/gin"
Expand All @@ -26,6 +27,9 @@
addCachableHandler(r, "GET", "/contact", contactHandler, &cache, app_settings, database)
addCachableHandler(r, "GET", "/post/:id", postHandler, &cache, app_settings, database)

// Add the pagination route as a cacheable endpoint
addCachableHandler(r, "GET", "/page/:num", homeHandler, &cache, app_settings, database)

// DO not cache as it needs to handlenew form values
r.POST("/contact-send", makeContactFormHandler())

Expand Down Expand Up @@ -81,7 +85,19 @@
// / This function will act as the handler for
// / the home page
func homeHandler(c *gin.Context, settings common.AppSettings, db database.Database) ([]byte, error) {
posts, err := db.GetPosts()
pageNum := 0 // Default to page 0
if pageNumQuery := c.Param("num"); pageNumQuery != "" {
num, err := strconv.Atoi(pageNumQuery)
if err == nil && num > 0 {
pageNum = num

Check warning on line 92 in app/app.go

View check run for this annotation

Codecov / codecov/patch

app/app.go#L92 

Added line #L92 was not covered by tests
} else {
log.Error().Msgf("Invalid page number: %s", pageNumQuery)
}
}
limit := 10 // or whatever limit you want
offset := max((pageNum-1)*limit, 0)

posts, err := db.GetPosts(limit, offset)
if err != nil {
return nil, err
}
Expand All @@ -92,7 +108,7 @@

err = index_view.Render(c, html_buffer)
if err != nil {
log.Error().Msgf("could not render index: %v", err)
log.Error().Msgf("Could not render index: %v", err)

Check warning on line 111 in app/app.go

View check run for this annotation

Codecov / codecov/patch

app/app.go#L111 

Added line #L111 was not covered by tests
return []byte{}, err
}

Expand Down
7 changes: 4 additions & 3 deletions database/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
)

type Database interface {
GetPosts() ([]common.Post, error)
GetPosts(int, int) ([]common.Post, error)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You changed the interface, don't forget to change the tests too! See the cmd/urchin/index_test.go

GetPost(post_id int) (common.Post, error)
AddPost(title string, excerpt string, content string) (int, error)
ChangePost(id int, title string, excerpt string, content string) error
Expand All @@ -28,8 +28,9 @@

// / This function gets all the posts from the current
// / database connection.
func (db SqlDatabase) GetPosts() (all_posts []common.Post, err error) {
rows, err := db.Connection.Query("SELECT title, excerpt, id FROM posts;")
func (db SqlDatabase) GetPosts(limit int, offset int) (all_posts []common.Post, err error) {
query := "SELECT title, excerpt, id FROM posts LIMIT ? OFFSET ?;"
rows, err := db.Connection.Query(query, limit, offset)

Check warning on line 33 in database/database.go

View check run for this annotation

Codecov / codecov/patch

database/database.go#L31-L33 

Added lines #L31 - L33 were not covered by tests
if err != nil {
return make([]common.Post, 0), err
}
Expand Down
6 changes: 3 additions & 3 deletions tests/app_tests/endpoint_tests/index_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestIndexSuccess(t *testing.T) {
}

database_mock := mocks.DatabaseMock{
GetPostsHandler: func() ([]common.Post, error) {
GetPostsHandler: func(limit int, offset int) ([]common.Post, error) {
return []common.Post{
{
Title: "TestPost",
Expand All @@ -38,7 +38,7 @@ func TestIndexSuccess(t *testing.T) {

r := app.SetupRoutes(app_settings, database_mock)
w := httptest.NewRecorder()
req, _ := http.NewRequest("GET", "/", nil)
req, _ := http.NewRequest("GET", "/page/0", nil)
r.ServeHTTP(w, req)

assert.Equal(t, http.StatusOK, w.Code)
Expand All @@ -57,7 +57,7 @@ func TestIndexFailToGetPosts(t *testing.T) {
}

database_mock := mocks.DatabaseMock{
GetPostsHandler: func() ([]common.Post, error) {
GetPostsHandler: func(limit int, offset int) ([]common.Post, error) {
return []common.Post{}, fmt.Errorf("invalid")
},
}
Expand Down
6 changes: 3 additions & 3 deletions tests/mocks/mocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (

type DatabaseMock struct {
GetPostHandler func(int) (common.Post, error)
GetPostsHandler func() ([]common.Post, error)
GetPostsHandler func(int, int) ([]common.Post, error)
}

func (db DatabaseMock) GetPosts() ([]common.Post, error) {
return db.GetPostsHandler()
func (db DatabaseMock) GetPosts(limit int, offset int) ([]common.Post, error) {
return db.GetPostsHandler(limit, offset)
}

func (db DatabaseMock) GetPost(post_id int) (common.Post, error) {
Expand Down
Loading