From db7de4b31b1836abed822077840665639f0d66da Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Fri, 19 Jan 2024 23:27:27 -0500 Subject: Add ability to use sequential or timestamp-based versions --- internal/models/migration.go | 38 +++++++++++++++----------------------- internal/models/migration_test.go | 25 +++++++++++++------------ 2 files changed, 28 insertions(+), 35 deletions(-) (limited to 'internal/models') diff --git a/internal/models/migration.go b/internal/models/migration.go index f647a1b..4007f3c 100644 --- a/internal/models/migration.go +++ b/internal/models/migration.go @@ -11,30 +11,22 @@ type Migration struct { Applied bool } -func NewMigration(timestamp time.Time, message string) *Migration { - version := fmt.Sprintf( - "%d%02d%02d%02d%02d%02d", - timestamp.Year(), timestamp.Month(), timestamp.Day(), - timestamp.Hour(), timestamp.Minute(), timestamp.Second(), - ) - return &Migration{Version: version, Message: message, Applied: false} -} - -func (m *Migration) String() string { - checkmark := " " - if m.Applied { - checkmark = "x" +func NewTimestampMigration(version time.Time, message string) *Migration { + return &Migration{ + Version: fmt.Sprintf( + "%d%02d%02d%02d%02d%02d", + version.Year(), version.Month(), version.Day(), + version.Hour(), version.Minute(), version.Second(), + ), + Message: message, + Applied: false, } +} - message := m.Message - if len(message) > 0 { - message = fmt.Sprintf("- %s ", message) +func NewSequentialMigration(version uint64, message string) *Migration { + return &Migration{ + Version: fmt.Sprintf("%03d", version), + Message: message, + Applied: false, } - - return fmt.Sprintf( - "%s %s- [%s]", - m.Version, - message, - checkmark, - ) } diff --git a/internal/models/migration_test.go b/internal/models/migration_test.go index 8d1fb06..81068f3 100644 --- a/internal/models/migration_test.go +++ b/internal/models/migration_test.go @@ -9,25 +9,26 @@ import ( "github.com/eugenetriguba/bolt/internal/models" ) -var timestamp = time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC) +func TestNewTimestampMigration(t *testing.T) { + var timestamp = time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC) -func TestNewMigrationInit(t *testing.T) { - m := models.NewMigration(timestamp, "test message") + m := models.NewTimestampMigration(timestamp, "test message") assert.Equal(t, m.Version, "20200101000000") assert.Equal(t, m.Message, "test message") assert.Equal(t, m.Applied, false) } -func TestAppliedNewMigration(t *testing.T) { - m := models.NewMigration(timestamp, "test_message") +func TestNewSequentialMigration(t *testing.T) { + m := models.NewSequentialMigration(1, "test message") - assert.Equal(t, m.String(), "20200101000000 - test_message - [ ]") - m.Applied = true - assert.Equal(t, m.String(), "20200101000000 - test_message - [x]") -} + assert.Equal(t, m.Version, "001") + assert.Equal(t, m.Message, "test message") + assert.Equal(t, m.Applied, false) -func TestEmptyMessageMigration(t *testing.T) { - m := models.NewMigration(timestamp, "") - assert.Equal(t, "20200101000000 - [ ]", m.String()) + m = models.NewSequentialMigration(100, "test message") + + assert.Equal(t, m.Version, "100") + assert.Equal(t, m.Message, "test message") + assert.Equal(t, m.Applied, false) } -- cgit v1.2.3 From b06eba3df09a8fcd777b8fe350c2b184758963d1 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:10:14 -0500 Subject: Use checkmate for tests --- internal/models/migration_test.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'internal/models') diff --git a/internal/models/migration_test.go b/internal/models/migration_test.go index 81068f3..1d449c8 100644 --- a/internal/models/migration_test.go +++ b/internal/models/migration_test.go @@ -4,9 +4,8 @@ import ( "testing" "time" - "gotest.tools/v3/assert" - "github.com/eugenetriguba/bolt/internal/models" + "github.com/eugenetriguba/checkmate" ) func TestNewTimestampMigration(t *testing.T) { @@ -14,21 +13,21 @@ func TestNewTimestampMigration(t *testing.T) { m := models.NewTimestampMigration(timestamp, "test message") - assert.Equal(t, m.Version, "20200101000000") - assert.Equal(t, m.Message, "test message") - assert.Equal(t, m.Applied, false) + checkmate.AssertEqual(t, m.Version, "20200101000000") + checkmate.AssertEqual(t, m.Message, "test message") + checkmate.AssertEqual(t, m.Applied, false) } func TestNewSequentialMigration(t *testing.T) { m := models.NewSequentialMigration(1, "test message") - assert.Equal(t, m.Version, "001") - assert.Equal(t, m.Message, "test message") - assert.Equal(t, m.Applied, false) + checkmate.AssertEqual(t, m.Version, "001") + checkmate.AssertEqual(t, m.Message, "test message") + checkmate.AssertEqual(t, m.Applied, false) m = models.NewSequentialMigration(100, "test message") - assert.Equal(t, m.Version, "100") - assert.Equal(t, m.Message, "test message") - assert.Equal(t, m.Applied, false) + checkmate.AssertEqual(t, m.Version, "100") + checkmate.AssertEqual(t, m.Message, "test message") + checkmate.AssertEqual(t, m.Applied, false) } -- cgit v1.2.3 From 345e28bd44ba6a38bf7ee9bfe2066f333bbbe894 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:29:00 -0500 Subject: Update to checkmate v0.2.0 --- internal/models/migration_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'internal/models') diff --git a/internal/models/migration_test.go b/internal/models/migration_test.go index 1d449c8..aa92510 100644 --- a/internal/models/migration_test.go +++ b/internal/models/migration_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/eugenetriguba/bolt/internal/models" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestNewTimestampMigration(t *testing.T) { @@ -13,21 +13,21 @@ func TestNewTimestampMigration(t *testing.T) { m := models.NewTimestampMigration(timestamp, "test message") - checkmate.AssertEqual(t, m.Version, "20200101000000") - checkmate.AssertEqual(t, m.Message, "test message") - checkmate.AssertEqual(t, m.Applied, false) + assert.Equal(t, m.Version, "20200101000000") + assert.Equal(t, m.Message, "test message") + assert.Equal(t, m.Applied, false) } func TestNewSequentialMigration(t *testing.T) { m := models.NewSequentialMigration(1, "test message") - checkmate.AssertEqual(t, m.Version, "001") - checkmate.AssertEqual(t, m.Message, "test message") - checkmate.AssertEqual(t, m.Applied, false) + assert.Equal(t, m.Version, "001") + assert.Equal(t, m.Message, "test message") + assert.Equal(t, m.Applied, false) m = models.NewSequentialMigration(100, "test message") - checkmate.AssertEqual(t, m.Version, "100") - checkmate.AssertEqual(t, m.Message, "test message") - checkmate.AssertEqual(t, m.Applied, false) + assert.Equal(t, m.Version, "100") + assert.Equal(t, m.Message, "test message") + assert.Equal(t, m.Applied, false) } -- cgit v1.2.3 From 32d10125d82aa7933fffac474105bf5897f3853a Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Wed, 7 Feb 2024 20:05:53 -0500 Subject: Use checkmate 0.3.0 --- internal/models/migration_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'internal/models') diff --git a/internal/models/migration_test.go b/internal/models/migration_test.go index aa92510..a511c12 100644 --- a/internal/models/migration_test.go +++ b/internal/models/migration_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/eugenetriguba/bolt/internal/models" - "github.com/eugenetriguba/checkmate/assert" + "github.com/eugenetriguba/checkmate/check" ) func TestNewTimestampMigration(t *testing.T) { @@ -13,21 +13,21 @@ func TestNewTimestampMigration(t *testing.T) { m := models.NewTimestampMigration(timestamp, "test message") - assert.Equal(t, m.Version, "20200101000000") - assert.Equal(t, m.Message, "test message") - assert.Equal(t, m.Applied, false) + check.Equal(t, m.Version, "20200101000000") + check.Equal(t, m.Message, "test message") + check.Equal(t, m.Applied, false) } func TestNewSequentialMigration(t *testing.T) { m := models.NewSequentialMigration(1, "test message") - assert.Equal(t, m.Version, "001") - assert.Equal(t, m.Message, "test message") - assert.Equal(t, m.Applied, false) + check.Equal(t, m.Version, "001") + check.Equal(t, m.Message, "test message") + check.Equal(t, m.Applied, false) m = models.NewSequentialMigration(100, "test message") - assert.Equal(t, m.Version, "100") - assert.Equal(t, m.Message, "test message") - assert.Equal(t, m.Applied, false) + check.Equal(t, m.Version, "100") + check.Equal(t, m.Message, "test message") + check.Equal(t, m.Applied, false) } -- cgit v1.2.3 From 8fd0e2b96a89b03dcff88a5b4bac5e614b9e4f90 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 15:56:19 -0500 Subject: Add Name func to Migration model --- internal/models/migration.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'internal/models') diff --git a/internal/models/migration.go b/internal/models/migration.go index 4007f3c..b63fec9 100644 --- a/internal/models/migration.go +++ b/internal/models/migration.go @@ -30,3 +30,7 @@ func NewSequentialMigration(version uint64, message string) *Migration { Applied: false, } } + +func (m *Migration) Name() string { + return fmt.Sprintf("%s_%s", m.Version, m.Message) +} -- cgit v1.2.3 From bf1d3b3e1fc42132678b244e479839416a03a6ce Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 29 Feb 2024 19:53:20 -0500 Subject: Add service tests --- internal/models/migration_test.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'internal/models') diff --git a/internal/models/migration_test.go b/internal/models/migration_test.go index a511c12..b6d3205 100644 --- a/internal/models/migration_test.go +++ b/internal/models/migration_test.go @@ -1,6 +1,7 @@ package models_test import ( + "fmt" "testing" "time" @@ -31,3 +32,8 @@ func TestNewSequentialMigration(t *testing.T) { check.Equal(t, m.Message, "test message") check.Equal(t, m.Applied, false) } + +func TestName(t *testing.T) { + m := models.NewSequentialMigration(1, "test message") + check.Equal(t, m.Name(), fmt.Sprintf("%s_%s", m.Version, m.Message)) +} -- cgit v1.2.3