YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: retire memo tags

Browse Source
This commit is contained in:
Steven
2024-05-13 22:12:56 +08:00
parent d3744ccfa3
commit 0c673d49ef
5 changed files with 9 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/router/api/v1/memo_service.go
View File

@ -780,7 +780,6 @@ func (s *APIV1Service) convertMemoFromStore(ctx context.Context, memo *store.Mem
Content: memo.Content, Content: memo.Content,
Nodes: convertFromASTNodes(nodes), Nodes: convertFromASTNodes(nodes),
Visibility: convertVisibilityFromStore(memo.Visibility), Visibility: convertVisibilityFromStore(memo.Visibility),
Tags: memo.Tags,
Pinned: memo.Pinned, Pinned: memo.Pinned,
ParentId: memo.ParentID, ParentId: memo.ParentID,
Relations: listMemoRelationsResponse.Relations, Relations: listMemoRelationsResponse.Relations,

18
store/db/mysql/memo.go
View File

@ -2,7 +2,6 @@ package mysql
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"strings" "strings"
@ -16,14 +15,6 @@ import (
func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) { func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {
fields := []string{"`uid`", "`creator_id`", "`content`", "`visibility`", "`tags`", "`payload`"} fields := []string{"`uid`", "`creator_id`", "`content`", "`visibility`", "`tags`", "`payload`"}
placeholder := []string{"?", "?", "?", "?", "?", "?"} placeholder := []string{"?", "?", "?", "?", "?", "?"}
tags := "[]"
if len(create.Tags) != 0 {
tagsBytes, err := json.Marshal(create.Tags)
if err != nil {
return nil, err
}
tags = string(tagsBytes)
}
payload := "{}" payload := "{}"
if create.Payload != nil { if create.Payload != nil {
payloadBytes, err := protojson.Marshal(create.Payload) payloadBytes, err := protojson.Marshal(create.Payload)
@ -32,7 +23,7 @@ func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, e
} }
payload = string(payloadBytes) payload = string(payloadBytes)
} }
args := []any{create.UID, create.CreatorID, create.Content, create.Visibility, tags, payload} args := []any{create.UID, create.CreatorID, create.Content, create.Visibility, "[]", payload}
stmt := "INSERT INTO `memo` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ")" stmt := "INSERT INTO `memo` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ")"
result, err := d.db.ExecContext(ctx, stmt, args...) result, err := d.db.ExecContext(ctx, stmt, args...)
@ -129,7 +120,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
"UNIX_TIMESTAMP(`memo`.`updated_ts`) AS `updated_ts`", "UNIX_TIMESTAMP(`memo`.`updated_ts`) AS `updated_ts`",
"`memo`.`row_status` AS `row_status`", "`memo`.`row_status` AS `row_status`",
"`memo`.`visibility` AS `visibility`", "`memo`.`visibility` AS `visibility`",
"`memo`.`tags` AS `tags`",
"`memo`.`payload` AS `payload`", "`memo`.`payload` AS `payload`",
"IFNULL(`memo_organizer`.`pinned`, 0) AS `pinned`", "IFNULL(`memo_organizer`.`pinned`, 0) AS `pinned`",
"`memo_relation`.`related_memo_id` AS `parent_id`", "`memo_relation`.`related_memo_id` AS `parent_id`",
@ -155,7 +145,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
list := make([]*store.Memo, 0) list := make([]*store.Memo, 0)
for rows.Next() { for rows.Next() {
var memo store.Memo var memo store.Memo
var tagsBytes, payloadBytes []byte var payloadBytes []byte
dests := []any{ dests := []any{
&memo.ID, &memo.ID,
&memo.UID, &memo.UID,
@ -164,7 +154,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
&memo.UpdatedTs, &memo.UpdatedTs,
&memo.RowStatus, &memo.RowStatus,
&memo.Visibility, &memo.Visibility,
&tagsBytes,
&payloadBytes, &payloadBytes,
&memo.Pinned, &memo.Pinned,
&memo.ParentID, &memo.ParentID,
@ -175,9 +164,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if err := rows.Scan(dests...); err != nil { if err := rows.Scan(dests...); err != nil {
return nil, err return nil, err
} }
if err := json.Unmarshal(tagsBytes, &memo.Tags); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal tags")
}
payload := &storepb.MemoPayload{} payload := &storepb.MemoPayload{}
if err := protojsonUnmarshaler.Unmarshal(payloadBytes, payload); err != nil { if err := protojsonUnmarshaler.Unmarshal(payloadBytes, payload); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal payload") return nil, errors.Wrap(err, "failed to unmarshal payload")

20
store/db/postgres/memo.go
View File

@ -2,7 +2,6 @@ package postgres
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"strings" "strings"
@ -14,15 +13,7 @@ import (
) )
func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) { func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {
fields := []string{"uid", "creator_id", "content", "visibility", "tags", "payload"} fields := []string{"uid", "creator_id", "content", "visibility", "payload"}
tags := "[]"
if len(create.Tags) != 0 {
tagsBytes, err := json.Marshal(create.Tags)
if err != nil {
return nil, err
}
tags = string(tagsBytes)
}
payload := "{}" payload := "{}"
if create.Payload != nil { if create.Payload != nil {
payloadBytes, err := protojson.Marshal(create.Payload) payloadBytes, err := protojson.Marshal(create.Payload)
@ -31,7 +22,7 @@ func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, e
} }
payload = string(payloadBytes) payload = string(payloadBytes)
} }
args := []any{create.UID, create.CreatorID, create.Content, create.Visibility, tags, payload} args := []any{create.UID, create.CreatorID, create.Content, create.Visibility, payload}
stmt := "INSERT INTO memo (" + strings.Join(fields, ", ") + ") VALUES (" + placeholders(len(args)) + ") RETURNING id, created_ts, updated_ts, row_status" stmt := "INSERT INTO memo (" + strings.Join(fields, ", ") + ") VALUES (" + placeholders(len(args)) + ") RETURNING id, created_ts, updated_ts, row_status"
if err := d.db.QueryRowContext(ctx, stmt, args...).Scan( if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(
@ -120,7 +111,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
`memo.updated_ts AS updated_ts`, `memo.updated_ts AS updated_ts`,
`memo.row_status AS row_status`, `memo.row_status AS row_status`,
`memo.visibility AS visibility`, `memo.visibility AS visibility`,
`memo.tags AS tags`,
`memo.payload AS payload`, `memo.payload AS payload`,
`COALESCE(memo_organizer.pinned, 0) AS pinned`, `COALESCE(memo_organizer.pinned, 0) AS pinned`,
`memo_relation.related_memo_id AS parent_id`, `memo_relation.related_memo_id AS parent_id`,
@ -151,7 +141,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
list := make([]*store.Memo, 0) list := make([]*store.Memo, 0)
for rows.Next() { for rows.Next() {
var memo store.Memo var memo store.Memo
var tagsBytes, payloadBytes []byte var payloadBytes []byte
dests := []any{ dests := []any{
&memo.ID, &memo.ID,
&memo.UID, &memo.UID,
@ -160,7 +150,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
&memo.UpdatedTs, &memo.UpdatedTs,
&memo.RowStatus, &memo.RowStatus,
&memo.Visibility, &memo.Visibility,
&tagsBytes,
&payloadBytes, &payloadBytes,
&memo.Pinned, &memo.Pinned,
&memo.ParentID, &memo.ParentID,
@ -171,9 +160,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if err := rows.Scan(dests...); err != nil { if err := rows.Scan(dests...); err != nil {
return nil, err return nil, err
} }
if err := json.Unmarshal(tagsBytes, &memo.Tags); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal tags")
}
payload := &storepb.MemoPayload{} payload := &storepb.MemoPayload{}
if err := protojsonUnmarshaler.Unmarshal(payloadBytes, payload); err != nil { if err := protojsonUnmarshaler.Unmarshal(payloadBytes, payload); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal payload") return nil, errors.Wrap(err, "failed to unmarshal payload")

22
store/db/sqlite/memo.go
View File

@ -2,7 +2,6 @@ package sqlite
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"strings" "strings"
@ -14,16 +13,8 @@ import (
) )
func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) { func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {
fields := []string{"`uid`", "`creator_id`", "`content`", "`visibility`", "`tags`", "`payload`"} fields := []string{"`uid`", "`creator_id`", "`content`", "`visibility`", "`payload`"}
placeholder := []string{"?", "?", "?", "?", "?", "?"} placeholder := []string{"?", "?", "?", "?", "?"}
tags := "[]"
if len(create.Tags) != 0 {
tagsBytes, err := json.Marshal(create.Tags)
if err != nil {
return nil, err
}
tags = string(tagsBytes)
}
payload := "{}" payload := "{}"
if create.Payload != nil { if create.Payload != nil {
payloadBytes, err := protojson.Marshal(create.Payload) payloadBytes, err := protojson.Marshal(create.Payload)
@ -32,7 +23,7 @@ func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, e
} }
payload = string(payloadBytes) payload = string(payloadBytes)
} }
args := []any{create.UID, create.CreatorID, create.Content, create.Visibility, tags, payload} args := []any{create.UID, create.CreatorID, create.Content, create.Visibility, payload}
stmt := "INSERT INTO `memo` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ") RETURNING `id`, `created_ts`, `updated_ts`, `row_status`" stmt := "INSERT INTO `memo` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ") RETURNING `id`, `created_ts`, `updated_ts`, `row_status`"
if err := d.db.QueryRowContext(ctx, stmt, args...).Scan( if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(
@ -121,7 +112,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
"`memo`.`updated_ts` AS `updated_ts`", "`memo`.`updated_ts` AS `updated_ts`",
"`memo`.`row_status` AS `row_status`", "`memo`.`row_status` AS `row_status`",
"`memo`.`visibility` AS `visibility`", "`memo`.`visibility` AS `visibility`",
"`memo`.`tags` AS `tags`",
"`memo`.`payload` AS `payload`", "`memo`.`payload` AS `payload`",
"IFNULL(`memo_organizer`.`pinned`, 0) AS `pinned`", "IFNULL(`memo_organizer`.`pinned`, 0) AS `pinned`",
"`memo_relation`.`related_memo_id` AS `parent_id`", "`memo_relation`.`related_memo_id` AS `parent_id`",
@ -151,7 +141,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
list := make([]*store.Memo, 0) list := make([]*store.Memo, 0)
for rows.Next() { for rows.Next() {
var memo store.Memo var memo store.Memo
var tagsBytes, payloadBytes []byte var payloadBytes []byte
dests := []any{ dests := []any{
&memo.ID, &memo.ID,
&memo.UID, &memo.UID,
@ -160,7 +150,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
&memo.UpdatedTs, &memo.UpdatedTs,
&memo.RowStatus, &memo.RowStatus,
&memo.Visibility, &memo.Visibility,
&tagsBytes,
&payloadBytes, &payloadBytes,
&memo.Pinned, &memo.Pinned,
&memo.ParentID, &memo.ParentID,
@ -171,9 +160,6 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
if err := rows.Scan(dests...); err != nil { if err := rows.Scan(dests...); err != nil {
return nil, err return nil, err
} }
if err := json.Unmarshal(tagsBytes, &memo.Tags); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal tags")
}
payload := &storepb.MemoPayload{} payload := &storepb.MemoPayload{}
if err := protojsonUnmarshaler.Unmarshal(payloadBytes, payload); err != nil { if err := protojsonUnmarshaler.Unmarshal(payloadBytes, payload); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal payload") return nil, errors.Wrap(err, "failed to unmarshal payload")

1
store/memo.go
View File

@ -48,7 +48,6 @@ type Memo struct {
// Domain specific fields // Domain specific fields
Content string Content string
Visibility Visibility Visibility Visibility
Tags []string
Payload *storepb.MemoPayload Payload *storepb.MemoPayload
// Composed fields // Composed fields