feat(store): list update, delete, listing and member removal
- Add ListLists, GetList, UpdateList, DeleteList, RemoveMember - Add ErrExists for duplicate lists
This commit is contained in:
parent
2b77cb7c05
commit
e1b0c7666c
2 changed files with 122 additions and 0 deletions
|
|
@ -13,6 +13,9 @@ import (
|
|||
// ErrNotFound is returned when a list or member does not exist.
|
||||
var ErrNotFound = errors.New("not found")
|
||||
|
||||
// ErrExists is returned when creating something that already exists.
|
||||
var ErrExists = errors.New("already exists")
|
||||
|
||||
// List is a mailing list.
|
||||
type List struct {
|
||||
ID int64
|
||||
|
|
@ -75,6 +78,9 @@ func (s *Store) CreateList(name, domain, title string) (List, error) {
|
|||
l := List{Name: strings.ToLower(name), Domain: strings.ToLower(domain), Title: title}
|
||||
res, err := s.db.Exec(`INSERT INTO lists(name, domain, title) VALUES(?,?,?)`, l.Name, l.Domain, l.Title)
|
||||
if err != nil {
|
||||
if strings.Contains(err.Error(), "UNIQUE") {
|
||||
return List{}, ErrExists
|
||||
}
|
||||
return List{}, err
|
||||
}
|
||||
l.ID, _ = res.LastInsertId()
|
||||
|
|
@ -128,3 +134,58 @@ func (s *Store) Members(listID int64) ([]Member, error) {
|
|||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// ListLists returns every list ordered by address.
|
||||
func (s *Store) ListLists() ([]List, error) {
|
||||
rows, err := s.db.Query(`SELECT id, name, domain, title FROM lists ORDER BY domain, name`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []List
|
||||
for rows.Next() {
|
||||
var l List
|
||||
if err := rows.Scan(&l.ID, &l.Name, &l.Domain, &l.Title); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, l)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// GetList returns a list by id.
|
||||
func (s *Store) GetList(id int64) (List, error) {
|
||||
var l List
|
||||
err := s.db.QueryRow(`SELECT id, name, domain, title FROM lists WHERE id=?`, id).
|
||||
Scan(&l.ID, &l.Name, &l.Domain, &l.Title)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return List{}, ErrNotFound
|
||||
}
|
||||
return l, err
|
||||
}
|
||||
|
||||
func affected(res sql.Result, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if n, _ := res.RowsAffected(); n == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// UpdateList changes the title of a list.
|
||||
func (s *Store) UpdateList(id int64, title string) error {
|
||||
return affected(s.db.Exec(`UPDATE lists SET title=? WHERE id=?`, title, id))
|
||||
}
|
||||
|
||||
// DeleteList removes a list and its members.
|
||||
func (s *Store) DeleteList(id int64) error {
|
||||
return affected(s.db.Exec(`DELETE FROM lists WHERE id=?`, id))
|
||||
}
|
||||
|
||||
// RemoveMember unsubscribes an address from a list.
|
||||
func (s *Store) RemoveMember(listID int64, addr string) error {
|
||||
return affected(s.db.Exec(`DELETE FROM members WHERE list_id=? AND address=?`,
|
||||
listID, strings.ToLower(strings.TrimSpace(addr))))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,3 +63,64 @@ func TestMembers(t *testing.T) {
|
|||
t.Fatalf("members: %+v %v", ms, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestListLifecycle(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
a, _ := s.CreateList("a", "example.org", "A")
|
||||
s.CreateList("b", "example.org", "B")
|
||||
|
||||
ls, err := s.ListLists()
|
||||
if err != nil || len(ls) != 2 {
|
||||
t.Fatalf("lists: %+v %v", ls, err)
|
||||
}
|
||||
got, err := s.GetList(a.ID)
|
||||
if err != nil || got.Name != "a" {
|
||||
t.Fatalf("get: %+v %v", got, err)
|
||||
}
|
||||
if _, err := s.GetList(999); !errors.Is(err, ErrNotFound) {
|
||||
t.Fatalf("want ErrNotFound, got %v", err)
|
||||
}
|
||||
if err := s.UpdateList(a.ID, "New title"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got, _ = s.GetList(a.ID)
|
||||
if got.Title != "New title" {
|
||||
t.Fatalf("title = %q", got.Title)
|
||||
}
|
||||
if err := s.UpdateList(999, "x"); !errors.Is(err, ErrNotFound) {
|
||||
t.Fatalf("want ErrNotFound, got %v", err)
|
||||
}
|
||||
s.AddMember(a.ID, "x@y.com", "")
|
||||
if err := s.DeleteList(a.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := s.GetList(a.ID); !errors.Is(err, ErrNotFound) {
|
||||
t.Fatal("list should be gone")
|
||||
}
|
||||
if err := s.DeleteList(a.ID); !errors.Is(err, ErrNotFound) {
|
||||
t.Fatalf("want ErrNotFound, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDuplicateList(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
s.CreateList("a", "example.org", "A")
|
||||
if _, err := s.CreateList("A", "Example.org", "again"); !errors.Is(err, ErrExists) {
|
||||
t.Fatalf("want ErrExists, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRemoveMember(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
l, _ := s.CreateList("a", "example.org", "A")
|
||||
s.AddMember(l.ID, "x@y.com", "")
|
||||
if err := s.RemoveMember(l.ID, "X@y.com"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if ok, _ := s.IsMember(l.ID, "x@y.com"); ok {
|
||||
t.Fatal("still a member")
|
||||
}
|
||||
if err := s.RemoveMember(l.ID, "x@y.com"); !errors.Is(err, ErrNotFound) {
|
||||
t.Fatalf("want ErrNotFound, got %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue