From a93dcaedb77e0411d2e0b90a3abc2722dba310e9 Mon Sep 17 00:00:00 2001 From: Semyon Krestyaninov <krestyaninov@perx.ru> Date: Thu, 17 Oct 2024 08:57:44 +0300 Subject: [PATCH] pkg invitations moved from pkg --- {pkg/invitations => invitations}/events.go | 0 {pkg/invitations => invitations}/invitation.go | 0 .../middleware/access_logging_middleware.go | 4 ++-- .../middleware/caching_middleware.go | 2 +- .../middleware/caching_middleware_test.go | 4 ++-- .../middleware/error_logging_middleware.go | 4 ++-- .../middleware/logging_middleware.go | 2 +- {pkg/invitations => invitations}/middleware/middleware.go | 4 ++-- .../middleware/recovering_middleware.go | 4 ++-- .../middleware/telemetry_middleware.go | 4 ++-- {pkg/invitations => invitations}/mocks/Invitations.go | 2 +- {pkg/invitations => invitations}/mocks/Middleware.go | 2 +- {pkg/invitations => invitations}/mocks/Storage.go | 2 +- {pkg/invitations => invitations}/service.go | 0 {pkg/invitations => invitations}/storage.go | 0 {pkg/invitations => invitations}/transport/client.go | 2 +- .../transport/endpoints.microgen.go | 0 .../transport/exchanges.microgen.go | 2 +- {pkg/invitations => invitations}/transport/grpc/client.go | 2 +- .../transport/grpc/client.microgen.go | 2 +- .../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +- .../transport/grpc/protobuf_type_converters.microgen.go | 4 ++-- {pkg/invitations => invitations}/transport/grpc/server.go | 4 ++-- .../transport/grpc/server.microgen.go | 2 +- {pkg/invitations => invitations}/transport/server.microgen.go | 2 +- pkg/content/client.go | 4 ++-- pkg/content/content.go | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) rename {pkg/invitations => invitations}/events.go (100%) rename {pkg/invitations => invitations}/invitation.go (100%) rename {pkg/invitations => invitations}/middleware/access_logging_middleware.go (93%) rename {pkg/invitations => invitations}/middleware/caching_middleware.go (96%) rename {pkg/invitations => invitations}/middleware/caching_middleware_test.go (97%) rename {pkg/invitations => invitations}/middleware/error_logging_middleware.go (90%) rename {pkg/invitations => invitations}/middleware/logging_middleware.go (98%) rename {pkg/invitations => invitations}/middleware/middleware.go (73%) rename {pkg/invitations => invitations}/middleware/recovering_middleware.go (91%) rename {pkg/invitations => invitations}/middleware/telemetry_middleware.go (97%) rename {pkg/invitations => invitations}/mocks/Invitations.go (98%) rename {pkg/invitations => invitations}/mocks/Middleware.go (94%) rename {pkg/invitations => invitations}/mocks/Storage.go (98%) rename {pkg/invitations => invitations}/service.go (100%) rename {pkg/invitations => invitations}/storage.go (100%) rename {pkg/invitations => invitations}/transport/client.go (96%) rename {pkg/invitations => invitations}/transport/endpoints.microgen.go (100%) rename {pkg/invitations => invitations}/transport/exchanges.microgen.go (95%) rename {pkg/invitations => invitations}/transport/grpc/client.go (91%) rename {pkg/invitations => invitations}/transport/grpc/client.microgen.go (95%) rename {pkg/invitations => invitations}/transport/grpc/protobuf_endpoint_converters.microgen.go (98%) rename {pkg/invitations => invitations}/transport/grpc/protobuf_type_converters.microgen.go (97%) rename {pkg/invitations => invitations}/transport/grpc/server.go (87%) rename {pkg/invitations => invitations}/transport/grpc/server.microgen.go (97%) rename {pkg/invitations => invitations}/transport/server.microgen.go (96%) diff --git a/pkg/invitations/events.go b/invitations/events.go similarity index 100% rename from pkg/invitations/events.go rename to invitations/events.go diff --git a/pkg/invitations/invitation.go b/invitations/invitation.go similarity index 100% rename from pkg/invitations/invitation.go rename to invitations/invitation.go diff --git a/pkg/invitations/middleware/access_logging_middleware.go b/invitations/middleware/access_logging_middleware.go similarity index 93% rename from pkg/invitations/middleware/access_logging_middleware.go rename to invitations/middleware/access_logging_middleware.go index 24a85499..8ede4e43 100644 --- a/pkg/invitations/middleware/access_logging_middleware.go +++ b/invitations/middleware/access_logging_middleware.go @@ -4,14 +4,14 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/invitations -i Invitations -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/invitations -i Invitations -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l "" import ( "context" "time" + "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/invitations" "git.perx.ru/perxis/perxis-go/pkg/options" "go.uber.org/zap" ) diff --git a/pkg/invitations/middleware/caching_middleware.go b/invitations/middleware/caching_middleware.go similarity index 96% rename from pkg/invitations/middleware/caching_middleware.go rename to invitations/middleware/caching_middleware.go index b14a155d..cca78514 100644 --- a/pkg/invitations/middleware/caching_middleware.go +++ b/invitations/middleware/caching_middleware.go @@ -3,8 +3,8 @@ package middleware import ( "context" + service "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/cache" - service "git.perx.ru/perxis/perxis-go/pkg/invitations" services "git.perx.ru/perxis/perxis-go/pkg/options" ) diff --git a/pkg/invitations/middleware/caching_middleware_test.go b/invitations/middleware/caching_middleware_test.go similarity index 97% rename from pkg/invitations/middleware/caching_middleware_test.go rename to invitations/middleware/caching_middleware_test.go index 46d0a443..a8b70800 100644 --- a/pkg/invitations/middleware/caching_middleware_test.go +++ b/invitations/middleware/caching_middleware_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" + "git.perx.ru/perxis/perxis-go/invitations" + invmocks "git.perx.ru/perxis/perxis-go/invitations/mocks" "git.perx.ru/perxis/perxis-go/pkg/cache" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/invitations" - invmocks "git.perx.ru/perxis/perxis-go/pkg/invitations/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/pkg/invitations/middleware/error_logging_middleware.go b/invitations/middleware/error_logging_middleware.go similarity index 90% rename from pkg/invitations/middleware/error_logging_middleware.go rename to invitations/middleware/error_logging_middleware.go index da6603ac..a9df75f5 100644 --- a/pkg/invitations/middleware/error_logging_middleware.go +++ b/invitations/middleware/error_logging_middleware.go @@ -4,12 +4,12 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/invitations -i Invitations -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/invitations -i Invitations -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l "" import ( "context" - "git.perx.ru/perxis/perxis-go/pkg/invitations" + "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/options" "go.uber.org/zap" ) diff --git a/pkg/invitations/middleware/logging_middleware.go b/invitations/middleware/logging_middleware.go similarity index 98% rename from pkg/invitations/middleware/logging_middleware.go rename to invitations/middleware/logging_middleware.go index f32fa01b..8864835c 100644 --- a/pkg/invitations/middleware/logging_middleware.go +++ b/invitations/middleware/logging_middleware.go @@ -5,8 +5,8 @@ import ( "fmt" "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/invitations" "git.perx.ru/perxis/perxis-go/pkg/options" logzap "git.perx.ru/perxis/perxis-go/zap" "go.uber.org/zap" diff --git a/pkg/invitations/middleware/middleware.go b/invitations/middleware/middleware.go similarity index 73% rename from pkg/invitations/middleware/middleware.go rename to invitations/middleware/middleware.go index 47a2d84b..ce1f1786 100644 --- a/pkg/invitations/middleware/middleware.go +++ b/invitations/middleware/middleware.go @@ -4,10 +4,10 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/invitations -i Invitations -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/invitations -i Invitations -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l "" import ( - "git.perx.ru/perxis/perxis-go/pkg/invitations" + "git.perx.ru/perxis/perxis-go/invitations" "go.uber.org/zap" ) diff --git a/pkg/invitations/middleware/recovering_middleware.go b/invitations/middleware/recovering_middleware.go similarity index 91% rename from pkg/invitations/middleware/recovering_middleware.go rename to invitations/middleware/recovering_middleware.go index 512daa46..a293c063 100644 --- a/pkg/invitations/middleware/recovering_middleware.go +++ b/invitations/middleware/recovering_middleware.go @@ -4,13 +4,13 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/invitations -i Invitations -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/invitations -i Invitations -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l "" import ( "context" "fmt" - "git.perx.ru/perxis/perxis-go/pkg/invitations" + "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/options" "go.uber.org/zap" ) diff --git a/pkg/invitations/middleware/telemetry_middleware.go b/invitations/middleware/telemetry_middleware.go similarity index 97% rename from pkg/invitations/middleware/telemetry_middleware.go rename to invitations/middleware/telemetry_middleware.go index 1696f81a..959c6a33 100644 --- a/pkg/invitations/middleware/telemetry_middleware.go +++ b/invitations/middleware/telemetry_middleware.go @@ -4,15 +4,15 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/invitations -i Invitations -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/invitations -i Invitations -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l "" import ( "context" "time" oid "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/invitations" "git.perx.ru/perxis/perxis-go/pkg/options" "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" diff --git a/pkg/invitations/mocks/Invitations.go b/invitations/mocks/Invitations.go similarity index 98% rename from pkg/invitations/mocks/Invitations.go rename to invitations/mocks/Invitations.go index 9484c62f..cf5b80c0 100644 --- a/pkg/invitations/mocks/Invitations.go +++ b/invitations/mocks/Invitations.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - invitations "git.perx.ru/perxis/perxis-go/pkg/invitations" + invitations "git.perx.ru/perxis/perxis-go/invitations" mock "github.com/stretchr/testify/mock" options "git.perx.ru/perxis/perxis-go/pkg/options" diff --git a/pkg/invitations/mocks/Middleware.go b/invitations/mocks/Middleware.go similarity index 94% rename from pkg/invitations/mocks/Middleware.go rename to invitations/mocks/Middleware.go index 608fa496..e0bb1f38 100644 --- a/pkg/invitations/mocks/Middleware.go +++ b/invitations/mocks/Middleware.go @@ -3,7 +3,7 @@ package mocks import ( - invitations "git.perx.ru/perxis/perxis-go/pkg/invitations" + invitations "git.perx.ru/perxis/perxis-go/invitations" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/invitations/mocks/Storage.go b/invitations/mocks/Storage.go similarity index 98% rename from pkg/invitations/mocks/Storage.go rename to invitations/mocks/Storage.go index 8739d1e1..971b680d 100644 --- a/pkg/invitations/mocks/Storage.go +++ b/invitations/mocks/Storage.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - invitations "git.perx.ru/perxis/perxis-go/pkg/invitations" + invitations "git.perx.ru/perxis/perxis-go/invitations" mock "github.com/stretchr/testify/mock" options "git.perx.ru/perxis/perxis-go/pkg/options" diff --git a/pkg/invitations/service.go b/invitations/service.go similarity index 100% rename from pkg/invitations/service.go rename to invitations/service.go diff --git a/pkg/invitations/storage.go b/invitations/storage.go similarity index 100% rename from pkg/invitations/storage.go rename to invitations/storage.go diff --git a/pkg/invitations/transport/client.go b/invitations/transport/client.go similarity index 96% rename from pkg/invitations/transport/client.go rename to invitations/transport/client.go index 04ad5567..bbe0befd 100644 --- a/pkg/invitations/transport/client.go +++ b/invitations/transport/client.go @@ -5,7 +5,7 @@ package transport import ( "context" - invitations "git.perx.ru/perxis/perxis-go/pkg/invitations" + invitations "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/options" ) diff --git a/pkg/invitations/transport/endpoints.microgen.go b/invitations/transport/endpoints.microgen.go similarity index 100% rename from pkg/invitations/transport/endpoints.microgen.go rename to invitations/transport/endpoints.microgen.go diff --git a/pkg/invitations/transport/exchanges.microgen.go b/invitations/transport/exchanges.microgen.go similarity index 95% rename from pkg/invitations/transport/exchanges.microgen.go rename to invitations/transport/exchanges.microgen.go index bb36e466..49251c43 100644 --- a/pkg/invitations/transport/exchanges.microgen.go +++ b/invitations/transport/exchanges.microgen.go @@ -3,7 +3,7 @@ package transport import ( - "git.perx.ru/perxis/perxis-go/pkg/invitations" + "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/options" ) diff --git a/pkg/invitations/transport/grpc/client.go b/invitations/transport/grpc/client.go similarity index 91% rename from pkg/invitations/transport/grpc/client.go rename to invitations/transport/grpc/client.go index 995dc563..e85b2fb3 100644 --- a/pkg/invitations/transport/grpc/client.go +++ b/invitations/transport/grpc/client.go @@ -3,8 +3,8 @@ package transportgrpc import ( + transport "git.perx.ru/perxis/perxis-go/invitations/transport" grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" - transport "git.perx.ru/perxis/perxis-go/pkg/invitations/transport" grpckit "github.com/go-kit/kit/transport/grpc" grpc "google.golang.org/grpc" ) diff --git a/pkg/invitations/transport/grpc/client.microgen.go b/invitations/transport/grpc/client.microgen.go similarity index 95% rename from pkg/invitations/transport/grpc/client.microgen.go rename to invitations/transport/grpc/client.microgen.go index a27396b6..e2ec4544 100644 --- a/pkg/invitations/transport/grpc/client.microgen.go +++ b/invitations/transport/grpc/client.microgen.go @@ -3,7 +3,7 @@ package transportgrpc import ( - transport "git.perx.ru/perxis/perxis-go/pkg/invitations/transport" + transport "git.perx.ru/perxis/perxis-go/invitations/transport" pb "git.perx.ru/perxis/perxis-go/proto/invitations" grpckit "github.com/go-kit/kit/transport/grpc" grpc "google.golang.org/grpc" diff --git a/pkg/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go b/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go similarity index 98% rename from pkg/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go rename to invitations/transport/grpc/protobuf_endpoint_converters.microgen.go index 99e87f53..c908fb34 100644 --- a/pkg/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go +++ b/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go @@ -7,7 +7,7 @@ import ( "context" "errors" - transport "git.perx.ru/perxis/perxis-go/pkg/invitations/transport" + transport "git.perx.ru/perxis/perxis-go/invitations/transport" pb "git.perx.ru/perxis/perxis-go/proto/invitations" empty "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go b/invitations/transport/grpc/protobuf_type_converters.microgen.go similarity index 97% rename from pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go rename to invitations/transport/grpc/protobuf_type_converters.microgen.go index 1b222519..d5ce77aa 100644 --- a/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go +++ b/invitations/transport/grpc/protobuf_type_converters.microgen.go @@ -7,7 +7,7 @@ package transportgrpc import ( "time" - service "git.perx.ru/perxis/perxis-go/pkg/invitations" + service "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/options" pb "git.perx.ru/perxis/perxis-go/proto/invitations" timestamp "google.golang.org/protobuf/types/known/timestamppb" @@ -127,7 +127,7 @@ func ProtoToPtrServicesFindOptions(protoOpts *pb.FindOptions) (*options.FindOpti Sort: protoOpts.Sort, }, PaginationOptions: options.PaginationOptions{ - Limit: int(protoOpts.PageSize), + Limit: int(protoOpts.PageSize), Offset: int(protoOpts.PageNum * protoOpts.PageSize), }, }, nil diff --git a/pkg/invitations/transport/grpc/server.go b/invitations/transport/grpc/server.go similarity index 87% rename from pkg/invitations/transport/grpc/server.go rename to invitations/transport/grpc/server.go index f0a23fcd..fbca6243 100644 --- a/pkg/invitations/transport/grpc/server.go +++ b/invitations/transport/grpc/server.go @@ -1,9 +1,9 @@ package transportgrpc import ( + "git.perx.ru/perxis/perxis-go/invitations" + "git.perx.ru/perxis/perxis-go/invitations/transport" grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" - "git.perx.ru/perxis/perxis-go/pkg/invitations" - "git.perx.ru/perxis/perxis-go/pkg/invitations/transport" pb "git.perx.ru/perxis/perxis-go/proto/invitations" grpckit "github.com/go-kit/kit/transport/grpc" ) diff --git a/pkg/invitations/transport/grpc/server.microgen.go b/invitations/transport/grpc/server.microgen.go similarity index 97% rename from pkg/invitations/transport/grpc/server.microgen.go rename to invitations/transport/grpc/server.microgen.go index 3a5ae2da..a3239550 100644 --- a/pkg/invitations/transport/grpc/server.microgen.go +++ b/invitations/transport/grpc/server.microgen.go @@ -4,7 +4,7 @@ package transportgrpc import ( - transport "git.perx.ru/perxis/perxis-go/pkg/invitations/transport" + transport "git.perx.ru/perxis/perxis-go/invitations/transport" pb "git.perx.ru/perxis/perxis-go/proto/invitations" grpc "github.com/go-kit/kit/transport/grpc" context "golang.org/x/net/context" diff --git a/pkg/invitations/transport/server.microgen.go b/invitations/transport/server.microgen.go similarity index 96% rename from pkg/invitations/transport/server.microgen.go rename to invitations/transport/server.microgen.go index 326659f2..f4fcc33a 100644 --- a/pkg/invitations/transport/server.microgen.go +++ b/invitations/transport/server.microgen.go @@ -5,7 +5,7 @@ package transport import ( "context" - invitations "git.perx.ru/perxis/perxis-go/pkg/invitations" + invitations "git.perx.ru/perxis/perxis-go/invitations" endpoint "github.com/go-kit/kit/endpoint" ) diff --git a/pkg/content/client.go b/pkg/content/client.go index adc5f784..1caac18a 100644 --- a/pkg/content/client.go +++ b/pkg/content/client.go @@ -3,6 +3,8 @@ package content import ( "time" + invitationsSvc "git.perx.ru/perxis/perxis-go/invitations/middleware" + invitationsTransportGrpc "git.perx.ru/perxis/perxis-go/invitations/transport/grpc" "git.perx.ru/perxis/perxis-go/pkg/cache" clientsSvc "git.perx.ru/perxis/perxis-go/pkg/clients/middleware" clientsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/clients/transport/grpc" @@ -12,8 +14,6 @@ import ( collectionsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collections/transport/grpc" environmentsSvc "git.perx.ru/perxis/perxis-go/pkg/environments/middleware" environmentsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/environments/transport/grpc" - invitationsSvc "git.perx.ru/perxis/perxis-go/pkg/invitations/middleware" - invitationsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/invitations/transport/grpc" itemsSvc "git.perx.ru/perxis/perxis-go/pkg/items/middleware" itemsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc" localesSvc "git.perx.ru/perxis/perxis-go/pkg/locales/middleware" diff --git a/pkg/content/content.go b/pkg/content/content.go index 1d351e93..840b3e71 100644 --- a/pkg/content/content.go +++ b/pkg/content/content.go @@ -1,12 +1,12 @@ package content import ( + "git.perx.ru/perxis/perxis-go/invitations" "git.perx.ru/perxis/perxis-go/pkg/auth" "git.perx.ru/perxis/perxis-go/pkg/clients" "git.perx.ru/perxis/perxis-go/pkg/collaborators" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/environments" - "git.perx.ru/perxis/perxis-go/pkg/invitations" "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" "git.perx.ru/perxis/perxis-go/pkg/references" -- GitLab