From 46afe20f788f5a2c65cb53e3acf59df79cd92772 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Thu, 13 Apr 2023 16:38:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
=?UTF-8?q?=D0=BE=20=D0=9F=D0=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/collections/collection.go | 5 ++---
pkg/collections/mocks/Collections.go | 4 ++--
pkg/collections/mocks/Middleware.go | 2 +-
pkg/collections/mocks/Storage.go | 2 +-
pkg/collections/service.go | 10 ++--------
pkg/collections/transport/client.microgen.go | 4 ++--
pkg/collections/transport/exchanges.microgen.go | 4 ++--
pkg/collections/transport/server.microgen.go | 2 +-
8 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/pkg/collections/collection.go b/pkg/collections/collection.go
index 63e2e93f..5b3c5dd3 100644
--- a/pkg/collections/collection.go
+++ b/pkg/collections/collection.go
@@ -3,9 +3,8 @@ package collections
import (
"time"
- // todo fix after pkg and schema will be added
- "git.perx.ru/perxis/perxis/pkg/permission"
- "git.perx.ru/perxis/perxis/schema"
+ "git.perx.ru/perxis/perxis-go/pkg/permission"
+ "git.perx.ru/perxis/perxis-go/pkg/schema"
)
// Config
diff --git a/pkg/collections/mocks/Collections.go b/pkg/collections/mocks/Collections.go
index 5bdccfd0..692b5a81 100644
--- a/pkg/collections/mocks/Collections.go
+++ b/pkg/collections/mocks/Collections.go
@@ -5,11 +5,11 @@ package mocks
import (
context "context"
- collections "git.perx.ru/perxis/perxis/services/collections"
+ collections "git.perx.ru/perxis/perxis-go/pkg/collections"
mock "github.com/stretchr/testify/mock"
- schema "git.perx.ru/perxis/perxis/schema"
+ schema "git.perx.ru/perxis/perxis-go/pkg/schema"
)
// Collections is an autogenerated mock type for the Collections type
diff --git a/pkg/collections/mocks/Middleware.go b/pkg/collections/mocks/Middleware.go
index fd318f59..6ba09040 100644
--- a/pkg/collections/mocks/Middleware.go
+++ b/pkg/collections/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- collections "git.perx.ru/perxis/perxis/services/collections"
+ collections "git.perx.ru/perxis/perxis-go/pkg/collections"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/collections/mocks/Storage.go b/pkg/collections/mocks/Storage.go
index 0a17c5bc..e219e50c 100644
--- a/pkg/collections/mocks/Storage.go
+++ b/pkg/collections/mocks/Storage.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- collections "git.perx.ru/perxis/perxis/services/collections"
+ collections "git.perx.ru/perxis/perxis-go/pkg/collections"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/collections/service.go b/pkg/collections/service.go
index e5c7649c..e73133e7 100644
--- a/pkg/collections/service.go
+++ b/pkg/collections/service.go
@@ -1,19 +1,13 @@
package collections
-//go:generate gowrap gen -i Collections -t ../../templates/middleware/middleware -o service/middleware.go
-//go:generate gowrap gen -i Collections -t ../../templates/middleware/error_log -o service/error_logging_middleware.go
-//go:generate gowrap gen -i Collections -t ../../templates/middleware/access_log -o service/logging_middleware.go
-//go:generate gowrap gen -i Collections -t ../../templates/middleware/recovery -o service/recovering_middleware.go
-//go:generate gowrap gen -i Collections -t ../../templates/middleware/telemetry -o service/telemetry_middleware.go
-
import (
"context"
- "git.perx.ru/perxis/perxis/schema"
+ "git.perx.ru/perxis/perxis-go/pkg/schema"
)
// @microgen grpc
-// @protobuf git.perx.ru/perxis/perxis/proto/collections
+// @protobuf git.perx.ru/perxis/perxis-go/proto/collections
// @grpc-addr content.collections.Collections
type Collections interface {
Create(ctx context.Context, collection *Collection) (created *Collection, err error)
diff --git a/pkg/collections/transport/client.microgen.go b/pkg/collections/transport/client.microgen.go
index 144e84ea..33cb0079 100644
--- a/pkg/collections/transport/client.microgen.go
+++ b/pkg/collections/transport/client.microgen.go
@@ -5,8 +5,8 @@ package transport
import (
"context"
"errors"
- schema "git.perx.ru/perxis/perxis/schema"
- collections "git.perx.ru/perxis/perxis/services/collections"
+ collections "git.perx.ru/perxis/perxis-go/pkg/collections"
+ schema "git.perx.ru/perxis/perxis-go/pkg/schema"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
)
diff --git a/pkg/collections/transport/exchanges.microgen.go b/pkg/collections/transport/exchanges.microgen.go
index 421e4f5f..3aabcbc8 100644
--- a/pkg/collections/transport/exchanges.microgen.go
+++ b/pkg/collections/transport/exchanges.microgen.go
@@ -3,8 +3,8 @@
package transport
import (
- schema "git.perx.ru/perxis/perxis/schema"
- collections "git.perx.ru/perxis/perxis/services/collections"
+ collections "git.perx.ru/perxis/perxis-go/pkg/collections"
+ schema "git.perx.ru/perxis/perxis-go/pkg/schema"
)
type (
diff --git a/pkg/collections/transport/server.microgen.go b/pkg/collections/transport/server.microgen.go
index dfe7a58f..548d611d 100644
--- a/pkg/collections/transport/server.microgen.go
+++ b/pkg/collections/transport/server.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
"context"
- collections "git.perx.ru/perxis/perxis/services/collections"
+ collections "git.perx.ru/perxis/perxis-go/pkg/collections"
endpoint "github.com/go-kit/kit/endpoint"
)
--
GitLab