commit 9d1d1117b95059e7555861053ed109d01c6f8dc2
parent bb28f2d3003885a75beda9961fab59a4b5b93bd5
Author: Tomas Nemec <nemi@skaut.cz>
Date: Tue, 21 Feb 2023 22:27:49 +0100
refactor
Diffstat:
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/command.go b/command.go
@@ -54,7 +54,7 @@ func (c Command) add() {
group := NewGroup(groupArg)
- entry, err := NewCompleted(start, stop)
+ entry, err := NewCompletedEntry(start, stop)
if err != nil {
fmt.Fprint(os.Stderr, err)
os.Exit(1)
@@ -87,7 +87,7 @@ func (c Command) start() {
}
}
- entry := NewRunning(start)
+ entry := NewRunningEntry(start)
if c.repository.ExistsEntry(group, entry) {
fmt.Fprintln(os.Stderr, "entry in this group already started")
diff --git a/entry.go b/entry.go
@@ -7,7 +7,7 @@ type Entry struct {
TimeRange TimeRange
}
-func NewCompleted(start time.Time, stop time.Time) (Entry, error) {
+func NewCompletedEntry(start time.Time, stop time.Time) (Entry, error) {
timeRange, err := NewTimeRange(start, stop)
if err != nil {
return Entry{}, err
@@ -16,7 +16,7 @@ func NewCompleted(start time.Time, stop time.Time) (Entry, error) {
return Entry{TimeRange: timeRange, Completed: true}, nil
}
-func NewRunning(start time.Time) Entry {
+func NewRunningEntry(start time.Time) Entry {
timeRange, _ := NewTimeRange(start, start.Add(time.Second))
return Entry{TimeRange: timeRange, Completed: false}
}
diff --git a/entry_test.go b/entry_test.go
@@ -8,7 +8,7 @@ func TestEntry(t *testing.T) {
t.Run("positive duration should pass", func(b *testing.T) {
start, _ := entryTime.ParseArg("5:00")
stop, _ := entryTime.ParseArg("6:00")
- _, err := NewCompleted(start, stop)
+ _, err := NewCompletedEntry(start, stop)
if err != nil {
b.Error(err)
}
@@ -17,7 +17,7 @@ func TestEntry(t *testing.T) {
t.Run("zero duration should fail", func(b *testing.T) {
start, _ := entryTime.ParseArg("6:00")
stop, _ := entryTime.ParseArg("6:00")
- _, err := NewCompleted(start, stop)
+ _, err := NewCompletedEntry(start, stop)
if err == nil {
b.Error(err)
}
@@ -26,7 +26,7 @@ func TestEntry(t *testing.T) {
t.Run("negative duration should fail", func(b *testing.T) {
start, _ := entryTime.ParseArg("6:00")
stop, _ := entryTime.ParseArg("5:00")
- _, err := NewCompleted(start, stop)
+ _, err := NewCompletedEntry(start, stop)
if err == nil {
b.Error(err)
}
diff --git a/repository_test.go b/repository_test.go
@@ -49,6 +49,6 @@ func TestSave(t *testing.T) {
func createEntry(timeContext *TimeContext, s string, st string) Entry {
start, _ := timeContext.ParseArg(s)
stop, _ := timeContext.ParseArgRight(st)
- entry, _ := NewCompleted(start, stop)
+ entry, _ := NewCompletedEntry(start, stop)
return entry
}