diff --git a/distribution/distribution.go b/distribution/distribution.go index e605618..6c33460 100644 --- a/distribution/distribution.go +++ b/distribution/distribution.go @@ -1,7 +1,5 @@ package distribution -import domainUtils "git.gregbrzezinski.com/Skirda/skirdagoutils/domain" - type Distributiuon struct { - Domains []domainUtils.Domain + Domains []Domain } diff --git a/distribution/domainModels.go b/distribution/domainModels.go new file mode 100644 index 0000000..c2d01f5 --- /dev/null +++ b/distribution/domainModels.go @@ -0,0 +1,11 @@ +package distribution + +type Domain struct { + DiscordGroupID string + Games Games + Sessions Sessions +} + +type Domains struct { + Domains []Domain +} diff --git a/distribution/domainUtils.go b/distribution/domainUtils.go new file mode 100644 index 0000000..6bf7b8a --- /dev/null +++ b/distribution/domainUtils.go @@ -0,0 +1,13 @@ +package distribution + +var fakeDomains = Domains{ //TODO: Move to back + Domains: []Domain{defaultDomain}, +} + +var defaultDomain = Domain{ + DiscordGroupID: "0", + Games: Games{ + SteamGames: SteamFakeGamesList, + }, + Sessions: FakeSessions, +} diff --git a/gameUtils/fakeGames.go b/distribution/fakeGames.go similarity index 96% rename from gameUtils/fakeGames.go rename to distribution/fakeGames.go index 71e74f5..86873f4 100644 --- a/gameUtils/fakeGames.go +++ b/distribution/fakeGames.go @@ -1,4 +1,4 @@ -package gameUtils +package distribution var garrysmodGame = SteamGame{ //TODO: Move to front GameId: "garrysmod", diff --git a/gameUtils/gameTypes.go b/distribution/gameTypes.go similarity index 96% rename from gameUtils/gameTypes.go rename to distribution/gameTypes.go index dfac299..2ac346c 100644 --- a/gameUtils/gameTypes.go +++ b/distribution/gameTypes.go @@ -1,4 +1,4 @@ -package gameUtils +package distribution type SteamGame struct { GameId string diff --git a/gameUtils/gameUtils.go b/distribution/gameUtils.go similarity index 97% rename from gameUtils/gameUtils.go rename to distribution/gameUtils.go index 223337f..15aad2c 100644 --- a/gameUtils/gameUtils.go +++ b/distribution/gameUtils.go @@ -1,4 +1,4 @@ -package gameUtils +package distribution func FindGameByID(id string, list Games) SteamGame { for _, game := range list.SteamGames { diff --git a/gameUtils/sessionTypes.go b/distribution/sessionTypes.go similarity index 95% rename from gameUtils/sessionTypes.go rename to distribution/sessionTypes.go index 3c454e0..0857735 100644 --- a/gameUtils/sessionTypes.go +++ b/distribution/sessionTypes.go @@ -1,4 +1,4 @@ -package gameUtils +package distribution import ( "time" diff --git a/gameUtils/sessionUtils.go b/distribution/sessionUtils.go similarity index 98% rename from gameUtils/sessionUtils.go rename to distribution/sessionUtils.go index 4106aba..4249517 100644 --- a/gameUtils/sessionUtils.go +++ b/distribution/sessionUtils.go @@ -1,4 +1,4 @@ -package gameUtils +package distribution import ( "encoding/json" diff --git a/domain/domainModels.go b/domain/domainModels.go deleted file mode 100644 index 5d5efa1..0000000 --- a/domain/domainModels.go +++ /dev/null @@ -1,13 +0,0 @@ -package domainUtils - -import "git.gregbrzezinski.com/Skirda/skirdagoutils/gameUtils" - -type Domain struct { - DiscordGroupID string - Games gameUtils.Games - Sessions gameUtils.Sessions -} - -type Domains struct { - Domains []Domain -} diff --git a/domain/domainUtils.go b/domain/domainUtils.go deleted file mode 100644 index c70575b..0000000 --- a/domain/domainUtils.go +++ /dev/null @@ -1,15 +0,0 @@ -package domainUtils - -import "git.gregbrzezinski.com/Skirda/skirdagoutils/gameUtils" - -var fakeDomains = Domains{ //TODO: Move to back - Domains: []Domain{defaultDomain}, -} - -var defaultDomain = Domain{ - DiscordGroupID: "0", - Games: gameUtils.Games{ - SteamGames: gameUtils.SteamFakeGamesList, - }, - Sessions: gameUtils.FakeSessions, -}