diff --git a/pkg/invitations/mocks/Invitations.go b/pkg/invitations/mocks/Invitations.go
index 33f18fefc914db6b8765bd01eba35a5eea1c260a..610f9fff80d4867b35b80ff464bcf2a8a9d0e764 100644
--- a/pkg/invitations/mocks/Invitations.go
+++ b/pkg/invitations/mocks/Invitations.go
@@ -3,11 +3,11 @@
package mocks
import (
- context "context"
+ "context"
- invitations "git.perx.ru/perxis/perxis-go/pkg/invitations"
- services "git.perx.ru/perxis/perxis/services"
- mock "github.com/stretchr/testify/mock"
+ "git.perx.ru/perxis/perxis-go/pkg/invitations"
+ "git.perx.ru/perxis/perxis-go/pkg/options"
+ "github.com/stretchr/testify/mock"
)
// Invitations is an autogenerated mock type for the Invitations type
@@ -67,11 +67,11 @@ func (_m *Invitations) Delete(ctx context.Context, invitationId string) error {
}
// Find provides a mock function with given fields: ctx, filter, opts
-func (_m *Invitations) Find(ctx context.Context, filter *invitations.Filter, opts *services.FindOptions) ([]*invitations.Invitation, int, error) {
+func (_m *Invitations) Find(ctx context.Context, filter *invitations.Filter, opts *options.FindOptions) ([]*invitations.Invitation, int, error) {
ret := _m.Called(ctx, filter, opts)
var r0 []*invitations.Invitation
- if rf, ok := ret.Get(0).(func(context.Context, *invitations.Filter, *services.FindOptions) []*invitations.Invitation); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, *invitations.Filter, *options.FindOptions) []*invitations.Invitation); ok {
r0 = rf(ctx, filter, opts)
} else {
if ret.Get(0) != nil {
@@ -80,14 +80,14 @@ func (_m *Invitations) Find(ctx context.Context, filter *invitations.Filter, opt
}
var r1 int
- if rf, ok := ret.Get(1).(func(context.Context, *invitations.Filter, *services.FindOptions) int); ok {
+ if rf, ok := ret.Get(1).(func(context.Context, *invitations.Filter, *options.FindOptions) int); ok {
r1 = rf(ctx, filter, opts)
} else {
r1 = ret.Get(1).(int)
}
var r2 error
- if rf, ok := ret.Get(2).(func(context.Context, *invitations.Filter, *services.FindOptions) error); ok {
+ if rf, ok := ret.Get(2).(func(context.Context, *invitations.Filter, *options.FindOptions) error); ok {
r2 = rf(ctx, filter, opts)
} else {
r2 = ret.Error(2)
diff --git a/pkg/invitations/service.go b/pkg/invitations/service.go
index 544e8c8ad28dc2958ae86da8a2642639844698c5..26426d67462cdcb51fc7fe8f1bd60dc1fde69260 100644
--- a/pkg/invitations/service.go
+++ b/pkg/invitations/service.go
@@ -3,7 +3,7 @@ package invitations
import (
"context"
- "git.perx.ru/perxis/perxis/services"
+ "git.perx.ru/perxis/perxis-go/pkg/options"
)
type Filter struct {
@@ -22,6 +22,6 @@ type Invitations interface {
Create(ctx context.Context, invitation *Invitation) (created *Invitation, err error)
Get(ctx context.Context, invitationId string) (invitation *Invitation, err error)
Accept(ctx context.Context, invitationId, userId string) (err error)
- Find(ctx context.Context, filter *Filter, opts *services.FindOptions) (invitations []*Invitation, total int, err error)
+ Find(ctx context.Context, filter *Filter, opts *options.FindOptions) (invitations []*Invitation, total int, err error)
Delete(ctx context.Context, invitationId string) (err error)
}
diff --git a/pkg/invitations/transport/client.microgen.go b/pkg/invitations/transport/client.microgen.go
index 8274b6fc6d17f0f647bda8a5000fc274dd27b246..6f896b0e67fa88a1eaa539c305a47fada11c9c8b 100644
--- a/pkg/invitations/transport/client.microgen.go
+++ b/pkg/invitations/transport/client.microgen.go
@@ -7,7 +7,7 @@ import (
"errors"
invitations "git.perx.ru/perxis/perxis-go/pkg/invitations"
- services "git.perx.ru/perxis/perxis/services"
+ "git.perx.ru/perxis/perxis-go/pkg/options"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
)
@@ -51,7 +51,7 @@ func (set EndpointsSet) Accept(arg0 context.Context, arg1 string, arg2 string) (
return res0
}
-func (set EndpointsSet) Find(arg0 context.Context, arg1 *invitations.Filter, arg2 *services.FindOptions) (res0 []*invitations.Invitation, res1 int, res2 error) {
+func (set EndpointsSet) Find(arg0 context.Context, arg1 *invitations.Filter, arg2 *options.FindOptions) (res0 []*invitations.Invitation, res1 int, res2 error) {
request := FindRequest{
Filter: arg1,
Opts: arg2,
diff --git a/pkg/invitations/transport/exchanges.microgen.go b/pkg/invitations/transport/exchanges.microgen.go
index 48724f5cc7a71136ed96af506770b0ff1d120e61..bb36e466cbcb25584c462931a3eab55ffd90732c 100644
--- a/pkg/invitations/transport/exchanges.microgen.go
+++ b/pkg/invitations/transport/exchanges.microgen.go
@@ -3,8 +3,8 @@
package transport
import (
- invitations "git.perx.ru/perxis/perxis-go/pkg/invitations"
- services "git.perx.ru/perxis/perxis/services"
+ "git.perx.ru/perxis/perxis-go/pkg/invitations"
+ "git.perx.ru/perxis/perxis-go/pkg/options"
)
type (
@@ -30,8 +30,8 @@ type (
AcceptResponse struct{}
FindRequest struct {
- Filter *invitations.Filter `json:"filter"`
- Opts *services.FindOptions `json:"opts"`
+ Filter *invitations.Filter `json:"filter"`
+ Opts *options.FindOptions `json:"opts"`
}
FindResponse struct {
Invitations []*invitations.Invitation `json:"invitations"`
diff --git a/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go b/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go
index 8ffaa16deea7722033821a3f8fd3b0f63bba3035..9899e39885a8ca07de15f74f2eeda24d65296928 100644
--- a/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go
@@ -7,9 +7,9 @@ package transportgrpc
import (
"time"
+ service "git.perx.ru/perxis/perxis-go/pkg/invitations"
+ "git.perx.ru/perxis/perxis-go/pkg/options"
pb "git.perx.ru/perxis/perxis-go/proto/invitations"
- services "git.perx.ru/perxis/perxis/services"
- service "git.perx.ru/perxis/perxis/services/invitations"
"github.com/golang/protobuf/ptypes"
timestamp "github.com/golang/protobuf/ptypes/timestamp"
)
@@ -110,7 +110,7 @@ func ProtoToPtrFilter(protoFilter *pb.Filter) (*service.Filter, error) {
}, nil
}
-func PtrServicesFindOptionsToProto(opts *services.FindOptions) (*pb.FindOptions, error) {
+func PtrServicesFindOptionsToProto(opts *options.FindOptions) (*pb.FindOptions, error) {
if opts == nil {
return nil, nil
}
@@ -121,15 +121,15 @@ func PtrServicesFindOptionsToProto(opts *services.FindOptions) (*pb.FindOptions,
}, nil
}
-func ProtoToPtrServicesFindOptions(protoOpts *pb.FindOptions) (*services.FindOptions, error) {
+func ProtoToPtrServicesFindOptions(protoOpts *pb.FindOptions) (*options.FindOptions, error) {
if protoOpts == nil {
return nil, nil
}
- return &services.FindOptions{
- SortOptions: services.SortOptions{
+ return &options.FindOptions{
+ SortOptions: options.SortOptions{
Sort: protoOpts.Sort,
},
- PaginationOptions: services.PaginationOptions{
+ PaginationOptions: options.PaginationOptions{
PageNum: int(protoOpts.PageNum),
PageSize: int(protoOpts.PageSize),
},