Collection form: add a button to remove added books

internal/apitest/delete_collection_element_test.go

@@ -0,0 +1,45 @@
+package apitest
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"git.artlef.fr/bibliomane/internal/testutils"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDeleteCollectionBookHandler_DelOk(t *testing.T) {
+	status := testDeleteCollectionBookHandler("23")
+	assert.Equal(t, http.StatusOK, status)
+	_, collection := testGetCollection(t, "6", "10", "0")
+	assert.Equal(t, int64(5), collection.Count)
+	assert.Equal(t, uint(1), collection.Items[0].Position)
+	assert.Equal(t, uint(2), collection.Items[1].Position)
+	assert.Equal(t, uint(3), collection.Items[2].Position)
+	assert.Equal(t, uint(4), collection.Items[3].Position)
+	assert.Equal(t, uint(5), collection.Items[4].Position)
+}
+
+func TestDeleteCollectionBookHandler_NotFound(t *testing.T) {
+	status := testDeleteCollectionBookHandler("425")
+	assert.Equal(t, http.StatusNotFound, status)
+}
+
+func TestDeleteCollectionBookHandler_Unauthorized(t *testing.T) {
+	status := testDeleteCollectionBookHandler("11")
+	assert.Equal(t, http.StatusUnauthorized, status)
+}
+
+func testDeleteCollectionBookHandler(itemId string) int {
+	router := testutils.TestSetup()
+	w := httptest.NewRecorder()
+
+	token := testutils.ConnectDemoUser(router)
+	req, _ := http.NewRequest("DELETE", "/ws/collection/item/"+itemId, nil)
+	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
+	router.ServeHTTP(w, req)
+
+	return w.Code
+}

internal/apitest/fetchallcollections_test.go

@@ -12,8 +12,8 @@ import (
 func TestFetchAllCollections_OK(t *testing.T) {
 	status, res := testFetchCollections(t, "10", "0")
 	assert.Equal(t, http.StatusOK, status)
-	assert.Equal(t, int64(4), res.Count)
-	assert.Equal(t, 4, len(res.Collections))
+	assert.Equal(t, int64(5), res.Count)
+	assert.Equal(t, 5, len(res.Collections))
 }
 
 func testFetchCollections(t *testing.T, limit string, offset string) (int, dto.CollectionItemsGet) {

internal/query/querycollections.go

@@ -20,6 +20,16 @@ func FetchCollectionHeader(db *gorm.DB, collectionId uint) (CollectionHeader, er
 	return collection, res.Error
 }
 
+func FetchCollectionHeaderFromItem(db *gorm.DB, itemId uint) (CollectionHeader, error) {
+	var collection CollectionHeader
+	query := db.Model(&model.Collection{})
+	query = query.Select("collections.name, collections.user_id")
+	query = query.Joins("left join collection_items on (collection_items.collection_id = collections.id)")
+	query = query.Where("collection_items.id = ?", itemId)
+	res := query.Find(&collection)
+	return collection, res.Error
+}
+
 type CollectionsQueryResult struct {
 	ID        uint
 	UserID    uint

internal/routes/collectionremovebookdelete.go

@@ -0,0 +1,62 @@
+package routes
+
+import (
+	"errors"
+	"net/http"
+	"strconv"
+
+	"git.artlef.fr/bibliomane/internal/appcontext"
+	"git.artlef.fr/bibliomane/internal/i18nresource"
+	"git.artlef.fr/bibliomane/internal/model"
+	"git.artlef.fr/bibliomane/internal/myvalidator"
+	"git.artlef.fr/bibliomane/internal/query"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+func DeleteCollectionBookHandler(ac appcontext.AppContext) {
+	collectionItemId, err := strconv.ParseUint(ac.C.Param("id"), 10, 64)
+	if err != nil {
+		ac.C.JSON(http.StatusBadRequest, gin.H{"error": err})
+		return
+	}
+
+	user, err := ac.GetAuthenticatedUser()
+	if err != nil {
+		myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
+		return
+	}
+
+	var collectionItem model.CollectionItem
+	err = ac.Db.First(&collectionItem, collectionItemId).Error
+	if err != nil {
+		myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
+		return
+	}
+	collection, err := query.FetchCollectionHeaderFromItem(ac.Db, collectionItem.ID)
+
+	if collection.UserID != user.ID {
+		err := myvalidator.HttpError{
+			StatusCode: http.StatusUnauthorized,
+			Err:        errors.New(i18nresource.GetTranslatedMessage(&ac, "Unauthorized")),
+		}
+		myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
+		return
+	}
+
+	err = ac.Db.Delete(&collectionItem).Error
+	if err != nil {
+		myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
+		return
+	}
+
+	//update position on remaining items
+	q := ac.Db.Model(&model.CollectionItem{})
+	q = q.Where("collection_id = ? AND position > ?", collectionItem.CollectionID, collectionItem.Position)
+	err = q.UpdateColumn("position", gorm.Expr("position - 1")).Error
+	if err != nil {
+		myvalidator.ReturnErrorsAsJsonResponse(&ac, err)
+		return
+	}
+	ac.C.JSON(http.StatusOK, "Success")
+}

internal/setup/setup.go

@@ -102,7 +102,9 @@ func Setup(config *config.Config) *gin.Engine {
 	ws.POST("/upload/cover", func(c *gin.Context) {
 		routes.PostUploadBookCoverHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config})
 	})
-
+	ws.DELETE("/collection/item/:id", func(c *gin.Context) {
+		routes.DeleteCollectionBookHandler(appcontext.AppContext{C: c, Db: db, I18n: bundle, Config: config})
+	})
 	r.Static("/static/bookcover", config.ImageFolderPath)
 
 	folders := []string{"assets", "css", "image"}