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 24a854995bed29e849ccf873f41ccd1af073cb69..8ede4e4369168bd1387928edaedd6c0e6257f690 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 b14a155dc04022baed930f4252ec63caf47dab3b..cca785148535f597a32a18bdb766b0324959b84e 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 46d0a44342822a877be1feffbc396e37606e8157..a8b7080020e6c079cbc41ccd1839fa869d0ef77e 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 da6603acdda802808abac634896ceb7d3b92cd1b..a9df75f5cbe16eac5f819c55720f3de5511ccbb5 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 f32fa01b32887a2ced9b2a702d9e8434e1fef3de..8864835cf85db74e4774d1ada26dfae99046e4bc 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 47a2d84b987fcd760086ff6837cd25867945e574..ce1f178626da8fd80838104a6acc60f6cdcc7144 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 512daa46447e0782093d646457dee609359a7a14..a293c0630059bb1a3ae7d1e4bc1684a2f7dba850 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 1696f81a9ada1457336e928ebb44c79aa6852bcd..959c6a33e41da76132c24760df08369eb0ad3df4 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 9484c62f6c3580ca114ad81bc0be1e14b8e263a2..cf5b80c03a8d3eabe53856c1a3c192db9db1dca0 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 608fa496bdef66615292c5426d5778942cf0ccad..e0bb1f3803fd426afd0cb71a339a087ec987b7c3 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 8739d1e1195931da4dfc05f2e62ad58ca7988365..971b680df59b3fda0aa43976cec80837a83a5d8c 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 04ad55679775497da0ec7919450c8e8d54738a90..bbe0befd63d5d32a532b2d5b4587af18621528e9 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 bb36e466cbcb25584c462931a3eab55ffd90732c..49251c43cdd3b8fb9b2f6bb5412ce25b1b8e051b 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 995dc563cc84f24b6f470de43531c6a6e62b90b2..e85b2fb3b2e0dd291ddd62008b4ff7509730df36 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 a27396b613b2ec46fffec11fdb107116e942ac5a..e2ec4544beb9a9c27357e03632a306d793eed61a 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 99e87f535531544ea588885970da0cb374cd154c..c908fb34bf0d4ca2fe861e69b9a7269c939d6141 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 1b222519b0aacc35feb180e0273ac9758394aefe..d5ce77aa7eeaab4d4780c77646d4fe998638bf99 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 f0a23fcd1d4f21c3f0dde9b72e7cee1757ace8b4..fbca6243b9f167ecab5629e13cbdc5cce2e06816 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 3a5ae2da4141eac9187d4078b9091519b8236532..a32395505fbd89022654b6db08c1bb2ee924b065 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 326659f2b813d8f6b306d8b9498c0590c6434011..f4fcc33a34f493ead3c06132dde048a168c77f3a 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 adc5f784dff8fccd5b505867bf65efb373a9149d..1caac18ad8e68626f9927f37106fa830af214914 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 1d351e9308da0ea2c81f8afa80fb2be219c633ea..840b3e7142eb21ecd76767280294ed7680f0ed39 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"