Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: retire tag store

Steven292861be168f
diff --git a/store/db/mysql/tag.go b/store/db/mysql/tag.go
deleted file mode 100644
index dccec0ab7..000000000
--- a/store/db/mysql/tag.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package mysql
-
-import (
- "context"
- "strings"
-
- "github.com/usememos/memos/store"
-)
-
-func (d *DB) UpsertTag(ctx context.Context, upsert *store.Tag) (*store.Tag, error) {
- stmt := "INSERT INTO `tag` (`name`, `creator_id`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `name` = ?"
- if _, err := d.db.ExecContext(ctx, stmt, upsert.Name, upsert.CreatorID, upsert.Name); err != nil {
- return nil, err
- }
-
- return upsert, nil
-}
-
-func (d *DB) ListTags(ctx context.Context, find *store.FindTag) ([]*store.Tag, error) {
- where, args := []string{"1 = 1"}, []any{}
-
- if find.CreatorID != 0 {
- where, args = append(where, "`creator_id` = ?"), append(args, find.CreatorID)
- }
-
- query := "SELECT `name`, `creator_id` FROM `tag` WHERE " + strings.Join(where, " AND ") + " ORDER BY name ASC"
- rows, err := d.db.QueryContext(ctx, query, args...)
- if err != nil {
- return nil, err
- }
- defer rows.Close()
-
- list := []*store.Tag{}
- for rows.Next() {
- tag := &store.Tag{}
- if err := rows.Scan(
- &tag.Name,
- &tag.CreatorID,
- ); err != nil {
- return nil, err
- }
-
- list = append(list, tag)
- }
-
- if err := rows.Err(); err != nil {
- return nil, err
- }
-
- return list, nil
-}
-
-func (d *DB) DeleteTag(ctx context.Context, delete *store.DeleteTag) error {
- where, args := []string{"`name` = ?", "`creator_id` = ?"}, []any{delete.Name, delete.CreatorID}
- stmt := "DELETE FROM `tag` WHERE " + strings.Join(where, " AND ")
- result, err := d.db.ExecContext(ctx, stmt, args...)
- if err != nil {
- return err
- }
- if _, err = result.RowsAffected(); err != nil {
- return err
- }
- return nil
-}
diff --git a/store/db/postgres/tag.go b/store/db/postgres/tag.go
deleted file mode 100644
index 342fa6f47..000000000
--- a/store/db/postgres/tag.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package postgres
-
-import (
- "context"
- "strings"
-
- "github.com/usememos/memos/store"
-)
-
-func (d *DB) UpsertTag(ctx context.Context, upsert *store.Tag) (*store.Tag, error) {
- stmt := "INSERT INTO tag (name, creator_id) VALUES ($1, $2) ON CONFLICT (name, creator_id) DO UPDATE SET name = $3"
- if _, err := d.db.ExecContext(ctx, stmt, upsert.Name, upsert.CreatorID, upsert.Name); err != nil {
- return nil, err
- }
- return upsert, nil
-}
-
-func (d *DB) ListTags(ctx context.Context, find *store.FindTag) ([]*store.Tag, error) {
- where, args := []string{"1 = 1"}, []any{}
-
- if find.CreatorID != 0 {
- where, args = append(where, "creator_id = "+placeholder(len(args)+1)), append(args, find.CreatorID)
- }
-
- query := `
- SELECT
- name,
- creator_id
- FROM tag
- WHERE ` + strings.Join(where, " AND ") + `
- ORDER BY name ASC
- `
- rows, err := d.db.QueryContext(ctx, query, args...)
- if err != nil {
- return nil, err
- }
- defer rows.Close()
-
- list := []*store.Tag{}
- for rows.Next() {
- tag := &store.Tag{}
- if err := rows.Scan(
- &tag.Name,
- &tag.CreatorID,
- ); err != nil {
- return nil, err
- }
-
- list = append(list, tag)
- }
-
- if err := rows.Err(); err != nil {
- return nil, err
- }
-
- return list, nil
-}
-
-func (d *DB) DeleteTag(ctx context.Context, delete *store.DeleteTag) error {
- where, args := []string{"name = $1", "creator_id = $2"}, []any{delete.Name, delete.CreatorID}
- stmt := `DELETE FROM tag WHERE ` + strings.Join(where, " AND ")
- result, err := d.db.ExecContext(ctx, stmt, args...)
- if err != nil {
- return err
- }
- if _, err = result.RowsAffected(); err != nil {
- return err
- }
- return nil
-}
diff --git a/store/db/sqlite/tag.go b/store/db/sqlite/tag.go
deleted file mode 100644
index aff9af265..000000000
--- a/store/db/sqlite/tag.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package sqlite
-
-import (
- "context"
- "strings"
-
- "github.com/usememos/memos/store"
-)
-
-func (d *DB) UpsertTag(ctx context.Context, upsert *store.Tag) (*store.Tag, error) {
- stmt := `
- INSERT INTO tag (
- name, creator_id
- )
- VALUES (?, ?)
- ON CONFLICT(name, creator_id) DO UPDATE
- SET
- name = EXCLUDED.name
- `
- if _, err := d.db.ExecContext(ctx, stmt, upsert.Name, upsert.CreatorID); err != nil {
- return nil, err
- }
-
- tag := upsert
- return tag, nil
-}
-
-func (d *DB) ListTags(ctx context.Context, find *store.FindTag) ([]*store.Tag, error) {
- where, args := []string{"1 = 1"}, []any{}
-
- if find.CreatorID != 0 {
- where, args = append(where, "`creator_id` = ?"), append(args, find.CreatorID)
- }
-
- query := `
- SELECT
- name,
- creator_id
- FROM tag
- WHERE ` + strings.Join(where, " AND ") + `
- ORDER BY name ASC
- `
- rows, err := d.db.QueryContext(ctx, query, args...)
- if err != nil {
- return nil, err
- }
- defer rows.Close()
-
- list := []*store.Tag{}
- for rows.Next() {
- tag := &store.Tag{}
- if err := rows.Scan(
- &tag.Name,
- &tag.CreatorID,
- ); err != nil {
- return nil, err
- }
-
- list = append(list, tag)
- }
-
- if err := rows.Err(); err != nil {
- return nil, err
- }
-
- return list, nil
-}
-
-func (d *DB) DeleteTag(ctx context.Context, delete *store.DeleteTag) error {
- where, args := []string{"name = ?", "creator_id = ?"}, []any{delete.Name, delete.CreatorID}
- stmt := `DELETE FROM tag WHERE ` + strings.Join(where, " AND ")
- result, err := d.db.ExecContext(ctx, stmt, args...)
- if err != nil {
- return err
- }
- if _, err = result.RowsAffected(); err != nil {
- return err
- }
- return nil
-}
diff --git a/store/driver.go b/store/driver.go
index ba5b97fc3..c8e6fa825 100644
--- a/store/driver.go
+++ b/store/driver.go
@@ -67,11 +67,6 @@ type Driver interface {
UpdateIdentityProvider(ctx context.Context, update *UpdateIdentityProvider) (*IdentityProvider, error)
DeleteIdentityProvider(ctx context.Context, delete *DeleteIdentityProvider) error
- // Tag model related methods.
- UpsertTag(ctx context.Context, upsert *Tag) (*Tag, error)
- ListTags(ctx context.Context, find *FindTag) ([]*Tag, error)
- DeleteTag(ctx context.Context, delete *DeleteTag) error
-
// Inbox model related methods.
CreateInbox(ctx context.Context, create *Inbox) (*Inbox, error)
ListInboxes(ctx context.Context, find *FindInbox) ([]*Inbox, error)
diff --git a/store/tag.go b/store/tag.go
deleted file mode 100644
index d5c38f6bf..000000000
--- a/store/tag.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package store
-
-import (
- "context"
-)
-
-type Tag struct {
- Name string
- CreatorID int32
-}
-
-type FindTag struct {
- CreatorID int32
-}
-
-type DeleteTag struct {
- Name string
- CreatorID int32
-}
-
-func (s *Store) UpsertTag(ctx context.Context, upsert *Tag) (*Tag, error) {
- return s.driver.UpsertTag(ctx, upsert)
-}
-
-func (s *Store) ListTags(ctx context.Context, find *FindTag) ([]*Tag, error) {
- return s.driver.ListTags(ctx, find)
-}
-
-func (s *Store) DeleteTag(ctx context.Context, delete *DeleteTag) error {
- return s.driver.DeleteTag(ctx, delete)
-}
diff --git a/test/store/tag_test.go b/test/store/tag_test.go
deleted file mode 100644
index c5eac5c58..000000000
--- a/test/store/tag_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package teststore
-
-import (
- "context"
- "testing"
-
- "github.com/stretchr/testify/require"
-
- "github.com/usememos/memos/store"
-)
-
-func TestTagStore(t *testing.T) {
- ctx := context.Background()
- ts := NewTestingStore(ctx, t)
- user, err := createTestingHostUser(ctx, ts)
- require.NoError(t, err)
- tag, err := ts.UpsertTag(ctx, &store.Tag{
- CreatorID: user.ID,
- Name: "test_tag",
- })
- require.NoError(t, err)
- require.Equal(t, "test_tag", tag.Name)
- require.Equal(t, user.ID, tag.CreatorID)
- tags, err := ts.ListTags(ctx, &store.FindTag{
- CreatorID: user.ID,
- })
- require.NoError(t, err)
- require.Equal(t, 1, len(tags))
- require.Equal(t, tag, tags[0])
- err = ts.DeleteTag(ctx, &store.DeleteTag{
- Name: "test_tag",
- CreatorID: user.ID,
- })
- require.NoError(t, err)
- tags, err = ts.ListTags(ctx, &store.FindTag{})
- require.NoError(t, err)
- require.Equal(t, 0, len(tags))
- ts.Close()
-}