diff --git a/internal/handlers/account/authentication.go b/internal/handlers/account/authentication.go index 34a74a3..bbf0e28 100644 --- a/internal/handlers/account/authentication.go +++ b/internal/handlers/account/authentication.go @@ -6,13 +6,13 @@ import ( "net/http" "time" - httpHelpers "synlotto-website/helpers/http" - securityHelpers "synlotto-website/helpers/security" - templateHelpers "synlotto-website/helpers/template" + httpHelpers "synlotto-website/internal/helpers/http" + securityHelpers "synlotto-website/internal/helpers/security" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/logging" - "synlotto-website/models" - "synlotto-website/storage" + "synlotto-website/internal/logging" + "synlotto-website/internal/models" + "synlotto-website/internal/storage" "github.com/gorilla/csrf" ) diff --git a/internal/handlers/admin/audit.go b/internal/handlers/admin/audit.go index 7d7a4fe..25bb9bf 100644 --- a/internal/handlers/admin/audit.go +++ b/internal/handlers/admin/audit.go @@ -5,10 +5,10 @@ import ( "log" "net/http" - templateHelpers "synlotto-website/helpers/template" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/middleware" - "synlotto-website/models" + "synlotto-website/internal/http/middleware" + "synlotto-website/internal/models" ) type AdminLogEntry struct { diff --git a/internal/handlers/admin/dashboard.go b/internal/handlers/admin/dashboard.go index 7d24305..d5a1031 100644 --- a/internal/handlers/admin/dashboard.go +++ b/internal/handlers/admin/dashboard.go @@ -5,12 +5,12 @@ import ( "log" "net/http" - httpHelpers "synlotto-website/helpers/http" - securityHelpers "synlotto-website/helpers/security" - templateHelpers "synlotto-website/helpers/template" + httpHelpers "synlotto-website/internal/helpers/http" + securityHelpers "synlotto-website/internal/helpers/security" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/models" - "synlotto-website/storage" + "synlotto-website/internal/models" + "synlotto-website/internal/storage" ) var ( diff --git a/internal/handlers/admin/draws.go b/internal/handlers/admin/draws.go index 5432b63..ab4fbf7 100644 --- a/internal/handlers/admin/draws.go +++ b/internal/handlers/admin/draws.go @@ -5,10 +5,10 @@ import ( "log" "net/http" - httpHelpers "synlotto-website/helpers/http" - templateHelpers "synlotto-website/helpers/template" + httpHelpers "synlotto-website/internal/helpers/http" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/models" + "synlotto-website/internal/models" ) func NewDrawHandler(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/admin/manualtriggers.go b/internal/handlers/admin/manualtriggers.go index 9e26261..617594a 100644 --- a/internal/handlers/admin/manualtriggers.go +++ b/internal/handlers/admin/manualtriggers.go @@ -8,10 +8,10 @@ import ( "net/url" "strconv" - templateHelpers "synlotto-website/helpers/template" + templateHelpers "synlotto-website/internal/helpers/template" services "synlotto-website/services/tickets" - "synlotto-website/models" + "synlotto-website/internal/models" ) func AdminTriggersHandler(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/admin/prizes.go b/internal/handlers/admin/prizes.go index 865b7b5..7305078 100644 --- a/internal/handlers/admin/prizes.go +++ b/internal/handlers/admin/prizes.go @@ -6,10 +6,10 @@ import ( "net/http" "strconv" - httpHelpers "synlotto-website/helpers/http" - templateHelpers "synlotto-website/helpers/template" + httpHelpers "synlotto-website/internal/helpers/http" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/models" + "synlotto-website/internal/models" ) func AddPrizesHandler(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/common.go b/internal/handlers/common.go index 9b44999..9aeee73 100644 --- a/internal/handlers/common.go +++ b/internal/handlers/common.go @@ -1,7 +1,7 @@ package handlers import ( - "synlotto-website/models" + "synlotto-website/internal/models" ) var Draws []models.ThunderballResult diff --git a/internal/handlers/home.go b/internal/handlers/home.go index 1e1d9d6..82e4957 100644 --- a/internal/handlers/home.go +++ b/internal/handlers/home.go @@ -5,8 +5,8 @@ import ( "log" "net/http" - templateHandlers "synlotto-website/handlers/template" - templateHelpers "synlotto-website/helpers/template" + templateHandlers "synlotto-website/internal/handlers/template" + templateHelpers "synlotto-website/internal/helpers/template" ) func Home(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/lottery/draws/draw_handler.go b/internal/handlers/lottery/draws/draw_handler.go index 9395677..988ac57 100644 --- a/internal/handlers/lottery/draws/draw_handler.go +++ b/internal/handlers/lottery/draws/draw_handler.go @@ -5,11 +5,11 @@ import ( "log" "net/http" - templateHelpers "synlotto-website/helpers/template" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/helpers" - "synlotto-website/models" - "synlotto-website/storage" + "synlotto-website/internal/helpers" + "synlotto-website/internal/models" + "synlotto-website/internal/storage" ) func NewDraw(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/lottery/syndicate/syndicate.go b/internal/handlers/lottery/syndicate/syndicate.go index d3fa2ee..a990ae0 100644 --- a/internal/handlers/lottery/syndicate/syndicate.go +++ b/internal/handlers/lottery/syndicate/syndicate.go @@ -6,13 +6,13 @@ import ( "log" "net/http" - templateHandlers "synlotto-website/handlers/template" - securityHelpers "synlotto-website/helpers/security" - templateHelpers "synlotto-website/helpers/template" + templateHandlers "synlotto-website/internal/handlers/template" + securityHelpers "synlotto-website/internal/helpers/security" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/helpers" - "synlotto-website/models" - "synlotto-website/storage" + "synlotto-website/internal/helpers" + "synlotto-website/internal/models" + "synlotto-website/internal/storage" ) func CreateSyndicateHandler(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/lottery/syndicate/syndicate_invites.go b/internal/handlers/lottery/syndicate/syndicate_invites.go index 1abd6c0..d43cffc 100644 --- a/internal/handlers/lottery/syndicate/syndicate_invites.go +++ b/internal/handlers/lottery/syndicate/syndicate_invites.go @@ -7,12 +7,12 @@ import ( "strconv" "time" - templateHandlers "synlotto-website/handlers/template" - securityHelpers "synlotto-website/helpers/security" - templateHelpers "synlotto-website/helpers/template" + templateHandlers "synlotto-website/internal/handlers/template" + securityHelpers "synlotto-website/internal/helpers/security" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/helpers" - "synlotto-website/storage" + "synlotto-website/internal/helpers" + "synlotto-website/internal/storage" ) func SyndicateInviteHandler(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/lottery/tickets/ticket_handler.go b/internal/handlers/lottery/tickets/ticket_handler.go index 8ccb729..204b71a 100644 --- a/internal/handlers/lottery/tickets/ticket_handler.go +++ b/internal/handlers/lottery/tickets/ticket_handler.go @@ -10,13 +10,13 @@ import ( "strconv" "time" - httpHelpers "synlotto-website/helpers/http" - securityHelpers "synlotto-website/helpers/security" - templateHelpers "synlotto-website/helpers/template" + httpHelpers "synlotto-website/internal/helpers/http" + securityHelpers "synlotto-website/internal/helpers/security" + templateHelpers "synlotto-website/internal/helpers/template" draws "synlotto-website/services/draws" - "synlotto-website/helpers" - "synlotto-website/models" + "synlotto-website/internal/helpers" + "synlotto-website/internal/models" "github.com/gorilla/csrf" ) diff --git a/internal/handlers/lottery/tickets/ticket_matcher.go b/internal/handlers/lottery/tickets/ticket_matcher.go index 8230add..8a55d97 100644 --- a/internal/handlers/lottery/tickets/ticket_matcher.go +++ b/internal/handlers/lottery/tickets/ticket_matcher.go @@ -1,7 +1,7 @@ package handlers import ( - "synlotto-website/models" + "synlotto-website/internal/models" ) func MatchTicketToDraw(ticket models.MatchTicket, draw models.DrawResult, rules []models.PrizeRule) models.MatchResult { diff --git a/internal/handlers/messages.go b/internal/handlers/messages.go index c7bf9dd..0b528ad 100644 --- a/internal/handlers/messages.go +++ b/internal/handlers/messages.go @@ -5,13 +5,13 @@ import ( "log" "net/http" - templateHandlers "synlotto-website/handlers/template" - "synlotto-website/helpers" - httpHelpers "synlotto-website/helpers/http" - securityHelpers "synlotto-website/helpers/security" - templateHelpers "synlotto-website/helpers/template" + templateHandlers "synlotto-website/internal/handlers/template" + "synlotto-website/internal/helpers" + httpHelpers "synlotto-website/internal/helpers/http" + securityHelpers "synlotto-website/internal/helpers/security" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/storage" + "synlotto-website/internal/storage" ) func MessagesInboxHandler(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/notifications.go b/internal/handlers/notifications.go index 008fce0..80369a2 100644 --- a/internal/handlers/notifications.go +++ b/internal/handlers/notifications.go @@ -6,11 +6,11 @@ import ( "net/http" "strconv" - templateHandlers "synlotto-website/handlers/template" - httpHelpers "synlotto-website/helpers/http" - templateHelpers "synlotto-website/helpers/template" + templateHandlers "synlotto-website/internal/handlers/template" + httpHelpers "synlotto-website/internal/helpers/http" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/storage" + "synlotto-website/internal/storage" ) func NotificationsHandler(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/results.go b/internal/handlers/results.go index 1352fe3..1bd6c72 100644 --- a/internal/handlers/results.go +++ b/internal/handlers/results.go @@ -9,11 +9,11 @@ import ( "sort" "strconv" - templateHelpers "synlotto-website/helpers/template" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/helpers" - "synlotto-website/middleware" - "synlotto-website/models" + "synlotto-website/internal/helpers" + "synlotto-website/internal/http/middleware" + "synlotto-website/internal/models" ) func ResultsThunderball(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/statistics/thunderball.go b/internal/handlers/statistics/thunderball.go index daff062..2bd1972 100644 --- a/internal/handlers/statistics/thunderball.go +++ b/internal/handlers/statistics/thunderball.go @@ -6,10 +6,10 @@ import ( "net" "net/http" - templateHandlers "synlotto-website/handlers/template" - templateHelpers "synlotto-website/helpers/template" + templateHandlers "synlotto-website/internal/handlers/template" + templateHelpers "synlotto-website/internal/helpers/template" - "synlotto-website/middleware" + "synlotto-website/internal/http/middleware" ) func StatisticsThunderball(db *sql.DB) http.HandlerFunc { diff --git a/internal/handlers/template/templatedata.go b/internal/handlers/template/templatedata.go index 8875a6a..e504e3d 100644 --- a/internal/handlers/template/templatedata.go +++ b/internal/handlers/template/templatedata.go @@ -5,10 +5,10 @@ import ( "log" "net/http" - httpHelper "synlotto-website/helpers/http" + httpHelper "synlotto-website/internal/helpers/http" - "synlotto-website/models" - "synlotto-website/storage" + "synlotto-website/internal/models" + "synlotto-website/internal/storage" ) func BuildTemplateData(db *sql.DB, w http.ResponseWriter, r *http.Request) models.TemplateData { diff --git a/internal/helpers/ballslice.go b/internal/helpers/ballslice.go index fb5cb33..9615e55 100644 --- a/internal/helpers/ballslice.go +++ b/internal/helpers/ballslice.go @@ -2,7 +2,7 @@ package helpers import ( "database/sql" - "synlotto-website/models" + "synlotto-website/internal/models" ) func BuildBallsSlice(t models.Ticket) []int { diff --git a/internal/helpers/http/session.go b/internal/helpers/http/session.go index c43c07b..8faa9db 100644 --- a/internal/helpers/http/session.go +++ b/internal/helpers/http/session.go @@ -4,9 +4,9 @@ import ( "net/http" "time" - session "synlotto-website/handlers/session" + session "synlotto-website/internal/handlers/session" - "synlotto-website/constants" + "synlotto-website/internal/platform/constants" "github.com/gorilla/sessions" ) diff --git a/internal/helpers/security/users.go b/internal/helpers/security/users.go index f31c428..2df9a20 100644 --- a/internal/helpers/security/users.go +++ b/internal/helpers/security/users.go @@ -3,7 +3,7 @@ package security import ( "net/http" - httpHelpers "synlotto-website/helpers/http" + httpHelpers "synlotto-website/internal/helpers/http" ) func GetCurrentUserID(r *http.Request) (int, bool) { diff --git a/internal/helpers/template/build.go b/internal/helpers/template/build.go index 90070a8..f5216e1 100644 --- a/internal/helpers/template/build.go +++ b/internal/helpers/template/build.go @@ -8,8 +8,8 @@ import ( "time" "synlotto-website/config" - helpers "synlotto-website/helpers/http" - "synlotto-website/models" + helpers "synlotto-website/internal/helpers/http" + "synlotto-website/internal/models" "github.com/gorilla/csrf" ) diff --git a/internal/helpers/template/error.go b/internal/helpers/template/error.go index 7a3b3bf..2e5ee7e 100644 --- a/internal/helpers/template/error.go +++ b/internal/helpers/template/error.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "synlotto-website/models" + "synlotto-website/internal/models" ) func RenderError(w http.ResponseWriter, r *http.Request, statusCode int) { diff --git a/internal/http/middleware/auth.go b/internal/http/middleware/auth.go index dad3314..344b284 100644 --- a/internal/http/middleware/auth.go +++ b/internal/http/middleware/auth.go @@ -4,9 +4,9 @@ import ( "net/http" "time" - httpHelpers "synlotto-website/helpers/http" + httpHelpers "synlotto-website/internal/helpers/http" - "synlotto-website/constants" + "synlotto-website/internal/platform/constants" ) func Auth(required bool) func(http.HandlerFunc) http.HandlerFunc { diff --git a/internal/http/middleware/recover.go b/internal/http/middleware/recover.go index 758d45e..da3d746 100644 --- a/internal/http/middleware/recover.go +++ b/internal/http/middleware/recover.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime/debug" - templateHelpers "synlotto-website/helpers/template" + templateHelpers "synlotto-website/internal/helpers/template" ) func Recover(next http.Handler) http.Handler { diff --git a/internal/http/middleware/sessiontimeout.go b/internal/http/middleware/sessiontimeout.go index a0c5662..0fccdfa 100644 --- a/internal/http/middleware/sessiontimeout.go +++ b/internal/http/middleware/sessiontimeout.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - session "synlotto-website/handlers/session" + session "synlotto-website/internal/handlers/session" - "synlotto-website/constants" + "synlotto-website/internal/platform/constants" ) func SessionTimeout(next http.HandlerFunc) http.HandlerFunc { diff --git a/internal/http/routes/accountroutes.go b/internal/http/routes/accountroutes.go index e302615..27bfc7b 100644 --- a/internal/http/routes/accountroutes.go +++ b/internal/http/routes/accountroutes.go @@ -4,11 +4,11 @@ import ( "database/sql" "net/http" - accountHandlers "synlotto-website/handlers/account" - lotteryDrawHandlers "synlotto-website/handlers/lottery/tickets" + accountHandlers "synlotto-website/internal/handlers/account" + lotteryDrawHandlers "synlotto-website/internal/handlers/lottery/tickets" - "synlotto-website/handlers" - "synlotto-website/middleware" + "synlotto-website/internal/handlers" + "synlotto-website/internal/http/middleware" ) func SetupAccountRoutes(mux *http.ServeMux, db *sql.DB) { diff --git a/internal/http/routes/adminroutes.go b/internal/http/routes/adminroutes.go index ff6b234..07bf87e 100644 --- a/internal/http/routes/adminroutes.go +++ b/internal/http/routes/adminroutes.go @@ -4,8 +4,8 @@ import ( "database/sql" "net/http" - admin "synlotto-website/handlers/admin" - "synlotto-website/middleware" + admin "synlotto-website/internal/handlers/admin" + "synlotto-website/internal/http/middleware" ) func SetupAdminRoutes(mux *http.ServeMux, db *sql.DB) { diff --git a/internal/http/routes/resultroutes.go b/internal/http/routes/resultroutes.go index 8b2c160..1a0972b 100644 --- a/internal/http/routes/resultroutes.go +++ b/internal/http/routes/resultroutes.go @@ -4,7 +4,7 @@ import ( "database/sql" "net/http" - "synlotto-website/handlers" + "synlotto-website/internal/handlers" ) func SetupResultRoutes(mux *http.ServeMux, db *sql.DB) { diff --git a/internal/http/routes/statisticroutes.go b/internal/http/routes/statisticroutes.go index d900fbf..083e3f1 100644 --- a/internal/http/routes/statisticroutes.go +++ b/internal/http/routes/statisticroutes.go @@ -4,8 +4,8 @@ import ( "database/sql" "net/http" - handlers "synlotto-website/handlers/statistics" - "synlotto-website/middleware" + handlers "synlotto-website/internal/handlers/statistics" + "synlotto-website/internal/http/middleware" ) func SetupStatisticsRoutes(mux *http.ServeMux, db *sql.DB) { diff --git a/internal/http/routes/syndicateroutes.go b/internal/http/routes/syndicateroutes.go index 8f1494b..878a4cb 100644 --- a/internal/http/routes/syndicateroutes.go +++ b/internal/http/routes/syndicateroutes.go @@ -4,9 +4,9 @@ import ( "database/sql" "net/http" - lotterySyndicateHandlers "synlotto-website/handlers/lottery/syndicate" + lotterySyndicateHandlers "synlotto-website/internal/handlers/lottery/syndicate" - "synlotto-website/middleware" + "synlotto-website/internal/http/middleware" ) func SetupSyndicateRoutes(mux *http.ServeMux, db *sql.DB) { diff --git a/internal/logging/config.go b/internal/logging/config.go index 58f76a8..5f1471f 100644 --- a/internal/logging/config.go +++ b/internal/logging/config.go @@ -4,7 +4,7 @@ import ( "encoding/json" "log" - "synlotto-website/models" + "synlotto-website/internal/models" ) func LogConfig(config *models.Config) { diff --git a/internal/platform/bootstrap/license.go b/internal/platform/bootstrap/license.go index eb5c355..cd4da4c 100644 --- a/internal/platform/bootstrap/license.go +++ b/internal/platform/bootstrap/license.go @@ -5,7 +5,7 @@ import ( "time" internal "synlotto-website/internal/licensecheck" - "synlotto-website/models" + "synlotto-website/internal/models" ) var globalChecker *internal.LicenseChecker diff --git a/internal/platform/bootstrap/loader.go b/internal/platform/bootstrap/loader.go index 6dcfeec..c410f3d 100644 --- a/internal/platform/bootstrap/loader.go +++ b/internal/platform/bootstrap/loader.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "synlotto-website/models" + "synlotto-website/internal/models" ) type AppState struct { diff --git a/internal/platform/bootstrap/session.go b/internal/platform/bootstrap/session.go index 336faea..9dbc217 100644 --- a/internal/platform/bootstrap/session.go +++ b/internal/platform/bootstrap/session.go @@ -10,11 +10,11 @@ import ( "os" "time" - sessionHandlers "synlotto-website/handlers/session" - sessionHelpers "synlotto-website/helpers/session" + sessionHandlers "synlotto-website/internal/handlers/session" + sessionHelpers "synlotto-website/internal/helpers/session" + "synlotto-website/internal/models" "synlotto-website/logging" - "synlotto-website/models" "github.com/gorilla/sessions" ) diff --git a/internal/platform/config/config.go b/internal/platform/config/config.go index 1b8d5d8..3c10c70 100644 --- a/internal/platform/config/config.go +++ b/internal/platform/config/config.go @@ -3,7 +3,7 @@ package config import ( "sync" - "synlotto-website/models" + "synlotto-website/internal/models" ) var ( diff --git a/internal/services/draws/drawlookup.go b/internal/services/draws/drawlookup.go index a70f8db..f5ce717 100644 --- a/internal/services/draws/drawlookup.go +++ b/internal/services/draws/drawlookup.go @@ -3,7 +3,7 @@ package services import ( "database/sql" "log" - "synlotto-website/models" + "synlotto-website/internal/models" ) func GetDrawResultForTicket(db *sql.DB, game string, drawDate string) models.DrawResult { diff --git a/internal/services/tickets/engine.go b/internal/services/tickets/engine.go index 5fc17e2..49b0313 100644 --- a/internal/services/tickets/engine.go +++ b/internal/services/tickets/engine.go @@ -3,8 +3,8 @@ package matcher import ( "database/sql" "fmt" - "synlotto-website/helpers" - "synlotto-website/models" + "synlotto-website/internal/helpers" + "synlotto-website/internal/models" thunderballRules "synlotto-website/rules" ) diff --git a/internal/services/tickets/ticketmatching.go b/internal/services/tickets/ticketmatching.go index d74616c..ba55e5a 100644 --- a/internal/services/tickets/ticketmatching.go +++ b/internal/services/tickets/ticketmatching.go @@ -5,13 +5,13 @@ import ( "fmt" "log" - lotteryTicketHandlers "synlotto-website/handlers/lottery/tickets" + lotteryTicketHandlers "synlotto-website/internal/handlers/lottery/tickets" thunderballrules "synlotto-website/rules" services "synlotto-website/services/draws" - "synlotto-website/helpers" + "synlotto-website/internal/helpers" + "synlotto-website/internal/models" "synlotto-website/matcher" - "synlotto-website/models" ) func RunTicketMatching(db *sql.DB, triggeredBy string) (models.MatchRunStats, error) { diff --git a/internal/storage/mysql/auditLog/create.go b/internal/storage/mysql/auditLog/create.go index e0bc2f8..c527232 100644 --- a/internal/storage/mysql/auditLog/create.go +++ b/internal/storage/mysql/auditLog/create.go @@ -6,11 +6,11 @@ import ( "net/http" "time" - securityHelpers "synlotto-website/helpers/security" - templateHelpers "synlotto-website/helpers/template" + securityHelpers "synlotto-website/internal/helpers/security" + templateHelpers "synlotto-website/internal/helpers/template" "synlotto-website/internal/logging" - "synlotto-website/middleware" + "synlotto-website/internal/http/middleware" ) func AdminOnly(db *sql.DB, next http.HandlerFunc) http.HandlerFunc { diff --git a/internal/storage/mysql/messages/delete.go b/internal/storage/mysql/messages/delete.go index 2ef79d9..27da811 100644 --- a/internal/storage/mysql/messages/delete.go +++ b/internal/storage/mysql/messages/delete.go @@ -1,2 +1,3 @@ -//Currently no delete functions, only archiving to remove from user view but they can pull them back. Consider a soft delete which hides them from being unarchived for 5 years? -// Then systematically delete after 5 years? or delete sooner but retain backups \ No newline at end of file +// Currently no delete functions, only archiving to remove from user +// view but they can pull them back. Consider a soft delete which hides them from being unarchived for 5 years? +// Then systematically delete after 5 years? or delete sooner but retain backup \ No newline at end of file diff --git a/internal/storage/mysql/users/create.go b/internal/storage/mysql/users/create.go index ea620f4..a35c878 100644 --- a/internal/storage/mysql/users/create.go +++ b/internal/storage/mysql/users/create.go @@ -6,7 +6,7 @@ import ( "database/sql" "errors" - "synlotto-website/models" + "synlotto-website/internal/models" ) type UsersRepo struct{ db *sql.DB} diff --git a/internal/storage/sqlite/db.go b/internal/storage/sqlite/db.go index c05be75..d7bfd33 100644 --- a/internal/storage/sqlite/db.go +++ b/internal/storage/sqlite/db.go @@ -4,9 +4,10 @@ import ( "database/sql" "log" - "synlotto-website/config" - "synlotto-website/logging" + "synlotto-website/internal/logging" + "synlotto-website/internal/platform/config" + // ToDo: remove sqlite _ "modernc.org/sqlite" ) diff --git a/internal/storage/sqlite/syndicate.go b/internal/storage/sqlite/syndicate.go index 685f33e..3e5b160 100644 --- a/internal/storage/sqlite/syndicate.go +++ b/internal/storage/sqlite/syndicate.go @@ -3,7 +3,7 @@ package storage import ( "database/sql" "fmt" - "synlotto-website/models" + "synlotto-website/internal/models" "time" )