mirror of
https://github.com/aykhans/slash-e.git
synced 2025-04-16 04:13:12 +00:00
feat: impl collection store
This commit is contained in:
Steven
parent
f770149066
commit
7715905204
@ -1 +1,219 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/boojack/slash/internal/util"
|
||||
storepb "github.com/boojack/slash/proto/gen/store"
|
||||
)
|
||||
|
||||
type UpdateCollection struct {
|
||||
ID int32
|
||||
|
||||
RowStatus *RowStatus
|
||||
Name *string
|
||||
Link *string
|
||||
Title *string
|
||||
Description *string
|
||||
ShortcutIDs []int32
|
||||
Visibility *Visibility
|
||||
}
|
||||
|
||||
type FindCollection struct {
|
||||
ID *int32
|
||||
CreatorID *int32
|
||||
Name *string
|
||||
VisibilityList []Visibility
|
||||
}
|
||||
|
||||
type DeleteCollection struct {
|
||||
ID int32
|
||||
}
|
||||
|
||||
func (s *Store) CreateCollection(ctx context.Context, create *storepb.Collection) (*storepb.Collection, error) {
|
||||
set := []string{"creator_id", "name", "title", "description", "shortcut_ids", "visibility"}
|
||||
args := []any{create.CreatorId, create.Name, create.Title, create.Description, strings.Trim(strings.Join(strings.Fields(fmt.Sprint(create.ShortcutIds)), ","), "[]"), create.Visibility.String()}
|
||||
placeholder := []string{"?", "?", "?", "?", "?", "?"}
|
||||
|
||||
stmt := `
|
||||
INSERT INTO collection (
|
||||
` + strings.Join(set, ", ") + `
|
||||
)
|
||||
VALUES (` + strings.Join(placeholder, ",") + `)
|
||||
RETURNING id, created_ts, updated_ts
|
||||
`
|
||||
if err := s.db.QueryRowContext(ctx, stmt, args...).Scan(
|
||||
&create.Id,
|
||||
&create.CreatedTs,
|
||||
&create.UpdatedTs,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
collection := create
|
||||
return collection, nil
|
||||
}
|
||||
|
||||
func (s *Store) UpdateCollection(ctx context.Context, update *UpdateCollection) (*storepb.Collection, error) {
|
||||
set, args := []string{}, []any{}
|
||||
if update.Name != nil {
|
||||
set, args = append(set, "name = ?"), append(args, *update.Name)
|
||||
}
|
||||
if update.Title != nil {
|
||||
set, args = append(set, "title = ?"), append(args, *update.Title)
|
||||
}
|
||||
if update.Description != nil {
|
||||
set, args = append(set, "description = ?"), append(args, *update.Description)
|
||||
}
|
||||
if update.ShortcutIDs != nil {
|
||||
set, args = append(set, "shortcut_ids = ?"), append(args, strings.Trim(strings.Join(strings.Fields(fmt.Sprint(update.ShortcutIDs)), ","), "[]"))
|
||||
}
|
||||
if update.Visibility != nil {
|
||||
set, args = append(set, "visibility = ?"), append(args, update.Visibility.String())
|
||||
}
|
||||
if len(set) == 0 {
|
||||
return nil, errors.New("no update specified")
|
||||
}
|
||||
args = append(args, update.ID)
|
||||
|
||||
stmt := `
|
||||
UPDATE collection
|
||||
SET
|
||||
` + strings.Join(set, ", ") + `
|
||||
WHERE
|
||||
id = ?
|
||||
RETURNING id, creator_id, created_ts, updated_ts, name, title, description, shortcut_ids, visibility
|
||||
`
|
||||
collection := &storepb.Collection{}
|
||||
var shortcutIDs, visibility string
|
||||
if err := s.db.QueryRowContext(ctx, stmt, args...).Scan(
|
||||
&collection.Id,
|
||||
&collection.CreatorId,
|
||||
&collection.CreatedTs,
|
||||
&collection.UpdatedTs,
|
||||
&collection.Name,
|
||||
&collection.Title,
|
||||
&collection.Description,
|
||||
&shortcutIDs,
|
||||
&visibility,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
collection.ShortcutIds = []int32{}
|
||||
if shortcutIDs != "" {
|
||||
for _, idStr := range strings.Split(shortcutIDs, ",") {
|
||||
shortcutID, err := util.ConvertStringToInt32(idStr)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "failed to convert shortcut id")
|
||||
}
|
||||
collection.ShortcutIds = append(collection.ShortcutIds, shortcutID)
|
||||
}
|
||||
}
|
||||
collection.Visibility = convertVisibilityStringToStorepb(visibility)
|
||||
return collection, nil
|
||||
}
|
||||
|
||||
func (s *Store) ListCollections(ctx context.Context, find *FindCollection) ([]*storepb.Collection, error) {
|
||||
where, args := []string{"1 = 1"}, []any{}
|
||||
if v := find.ID; v != nil {
|
||||
where, args = append(where, "id = ?"), append(args, *v)
|
||||
}
|
||||
if v := find.CreatorID; v != nil {
|
||||
where, args = append(where, "creator_id = ?"), append(args, *v)
|
||||
}
|
||||
if v := find.Name; v != nil {
|
||||
where, args = append(where, "name = ?"), append(args, *v)
|
||||
}
|
||||
if v := find.VisibilityList; len(v) != 0 {
|
||||
list := []string{}
|
||||
for _, visibility := range v {
|
||||
list = append(list, fmt.Sprintf("$%d", len(args)+1))
|
||||
args = append(args, visibility)
|
||||
}
|
||||
where = append(where, fmt.Sprintf("visibility in (%s)", strings.Join(list, ",")))
|
||||
}
|
||||
|
||||
rows, err := s.db.QueryContext(ctx, `
|
||||
SELECT
|
||||
id,
|
||||
creator_id,
|
||||
created_ts,
|
||||
updated_ts,
|
||||
name,
|
||||
title,
|
||||
description,
|
||||
shortcut_ids,
|
||||
visibility
|
||||
FROM collection
|
||||
WHERE `+strings.Join(where, " AND ")+`
|
||||
ORDER BY created_ts DESC`,
|
||||
args...,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
list := make([]*storepb.Collection, 0)
|
||||
for rows.Next() {
|
||||
collection := &storepb.Collection{}
|
||||
var shortcutIDs, visibility string
|
||||
if err := rows.Scan(
|
||||
&collection.Id,
|
||||
&collection.CreatorId,
|
||||
&collection.CreatedTs,
|
||||
&collection.UpdatedTs,
|
||||
&collection.Name,
|
||||
&collection.Title,
|
||||
&collection.Description,
|
||||
&shortcutIDs,
|
||||
&visibility,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
collection.ShortcutIds = []int32{}
|
||||
if shortcutIDs != "" {
|
||||
for _, idStr := range strings.Split(shortcutIDs, ",") {
|
||||
shortcutID, err := util.ConvertStringToInt32(idStr)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "failed to convert shortcut id")
|
||||
}
|
||||
collection.ShortcutIds = append(collection.ShortcutIds, shortcutID)
|
||||
}
|
||||
}
|
||||
collection.Visibility = storepb.Visibility(storepb.Visibility_value[visibility])
|
||||
list = append(list, collection)
|
||||
}
|
||||
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return list, nil
|
||||
}
|
||||
|
||||
func (s *Store) GetCollection(ctx context.Context, find *FindCollection) (*storepb.Collection, error) {
|
||||
collections, err := s.ListCollections(ctx, find)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(collections) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
collection := collections[0]
|
||||
return collection, nil
|
||||
}
|
||||
|
||||
func (s *Store) DeleteCollection(ctx context.Context, delete *DeleteCollection) error {
|
||||
if _, err := s.db.ExecContext(ctx, `DELETE FROM collection WHERE id = ?`, delete.ID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -33,3 +33,27 @@ func convertRowStatusStringToStorepb(status string) storepb.RowStatus {
|
||||
}
|
||||
return storepb.RowStatus_ROW_STATUS_UNSPECIFIED
|
||||
}
|
||||
|
||||
// Visibility is the type of a visibility.
|
||||
type Visibility string
|
||||
|
||||
const (
|
||||
// VisibilityPublic is the PUBLIC visibility.
|
||||
VisibilityPublic Visibility = "PUBLIC"
|
||||
// VisibilityWorkspace is the WORKSPACE visibility.
|
||||
VisibilityWorkspace Visibility = "WORKSPACE"
|
||||
// VisibilityPrivate is the PRIVATE visibility.
|
||||
VisibilityPrivate Visibility = "PRIVATE"
|
||||
)
|
||||
|
||||
func (e Visibility) String() string {
|
||||
switch e {
|
||||
case VisibilityPublic:
|
||||
return "PUBLIC"
|
||||
case VisibilityWorkspace:
|
||||
return "WORKSPACE"
|
||||
case VisibilityPrivate:
|
||||
return "PRIVATE"
|
||||
}
|
||||
return "PRIVATE"
|
||||
}
|
||||
|
||||
@ -13,30 +13,6 @@ import (
|
||||
storepb "github.com/boojack/slash/proto/gen/store"
|
||||
)
|
||||
|
||||
// Visibility is the type of a visibility.
|
||||
type Visibility string
|
||||
|
||||
const (
|
||||
// VisibilityPublic is the PUBLIC visibility.
|
||||
VisibilityPublic Visibility = "PUBLIC"
|
||||
// VisibilityWorkspace is the WORKSPACE visibility.
|
||||
VisibilityWorkspace Visibility = "WORKSPACE"
|
||||
// VisibilityPrivate is the PRIVATE visibility.
|
||||
VisibilityPrivate Visibility = "PRIVATE"
|
||||
)
|
||||
|
||||
func (e Visibility) String() string {
|
||||
switch e {
|
||||
case VisibilityPublic:
|
||||
return "PUBLIC"
|
||||
case VisibilityWorkspace:
|
||||
return "WORKSPACE"
|
||||
case VisibilityPrivate:
|
||||
return "PRIVATE"
|
||||
}
|
||||
return "PRIVATE"
|
||||
}
|
||||
|
||||
type OpenGraphMetadata struct {
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
|
||||
49
test/store/collection_test.go
Normal file
49
test/store/collection_test.go
Normal file
@ -0,0 +1,49 @@
|
||||
package teststore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
storepb "github.com/boojack/slash/proto/gen/store"
|
||||
"github.com/boojack/slash/store"
|
||||
)
|
||||
|
||||
func TestCollectionStore(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ts := NewTestingStore(ctx, t)
|
||||
user, err := createTestingAdminUser(ctx, ts)
|
||||
require.NoError(t, err)
|
||||
collection, err := ts.CreateCollection(ctx, &storepb.Collection{
|
||||
CreatorId: user.ID,
|
||||
Name: "test",
|
||||
Title: "My collection",
|
||||
Description: "A test collection",
|
||||
ShortcutIds: []int32{101, 102},
|
||||
Visibility: storepb.Visibility_PRIVATE,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
collections, err := ts.ListCollections(ctx, &store.FindCollection{
|
||||
CreatorID: &user.ID,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, 1, len(collections))
|
||||
require.Equal(t, collection, collections[0])
|
||||
newShortcutIds := []int32{101, 103}
|
||||
updatedCollection, err := ts.UpdateCollection(ctx, &store.UpdateCollection{
|
||||
ID: collection.Id,
|
||||
ShortcutIDs: newShortcutIds,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, newShortcutIds, updatedCollection.ShortcutIds)
|
||||
err = ts.DeleteCollection(ctx, &store.DeleteCollection{
|
||||
ID: collection.Id,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
collections, err = ts.ListCollections(ctx, &store.FindCollection{
|
||||
CreatorID: &user.ID,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, 0, len(collections))
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user