artlef/bibliomane
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects 1 Releases 3 Wiki Activity

User book API: use a single query with result and count

Browse Source
This commit is contained in:
Arthur Lefebvre
2026-01-25 00:42:50 +01:00
parent cd2b8a93bb
commit 8584e95ef7
15 changed files with 63 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/apitest/get_book_per_author.go
View File

@@ -13,7 +13,7 @@ import (
)
type bookAuthorGetResult struct {
Count int64 `json:"count"`
Count int64 `json:"count"`
Books []bookAuthorGet `json:"books"`
}

73
internal/apitest/get_count_user_book_test.go
View File

@@ -1,73 +0,0 @@
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, 22, 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)
}
func TestGetReadingBooksCountHandler_Demo(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemoUser(router)
req, _ := http.NewRequest("GET", "/mybooks/reading/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)
}

35
internal/apitest/get_read_user_book_test.go
View File

@@ -13,55 +13,60 @@ func TestGetReadBooksHandler_Demo(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemoUser(router)
books := testGetReadBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 22, len(books))
result := testGetReadBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 22, len(result.Books))
assert.Equal(t, int64(22), result.Count)
}
func TestGetReadBooksHandler_DemoNoLimit(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemoUser(router)
books := testGetReadBooksHandler(t, router, token, 200, "100", "")
assert.Equal(t, 22, len(books))
result := testGetReadBooksHandler(t, router, token, 200, "100", "")
assert.Equal(t, 22, len(result.Books))
assert.Equal(t, int64(22), result.Count)
}
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))
result := testGetReadBooksHandler(t, router, token, 200, "5", "")
assert.Equal(t, 5, len(result.Books))
assert.Equal(t, int64(22), result.Count)
}
func TestGetReadBooksHandler_DemoOffset(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemoUser(router)
books := testGetReadBooksHandler(t, router, token, 200, "20", "10")
assert.Equal(t, 12, len(books))
result := testGetReadBooksHandler(t, router, token, 200, "20", "10")
assert.Equal(t, 12, len(result.Books))
assert.Equal(t, int64(22), result.Count)
}
func TestGetReadBooksHandler_Demo2(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemo2User(router)
books := testGetReadBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 3, len(books))
result := testGetReadBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 3, len(result.Books))
assert.Equal(t, int64(3), result.Count)
}
func TestGetReadBooksHandler_CheckOneBook(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemo2User(router)
books := testGetReadBooksHandler(t, router, token, 200, "100", "")
var book bookUserGet
for _, b := range books {
result := testGetReadBooksHandler(t, router, token, 200, "100", "")
var book bookUserGetBook
for _, b := range result.Books {
if b.Title == "De sang-froid" {
book = b
}
}
assert.Equal(t,
bookUserGet{
bookUserGetBook{
BookId: 18,
Title: "De sang-froid",
Author: "Truman Capote",
@@ -70,7 +75,7 @@ func TestGetReadBooksHandler_CheckOneBook(t *testing.T) {
}, book)
}
func testGetReadBooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int, limit string, offset string) []bookUserGet {
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)

12
internal/apitest/get_reading_user_book_test.go
View File

@@ -13,19 +13,21 @@ func TestGetReadingBooksHandler_Demo(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemoUser(router)
books := testGetReadingBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 2, len(books))
result := testGetReadingBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 2, len(result.Books))
assert.Equal(t, int64(2), result.Count)
}
func TestGetReadingBooksHandler_Demo2(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemo2User(router)
books := testGetReadingBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 0, len(books))
result := testGetReadingBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 0, len(result.Books))
assert.Equal(t, int64(0), result.Count)
}
func testGetReadingBooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int, limit string, offset string) []bookUserGet {
func testGetReadingBooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int, limit string, offset string) bookUserGet {
u, err := url.Parse("/mybooks/reading")
if err != nil {
t.Error(err)

9
internal/apitest/get_user_book_test.go
View File

@@ -13,6 +13,11 @@ import (
)
type bookUserGet struct {
Count int64 `json:"count"`
Books []bookUserGetBook `json:"books"`
}
type bookUserGetBook struct {
BookId uint `json:"id"`
Title string `json:"title" binding:"required,max=300"`
Author string `json:"author" binding:"max=100"`
@@ -21,14 +26,14 @@ type bookUserGet struct {
WantRead bool `json:"wantread"`
}
func testGetbooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int, url string) []bookUserGet {
func testGetbooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int, url string) bookUserGet {
req, _ := http.NewRequest("GET", url, nil)
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", userToken))
w := httptest.NewRecorder()
router.ServeHTTP(w, req)
var parsedResponse []bookUserGet
var parsedResponse bookUserGet
err := json.Unmarshal(w.Body.Bytes(), &parsedResponse)
if err != nil {
t.Error(err)

12
internal/apitest/get_wantread_user_book_test.go
View File

@@ -12,18 +12,20 @@ func TestGetWantReadBooksHandler_Demo(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemoUser(router)
books := testGetWantReadBooksHandler(t, router, token, 200)
assert.Equal(t, 2, len(books))
result := testGetWantReadBooksHandler(t, router, token, 200)
assert.Equal(t, 2, len(result.Books))
assert.Equal(t, int64(2), result.Count)
}
func TestGetWantReadBooksHandler_Demo2(t *testing.T) {
router := testutils.TestSetup()
token := testutils.ConnectDemo2User(router)
books := testGetWantReadBooksHandler(t, router, token, 200)
assert.Equal(t, 0, len(books))
result := testGetWantReadBooksHandler(t, router, token, 200)
assert.Equal(t, 0, len(result.Books))
assert.Equal(t, int64(0), result.Count)
}
func testGetWantReadBooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int) []bookUserGet {
func testGetWantReadBooksHandler(t *testing.T, router *gin.Engine, userToken string, expectedCode int) bookUserGet {
return testGetbooksHandler(t, router, userToken, expectedCode, "/mybooks/wantread")
}

5
internal/dto/out.go
View File

@@ -16,6 +16,11 @@ type BookGet struct {
}
type BookUserGet struct {
Count int64 `json:"count"`
Books []BookUserGetBook `json:"books"`
}
type BookUserGetBook struct {
ID uint `json:"id"`
Title string `json:"title" binding:"required,max=300"`
Author string `json:"author" binding:"max=100"`

12
internal/query/query.go
View File

@@ -24,8 +24,8 @@ func FetchBookGet(db *gorm.DB, userId uint, bookId uint64) (dto.BookGet, error)
return book, res.Error
}
func FetchReadUserBook(db *gorm.DB, userId uint, limit int, offset int) ([]dto.BookUserGet, error) {
var books []dto.BookUserGet
func FetchReadUserBook(db *gorm.DB, userId uint, limit int, offset int) ([]dto.BookUserGetBook, error) {
var books []dto.BookUserGetBook
query := fetchReadUserBookQuery(db, userId)
query = query.Limit(limit)
query = query.Offset(offset)
@@ -40,8 +40,8 @@ func FetchReadUserBookCount(db *gorm.DB, userId uint) (int64, error) {
return count, res.Error
}
func FetchReadingUserBook(db *gorm.DB, userId uint, limit int, offset int) ([]dto.BookUserGet, error) {
var books []dto.BookUserGet
func FetchReadingUserBook(db *gorm.DB, userId uint, limit int, offset int) ([]dto.BookUserGetBook, error) {
var books []dto.BookUserGetBook
query := fetchReadingUserBookQuery(db, userId)
query = query.Limit(limit)
query = query.Offset(offset)
@@ -67,8 +67,8 @@ func fetchReadingUserBookQuery(db *gorm.DB, userId uint) *gorm.DB {
return query
}
func FetchWantReadUserBook(db *gorm.DB, userId uint, limit int, offset int) ([]dto.BookUserGet, error) {
var books []dto.BookUserGet
func FetchWantReadUserBook(db *gorm.DB, userId uint, limit int, offset int) ([]dto.BookUserGetBook, error) {
var books []dto.BookUserGetBook
query := fetchWantReadUserBookQuery(db, userId)
query = query.Limit(limit)

1
internal/routes/authorbooksget.go
View File

@@ -52,4 +52,3 @@ func GetAuthorBooksHandler(ac appcontext.AppContext) {
}
ac.C.JSON(http.StatusOK, dto.BookSearchGet{Books: books, Count: count})
}

13
internal/routes/userbookreadget.go
View File

@@ -4,9 +4,9 @@ import (
"net/http"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/dto"
"git.artlef.fr/PersonalLibraryManager/internal/myvalidator"
"git.artlef.fr/PersonalLibraryManager/internal/query"
"github.com/gin-gonic/gin"
)
func GetMyBooksReadHandler(ac appcontext.AppContext) {
@@ -30,19 +30,10 @@ func GetMyBooksReadHandler(ac appcontext.AppContext) {
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})
ac.C.JSON(http.StatusOK, dto.BookUserGet{Count: count, Books: userbooks})
}

13
internal/routes/userbookreadingget.go
View File

@@ -4,9 +4,9 @@ import (
"net/http"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/dto"
"git.artlef.fr/PersonalLibraryManager/internal/myvalidator"
"git.artlef.fr/PersonalLibraryManager/internal/query"
"github.com/gin-gonic/gin"
)
func GetMyBooksReadingHandler(ac appcontext.AppContext) {
@@ -30,19 +30,10 @@ func GetMyBooksReadingHandler(ac appcontext.AppContext) {
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
return
}
ac.C.JSON(http.StatusOK, userbooks)
}
func GetMyBooksReadingCountHandler(ac appcontext.AppContext) {
user, err := ac.GetAuthenticatedUser()
if err != nil {
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
return
}
count, err := query.FetchReadingUserBookCount(ac.Db, user.ID)
if err != nil {
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
return
}
ac.C.JSON(http.StatusOK, gin.H{"count": count})
ac.C.JSON(http.StatusOK, dto.BookUserGet{Count: count, Books: userbooks})
}

13
internal/routes/userbookwantreadget.go
View File

@@ -4,9 +4,9 @@ import (
"net/http"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/dto"
"git.artlef.fr/PersonalLibraryManager/internal/myvalidator"
"git.artlef.fr/PersonalLibraryManager/internal/query"
"github.com/gin-gonic/gin"
)
func GetMyBooksWantReadHandler(ac appcontext.AppContext) {
@@ -30,19 +30,10 @@ func GetMyBooksWantReadHandler(ac appcontext.AppContext) {
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})
ac.C.JSON(http.StatusOK, dto.BookUserGet{Count: count, Books: userbooks})
}

9
internal/setup/setup.go
View File

@@ -27,21 +27,12 @@ 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/reading", func(c *gin.Context) {
routes.GetMyBooksReadingHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config})
})
r.GET("/mybooks/reading/count", func(c *gin.Context) {
routes.GetMyBooksReadingCountHandler(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})
})