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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: implement memo filter in list memo relations
Johnny18b9b9d18f55
diff --git a/store/db/mysql/memo_relation.go b/store/db/mysql/memo_relation.goindex b75c9b7ce..d30fb9261 100644--- a/store/db/mysql/memo_relation.go+++ b/store/db/mysql/memo_relation.go@@ -40,6 +40,25 @@ func (d *DB) ListMemoRelations(ctx context.Context, find *store.FindMemoRelationif find.Type != nil {where, args = append(where, "`type` = ?"), append(args, find.Type)}+ if find.MemoFilter != nil {+ // Parse filter string and return the parsed expression.+ // The filter string should be a CEL expression.+ parsedExpr, err := filter.Parse(*find.MemoFilter, filter.MemoFilterCELAttributes...)+ if err != nil {+ return nil, err+ }+ convertCtx := filter.NewConvertContext()+ // ConvertExprToSQL converts the parsed expression to a SQL condition string.+ if err := d.ConvertExprToSQL(convertCtx, parsedExpr.GetExpr()); err != nil {+ return nil, err+ }+ condition := convertCtx.Buffer.String()+ if condition != "" {+ where = append(where, fmt.Sprintf("memo_id IN (SELECT id FROM memo WHERE %s)", condition))+ where = append(where, fmt.Sprintf("related_memo_id IN (SELECT id FROM memo WHERE %s)", condition))+ args = append(args, append(convertCtx.Args, convertCtx.Args...)...)+ }+ }rows, err := d.db.QueryContext(ctx, "SELECT `memo_id`, `related_memo_id`, `type` FROM `memo_relation` WHERE "+strings.Join(where, " AND "), args...)if err != nil {diff --git a/store/db/postgres/memo_relation.go b/store/db/postgres/memo_relation.goindex 5b4060357..4d12b7712 100644--- a/store/db/postgres/memo_relation.go+++ b/store/db/postgres/memo_relation.go@@ -46,6 +46,25 @@ func (d *DB) ListMemoRelations(ctx context.Context, find *store.FindMemoRelationif find.Type != nil {where, args = append(where, "type = "+placeholder(len(args)+1)), append(args, find.Type)}+ if find.MemoFilter != nil {+ // Parse filter string and return the parsed expression.+ // The filter string should be a CEL expression.+ parsedExpr, err := filter.Parse(*find.MemoFilter, filter.MemoFilterCELAttributes...)+ if err != nil {+ return nil, err+ }+ convertCtx := filter.NewConvertContext()+ // ConvertExprToSQL converts the parsed expression to a SQL condition string.+ if err := d.ConvertExprToSQL(convertCtx, parsedExpr.GetExpr()); err != nil {+ return nil, err+ }+ condition := convertCtx.Buffer.String()+ if condition != "" {+ where = append(where, fmt.Sprintf("memo_id IN (SELECT id FROM memo WHERE %s)", condition))+ where = append(where, fmt.Sprintf("related_memo_id IN (SELECT id FROM memo WHERE %s)", condition))+ args = append(args, append(convertCtx.Args, convertCtx.Args...)...)+ }+ }rows, err := d.db.QueryContext(ctx, `SELECT