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: add support for ListActivity (#2365)
Athurg Goothfa2bba51c173
diff --git a/store/activity.go b/store/activity.goindex a9e7cb30e..ad99f5de0 100644--- a/store/activity.go+++ b/store/activity.go@@ -17,6 +17,14 @@ type Activity struct {Payload string}+type FindActivity struct {+ ID *int32+}+func (s *Store) CreateActivity(ctx context.Context, create *Activity) (*Activity, error) {return s.driver.CreateActivity(ctx, create)}++func (s *Store) ListActivity(ctx context.Context, find *FindActivity) ([]*Activity, error) {+ return s.driver.ListActivity(ctx, find)+}diff --git a/store/db/mysql/activity.go b/store/db/mysql/activity.goindex d81364cf4..42e73cfcf 100644--- a/store/db/mysql/activity.go+++ b/store/db/mysql/activity.go@@ -37,22 +37,50 @@ func (d *DB) CreateActivity(ctx context.Context, create *store.Activity) (*storereturn nil, errors.Wrap(err, "failed to get last insert id")}- return d.FindActivity(ctx, id)+ id32 := int32(id)++ list, err := d.ListActivity(ctx, &store.FindActivity{ID: &id32})+ if err != nil || len(list) == 0 {+ return nil, errors.Wrap(err, "failed to find activity")+ }++ return list[0], nil}-func (d *DB) FindActivity(ctx context.Context, id int64) (*store.Activity, error) {- var activity store.Activity- stmt := "SELECT `id`, `creator_id`, `type`, `level`, `payload`, UNIX_TIMESTAMP(`created_ts`) FROM `activity` WHERE `id` = ?"- if err := d.db.QueryRowContext(ctx, stmt, id).Scan(- &activity.ID,- &activity.CreatorID,- &activity.Type,- &activity.Level,- &activity.Payload,- &activity.CreatedTs,- ); err != nil {- return nil, errors.Wrap(err, "failed to db.QueryRow")- }-- return &activity, nil+func (d *DB) ListActivity(ctx context.Context, find *store.FindActivity) ([]*store.Activity, error) {+ where, args := []string{"1 = 1"}, []any{}++ if find.ID != nil {+ where, args = append(where, "`id` = ?"), append(args, *find.ID)+ }++ query := "SELECT `id`, `creator_id`, `type`, `level`, `payload`, UNIX_TIMESTAMP(`created_ts`) FROM `activity` WHERE " + strings.Join(where, " AND ")+ rows, err := d.db.QueryContext(ctx, query, args...)+ if err != nil {+ return nil, err+ }+ defer rows.Close()++ list := []*store.Activity{}+ for rows.Next() {+ activity := &store.Activity{}+ if err := rows.Scan(+ &activity.ID,+ &activity.CreatorID,+ &activity.Type,+ &activity.Level,+ &activity.Payload,+ &activity.CreatedTs,+ ); err != nil {+ return nil, err+ }++ list = append(list, activity)+ }++ if err := rows.Err(); err != nil {+ return nil, err+ }++ return list, nil}diff --git a/store/db/sqlite/activity.go b/store/db/sqlite/activity.goindex ccb7d68cf..37998e138 100644--- a/store/db/sqlite/activity.go+++ b/store/db/sqlite/activity.go@@ -34,3 +34,41 @@ func (d *DB) CreateActivity(ctx context.Context, create *store.Activity) (*storereturn create, nil}++func (d *DB) ListActivity(ctx context.Context, find *store.FindActivity) ([]*store.Activity, error) {+ where, args := []string{"1 = 1"}, []any{}++ if find.ID != nil {+ where, args = append(where, "`id` = ?"), append(args, *find.ID)+ }++ query := "SELECT `id`, `creator_id`, `type`, `level`, `payload`, `created_ts` FROM `activity` WHERE " + strings.Join(where, " AND ")+ rows, err := d.db.QueryContext(ctx, query, args...)+ if err != nil {+ return nil, err+ }+ defer rows.Close()++ list := []*store.Activity{}+ for rows.Next() {+ activity := &store.Activity{}+ if err := rows.Scan(+ &activity.ID,+ &activity.CreatorID,+ &activity.Type,+ &activity.Level,+ &activity.Payload,+ &activity.CreatedTs,+ ); err != nil {+ return nil, err+ }++ list = append(list, activity)+ }++ if err := rows.Err(); err != nil {+ return nil, err+ }++ return list, nil+}diff --git a/store/driver.go b/store/driver.goindex c7494e98f..26c6af5ba 100644--- a/store/driver.go+++ b/store/driver.go@@ -19,6 +19,7 @@ type Driver interface {// Activity model related methods.CreateActivity(ctx context.Context, create *Activity) (*Activity, error)+ ListActivity(ctx context.Context, find *FindActivity) ([]*Activity, error)// Resource model related methods.CreateResource(ctx context.Context, create *Resource) (*Resource, error)