From e4beb792d5414eefa07ac2335cb4f482495d1638 Mon Sep 17 00:00:00 2001 From: Erik Winter Date: Fri, 25 Jun 2021 07:48:58 +0200 Subject: [PATCH] rename task repository --- internal/process/inbox.go | 4 +-- internal/process/recur.go | 4 +-- .../task/{repo.go => remoterepository.go} | 26 +++++++++---------- ...{repo_test.go => remoterepository_test.go} | 0 4 files changed, 17 insertions(+), 17 deletions(-) rename internal/task/{repo.go => remoterepository.go} (76%) rename internal/task/{repo_test.go => remoterepository_test.go} (100%) diff --git a/internal/process/inbox.go b/internal/process/inbox.go index 9ea0e6b..8bb80c3 100644 --- a/internal/process/inbox.go +++ b/internal/process/inbox.go @@ -16,7 +16,7 @@ var ( ) type Inbox struct { - taskRepo *task.TaskRepo + taskRepo *task.RemoteRepository } type InboxResult struct { @@ -24,7 +24,7 @@ type InboxResult struct { Count int `json:"count"` } -func NewInbox(repo *task.TaskRepo) *Inbox { +func NewInbox(repo *task.RemoteRepository) *Inbox { return &Inbox{ taskRepo: repo, } diff --git a/internal/process/recur.go b/internal/process/recur.go index b253af5..35171ea 100644 --- a/internal/process/recur.go +++ b/internal/process/recur.go @@ -16,7 +16,7 @@ var ( ) type Recur struct { - taskRepo *task.TaskRepo + taskRepo *task.RemoteRepository taskDispatcher *task.Dispatcher daysAhead int } @@ -26,7 +26,7 @@ type RecurResult struct { Count int `json:"count"` } -func NewRecur(repo *task.TaskRepo, disp *task.Dispatcher, daysAhead int) *Recur { +func NewRecur(repo *task.RemoteRepository, disp *task.Dispatcher, daysAhead int) *Recur { return &Recur{ taskRepo: repo, taskDispatcher: disp, diff --git a/internal/task/repo.go b/internal/task/remoterepository.go similarity index 76% rename from internal/task/repo.go rename to internal/task/remoterepository.go index 5504e27..f59f5ba 100644 --- a/internal/task/repo.go +++ b/internal/task/remoterepository.go @@ -14,18 +14,18 @@ var ( ErrInvalidMessage = errors.New("task contains invalid message") ) -type TaskRepo struct { +type RemoteRepository struct { mstore mstore.MStorer } -func NewRepository(ms mstore.MStorer) *TaskRepo { - return &TaskRepo{ +func NewRepository(ms mstore.MStorer) *RemoteRepository { + return &RemoteRepository{ mstore: ms, } } -func (tr *TaskRepo) FindAll(folder string) ([]*Task, error) { - msgs, err := tr.mstore.Messages(folder) +func (rr *RemoteRepository) FindAll(folder string) ([]*Task, error) { + msgs, err := rr.mstore.Messages(folder) if err != nil { return []*Task{}, fmt.Errorf("%w: %v", ErrMStoreError, err) } @@ -40,31 +40,31 @@ func (tr *TaskRepo) FindAll(folder string) ([]*Task, error) { return tasks, nil } -func (tr *TaskRepo) Update(t *Task) error { +func (rr *RemoteRepository) Update(t *Task) error { if t == nil { return ErrInvalidTask } // add new - if err := tr.Add(t); err != nil { + if err := rr.Add(t); err != nil { return err } // remove old - if err := tr.mstore.Remove(t.Message); err != nil { + if err := rr.mstore.Remove(t.Message); err != nil { return fmt.Errorf("%w: %s", ErrMStoreError, err) } return nil } -func (tr *TaskRepo) Add(t *Task) error { +func (rr *RemoteRepository) Add(t *Task) error { if t == nil { return ErrInvalidTask } msg := t.NextMessage() - if err := tr.mstore.Add(msg.Folder, msg.Subject, msg.Body); err != nil { + if err := rr.mstore.Add(msg.Folder, msg.Subject, msg.Body); err != nil { return fmt.Errorf("%w: %v", ErrMStoreError, err) } @@ -72,7 +72,7 @@ func (tr *TaskRepo) Add(t *Task) error { } // Cleanup removes older versions of tasks -func (tr *TaskRepo) CleanUp() error { +func (rr *RemoteRepository) CleanUp() error { // loop through folders, get all task version info type msgInfo struct { Version int @@ -81,7 +81,7 @@ func (tr *TaskRepo) CleanUp() error { msgsSet := make(map[string][]msgInfo) for _, folder := range knownFolders { - msgs, err := tr.mstore.Messages(folder) + msgs, err := rr.mstore.Messages(folder) if err != nil { return fmt.Errorf("%w: %v", ErrMStoreError, err) } @@ -118,7 +118,7 @@ func (tr *TaskRepo) CleanUp() error { // remove them for _, msg := range tobeRemoved { - if err := tr.mstore.Remove(msg); err != nil { + if err := rr.mstore.Remove(msg); err != nil { return err } } diff --git a/internal/task/repo_test.go b/internal/task/remoterepository_test.go similarity index 100% rename from internal/task/repo_test.go rename to internal/task/remoterepository_test.go