From 85b3f904471c31da1f276135a0b1026c7dd30664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= Date: Sun, 14 Jan 2024 10:04:17 +0000 Subject: [PATCH] refactor: update project structure (#42) Reviewed-on: https://gitea.dwysokinski.me/twhelp/corev3/pulls/42 --- cmd/twhelp/cmd_db.go | 2 +- internal/adapter/adapter_test.go | 6 +++--- internal/adapter/repository_bun_ennoblement.go | 2 +- internal/adapter/repository_bun_ennoblement_test.go | 6 +++--- internal/adapter/repository_bun_player.go | 2 +- internal/adapter/repository_bun_player_test.go | 6 +++--- internal/adapter/repository_bun_server.go | 2 +- internal/adapter/repository_bun_server_test.go | 6 +++--- internal/adapter/repository_bun_tribe.go | 2 +- internal/adapter/repository_bun_tribe_change.go | 2 +- internal/adapter/repository_bun_tribe_change_test.go | 6 +++--- internal/adapter/repository_bun_tribe_test.go | 6 +++--- internal/adapter/repository_bun_version.go | 2 +- internal/adapter/repository_bun_version_test.go | 6 +++--- internal/adapter/repository_bun_village.go | 2 +- internal/adapter/repository_bun_village_test.go | 6 +++--- internal/adapter/repository_test.go | 4 ++-- .../internal => bun}/bunmodel/building_info.go | 0 .../{adapter/internal => bun}/bunmodel/ennoblement.go | 0 .../internal => bun}/bunmodel/opponents_defeated.go | 0 internal/{adapter/internal => bun}/bunmodel/player.go | 0 internal/{adapter/internal => bun}/bunmodel/server.go | 0 .../internal => bun}/bunmodel/server_config.go | 0 internal/{adapter/internal => bun}/bunmodel/tribe.go | 0 .../{adapter/internal => bun}/bunmodel/tribe_change.go | 0 .../{adapter/internal => bun}/bunmodel/unit_info.go | 0 internal/{adapter/internal => bun}/bunmodel/version.go | 0 internal/{adapter/internal => bun}/bunmodel/village.go | 0 .../{adapter/adaptertest => bun/buntest}/fixture.go | 4 ++-- .../{adapter/adaptertest => bun/buntest}/postgres.go | 8 ++++---- .../{adapter/adaptertest => bun/buntest}/sqlite.go | 6 +++--- .../{adapter/adaptertest => bun/buntest}/testing_tb.go | 2 +- internal/{adapter/adaptertest => bun/buntest}/utils.go | 4 ++-- .../migrations/20231220050527_create_versions_table.go | 0 .../migrations/20231220050708_create_servers_table.go | 0 .../migrations/20231220050904_create_tribes_table.go | 0 .../migrations/20231220051107_create_players_table.go | 0 .../migrations/20231220051221_create_villages_table.go | 0 .../20231220051322_create_ennoblements_table.go | 0 .../20231220051411_create_player_snapshots_table.go | 0 .../20231220052323_create_tribe_snapshots_table.go | 0 .../20231220052428_create_tribe_changes_table.go | 0 ...0231220052526_create_index_ennoblements_hash_key.go | 0 ...231220052547_create_index_tribe_changes_hash_key.go | 0 internal/{ => bun}/migrations/migrations.go | 10 +++++----- internal/service/data_sync_test.go | 2 +- internal/service/ennoblement_sync_test.go | 6 +++--- internal/service/service_test.go | 6 +++--- 48 files changed, 58 insertions(+), 58 deletions(-) rename internal/{adapter/internal => bun}/bunmodel/building_info.go (100%) rename internal/{adapter/internal => bun}/bunmodel/ennoblement.go (100%) rename internal/{adapter/internal => bun}/bunmodel/opponents_defeated.go (100%) rename internal/{adapter/internal => bun}/bunmodel/player.go (100%) rename internal/{adapter/internal => bun}/bunmodel/server.go (100%) rename internal/{adapter/internal => bun}/bunmodel/server_config.go (100%) rename internal/{adapter/internal => bun}/bunmodel/tribe.go (100%) rename internal/{adapter/internal => bun}/bunmodel/tribe_change.go (100%) rename internal/{adapter/internal => bun}/bunmodel/unit_info.go (100%) rename internal/{adapter/internal => bun}/bunmodel/version.go (100%) rename internal/{adapter/internal => bun}/bunmodel/village.go (100%) rename internal/{adapter/adaptertest => bun/buntest}/fixture.go (87%) rename internal/{adapter/adaptertest => bun/buntest}/postgres.go (94%) rename internal/{adapter/adaptertest => bun/buntest}/sqlite.go (77%) rename internal/{adapter/adaptertest => bun/buntest}/testing_tb.go (90%) rename internal/{adapter/adaptertest => bun/buntest}/utils.go (94%) rename internal/{ => bun}/migrations/20231220050527_create_versions_table.go (100%) rename internal/{ => bun}/migrations/20231220050708_create_servers_table.go (100%) rename internal/{ => bun}/migrations/20231220050904_create_tribes_table.go (100%) rename internal/{ => bun}/migrations/20231220051107_create_players_table.go (100%) rename internal/{ => bun}/migrations/20231220051221_create_villages_table.go (100%) rename internal/{ => bun}/migrations/20231220051322_create_ennoblements_table.go (100%) rename internal/{ => bun}/migrations/20231220051411_create_player_snapshots_table.go (100%) rename internal/{ => bun}/migrations/20231220052323_create_tribe_snapshots_table.go (100%) rename internal/{ => bun}/migrations/20231220052428_create_tribe_changes_table.go (100%) rename internal/{ => bun}/migrations/20231220052526_create_index_ennoblements_hash_key.go (100%) rename internal/{ => bun}/migrations/20231220052547_create_index_tribe_changes_hash_key.go (100%) rename internal/{ => bun}/migrations/migrations.go (75%) diff --git a/cmd/twhelp/cmd_db.go b/cmd/twhelp/cmd_db.go index 1508f20..308c2a5 100644 --- a/cmd/twhelp/cmd_db.go +++ b/cmd/twhelp/cmd_db.go @@ -5,7 +5,7 @@ import ( "log/slog" "strings" - "gitea.dwysokinski.me/twhelp/corev3/internal/migrations" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/migrations" "github.com/uptrace/bun/migrate" "github.com/urfave/cli/v2" ) diff --git a/internal/adapter/adapter_test.go b/internal/adapter/adapter_test.go index 20f66c0..9518a4b 100644 --- a/internal/adapter/adapter_test.go +++ b/internal/adapter/adapter_test.go @@ -6,11 +6,11 @@ import ( "os" "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" "github.com/ory/dockertest/v3" ) -var postgres *adaptertest.Postgres +var postgres *buntest.Postgres func TestMain(m *testing.M) { os.Exit(testMainWrapper(m)) @@ -30,7 +30,7 @@ func testMainWrapper(m *testing.M) int { return 1 } - postgres, err = adaptertest.NewPostgres(pool) + postgres, err = buntest.NewPostgres(pool) if err != nil { log.Println("couldn't construct adaptertest.Postgres:", err) return 1 diff --git a/internal/adapter/repository_bun_ennoblement.go b/internal/adapter/repository_bun_ennoblement.go index 401a60d..8819d13 100644 --- a/internal/adapter/repository_bun_ennoblement.go +++ b/internal/adapter/repository_bun_ennoblement.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/internal/bunmodel" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/bunmodel" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "github.com/uptrace/bun" ) diff --git a/internal/adapter/repository_bun_ennoblement_test.go b/internal/adapter/repository_bun_ennoblement_test.go index 5dd8054..bab62d9 100644 --- a/internal/adapter/repository_bun_ennoblement_test.go +++ b/internal/adapter/repository_bun_ennoblement_test.go @@ -3,7 +3,7 @@ package adapter_test import ( "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" ) func TestEnnoblementBunRepository_Postgres(t *testing.T) { @@ -15,7 +15,7 @@ func TestEnnoblementBunRepository_Postgres(t *testing.T) { testEnnoblementRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, postgres.NewBunDB(t)) + return newBunDBRepositories(t, postgres.NewDB(t)) }) } @@ -24,6 +24,6 @@ func TestEnnoblementBunRepository_SQLite(t *testing.T) { testEnnoblementRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, adaptertest.NewBunDBSQLite(t)) + return newBunDBRepositories(t, buntest.NewSQLiteDB(t)) }) } diff --git a/internal/adapter/repository_bun_player.go b/internal/adapter/repository_bun_player.go index a0ab2d3..44619ed 100644 --- a/internal/adapter/repository_bun_player.go +++ b/internal/adapter/repository_bun_player.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/internal/bunmodel" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/bunmodel" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" diff --git a/internal/adapter/repository_bun_player_test.go b/internal/adapter/repository_bun_player_test.go index 4654cc8..9d2b286 100644 --- a/internal/adapter/repository_bun_player_test.go +++ b/internal/adapter/repository_bun_player_test.go @@ -3,7 +3,7 @@ package adapter_test import ( "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" ) func TestPlayerBunRepository_Postgres(t *testing.T) { @@ -15,7 +15,7 @@ func TestPlayerBunRepository_Postgres(t *testing.T) { testPlayerRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, postgres.NewBunDB(t)) + return newBunDBRepositories(t, postgres.NewDB(t)) }) } @@ -24,6 +24,6 @@ func TestPlayerBunRepository_SQLite(t *testing.T) { testPlayerRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, adaptertest.NewBunDBSQLite(t)) + return newBunDBRepositories(t, buntest.NewSQLiteDB(t)) }) } diff --git a/internal/adapter/repository_bun_server.go b/internal/adapter/repository_bun_server.go index 8992108..981bb9b 100644 --- a/internal/adapter/repository_bun_server.go +++ b/internal/adapter/repository_bun_server.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/internal/bunmodel" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/bunmodel" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" diff --git a/internal/adapter/repository_bun_server_test.go b/internal/adapter/repository_bun_server_test.go index 9d367bb..5b18913 100644 --- a/internal/adapter/repository_bun_server_test.go +++ b/internal/adapter/repository_bun_server_test.go @@ -3,7 +3,7 @@ package adapter_test import ( "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" ) func TestServerBunRepository_Postgres(t *testing.T) { @@ -15,7 +15,7 @@ func TestServerBunRepository_Postgres(t *testing.T) { testServerRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, postgres.NewBunDB(t)) + return newBunDBRepositories(t, postgres.NewDB(t)) }) } @@ -24,6 +24,6 @@ func TestServerBunRepository_SQLite(t *testing.T) { testServerRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, adaptertest.NewBunDBSQLite(t)) + return newBunDBRepositories(t, buntest.NewSQLiteDB(t)) }) } diff --git a/internal/adapter/repository_bun_tribe.go b/internal/adapter/repository_bun_tribe.go index 2592c1e..f6d0f44 100644 --- a/internal/adapter/repository_bun_tribe.go +++ b/internal/adapter/repository_bun_tribe.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/internal/bunmodel" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/bunmodel" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" diff --git a/internal/adapter/repository_bun_tribe_change.go b/internal/adapter/repository_bun_tribe_change.go index 2106154..def68fd 100644 --- a/internal/adapter/repository_bun_tribe_change.go +++ b/internal/adapter/repository_bun_tribe_change.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/internal/bunmodel" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/bunmodel" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "github.com/uptrace/bun" ) diff --git a/internal/adapter/repository_bun_tribe_change_test.go b/internal/adapter/repository_bun_tribe_change_test.go index b70e91a..faf0a4f 100644 --- a/internal/adapter/repository_bun_tribe_change_test.go +++ b/internal/adapter/repository_bun_tribe_change_test.go @@ -3,7 +3,7 @@ package adapter_test import ( "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" ) func TestTribeChangeBunRepository_Postgres(t *testing.T) { @@ -15,7 +15,7 @@ func TestTribeChangeBunRepository_Postgres(t *testing.T) { testTribeChangeRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, postgres.NewBunDB(t)) + return newBunDBRepositories(t, postgres.NewDB(t)) }) } @@ -24,6 +24,6 @@ func TestTribeChangeBunRepository_SQLite(t *testing.T) { testTribeChangeRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, adaptertest.NewBunDBSQLite(t)) + return newBunDBRepositories(t, buntest.NewSQLiteDB(t)) }) } diff --git a/internal/adapter/repository_bun_tribe_test.go b/internal/adapter/repository_bun_tribe_test.go index de1a1df..3710d80 100644 --- a/internal/adapter/repository_bun_tribe_test.go +++ b/internal/adapter/repository_bun_tribe_test.go @@ -3,7 +3,7 @@ package adapter_test import ( "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" ) func TestTribeBunRepository_Postgres(t *testing.T) { @@ -15,7 +15,7 @@ func TestTribeBunRepository_Postgres(t *testing.T) { testTribeRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, postgres.NewBunDB(t)) + return newBunDBRepositories(t, postgres.NewDB(t)) }) } @@ -24,6 +24,6 @@ func TestTribeBunRepository_SQLite(t *testing.T) { testTribeRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, adaptertest.NewBunDBSQLite(t)) + return newBunDBRepositories(t, buntest.NewSQLiteDB(t)) }) } diff --git a/internal/adapter/repository_bun_version.go b/internal/adapter/repository_bun_version.go index ed004cb..43363b5 100644 --- a/internal/adapter/repository_bun_version.go +++ b/internal/adapter/repository_bun_version.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/internal/bunmodel" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/bunmodel" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "github.com/uptrace/bun" ) diff --git a/internal/adapter/repository_bun_version_test.go b/internal/adapter/repository_bun_version_test.go index 99d7561..b5b467b 100644 --- a/internal/adapter/repository_bun_version_test.go +++ b/internal/adapter/repository_bun_version_test.go @@ -3,7 +3,7 @@ package adapter_test import ( "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" ) func TestVersionBunRepository_Postgres(t *testing.T) { @@ -15,7 +15,7 @@ func TestVersionBunRepository_Postgres(t *testing.T) { testVersionRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, postgres.NewBunDB(t)) + return newBunDBRepositories(t, postgres.NewDB(t)) }) } @@ -24,6 +24,6 @@ func TestVersionBunRepository_SQLite(t *testing.T) { testVersionRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, adaptertest.NewBunDBSQLite(t)) + return newBunDBRepositories(t, buntest.NewSQLiteDB(t)) }) } diff --git a/internal/adapter/repository_bun_village.go b/internal/adapter/repository_bun_village.go index 7cd37a6..0ce2b94 100644 --- a/internal/adapter/repository_bun_village.go +++ b/internal/adapter/repository_bun_village.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/internal/bunmodel" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/bunmodel" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" diff --git a/internal/adapter/repository_bun_village_test.go b/internal/adapter/repository_bun_village_test.go index 484e09a..f561675 100644 --- a/internal/adapter/repository_bun_village_test.go +++ b/internal/adapter/repository_bun_village_test.go @@ -3,7 +3,7 @@ package adapter_test import ( "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" ) func TestVillageBunRepository_Postgres(t *testing.T) { @@ -15,7 +15,7 @@ func TestVillageBunRepository_Postgres(t *testing.T) { testVillageRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, postgres.NewBunDB(t)) + return newBunDBRepositories(t, postgres.NewDB(t)) }) } @@ -24,6 +24,6 @@ func TestVillageBunRepository_SQLite(t *testing.T) { testVillageRepository(t, func(t *testing.T) repositories { t.Helper() - return newBunDBRepositories(t, adaptertest.NewBunDBSQLite(t)) + return newBunDBRepositories(t, buntest.NewSQLiteDB(t)) }) } diff --git a/internal/adapter/repository_test.go b/internal/adapter/repository_test.go index 8766a6d..4b0ad79 100644 --- a/internal/adapter/repository_test.go +++ b/internal/adapter/repository_test.go @@ -6,7 +6,7 @@ import ( "testing" "gitea.dwysokinski.me/twhelp/corev3/internal/adapter" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "github.com/uptrace/bun" ) @@ -67,7 +67,7 @@ type repositories struct { func newBunDBRepositories(tb testing.TB, bunDB *bun.DB) repositories { tb.Helper() - adaptertest.NewFixture(bunDB).Load(tb, context.Background(), os.DirFS("testdata"), "fixture.yml") + buntest.NewFixture(bunDB).Load(tb, context.Background(), os.DirFS("testdata"), "fixture.yml") return repositories{ version: adapter.NewVersionBunRepository(bunDB), diff --git a/internal/adapter/internal/bunmodel/building_info.go b/internal/bun/bunmodel/building_info.go similarity index 100% rename from internal/adapter/internal/bunmodel/building_info.go rename to internal/bun/bunmodel/building_info.go diff --git a/internal/adapter/internal/bunmodel/ennoblement.go b/internal/bun/bunmodel/ennoblement.go similarity index 100% rename from internal/adapter/internal/bunmodel/ennoblement.go rename to internal/bun/bunmodel/ennoblement.go diff --git a/internal/adapter/internal/bunmodel/opponents_defeated.go b/internal/bun/bunmodel/opponents_defeated.go similarity index 100% rename from internal/adapter/internal/bunmodel/opponents_defeated.go rename to internal/bun/bunmodel/opponents_defeated.go diff --git a/internal/adapter/internal/bunmodel/player.go b/internal/bun/bunmodel/player.go similarity index 100% rename from internal/adapter/internal/bunmodel/player.go rename to internal/bun/bunmodel/player.go diff --git a/internal/adapter/internal/bunmodel/server.go b/internal/bun/bunmodel/server.go similarity index 100% rename from internal/adapter/internal/bunmodel/server.go rename to internal/bun/bunmodel/server.go diff --git a/internal/adapter/internal/bunmodel/server_config.go b/internal/bun/bunmodel/server_config.go similarity index 100% rename from internal/adapter/internal/bunmodel/server_config.go rename to internal/bun/bunmodel/server_config.go diff --git a/internal/adapter/internal/bunmodel/tribe.go b/internal/bun/bunmodel/tribe.go similarity index 100% rename from internal/adapter/internal/bunmodel/tribe.go rename to internal/bun/bunmodel/tribe.go diff --git a/internal/adapter/internal/bunmodel/tribe_change.go b/internal/bun/bunmodel/tribe_change.go similarity index 100% rename from internal/adapter/internal/bunmodel/tribe_change.go rename to internal/bun/bunmodel/tribe_change.go diff --git a/internal/adapter/internal/bunmodel/unit_info.go b/internal/bun/bunmodel/unit_info.go similarity index 100% rename from internal/adapter/internal/bunmodel/unit_info.go rename to internal/bun/bunmodel/unit_info.go diff --git a/internal/adapter/internal/bunmodel/version.go b/internal/bun/bunmodel/version.go similarity index 100% rename from internal/adapter/internal/bunmodel/version.go rename to internal/bun/bunmodel/version.go diff --git a/internal/adapter/internal/bunmodel/village.go b/internal/bun/bunmodel/village.go similarity index 100% rename from internal/adapter/internal/bunmodel/village.go rename to internal/bun/bunmodel/village.go diff --git a/internal/adapter/adaptertest/fixture.go b/internal/bun/buntest/fixture.go similarity index 87% rename from internal/adapter/adaptertest/fixture.go rename to internal/bun/buntest/fixture.go index ac18e87..3128914 100644 --- a/internal/adapter/adaptertest/fixture.go +++ b/internal/bun/buntest/fixture.go @@ -1,10 +1,10 @@ -package adaptertest +package buntest import ( "context" "io/fs" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/internal/bunmodel" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/bunmodel" "github.com/stretchr/testify/require" "github.com/uptrace/bun" "github.com/uptrace/bun/dbfixture" diff --git a/internal/adapter/adaptertest/postgres.go b/internal/bun/buntest/postgres.go similarity index 94% rename from internal/adapter/adaptertest/postgres.go rename to internal/bun/buntest/postgres.go index dcd2a6a..f1fa7bb 100644 --- a/internal/adapter/adaptertest/postgres.go +++ b/internal/bun/buntest/postgres.go @@ -1,4 +1,4 @@ -package adaptertest +package buntest import ( "database/sql" @@ -127,13 +127,13 @@ const ( postgresPingBackOffMaxElapsedTime = 30 * time.Second ) -// NewBunDB initializes a new instance of *bun.DB, which is ready for use (all required migrations are applied). +// NewDB initializes a new instance of *bun.DB, which is ready for use (all required migrations are applied). // This method guarantees data separation through PostgresSQL schemas // (https://www.postgresql.org/docs/current/ddl-schemas.html) -// and it is safe to call Postgres.NewBunDB multiple times. +// and it is safe to call postgres.NewDB multiple times. // // It fails if Postgres hasn't been properly initialized (via NewPostgres). -func (p *Postgres) NewBunDB(tb TestingTB) *bun.DB { +func (p *Postgres) NewDB(tb TestingTB) *bun.DB { tb.Helper() require.NotNil(tb, p, "postgres resource not property initialized") diff --git a/internal/adapter/adaptertest/sqlite.go b/internal/bun/buntest/sqlite.go similarity index 77% rename from internal/adapter/adaptertest/sqlite.go rename to internal/bun/buntest/sqlite.go index cdf5cd7..5d426b1 100644 --- a/internal/adapter/adaptertest/sqlite.go +++ b/internal/bun/buntest/sqlite.go @@ -1,4 +1,4 @@ -package adaptertest +package buntest import ( "database/sql" @@ -9,9 +9,9 @@ import ( "github.com/uptrace/bun/driver/sqliteshim" ) -// NewBunDBSQLite initializes a new instance of *bun.DB, which is ready for use (all required migrations are applied). +// NewSQLiteDB initializes a new instance of *bun.DB, which is ready for use (all required migrations are applied). // Data is stored in memory (https://www.sqlite.org/inmemorydb.html). -func NewBunDBSQLite(tb TestingTB) *bun.DB { +func NewSQLiteDB(tb TestingTB) *bun.DB { tb.Helper() sqlDB, err := sql.Open(sqliteshim.ShimName, "file::memory:") diff --git a/internal/adapter/adaptertest/testing_tb.go b/internal/bun/buntest/testing_tb.go similarity index 90% rename from internal/adapter/adaptertest/testing_tb.go rename to internal/bun/buntest/testing_tb.go index d53ef9e..a838dcf 100644 --- a/internal/adapter/adaptertest/testing_tb.go +++ b/internal/bun/buntest/testing_tb.go @@ -1,4 +1,4 @@ -package adaptertest +package buntest // TestingTB is a subset of the API provided by both *testing.T and *testing.B. type TestingTB interface { diff --git a/internal/adapter/adaptertest/utils.go b/internal/bun/buntest/utils.go similarity index 94% rename from internal/adapter/adaptertest/utils.go rename to internal/bun/buntest/utils.go index 08c3af1..04974a2 100644 --- a/internal/adapter/adaptertest/utils.go +++ b/internal/bun/buntest/utils.go @@ -1,4 +1,4 @@ -package adaptertest +package buntest import ( "context" @@ -8,7 +8,7 @@ import ( "os" "time" - "gitea.dwysokinski.me/twhelp/corev3/internal/migrations" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/migrations" "github.com/cenkalti/backoff/v4" "github.com/ory/dockertest/v3" "github.com/stretchr/testify/require" diff --git a/internal/migrations/20231220050527_create_versions_table.go b/internal/bun/migrations/20231220050527_create_versions_table.go similarity index 100% rename from internal/migrations/20231220050527_create_versions_table.go rename to internal/bun/migrations/20231220050527_create_versions_table.go diff --git a/internal/migrations/20231220050708_create_servers_table.go b/internal/bun/migrations/20231220050708_create_servers_table.go similarity index 100% rename from internal/migrations/20231220050708_create_servers_table.go rename to internal/bun/migrations/20231220050708_create_servers_table.go diff --git a/internal/migrations/20231220050904_create_tribes_table.go b/internal/bun/migrations/20231220050904_create_tribes_table.go similarity index 100% rename from internal/migrations/20231220050904_create_tribes_table.go rename to internal/bun/migrations/20231220050904_create_tribes_table.go diff --git a/internal/migrations/20231220051107_create_players_table.go b/internal/bun/migrations/20231220051107_create_players_table.go similarity index 100% rename from internal/migrations/20231220051107_create_players_table.go rename to internal/bun/migrations/20231220051107_create_players_table.go diff --git a/internal/migrations/20231220051221_create_villages_table.go b/internal/bun/migrations/20231220051221_create_villages_table.go similarity index 100% rename from internal/migrations/20231220051221_create_villages_table.go rename to internal/bun/migrations/20231220051221_create_villages_table.go diff --git a/internal/migrations/20231220051322_create_ennoblements_table.go b/internal/bun/migrations/20231220051322_create_ennoblements_table.go similarity index 100% rename from internal/migrations/20231220051322_create_ennoblements_table.go rename to internal/bun/migrations/20231220051322_create_ennoblements_table.go diff --git a/internal/migrations/20231220051411_create_player_snapshots_table.go b/internal/bun/migrations/20231220051411_create_player_snapshots_table.go similarity index 100% rename from internal/migrations/20231220051411_create_player_snapshots_table.go rename to internal/bun/migrations/20231220051411_create_player_snapshots_table.go diff --git a/internal/migrations/20231220052323_create_tribe_snapshots_table.go b/internal/bun/migrations/20231220052323_create_tribe_snapshots_table.go similarity index 100% rename from internal/migrations/20231220052323_create_tribe_snapshots_table.go rename to internal/bun/migrations/20231220052323_create_tribe_snapshots_table.go diff --git a/internal/migrations/20231220052428_create_tribe_changes_table.go b/internal/bun/migrations/20231220052428_create_tribe_changes_table.go similarity index 100% rename from internal/migrations/20231220052428_create_tribe_changes_table.go rename to internal/bun/migrations/20231220052428_create_tribe_changes_table.go diff --git a/internal/migrations/20231220052526_create_index_ennoblements_hash_key.go b/internal/bun/migrations/20231220052526_create_index_ennoblements_hash_key.go similarity index 100% rename from internal/migrations/20231220052526_create_index_ennoblements_hash_key.go rename to internal/bun/migrations/20231220052526_create_index_ennoblements_hash_key.go diff --git a/internal/migrations/20231220052547_create_index_tribe_changes_hash_key.go b/internal/bun/migrations/20231220052547_create_index_tribe_changes_hash_key.go similarity index 100% rename from internal/migrations/20231220052547_create_index_tribe_changes_hash_key.go rename to internal/bun/migrations/20231220052547_create_index_tribe_changes_hash_key.go diff --git a/internal/migrations/migrations.go b/internal/bun/migrations/migrations.go similarity index 75% rename from internal/migrations/migrations.go rename to internal/bun/migrations/migrations.go index fa46505..d86e79a 100644 --- a/internal/migrations/migrations.go +++ b/internal/bun/migrations/migrations.go @@ -10,11 +10,11 @@ import ( var migrations = migrate.NewMigrations() func NewMigrator(db *bun.DB, opts ...migrate.MigratorOption) *migrate.Migrator { - return migrate.NewMigrator( - db.WithNamedArg("ID_COL", autoincrementIDColumn(db)), - migrations, - opts..., - ) + // db isn't required in all cases (e.g. for creating migrations) + if db != nil { + db = db.WithNamedArg("ID_COL", autoincrementIDColumn(db)) + } + return migrate.NewMigrator(db, migrations, opts...) } type hasFeaturer interface { diff --git a/internal/service/data_sync_test.go b/internal/service/data_sync_test.go index e113fa8..7c02f6d 100644 --- a/internal/service/data_sync_test.go +++ b/internal/service/data_sync_test.go @@ -48,7 +48,7 @@ func TestDataSync(t *testing.T) { defer stop() // bun - db := postgres.NewBunDB(t) + db := postgres.NewDB(t) // watermill marshaler := watermillmsg.JSONMarshaler{NewUUID: watermill.NewUUID} diff --git a/internal/service/ennoblement_sync_test.go b/internal/service/ennoblement_sync_test.go index 254fd9c..2c57001 100644 --- a/internal/service/ennoblement_sync_test.go +++ b/internal/service/ennoblement_sync_test.go @@ -16,8 +16,8 @@ import ( "time" "gitea.dwysokinski.me/twhelp/corev3/internal/adapter" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" "gitea.dwysokinski.me/twhelp/corev3/internal/app" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" "gitea.dwysokinski.me/twhelp/corev3/internal/domain" "gitea.dwysokinski.me/twhelp/corev3/internal/port" "gitea.dwysokinski.me/twhelp/corev3/internal/tw" @@ -48,8 +48,8 @@ func TestEnnoblementSync(t *testing.T) { defer stop() // bun - db := postgres.NewBunDB(t) - adaptertest.NewFixture(db).Load(t, ctx, os.DirFS("./testdata/ennoblementsync"), "fixture.yml") + db := postgres.NewDB(t) + buntest.NewFixture(db).Load(t, ctx, os.DirFS("./testdata/ennoblementsync"), "fixture.yml") // watermill marshaler := watermillmsg.JSONMarshaler{NewUUID: watermill.NewUUID} diff --git a/internal/service/service_test.go b/internal/service/service_test.go index 244983d..4f91438 100644 --- a/internal/service/service_test.go +++ b/internal/service/service_test.go @@ -6,13 +6,13 @@ import ( "os" "testing" - "gitea.dwysokinski.me/twhelp/corev3/internal/adapter/adaptertest" + "gitea.dwysokinski.me/twhelp/corev3/internal/bun/buntest" "gitea.dwysokinski.me/twhelp/corev3/internal/watermill/watermillamqptest" "github.com/ory/dockertest/v3" ) var ( - postgres *adaptertest.Postgres + postgres *buntest.Postgres rabbitMQ *watermillamqptest.RabbitMQ ) @@ -34,7 +34,7 @@ func testMainWrapper(m *testing.M) int { return 1 } - postgres, err = adaptertest.NewPostgres(pool, adaptertest.WithPostgresTTL(180)) + postgres, err = buntest.NewPostgres(pool, buntest.WithPostgresTTL(180)) if err != nil { log.Println("couldn't construct adaptertest.Postgres:", err) return 1