diff --git a/front/src/BooksBrowser.vue b/front/src/BooksBrowser.vue index 081ccb9..e35d14a 100644 --- a/front/src/BooksBrowser.vue +++ b/front/src/BooksBrowser.vue @@ -1,7 +1,8 @@ + diff --git a/front/src/api.js b/front/src/api.js index bd25852..1573954 100644 --- a/front/src/api.js +++ b/front/src/api.js @@ -29,8 +29,13 @@ function useFetch(url) { return { data, error } } -export function getMyBooks(arg) { - return useFetch(baseUrl + '/mybooks/' + arg); +export function getCountMyBooks(arg) { + return useFetch(baseUrl + '/mybooks/' + arg + "/count"); +} + +export function getMyBooks(arg, limit, offset) { + const queryParams = new URLSearchParams({limit: limit, offset: offset}); + return useFetch(baseUrl + '/mybooks/' + arg + "?" + queryParams.toString()); } export function getSearchBooks(searchterm) { diff --git a/front/src/locales/en.json b/front/src/locales/en.json index 4ce59e7..159f9c3 100644 --- a/front/src/locales/en.json +++ b/front/src/locales/en.json @@ -47,5 +47,11 @@ "read": "Read", "startread": "Started", "wantread": "Interested" + }, + "pagination": { + "previous":"Previous", + "next":"Next", + "goto":"Goto page {pageNumber}", + "page":"Page {pageNumber}" } } diff --git a/front/src/locales/fr.json b/front/src/locales/fr.json index ad5c26f..e964800 100644 --- a/front/src/locales/fr.json +++ b/front/src/locales/fr.json @@ -47,5 +47,11 @@ "read": "Lu", "startread": "Commencé", "wantread": "Intéressé" + }, + "pagination": { + "previous":"Précédent", + "next":"Suivant", + "goto":"Aller à la page {pageNumber}", + "page":"Page {pageNumber}" } } diff --git a/internal/apitest/get_count_user_book_test.go b/internal/apitest/get_count_user_book_test.go new file mode 100644 index 0000000..95dc707 --- /dev/null +++ b/internal/apitest/get_count_user_book_test.go @@ -0,0 +1,54 @@ +package apitest + +import ( + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "testing" + + "git.artlef.fr/PersonalLibraryManager/internal/testutils" + "github.com/stretchr/testify/assert" +) + +type countResponse struct { + Count int +} + +func TestGetReadBooksCountHandler_Demo(t *testing.T) { + router := testutils.TestSetup() + + token := testutils.ConnectDemoUser(router) + + req, _ := http.NewRequest("GET", "/mybooks/read/count", nil) + req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token)) + + w := httptest.NewRecorder() + router.ServeHTTP(w, req) + + var c countResponse + err := json.Unmarshal(w.Body.Bytes(), &c) + if err != nil { + t.Error(err) + } + assert.Equal(t, 23, c.Count) +} + +func TestGetWantReadBooksCountHandler_Demo(t *testing.T) { + router := testutils.TestSetup() + + token := testutils.ConnectDemoUser(router) + + req, _ := http.NewRequest("GET", "/mybooks/wantread/count", nil) + req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token)) + + w := httptest.NewRecorder() + router.ServeHTTP(w, req) + + var c countResponse + err := json.Unmarshal(w.Body.Bytes(), &c) + if err != nil { + t.Error(err) + } + assert.Equal(t, 2, c.Count) +} diff --git a/internal/apitest/get_read_user_book_test.go b/internal/apitest/get_read_user_book_test.go index 516788c..adea3ab 100644 --- a/internal/apitest/get_read_user_book_test.go +++ b/internal/apitest/get_read_user_book_test.go @@ -1,6 +1,7 @@ package apitest import ( + "net/url" "testing" "git.artlef.fr/PersonalLibraryManager/internal/testutils" @@ -12,15 +13,39 @@ func TestGetReadBooksHandler_Demo(t *testing.T) { router := testutils.TestSetup() token := testutils.ConnectDemoUser(router) - books := testGetReadBooksHandler(t, router, token, 200) + books := testGetReadBooksHandler(t, router, token, 200, "", "") assert.Equal(t, 23, len(books)) } +func TestGetReadBooksHandler_DemoNoLimit(t *testing.T) { + router := testutils.TestSetup() + + token := testutils.ConnectDemoUser(router) + books := testGetReadBooksHandler(t, router, token, 200, "100", "") + assert.Equal(t, 23, len(books)) +} + +func TestGetReadBooksHandler_DemoLowerLimit(t *testing.T) { + router := testutils.TestSetup() + + token := testutils.ConnectDemoUser(router) + books := testGetReadBooksHandler(t, router, token, 200, "5", "") + assert.Equal(t, 5, len(books)) +} + +func TestGetReadBooksHandler_DemoOffset(t *testing.T) { + router := testutils.TestSetup() + + token := testutils.ConnectDemoUser(router) + books := testGetReadBooksHandler(t, router, token, 200, "20", "10") + assert.Equal(t, 13, len(books)) +} + func TestGetReadBooksHandler_Demo2(t *testing.T) { router := testutils.TestSetup() token := testutils.ConnectDemo2User(router) - books := testGetReadBooksHandler(t, router, token, 200) + books := testGetReadBooksHandler(t, router, token, 200, "", "") assert.Equal(t, 2, len(books)) } @@ -28,7 +53,7 @@ func TestGetReadBooksHandler_CheckOneBook(t *testing.T) { router := testutils.TestSetup() token := testutils.ConnectDemo2User(router) - books := testGetReadBooksHandler(t, router, token, 200) + books := testGetReadBooksHandler(t, router, token, 200, "100", "") var book bookUserGet for _, b := range books { if b.Title == "De sang-froid" { @@ -45,6 +70,20 @@ func TestGetReadBooksHandler_CheckOneBook(t *testing.T) { }, book) } -func testGetReadBooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int) []bookUserGet { - return testGetbooksHandler(t, router, userToken, expectedCode, "/mybooks/read") +func testGetReadBooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int, limit string, offset string) []bookUserGet { + u, err := url.Parse("/mybooks/read") + if err != nil { + t.Error(err) + } + if limit != "" { + q := u.Query() + q.Set("limit", limit) + u.RawQuery = q.Encode() + } + if offset != "" { + q := u.Query() + q.Set("offset", offset) + u.RawQuery = q.Encode() + } + return testGetbooksHandler(t, router, userToken, expectedCode, u.String()) } diff --git a/internal/appcontext/main.go b/internal/appcontext/main.go index 04aa7e5..7973616 100644 --- a/internal/appcontext/main.go +++ b/internal/appcontext/main.go @@ -2,6 +2,7 @@ package appcontext import ( "errors" + "strconv" "git.artlef.fr/PersonalLibraryManager/internal/config" "git.artlef.fr/PersonalLibraryManager/internal/model" @@ -26,3 +27,21 @@ func (ac AppContext) GetAuthenticatedUser() (model.User, error) { res := ac.Db.Where("name = ?", username).First(&user) return user, res.Error } + +func (ac AppContext) GetQueryLimit() (int, error) { + l := ac.C.Query("limit") + if l != "" { + return strconv.Atoi(l) + } else { + return ac.Config.Limit, nil + } +} + +func (ac AppContext) GetQueryOffset() (int, error) { + o := ac.C.Query("offset") + if o != "" { + return strconv.Atoi(o) + } else { + return 0, nil + } +} diff --git a/internal/config/config.go b/internal/config/config.go index db84c67..4a822b6 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -14,6 +14,7 @@ type Config struct { DemoDataPath string `toml:"demo_data_path" comment:"The path to the sql file to load for demo data."` JWTKey string `toml:"jwt_key" comment:"The key used to encrypt the generated JWT. Encoded in base64. If empty a random one will be generated on every restart."` ImageFolderPath string `toml:"image_folder_path" default:"img" comment:"Folder where uploaded files will be stored."` + Limit int `toml:"limit" default:"100" comment:"Folder where uploaded files will be stored."` } func defaultConfig() Config { @@ -23,6 +24,7 @@ func defaultConfig() Config { DemoDataPath: "", JWTKey: "", ImageFolderPath: "img", + Limit: 100, } } diff --git a/internal/query/query.go b/internal/query/query.go index 6ff7255..7cdbc76 100644 --- a/internal/query/query.go +++ b/internal/query/query.go @@ -56,22 +56,51 @@ type BookUserGet struct { CoverPath string `json:"coverPath"` } -func FetchReadUserBook(db *gorm.DB, userId uint) ([]BookUserGet, error) { - query := fetchUserBookGet(db, userId) - query = query.Where("user_books.read IS TRUE") +func FetchReadUserBook(db *gorm.DB, userId uint, limit int, offset int) ([]BookUserGet, error) { var books []BookUserGet + query := fetchReadUserBookQuery(db, userId) + query = query.Limit(limit) + query = query.Offset(offset) res := query.Find(&books) return books, res.Error } -func FetchWantReadUserBook(db *gorm.DB, userId uint) ([]BookUserGet, error) { +func FetchReadUserBookCount(db *gorm.DB, userId uint) (int64, error) { + query := fetchReadUserBookQuery(db, userId) + var count int64 + res := query.Count(&count) + return count, res.Error +} + +func fetchReadUserBookQuery(db *gorm.DB, userId uint) *gorm.DB { query := fetchUserBookGet(db, userId) - query = query.Where("user_books.want_read IS TRUE") + query = query.Where("user_books.read IS TRUE") + return query +} + +func FetchWantReadUserBook(db *gorm.DB, userId uint, limit int, offset int) ([]BookUserGet, error) { var books []BookUserGet + + query := fetchWantReadUserBookQuery(db, userId) + query = query.Limit(limit) + query = query.Offset(offset) res := query.Find(&books) return books, res.Error } +func FetchWantReadUserBookCount(db *gorm.DB, userId uint) (int64, error) { + query := fetchWantReadUserBookQuery(db, userId) + var count int64 + res := query.Count(&count) + return count, res.Error +} + +func fetchWantReadUserBookQuery(db *gorm.DB, userId uint) *gorm.DB { + query := fetchUserBookGet(db, userId) + query = query.Where("user_books.want_read IS TRUE") + return query +} + func fetchUserBookGet(db *gorm.DB, userId uint) *gorm.DB { query := db.Model(&model.UserBook{}) query = query.Select("books.id, books.title, books.author, user_books.rating, user_books.read, user_books.want_read, " + selectStaticFilesPath()) diff --git a/internal/routes/userbookreadget.go b/internal/routes/userbookreadget.go index 2cb53fc..a609b65 100644 --- a/internal/routes/userbookreadget.go +++ b/internal/routes/userbookreadget.go @@ -6,6 +6,7 @@ import ( "git.artlef.fr/PersonalLibraryManager/internal/appcontext" "git.artlef.fr/PersonalLibraryManager/internal/myvalidator" "git.artlef.fr/PersonalLibraryManager/internal/query" + "github.com/gin-gonic/gin" ) func GetMyBooksReadHandler(ac appcontext.AppContext) { @@ -14,6 +15,34 @@ func GetMyBooksReadHandler(ac appcontext.AppContext) { myvalidator.ReturnErrorsAsJsonResponse(&ac, err) return } - userbooks, err := query.FetchReadUserBook(ac.Db, user.ID) + limit, err := ac.GetQueryLimit() + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } + offset, err := ac.GetQueryOffset() + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } + userbooks, err := query.FetchReadUserBook(ac.Db, user.ID, limit, offset) + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } ac.C.JSON(http.StatusOK, userbooks) } + +func GetMyBooksReadCountHandler(ac appcontext.AppContext) { + user, err := ac.GetAuthenticatedUser() + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } + count, err := query.FetchReadUserBookCount(ac.Db, user.ID) + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } + ac.C.JSON(http.StatusOK, gin.H{"count": count}) +} diff --git a/internal/routes/userbookwantreadget.go b/internal/routes/userbookwantreadget.go index 439f135..0cd999f 100644 --- a/internal/routes/userbookwantreadget.go +++ b/internal/routes/userbookwantreadget.go @@ -6,6 +6,7 @@ import ( "git.artlef.fr/PersonalLibraryManager/internal/appcontext" "git.artlef.fr/PersonalLibraryManager/internal/myvalidator" "git.artlef.fr/PersonalLibraryManager/internal/query" + "github.com/gin-gonic/gin" ) func GetMyBooksWantReadHandler(ac appcontext.AppContext) { @@ -14,6 +15,34 @@ func GetMyBooksWantReadHandler(ac appcontext.AppContext) { myvalidator.ReturnErrorsAsJsonResponse(&ac, err) return } - userbooks, err := query.FetchWantReadUserBook(ac.Db, user.ID) + limit, err := ac.GetQueryLimit() + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } + offset, err := ac.GetQueryOffset() + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } + userbooks, err := query.FetchWantReadUserBook(ac.Db, user.ID, limit, offset) + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } ac.C.JSON(http.StatusOK, userbooks) } + +func GetMyBooksWantReadCountHandler(ac appcontext.AppContext) { + user, err := ac.GetAuthenticatedUser() + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } + count, err := query.FetchWantReadUserBookCount(ac.Db, user.ID) + if err != nil { + myvalidator.ReturnErrorsAsJsonResponse(&ac, err) + return + } + ac.C.JSON(http.StatusOK, gin.H{"count": count}) +} diff --git a/internal/setup/setup.go b/internal/setup/setup.go index f3e54b2..395c195 100644 --- a/internal/setup/setup.go +++ b/internal/setup/setup.go @@ -27,9 +27,15 @@ func Setup(config *config.Config) *gin.Engine { r.GET("/mybooks/read", func(c *gin.Context) { routes.GetMyBooksReadHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config}) }) + r.GET("/mybooks/read/count", func(c *gin.Context) { + routes.GetMyBooksReadCountHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config}) + }) r.GET("/mybooks/wantread", func(c *gin.Context) { routes.GetMyBooksWantReadHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config}) }) + r.GET("/mybooks/wantread/count", func(c *gin.Context) { + routes.GetMyBooksWantReadCountHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config}) + }) r.GET("/search/:searchterm", func(c *gin.Context) { routes.GetSearchBooksHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config}) })