diff --git a/internal/app/game_mapper.go b/internal/app/game_mapper.go index a232072..ae8157d 100644 --- a/internal/app/game_mapper.go +++ b/internal/app/game_mapper.go @@ -1,7 +1,7 @@ package app import ( - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "evening_detective_server/proto" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/app/results_mapper_test.go b/internal/app/results_mapper_test.go index e3b9ee2..a7a0a34 100644 --- a/internal/app/results_mapper_test.go +++ b/internal/app/results_mapper_test.go @@ -1,7 +1,7 @@ package app import ( - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "testing" "evening_detective_server/internal/services/answer_service" diff --git a/internal/app/team_mapper.go b/internal/app/team_mapper.go index 566a29a..c4a77cd 100644 --- a/internal/app/team_mapper.go +++ b/internal/app/team_mapper.go @@ -1,7 +1,7 @@ package app import ( - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "evening_detective_server/proto" ) diff --git a/internal/app/team_registration_test.go b/internal/app/team_registration_test.go index f591625..8b683cc 100644 --- a/internal/app/team_registration_test.go +++ b/internal/app/team_registration_test.go @@ -3,7 +3,7 @@ package app import ( "context" "errors" - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "evening_detective_server/internal/services/team_service" "net/http" "net/http/httptest" diff --git a/internal/services/answer_service/answer.go b/internal/services/answer_service/answer.go index bbf47f6..d349bda 100644 --- a/internal/services/answer_service/answer.go +++ b/internal/services/answer_service/answer.go @@ -1,8 +1,8 @@ package answer_service import ( - "evening_detective_server/internal/modules/game_model" "evening_detective_server/internal/modules/storytelling" + "evening_detective_server/internal/services/game_model" ) // Answer — ответ команды на вопрос дела (для публичного API команды). diff --git a/internal/services/answer_service/results.go b/internal/services/answer_service/results.go index a37bcac..0a774ee 100644 --- a/internal/services/answer_service/results.go +++ b/internal/services/answer_service/results.go @@ -1,7 +1,7 @@ package answer_service import ( - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "sort" "evening_detective_server/internal/modules/storytelling" diff --git a/internal/services/answer_service/results_test.go b/internal/services/answer_service/results_test.go index ffed0fd..0788f4a 100644 --- a/internal/services/answer_service/results_test.go +++ b/internal/services/answer_service/results_test.go @@ -1,7 +1,7 @@ package answer_service import ( - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "testing" "evening_detective_server/internal/modules/storytelling" diff --git a/internal/services/answer_service/service.go b/internal/services/answer_service/service.go index f0952f4..5c95abf 100644 --- a/internal/services/answer_service/service.go +++ b/internal/services/answer_service/service.go @@ -3,13 +3,13 @@ package answer_service import ( "context" "errors" - "evening_detective_server/internal/modules/game_model" "evening_detective_server/internal/modules/storytelling" "evening_detective_server/internal/repos" "evening_detective_server/internal/repos/actions_repo" "evening_detective_server/internal/repos/games_repo" "evening_detective_server/internal/repos/team_answers_repo" "evening_detective_server/internal/repos/teams_repo" + "evening_detective_server/internal/services/game_model" "evening_detective_server/internal/services/scenarios_service" ) diff --git a/internal/modules/game_model/game.go b/internal/services/game_model/game.go similarity index 100% rename from internal/modules/game_model/game.go rename to internal/services/game_model/game.go diff --git a/internal/modules/game_model/game_mapper.go b/internal/services/game_model/game_mapper.go similarity index 100% rename from internal/modules/game_model/game_mapper.go rename to internal/services/game_model/game_mapper.go diff --git a/internal/modules/game_model/team.go b/internal/services/game_model/team.go similarity index 100% rename from internal/modules/game_model/team.go rename to internal/services/game_model/team.go diff --git a/internal/modules/game_model/team_mapper.go b/internal/services/game_model/team_mapper.go similarity index 100% rename from internal/modules/game_model/team_mapper.go rename to internal/services/game_model/team_mapper.go diff --git a/internal/services/game_service/service.go b/internal/services/game_service/service.go index 196cb00..bd20791 100644 --- a/internal/services/game_service/service.go +++ b/internal/services/game_service/service.go @@ -3,12 +3,12 @@ package game_service import ( "context" "errors" - "evening_detective_server/internal/modules/game_model" "evening_detective_server/internal/repos/actions_repo" "evening_detective_server/internal/repos/applications_repo" "evening_detective_server/internal/repos/games_repo" "evening_detective_server/internal/repos/scenarios_repo" "evening_detective_server/internal/repos/teams_repo" + "evening_detective_server/internal/services/game_model" "evening_detective_server/internal/services/scenarios_service" "time" ) diff --git a/internal/services/gameplay_service/service.go b/internal/services/gameplay_service/service.go index 0187648..c777103 100644 --- a/internal/services/gameplay_service/service.go +++ b/internal/services/gameplay_service/service.go @@ -3,12 +3,12 @@ package gameplay_service import ( "context" "evening_detective_server/internal/modules/cleaner" - "evening_detective_server/internal/modules/game_model" "evening_detective_server/internal/modules/storytelling" "evening_detective_server/internal/repos/actions_repo" "evening_detective_server/internal/repos/applications_repo" "evening_detective_server/internal/repos/games_repo" "evening_detective_server/internal/repos/teams_repo" + "evening_detective_server/internal/services/game_model" "evening_detective_server/internal/services/scenarios_service" ) diff --git a/internal/services/mcp_service/http_test.go b/internal/services/mcp_service/http_test.go index 2003c4c..953bb5a 100644 --- a/internal/services/mcp_service/http_test.go +++ b/internal/services/mcp_service/http_test.go @@ -2,7 +2,7 @@ package mcp_service import ( "context" - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "net/http/httptest" "strings" "testing" diff --git a/internal/services/mcp_service/service.go b/internal/services/mcp_service/service.go index 736c525..9e822d0 100644 --- a/internal/services/mcp_service/service.go +++ b/internal/services/mcp_service/service.go @@ -8,7 +8,7 @@ package mcp_service import ( "context" "encoding/json" - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "fmt" "net/url" "strconv" diff --git a/internal/services/mcp_service/service_test.go b/internal/services/mcp_service/service_test.go index 352331f..505f395 100644 --- a/internal/services/mcp_service/service_test.go +++ b/internal/services/mcp_service/service_test.go @@ -3,7 +3,7 @@ package mcp_service import ( "context" "errors" - "evening_detective_server/internal/modules/game_model" + "evening_detective_server/internal/services/game_model" "strings" "testing" "time" diff --git a/internal/services/team_service/service.go b/internal/services/team_service/service.go index 9cfd09e..f3e6575 100644 --- a/internal/services/team_service/service.go +++ b/internal/services/team_service/service.go @@ -9,12 +9,12 @@ import ( "time" "evening_detective_server/internal/modules/email_sender" - "evening_detective_server/internal/modules/game_model" "evening_detective_server/internal/modules/password_generator" "evening_detective_server/internal/modules/team_qr_pdf" "evening_detective_server/internal/repos" "evening_detective_server/internal/repos/games_repo" "evening_detective_server/internal/repos/teams_repo" + "evening_detective_server/internal/services/game_model" ) type TeamService struct {