Skip to content
Snippets Groups Projects
Commit 265cadca authored by ko_oler's avatar ko_oler
Browse files

исправления в конструктор, правки в тесты

parent 86f96ce0
No related branches found
No related tags found
No related merge requests found
......@@ -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}}
}
......@@ -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}}
}
......@@ -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}}
}
......@@ -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}}
}
......@@ -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}}
}
......@@ -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}}
}
......@@ -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}}
}
......@@ -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}}
}
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment