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

Added start read date

Browse Source
This commit is contained in:
Arthur Lefebvre
2025-11-20 22:55:26 +01:00
parent 4cbddfb15f
commit 0bfd0dc231
16 changed files with 263 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demodata.sql
View File

@@ -43,7 +43,7 @@ INSERT INTO user_books(created_at, user_id, book_id, read, rating) VALUES ('NOW'
INSERT INTO books(created_at, title, author, added_by_id, cover_id) VALUES ('NOW', 'Les dieux ont soif','Anatole France', (SELECT id FROM users WHERE name = 'demo'),(SELECT id FROM static_files WHERE name = 'lesdieuxontsoif.jpg'));
INSERT INTO user_books(created_at, user_id, book_id, read, rating) VALUES ('NOW',(SELECT id FROM users WHERE name = 'demo'),(SELECT id FROM books WHERE title = 'Les dieux ont soif'), true,7);
INSERT INTO books(created_at, title, author, added_by_id, cover_id) VALUES ('NOW', 'Rigodon','Louis-Ferdinand Céline', (SELECT id FROM users WHERE name = 'demo'),(SELECT id FROM static_files WHERE name = 'rigodon.jpg'));
INSERT INTO user_books(created_at, user_id, book_id, read, rating) VALUES ('NOW',(SELECT id FROM users WHERE name = 'demo'),(SELECT id FROM books WHERE title = 'Rigodon'),true, 10);
INSERT INTO user_books(created_at, user_id, book_id, read, rating) VALUES ('NOW',(SELECT id FROM users WHERE name = 'demo2'),(SELECT id FROM books WHERE title = 'Rigodon'),true, 10);
INSERT INTO books(created_at, title, author, added_by_id, cover_id) VALUES ('NOW', 'Un barrage contre le Pacifique','Marguerite Duras', (SELECT id FROM users WHERE name = 'demo'),(SELECT id FROM static_files WHERE name = 'Un_barrage_contre_le_Pacifique.jpg'));
INSERT INTO user_books(created_at, user_id, book_id, read, rating) VALUES ('NOW',(SELECT id FROM users WHERE name = 'demo'),(SELECT id FROM books WHERE title = 'Un barrage contre le Pacifique'), true,7);
INSERT INTO books(created_at, title, author, added_by_id, cover_id) VALUES ('NOW', 'Salammbô','Flaubert Gustave', (SELECT id FROM users WHERE name = 'demo'),(SELECT id FROM static_files WHERE name = 'salammbo.jpg'));

1
front/src/BigIcon.vue
View File

@@ -34,7 +34,6 @@
.bigiconandlegend:hover {
transform: scale(1.03);
transition: ease-in-out 0.02s;
background-color: bulma-primary;
cursor: pointer;
}

26
front/src/BookForm.vue
View File

@@ -1,10 +1,12 @@
<script setup>
import { ref, computed } from 'vue'
import { getBook, getImagePathOrDefault, putReadBook, putWantReadBook, putRateBook } from './api.js'
import { getBook, getImagePathOrDefault, putReadBook, putWantReadBook, putRateBook,
putStartReadDate, putStartReadDateUnset } from './api.js'
import { onBeforeRouteUpdate } from 'vue-router'
import { VRating } from 'vuetify/components/VRating';
import BigIcon from './BigIcon.vue';
import StartReadWidget from './StartReadWidget.vue';
const props = defineProps({
id: String
@@ -14,6 +16,7 @@
let error = ref(null);
getBook(data, error, props.id);
const imagePathOrDefault = computed(() => getImagePathOrDefault(data.value.coverPath));
onBeforeRouteUpdate(async (to, from) => {
getBook(data, error, to.params.id);
})
@@ -40,6 +43,21 @@
putWantReadBook(props.id, {wantread: data.value.wantread});
}
function onStartReadIconClick() {
if (data.value.startReadDate == null) {
data.value.startReadDate = new Date().toISOString().slice(0, 10);
putStartReadDate(props.id, data.value.startReadDate);
} else {
data.value.startReadDate = null;
putStartReadDateUnset(props.id);
}
}
function onStartReadDateChange(d) {
data.value.startReadDate = d;
putStartReadDate(props.id, data.value.startReadDate);
}
</script>
<template>
@@ -72,9 +90,11 @@
:legend="$t('bookform.wantread')"
:isSet="data.wantread"
@click="onWantReadIconClick"/>
<BigIcon icon="BIconBook"
<StartReadWidget
:legend="$t('bookform.startread')"
:isSet="false"/>
:startReadDate="data.startReadDate"
@onDateChange="onStartReadDateChange"
@onIconClick="onStartReadIconClick"/>
<BigIcon icon="BIconCheckCircle"
:legend="$t('bookform.read')"
:isSet="data.read"

75
front/src/StartReadWidget.vue Normal file
View File

@@ -0,0 +1,75 @@
<script setup>
import { ref } from 'vue'
import BigIcon from './BigIcon.vue';
const props = defineProps({
legend: String,
startReadDate: String
});
defineEmits(['onIconClick', 'onDateChange'])
const today = new Date().toISOString().slice(0, 10);
function computeParentClasses() {
if (props.startReadDate != null) {
return "startdatewidget has-text-dark has-background-text"
} else {
return "startdatewidget"
}
}
</script>
<template>
<div :class="computeParentClasses()">
<BigIcon icon="BIconBook"
:legend="props.legend"
:isSet="props.startReadDate != null"
@click="$emit('onIconClick')"/>
<div v-if="props.startReadDate != null" class="inputdate">
<div class="ontopofinput">
<label class="datelabel" for="startread">
{{$t('startreadwidget.started')}}
</label>
<input class="datepicker has-background-dark has-text-light"
id="startread"
type="date"
@change="(e) => $emit('onDateChange', e.target.value)"
:value="props.startReadDate"
:max="today"/>
</div>
</div>
</div>
</template>
<style scoped>
.inputdate {
display: flex;
justify-content:center;
align-items:center;
padding: 20px;
}
.startdatewidget {
display: flex;
width: 500px;
border-radius: 0 30px 30px 0;
}
.ontopofinput {
display: block;
}
.datelabel {
display: flex;
justify-content:center;
align-items:center;
font-size: 26px;
border: none;
padding-bottom: 15px;
}
.datepicker {
font-size: 26px;
border-radius: 5px;
}
</style>

8
front/src/api.js
View File

@@ -53,6 +53,14 @@ export async function putReadBook(bookId, payload) {
return genericPayloadCall('/book/' + bookId + "/read", payload, 'PUT')
}
export async function putStartReadDateUnset(bookId) {
return genericPayloadCall('/book/' + bookId + "/startread", {startDate: "null"}, 'PUT')
}
export async function putStartReadDate(bookId, startdate) {
return genericPayloadCall('/book/' + bookId + "/startread", {startDate: startdate}, 'PUT')
}
export async function putWantReadBook(bookId, payload) {
return genericPayloadCall('/book/' + bookId + "/wantread", payload, 'PUT')
}

3
front/src/locales/en.json
View File

@@ -53,5 +53,8 @@
"next":"Next",
"goto":"Goto page {pageNumber}",
"page":"Page {pageNumber}"
},
"startreadwidget" :{
"started": "Started at :"
}
}

3
front/src/locales/fr.json
View File

@@ -53,5 +53,8 @@
"next":"Suivant",
"goto":"Aller à la page {pageNumber}",
"page":"Page {pageNumber}"
},
"startreadwidget" :{
"started": "Commencé le :"
}
}

17
internal/apitest/get_book_test.go
View File

@@ -12,19 +12,20 @@ import (
)
type fetchedBook struct {
Title string `json:"title" binding:"required,max=300"`
Author string `json:"author" binding:"max=100"`
Summary string `json:"summary"`
Rating int `json:"rating"`
Read bool `json:"read"`
WantRead bool `json:"wantread"`
Title string `json:"title" binding:"required,max=300"`
Author string `json:"author" binding:"max=100"`
Summary string `json:"summary"`
Rating int `json:"rating"`
Read bool `json:"read"`
WantRead bool `json:"wantread"`
StartReadDate string `json:"startReadDate"`
}
func TestGetBook_Ok(t *testing.T) {
book := testGetBook(t, "5", http.StatusOK)
book := testGetBook(t, "3", http.StatusOK)
assert.Equal(t,
fetchedBook{
Title: "Rigodon",
Title: "D'un château l'autre",
Author: "Louis-Ferdinand Céline",
Rating: 10,
Read: true,

2
internal/apitest/get_count_user_book_test.go
View File

@@ -31,7 +31,7 @@ func TestGetReadBooksCountHandler_Demo(t *testing.T) {
if err != nil {
t.Error(err)
}
assert.Equal(t, 23, c.Count)
assert.Equal(t, 22, c.Count)
}
func TestGetWantReadBooksCountHandler_Demo(t *testing.T) {

8
internal/apitest/get_read_user_book_test.go
View File

@@ -14,7 +14,7 @@ func TestGetReadBooksHandler_Demo(t *testing.T) {
token := testutils.ConnectDemoUser(router)
books := testGetReadBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 23, len(books))
assert.Equal(t, 22, len(books))
}
func TestGetReadBooksHandler_DemoNoLimit(t *testing.T) {
@@ -22,7 +22,7 @@ func TestGetReadBooksHandler_DemoNoLimit(t *testing.T) {
token := testutils.ConnectDemoUser(router)
books := testGetReadBooksHandler(t, router, token, 200, "100", "")
assert.Equal(t, 23, len(books))
assert.Equal(t, 22, len(books))
}
func TestGetReadBooksHandler_DemoLowerLimit(t *testing.T) {
@@ -38,7 +38,7 @@ func TestGetReadBooksHandler_DemoOffset(t *testing.T) {
token := testutils.ConnectDemoUser(router)
books := testGetReadBooksHandler(t, router, token, 200, "20", "10")
assert.Equal(t, 13, len(books))
assert.Equal(t, 12, len(books))
}
func TestGetReadBooksHandler_Demo2(t *testing.T) {
@@ -46,7 +46,7 @@ func TestGetReadBooksHandler_Demo2(t *testing.T) {
token := testutils.ConnectDemo2User(router)
books := testGetReadBooksHandler(t, router, token, 200, "", "")
assert.Equal(t, 2, len(books))
assert.Equal(t, 3, len(books))
}
func TestGetReadBooksHandler_CheckOneBook(t *testing.T) {

53
internal/apitest/put_userbook_startread_test.go Normal file
View File

@@ -0,0 +1,53 @@
package apitest
import (
"net/http"
"testing"
"git.artlef.fr/PersonalLibraryManager/internal/testutils"
"github.com/stretchr/testify/assert"
)
func TestPutStartReadUserBooks_NoDate(t *testing.T) {
payload :=
`{
"date": "2025-11-19"
}`
bookId := "6"
testPutStartReadUserBooks(t, payload, bookId, http.StatusBadRequest)
}
func TestPutStartReadUserBooks_WrongDateFormat(t *testing.T) {
payload :=
`{
"startDate": "19/11/2025"
}`
bookId := "6"
testPutStartReadUserBooks(t, payload, bookId, http.StatusInternalServerError)
}
func TestPutStartReadUserBooks_NewReadOk(t *testing.T) {
payload :=
`{
"startDate": "2025-11-19"
}`
bookId := "6"
testPutStartReadUserBooks(t, payload, bookId, http.StatusOK)
book := testGetBook(t, bookId, http.StatusOK)
assert.Equal(t, "2025-11-19", book.StartReadDate)
}
func TestPutStartReadUserBooks_Unset(t *testing.T) {
payload :=
`{
"startDate": "null"
}`
bookId := "6"
testPutStartReadUserBooks(t, payload, bookId, http.StatusOK)
book := testGetBook(t, bookId, http.StatusOK)
assert.Equal(t, "", book.StartReadDate)
}
func testPutStartReadUserBooks(t *testing.T, payload string, bookId string, expectedCode int) {
testutils.TestBookPutCallWithDemoPayload(t, payload, bookId, expectedCode, "/book/"+bookId+"/startread")
}

19
internal/model/userbook.go
View File

@@ -1,14 +1,19 @@
package model
import "gorm.io/gorm"
import (
"time"
"gorm.io/gorm"
)
// describes the relationship between a user and a book.
type UserBook struct {
gorm.Model
UserID uint
BookID uint
Book Book
Rating int
Read bool
WantRead bool
UserID uint
BookID uint
Book Book
Rating int
Read bool
WantRead bool
StartReadDate *time.Time
}

17
internal/query/query.go
View File

@@ -9,19 +9,20 @@ import (
)
type BookGet struct {
Title string `json:"title" binding:"required,max=300"`
Author string `json:"author" binding:"max=100"`
Summary string `json:"summary"`
Rating int `json:"rating"`
Read bool `json:"read"`
WantRead bool `json:"wantread"`
CoverPath string `json:"coverPath"`
Title string `json:"title" binding:"required,max=300"`
Author string `json:"author" binding:"max=100"`
Summary string `json:"summary"`
Rating int `json:"rating"`
Read bool `json:"read"`
WantRead bool `json:"wantread"`
StartReadDate string `json:"startReadDate"`
CoverPath string `json:"coverPath"`
}
func FetchBookGet(db *gorm.DB, userId uint, bookId uint64) (BookGet, error) {
var book BookGet
query := db.Model(&model.Book{})
query = query.Select("books.title, books.author, books.summary, user_books.rating, user_books.read, user_books.want_read, " + selectStaticFilesPath())
query = query.Select("books.title, books.author, books.summary, user_books.rating, user_books.read, user_books.want_read, user_books.start_read_date, " + selectStaticFilesPath())
query = query.Joins("left join user_books on (user_books.book_id = books.id and user_books.user_id = ?)", userId)
query = query.Joins("left join static_files on (static_files.id = books.cover_id)")
query = query.Where("books.id = ?", bookId)

18
internal/routes/bookget.go
View File

@@ -3,6 +3,7 @@ package routes
import (
"net/http"
"strconv"
"time"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/model"
@@ -32,5 +33,22 @@ func GetBookHandler(ac appcontext.AppContext) {
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
return
}
err = fixBookGetDateFields(&book)
if err != nil {
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
return
}
ac.C.JSON(http.StatusOK, book)
}
func fixBookGetDateFields(book *query.BookGet) error {
if book.StartReadDate == "" {
return nil
}
startDate, err := time.Parse(time.RFC3339, book.StartReadDate)
if err != nil {
return err
}
book.StartReadDate = startDate.Format(time.DateOnly)
return nil
}

41
internal/routes/userbookputupdate.go
View File

@@ -4,6 +4,7 @@ import (
"errors"
"net/http"
"strconv"
"time"
"git.artlef.fr/PersonalLibraryManager/internal/appcontext"
"git.artlef.fr/PersonalLibraryManager/internal/model"
@@ -63,6 +64,42 @@ func PutWantReadUserBookHandler(ac appcontext.AppContext) {
ac.C.String(http.StatusOK, "Success")
}
func PutStartReadUserBookHandler(ac appcontext.AppContext) {
data, err := retrieveDataFromContext(ac)
if err != nil {
return
}
bookId := data.BookId
user := data.User
var startDateToParse userbookPutStartRead
err = ac.C.ShouldBindJSON(&startDateToParse)
if err != nil {
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
return
}
userbook, err := fetchOrCreateUserBook(ac, bookId, &user)
if err != nil {
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
return
}
//string equal to "null" to unset value
if startDateToParse.StartDate == "null" {
userbook.StartReadDate = nil
} else {
startDate, err := time.Parse(time.DateOnly, startDateToParse.StartDate)
if err != nil {
myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
return
}
userbook.StartReadDate = &startDate
}
ac.Db.Save(&userbook)
ac.C.String(http.StatusOK, "Success")
}
func PutRateUserBookHandler(ac appcontext.AppContext) {
data, err := retrieveDataFromContext(ac)
if err != nil {
@@ -104,6 +141,10 @@ type userbookPutRating struct {
Rating int `json:"rating" binding:"min=0,max=10"`
}
type userbookPutStartRead struct {
StartDate string `json:"startDate" binding:"required"`
}
type apiCallData struct {
BookId uint
User model.User

3
internal/setup/setup.go
View File

@@ -51,6 +51,9 @@ func Setup(config *config.Config) *gin.Engine {
r.PUT("/book/:id/wantread", func(c *gin.Context) {
routes.PutWantReadUserBookHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config})
})
r.PUT("/book/:id/startread", func(c *gin.Context) {
routes.PutStartReadUserBookHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config})
})
r.PUT("/book/:id/rate", func(c *gin.Context) {
routes.PutRateUserBookHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config})
})