From 265cadca3c59ab91fe884e28c633daeff3b6a157 Mon Sep 17 00:00:00 2001 From: ko_oler <kooler89@gmail.com> Date: Fri, 16 Feb 2024 12:37:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=81?= =?UTF-8?q?=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80,=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- id/client.go | 6 ++---- id/collection.go | 14 ++------------ id/environment.go | 12 +++--------- id/item.go | 18 +++--------------- id/organization.go | 6 ++---- id/role.go | 12 +++--------- id/space.go | 6 ++---- id/user.go | 6 ++---- log/zap/field_test.go | 4 ++-- 9 files changed, 21 insertions(+), 63 deletions(-) diff --git a/id/client.go b/id/client.go index 704f8d5f..99c2cedf 100644 --- a/id/client.go +++ b/id/client.go @@ -2,8 +2,6 @@ package id import ( "fmt" - - "git.perx.ru/perxis/perxis-go/pkg/clients" ) const ( @@ -62,6 +60,6 @@ func (id *ClientId) Validate() error { return id.SpaceId.Validate() } -func NewClientId(c clients.Client) *ObjectId { - return &ObjectId{Descriptor: &ClientId{SpaceId: SpaceId{SpaceID: c.SpaceID}, ClientID: c.ID}} +func NewClientId(spaceID, id string) *ObjectId { + return &ObjectId{Descriptor: &ClientId{SpaceId: SpaceId{SpaceID: spaceID}, ClientID: id}} } diff --git a/id/collection.go b/id/collection.go index 6518513b..f507d66c 100644 --- a/id/collection.go +++ b/id/collection.go @@ -2,8 +2,6 @@ package id import ( "fmt" - - "git.perx.ru/perxis/perxis-go/pkg/collections" ) const ( @@ -61,14 +59,6 @@ func (id *CollectionId) Validate() error { return id.EnvironmentId.Validate() } -func NewCollectionId(coll collections.Collection) *ObjectId { - return &ObjectId{Descriptor: &CollectionId{ - EnvironmentId: EnvironmentId{ - SpaceId: SpaceId{ - SpaceID: coll.SpaceID, - }, - EnvironmentID: coll.EnvID, - }, - CollectionID: coll.ID, - }} +func NewCollectionId(spaceID, envID, id string) *ObjectId { + return &ObjectId{Descriptor: &CollectionId{EnvironmentId: EnvironmentId{SpaceId: SpaceId{SpaceID: spaceID}, EnvironmentID: envID}, CollectionID: id}} } diff --git a/id/environment.go b/id/environment.go index 0da72195..364529f6 100644 --- a/id/environment.go +++ b/id/environment.go @@ -2,8 +2,6 @@ package id import ( "fmt" - - "git.perx.ru/perxis/perxis-go/pkg/environments" ) const ( @@ -61,11 +59,7 @@ func (id *EnvironmentId) Validate() error { } return id.SpaceId.Validate() } -func NewEnvironmentId(env environments.Environment) *ObjectId { - return &ObjectId{Descriptor: &EnvironmentId{ - SpaceId: SpaceId{ - SpaceID: env.SpaceID, - }, - EnvironmentID: env.ID, - }} + +func NewEnvironmentId(spaceID, id string) *ObjectId { + return &ObjectId{Descriptor: &EnvironmentId{SpaceId: SpaceId{SpaceID: spaceID}, EnvironmentID: id}} } diff --git a/id/item.go b/id/item.go index dbfb8e18..968175a2 100644 --- a/id/item.go +++ b/id/item.go @@ -2,8 +2,6 @@ package id import ( "fmt" - - "git.perx.ru/perxis/perxis-go/pkg/items" ) const ( @@ -64,17 +62,7 @@ func (i *ItemId) Validate() error { } return i.CollectionId.Validate() } -func NewItemId(i items.Item) *ObjectId { - return &ObjectId{Descriptor: &ItemId{ - CollectionId: CollectionId{ - EnvironmentId: EnvironmentId{ - SpaceId: SpaceId{ - SpaceID: i.SpaceID, - }, - EnvironmentID: i.EnvID, - }, - CollectionID: i.CollectionID, - }, - ItemID: i.ID, - }} + +func NewItemId(spaceID, envID, collID, id string) *ObjectId { + return &ObjectId{Descriptor: &ItemId{CollectionId: CollectionId{EnvironmentId: EnvironmentId{SpaceId: SpaceId{SpaceID: spaceID}, EnvironmentID: envID}, CollectionID: collID}, ItemID: id}} } diff --git a/id/organization.go b/id/organization.go index 03fd47fc..5aedfb70 100644 --- a/id/organization.go +++ b/id/organization.go @@ -2,8 +2,6 @@ package id import ( "fmt" - - "git.perx.ru/perxis/perxis-go/pkg/organizations" ) const ( @@ -57,6 +55,6 @@ func (id *OrganizationId) Validate() error { return nil } -func NewOrganizationId(o organizations.Organization) *ObjectId { - return &ObjectId{Descriptor: &OrganizationId{OrganizationID: o.ID}} +func NewOrganizationId(id string) *ObjectId { + return &ObjectId{Descriptor: &OrganizationId{OrganizationID: id}} } diff --git a/id/role.go b/id/role.go index 4e507d92..d9f8f019 100644 --- a/id/role.go +++ b/id/role.go @@ -2,8 +2,6 @@ package id import ( "fmt" - - "git.perx.ru/perxis/perxis-go/pkg/roles" ) const ( @@ -61,11 +59,7 @@ func (id *RoleId) Validate() error { return id.SpaceId.Validate() } -func NewRoleId(r roles.Role) *ObjectId { - return &ObjectId{Descriptor: &RoleId{ - SpaceId: SpaceId{ - SpaceID: r.SpaceID, - }, - RoleID: r.ID, - }} + +func NewRoleId(spaceID, id string) *ObjectId { + return &ObjectId{Descriptor: &RoleId{SpaceId: SpaceId{SpaceID: spaceID}, RoleID: id}} } diff --git a/id/space.go b/id/space.go index a9d88bc6..9859a478 100644 --- a/id/space.go +++ b/id/space.go @@ -2,8 +2,6 @@ package id import ( "fmt" - - "git.perx.ru/perxis/perxis-go/pkg/spaces" ) const ( @@ -58,6 +56,6 @@ func (id *SpaceId) Validate() error { return nil } -func NewSpaceId(s spaces.Space) *ObjectId { - return &ObjectId{Descriptor: &SpaceId{SpaceID: s.ID}} +func NewSpaceId(id string) *ObjectId { + return &ObjectId{Descriptor: &SpaceId{SpaceID: id}} } diff --git a/id/user.go b/id/user.go index 8b4100b0..85459c7e 100644 --- a/id/user.go +++ b/id/user.go @@ -2,8 +2,6 @@ package id import ( "fmt" - - "git.perx.ru/perxis/perxis-go/pkg/users" ) const ( @@ -57,6 +55,6 @@ func (id *UserId) Validate() error { return nil } -func NewUserId(u users.User) *ObjectId { - return &ObjectId{Descriptor: &UserId{UserID: u.ID}} +func NewUserId(id string) *ObjectId { + return &ObjectId{Descriptor: &UserId{UserID: id}} } diff --git a/log/zap/field_test.go b/log/zap/field_test.go index ef2e7eff..ead5af23 100644 --- a/log/zap/field_test.go +++ b/log/zap/field_test.go @@ -72,7 +72,7 @@ func TestObjectID(t *testing.T) { } oid := id.MustObjectId(item) - itemId := id.NewItemId(*item) + itemId := id.NewItemId(item.SpaceID, item.EnvID, item.CollectionID, item.ID) tests := []struct { name string @@ -102,7 +102,7 @@ func TestCallerID(t *testing.T) { } oid := id.MustObjectId(user) - userId := id.NewUserId(*user) + userId := id.NewUserId(user.ID) tests := []struct { name string -- GitLab