From 3069e24e8da9857cc81dd1cb4e8c378d27cd43b2 Mon Sep 17 00:00:00 2001 From: Dustin Pianalto Date: Mon, 22 Feb 2021 14:04:51 -0900 Subject: [PATCH] Move db and services to pkg --- cmd/geeksbot/main.go | 4 ++-- internal/exts/guild/guild.go | 2 +- internal/exts/guild/roles.go | 2 +- internal/exts/requests/requests.go | 2 +- internal/exts/utils/utils.go | 2 +- {internal => pkg}/database/channel.go | 0 {internal => pkg}/database/database.go | 2 +- {internal => pkg}/database/guild.go | 0 {internal => pkg}/database/message.go | 0 .../database/migrations/000001_init_schema.down.sql | 0 .../database/migrations/000001_init_schema.up.sql | 0 .../database/migrations/000002_add_guild_to_request.down.sql | 0 .../database/migrations/000002_add_guild_to_request.up.sql | 0 .../database/migrations/000003_set_column_not_null.down.sql | 0 .../database/migrations/000003_set_column_not_null.up.sql | 0 .../database/migrations/000004_add_sar_role_type.down.sql | 0 .../database/migrations/000004_add_sar_role_type.up.sql | 0 {internal => pkg}/database/migrations/bindata.go | 0 {internal => pkg}/database/patreon.go | 0 {internal => pkg}/database/request.go | 0 {internal => pkg}/database/server.go | 0 {internal => pkg}/database/user.go | 0 {internal => pkg}/services/services.go | 2 +- 23 files changed, 8 insertions(+), 8 deletions(-) rename {internal => pkg}/database/channel.go (100%) rename {internal => pkg}/database/database.go (96%) rename {internal => pkg}/database/guild.go (100%) rename {internal => pkg}/database/message.go (100%) rename {internal => pkg}/database/migrations/000001_init_schema.down.sql (100%) rename {internal => pkg}/database/migrations/000001_init_schema.up.sql (100%) rename {internal => pkg}/database/migrations/000002_add_guild_to_request.down.sql (100%) rename {internal => pkg}/database/migrations/000002_add_guild_to_request.up.sql (100%) rename {internal => pkg}/database/migrations/000003_set_column_not_null.down.sql (100%) rename {internal => pkg}/database/migrations/000003_set_column_not_null.up.sql (100%) rename {internal => pkg}/database/migrations/000004_add_sar_role_type.down.sql (100%) rename {internal => pkg}/database/migrations/000004_add_sar_role_type.up.sql (100%) rename {internal => pkg}/database/migrations/bindata.go (100%) rename {internal => pkg}/database/patreon.go (100%) rename {internal => pkg}/database/request.go (100%) rename {internal => pkg}/database/server.go (100%) rename {internal => pkg}/database/user.go (100%) rename {internal => pkg}/services/services.go (92%) diff --git a/cmd/geeksbot/main.go b/cmd/geeksbot/main.go index 93d06fb..6413e32 100644 --- a/cmd/geeksbot/main.go +++ b/cmd/geeksbot/main.go @@ -8,9 +8,9 @@ import ( "github.com/bwmarrin/discordgo" "github.com/dustinpianalto/disgoman" - "github.com/dustinpianalto/geeksbot/internal/database" "github.com/dustinpianalto/geeksbot/internal/exts" - "github.com/dustinpianalto/geeksbot/internal/services" + "github.com/dustinpianalto/geeksbot/pkg/database" + "github.com/dustinpianalto/geeksbot/pkg/services" ) func main() { diff --git a/internal/exts/guild/guild.go b/internal/exts/guild/guild.go index 4f52b9f..81ac0a3 100644 --- a/internal/exts/guild/guild.go +++ b/internal/exts/guild/guild.go @@ -6,8 +6,8 @@ import ( "github.com/dustinpianalto/disgoman" "github.com/dustinpianalto/geeksbot" "github.com/dustinpianalto/geeksbot/internal/discord_utils" - "github.com/dustinpianalto/geeksbot/internal/services" "github.com/dustinpianalto/geeksbot/internal/utils" + "github.com/dustinpianalto/geeksbot/pkg/services" ) var AddPrefixCommand = &disgoman.Command{ diff --git a/internal/exts/guild/roles.go b/internal/exts/guild/roles.go index d44c7e4..2c7904e 100644 --- a/internal/exts/guild/roles.go +++ b/internal/exts/guild/roles.go @@ -9,8 +9,8 @@ import ( "github.com/dustinpianalto/disgoman" "github.com/dustinpianalto/geeksbot" "github.com/dustinpianalto/geeksbot/internal/discord_utils" - "github.com/dustinpianalto/geeksbot/internal/services" "github.com/dustinpianalto/geeksbot/internal/utils" + "github.com/dustinpianalto/geeksbot/pkg/services" ) var AddModeratorRoleCommand = &disgoman.Command{ diff --git a/internal/exts/requests/requests.go b/internal/exts/requests/requests.go index a72ee79..2e2698c 100644 --- a/internal/exts/requests/requests.go +++ b/internal/exts/requests/requests.go @@ -9,7 +9,7 @@ import ( "github.com/dustinpianalto/disgoman" "github.com/dustinpianalto/geeksbot" "github.com/dustinpianalto/geeksbot/internal/discord_utils" - "github.com/dustinpianalto/geeksbot/internal/services" + "github.com/dustinpianalto/geeksbot/pkg/services" ) var RequestCommand = &disgoman.Command{ diff --git a/internal/exts/utils/utils.go b/internal/exts/utils/utils.go index 942b311..a3d5f02 100644 --- a/internal/exts/utils/utils.go +++ b/internal/exts/utils/utils.go @@ -11,7 +11,7 @@ import ( "github.com/dustinpianalto/disgoman" "github.com/dustinpianalto/geeksbot" "github.com/dustinpianalto/geeksbot/internal/discord_utils" - "github.com/dustinpianalto/geeksbot/internal/services" + "github.com/dustinpianalto/geeksbot/pkg/services" ) var PingCommand = &disgoman.Command{ diff --git a/internal/database/channel.go b/pkg/database/channel.go similarity index 100% rename from internal/database/channel.go rename to pkg/database/channel.go diff --git a/internal/database/database.go b/pkg/database/database.go similarity index 96% rename from internal/database/database.go rename to pkg/database/database.go index 4defa81..0a07049 100644 --- a/internal/database/database.go +++ b/pkg/database/database.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/dustinpianalto/geeksbot/internal/database/migrations" + "github.com/dustinpianalto/geeksbot/pkg/database/migrations" "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database/postgres" bindata "github.com/golang-migrate/migrate/v4/source/go_bindata" diff --git a/internal/database/guild.go b/pkg/database/guild.go similarity index 100% rename from internal/database/guild.go rename to pkg/database/guild.go diff --git a/internal/database/message.go b/pkg/database/message.go similarity index 100% rename from internal/database/message.go rename to pkg/database/message.go diff --git a/internal/database/migrations/000001_init_schema.down.sql b/pkg/database/migrations/000001_init_schema.down.sql similarity index 100% rename from internal/database/migrations/000001_init_schema.down.sql rename to pkg/database/migrations/000001_init_schema.down.sql diff --git a/internal/database/migrations/000001_init_schema.up.sql b/pkg/database/migrations/000001_init_schema.up.sql similarity index 100% rename from internal/database/migrations/000001_init_schema.up.sql rename to pkg/database/migrations/000001_init_schema.up.sql diff --git a/internal/database/migrations/000002_add_guild_to_request.down.sql b/pkg/database/migrations/000002_add_guild_to_request.down.sql similarity index 100% rename from internal/database/migrations/000002_add_guild_to_request.down.sql rename to pkg/database/migrations/000002_add_guild_to_request.down.sql diff --git a/internal/database/migrations/000002_add_guild_to_request.up.sql b/pkg/database/migrations/000002_add_guild_to_request.up.sql similarity index 100% rename from internal/database/migrations/000002_add_guild_to_request.up.sql rename to pkg/database/migrations/000002_add_guild_to_request.up.sql diff --git a/internal/database/migrations/000003_set_column_not_null.down.sql b/pkg/database/migrations/000003_set_column_not_null.down.sql similarity index 100% rename from internal/database/migrations/000003_set_column_not_null.down.sql rename to pkg/database/migrations/000003_set_column_not_null.down.sql diff --git a/internal/database/migrations/000003_set_column_not_null.up.sql b/pkg/database/migrations/000003_set_column_not_null.up.sql similarity index 100% rename from internal/database/migrations/000003_set_column_not_null.up.sql rename to pkg/database/migrations/000003_set_column_not_null.up.sql diff --git a/internal/database/migrations/000004_add_sar_role_type.down.sql b/pkg/database/migrations/000004_add_sar_role_type.down.sql similarity index 100% rename from internal/database/migrations/000004_add_sar_role_type.down.sql rename to pkg/database/migrations/000004_add_sar_role_type.down.sql diff --git a/internal/database/migrations/000004_add_sar_role_type.up.sql b/pkg/database/migrations/000004_add_sar_role_type.up.sql similarity index 100% rename from internal/database/migrations/000004_add_sar_role_type.up.sql rename to pkg/database/migrations/000004_add_sar_role_type.up.sql diff --git a/internal/database/migrations/bindata.go b/pkg/database/migrations/bindata.go similarity index 100% rename from internal/database/migrations/bindata.go rename to pkg/database/migrations/bindata.go diff --git a/internal/database/patreon.go b/pkg/database/patreon.go similarity index 100% rename from internal/database/patreon.go rename to pkg/database/patreon.go diff --git a/internal/database/request.go b/pkg/database/request.go similarity index 100% rename from internal/database/request.go rename to pkg/database/request.go diff --git a/internal/database/server.go b/pkg/database/server.go similarity index 100% rename from internal/database/server.go rename to pkg/database/server.go diff --git a/internal/database/user.go b/pkg/database/user.go similarity index 100% rename from internal/database/user.go rename to pkg/database/user.go diff --git a/internal/services/services.go b/pkg/services/services.go similarity index 92% rename from internal/services/services.go rename to pkg/services/services.go index 2434300..98c4056 100644 --- a/internal/services/services.go +++ b/pkg/services/services.go @@ -2,7 +2,7 @@ package services import ( "github.com/dustinpianalto/geeksbot" - "github.com/dustinpianalto/geeksbot/internal/database" + "github.com/dustinpianalto/geeksbot/pkg/database" ) var (