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
feat: compose memo resource list
stevene5c9d8604d1a
diff --git a/api/memo.go b/api/memo.goindex a42ffcebd..0883c10ff 100644--- a/api/memo.go+++ b/api/memo.go@@ -39,7 +39,8 @@ type Memo struct {Pinned bool `json:"pinned"`// Related fields- Creator *User `json:"creator"`+ Creator *User `json:"creator"`+ ResourceList []*Resource `json:"resourceList"`}type MemoCreate struct {diff --git a/store/memo.go b/store/memo.goindex 248a14c87..bf96ecea8 100644--- a/store/memo.go+++ b/store/memo.go@@ -57,8 +57,10 @@ func (s *Store) composeMemo(ctx context.Context, raw *memoRaw) (*api.Memo, errormemo.Pinned = memoOrganizer.Pinned}- err = s.ComposeMemoCreator(ctx, memo)- if err != nil {+ if err = s.ComposeMemoCreator(ctx, memo); err != nil {+ return nil, err+ }+ if err = s.ComposeMemoResourceList(ctx, memo); err != nil {return nil, err}diff --git a/store/memo_resource.go b/store/memo_resource.goindex 0ad13a498..54729c7cf 100644--- a/store/memo_resource.go+++ b/store/memo_resource.go@@ -28,6 +28,31 @@ func (raw *memoResourceRaw) toMemoResource() *api.MemoResource {}}+func (s *Store) ComposeMemoResourceList(ctx context.Context, memo *api.Memo) error {+ memoResourceList, err := s.FindMemoResourceList(ctx, &api.MemoResourceFind{+ MemoID: &memo.ID,+ })+ if err != nil {+ return err+ }++ resourceList := []*api.Resource{}+ for _, memoResource := range memoResourceList {+ resource, err := s.FindResource(ctx, &api.ResourceFind{+ ID: &memoResource.ResourceID,+ })+ if err != nil {+ return err+ }++ resourceList = append(resourceList, resource)+ }++ memo.ResourceList = resourceList++ return nil+}+func (s *Store) FindMemoResourceList(ctx context.Context, find *api.MemoResourceFind) ([]*api.MemoResource, error) {tx, err := s.db.BeginTx(ctx, nil)if err != nil {