From 079135747af3890971923341e472d5b8aeef79c9 Mon Sep 17 00:00:00 2001 From: dragonmuffin Date: Sun, 25 Aug 2024 21:52:00 +0500 Subject: [PATCH] move models to pkg --- internal/services/contest.go | 2 +- internal/services/language.go | 2 +- internal/services/participants.go | 2 +- internal/services/permission.go | 2 +- internal/services/problem.go | 2 +- internal/services/solution.go | 2 +- internal/services/task.go | 2 +- internal/services/user.go | 2 +- internal/storage/contests.go | 2 +- internal/storage/language.go | 2 +- internal/storage/participants.go | 2 +- internal/storage/problem.go | 2 +- internal/storage/solution.go | 2 +- internal/storage/task.go | 2 +- internal/storage/user.go | 2 +- internal/transport/interceptors.go | 2 +- internal/transport/problem.go | 2 +- internal/transport/server.go | 2 +- {internal => pkg}/models/contest.go | 0 {internal => pkg}/models/language.go | 0 {internal => pkg}/models/participant.go | 0 {internal => pkg}/models/problem.go | 0 {internal => pkg}/models/result.go | 0 {internal => pkg}/models/role.go | 0 {internal => pkg}/models/solution.go | 0 {internal => pkg}/models/subtask.go | 0 {internal => pkg}/models/task.go | 0 {internal => pkg}/models/testgroup.go | 0 {internal => pkg}/models/user.go | 0 29 files changed, 18 insertions(+), 18 deletions(-) rename {internal => pkg}/models/contest.go (100%) rename {internal => pkg}/models/language.go (100%) rename {internal => pkg}/models/participant.go (100%) rename {internal => pkg}/models/problem.go (100%) rename {internal => pkg}/models/result.go (100%) rename {internal => pkg}/models/role.go (100%) rename {internal => pkg}/models/solution.go (100%) rename {internal => pkg}/models/subtask.go (100%) rename {internal => pkg}/models/task.go (100%) rename {internal => pkg}/models/testgroup.go (100%) rename {internal => pkg}/models/user.go (100%) diff --git a/internal/services/contest.go b/internal/services/contest.go index 5feaa78..194f300 100644 --- a/internal/services/contest.go +++ b/internal/services/contest.go @@ -3,7 +3,7 @@ package services import ( "context" "git.sch9.ru/new_gate/ms-tester/internal/lib" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" ) type ContestStorage interface { diff --git a/internal/services/language.go b/internal/services/language.go index dd83807..6cd46bd 100644 --- a/internal/services/language.go +++ b/internal/services/language.go @@ -2,7 +2,7 @@ package services import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" ) type LanguageStorage interface { diff --git a/internal/services/participants.go b/internal/services/participants.go index 1f2daa3..bfdf174 100644 --- a/internal/services/participants.go +++ b/internal/services/participants.go @@ -3,7 +3,7 @@ package services import ( "context" "git.sch9.ru/new_gate/ms-tester/internal/lib" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" ) type ParticipantStorage interface { diff --git a/internal/services/permission.go b/internal/services/permission.go index 2bea2d1..6d22dbe 100644 --- a/internal/services/permission.go +++ b/internal/services/permission.go @@ -2,7 +2,7 @@ package services import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" "github.com/open-policy-agent/opa/rego" ) diff --git a/internal/services/problem.go b/internal/services/problem.go index 86b3e45..140bf68 100644 --- a/internal/services/problem.go +++ b/internal/services/problem.go @@ -3,7 +3,7 @@ package services import ( "context" "git.sch9.ru/new_gate/ms-tester/internal/lib" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" ) type ProblemStorage interface { diff --git a/internal/services/solution.go b/internal/services/solution.go index d1e8c99..3089f0e 100644 --- a/internal/services/solution.go +++ b/internal/services/solution.go @@ -3,7 +3,7 @@ package services import ( "context" "git.sch9.ru/new_gate/ms-tester/internal/lib" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" ) type SolutionStorage interface { diff --git a/internal/services/task.go b/internal/services/task.go index 68901cc..94465e4 100644 --- a/internal/services/task.go +++ b/internal/services/task.go @@ -3,7 +3,7 @@ package services import ( "context" "git.sch9.ru/new_gate/ms-tester/internal/lib" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" ) type TaskStorage interface { diff --git a/internal/services/user.go b/internal/services/user.go index 40f1179..cf80595 100644 --- a/internal/services/user.go +++ b/internal/services/user.go @@ -2,7 +2,7 @@ package services import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" ) type UserStorage interface { diff --git a/internal/storage/contests.go b/internal/storage/contests.go index 324b094..2ed0528 100644 --- a/internal/storage/contests.go +++ b/internal/storage/contests.go @@ -2,7 +2,7 @@ package storage import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" "github.com/jmoiron/sqlx" "go.uber.org/zap" ) diff --git a/internal/storage/language.go b/internal/storage/language.go index 0e5bf04..1903c1c 100644 --- a/internal/storage/language.go +++ b/internal/storage/language.go @@ -2,7 +2,7 @@ package storage import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" "git.sch9.ru/new_gate/ms-tester/internal/lib" "github.com/jmoiron/sqlx" "go.uber.org/zap" diff --git a/internal/storage/participants.go b/internal/storage/participants.go index cc58cc3..664f23a 100644 --- a/internal/storage/participants.go +++ b/internal/storage/participants.go @@ -2,7 +2,7 @@ package storage import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" "github.com/jmoiron/sqlx" "go.uber.org/zap" ) diff --git a/internal/storage/problem.go b/internal/storage/problem.go index 10bf2c8..6765964 100644 --- a/internal/storage/problem.go +++ b/internal/storage/problem.go @@ -3,7 +3,7 @@ package storage import ( "context" "errors" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" "github.com/jmoiron/sqlx" "go.uber.org/zap" ) diff --git a/internal/storage/solution.go b/internal/storage/solution.go index 4b7eae5..c50648c 100644 --- a/internal/storage/solution.go +++ b/internal/storage/solution.go @@ -2,7 +2,7 @@ package storage import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" "github.com/jmoiron/sqlx" "go.uber.org/zap" ) diff --git a/internal/storage/task.go b/internal/storage/task.go index 242bfdb..091d484 100644 --- a/internal/storage/task.go +++ b/internal/storage/task.go @@ -2,7 +2,7 @@ package storage import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" "github.com/jmoiron/sqlx" "go.uber.org/zap" ) diff --git a/internal/storage/user.go b/internal/storage/user.go index 21957fb..69ea160 100644 --- a/internal/storage/user.go +++ b/internal/storage/user.go @@ -2,7 +2,7 @@ package storage import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" "github.com/jmoiron/sqlx" ) diff --git a/internal/transport/interceptors.go b/internal/transport/interceptors.go index 882d3ef..7c36b96 100644 --- a/internal/transport/interceptors.go +++ b/internal/transport/interceptors.go @@ -4,7 +4,7 @@ import ( "context" "errors" "git.sch9.ru/new_gate/ms-tester/internal/lib" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/session/v1" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/transport/problem.go b/internal/transport/problem.go index 7f12a5c..ea3c396 100644 --- a/internal/transport/problem.go +++ b/internal/transport/problem.go @@ -3,7 +3,7 @@ package transport import ( "context" "git.sch9.ru/new_gate/ms-tester/internal/lib" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" problemv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/problem/v1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/transport/server.go b/internal/transport/server.go index a82d0f5..347eec8 100644 --- a/internal/transport/server.go +++ b/internal/transport/server.go @@ -2,7 +2,7 @@ package transport import ( "context" - "git.sch9.ru/new_gate/ms-tester/internal/models" + "git.sch9.ru/new_gate/ms-tester/pkg/models" problemv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/problem/v1" sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/session/v1" "go.uber.org/zap" diff --git a/internal/models/contest.go b/pkg/models/contest.go similarity index 100% rename from internal/models/contest.go rename to pkg/models/contest.go diff --git a/internal/models/language.go b/pkg/models/language.go similarity index 100% rename from internal/models/language.go rename to pkg/models/language.go diff --git a/internal/models/participant.go b/pkg/models/participant.go similarity index 100% rename from internal/models/participant.go rename to pkg/models/participant.go diff --git a/internal/models/problem.go b/pkg/models/problem.go similarity index 100% rename from internal/models/problem.go rename to pkg/models/problem.go diff --git a/internal/models/result.go b/pkg/models/result.go similarity index 100% rename from internal/models/result.go rename to pkg/models/result.go diff --git a/internal/models/role.go b/pkg/models/role.go similarity index 100% rename from internal/models/role.go rename to pkg/models/role.go diff --git a/internal/models/solution.go b/pkg/models/solution.go similarity index 100% rename from internal/models/solution.go rename to pkg/models/solution.go diff --git a/internal/models/subtask.go b/pkg/models/subtask.go similarity index 100% rename from internal/models/subtask.go rename to pkg/models/subtask.go diff --git a/internal/models/task.go b/pkg/models/task.go similarity index 100% rename from internal/models/task.go rename to pkg/models/task.go diff --git a/internal/models/testgroup.go b/pkg/models/testgroup.go similarity index 100% rename from internal/models/testgroup.go rename to pkg/models/testgroup.go diff --git a/internal/models/user.go b/pkg/models/user.go similarity index 100% rename from internal/models/user.go rename to pkg/models/user.go