From 76b684e2fe0446d3e99d24b11afe6ce2d00cbb02 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Mon, 26 Feb 2024 17:13:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?=
=?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5?=
=?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83=D0=B7?=
=?UTF-8?q?=D0=BA=D0=B5=20=D0=B2=20=D0=BC=D0=B0=D0=BF=D1=83=20organization?=
=?UTF-8?q?Id=20c=20"organization=5Fid"=20=D0=BD=D0=B0=20"org=5Fid"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
id/organization.go | 6 +++---
id/test/object_id_test.go | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/id/organization.go b/id/organization.go
index 5aedfb70..a3a9d7e8 100644
--- a/id/organization.go
+++ b/id/organization.go
@@ -35,13 +35,13 @@ func (id *OrganizationId) FromParts(parts []string) error {
func (id *OrganizationId) Map() map[string]any {
return map[string]any{
- "organization_id": id.OrganizationID,
- "type": id.Type(),
+ "org_id": id.OrganizationID,
+ "type": id.Type(),
}
}
func (id *OrganizationId) FromMap(m map[string]any) error {
- id.OrganizationID, _ = m["organization_id"].(string)
+ id.OrganizationID, _ = m["org_id"].(string)
if id.OrganizationID == "" {
return fmt.Errorf("%w: OrganizationId required", ErrInvalidID)
}
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index f97e50e4..ec2cd931 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -38,7 +38,7 @@ func Test_OrganizationId(t *testing.T) {
},
{
name: "valid map",
- in: map[string]any{"type": "organization", "organization_id": "<org_id>"},
+ in: map[string]any{"type": "organization", "org_id": "<org_id>"},
out: "/orgs/<org_id>",
result: &id.ObjectId{Descriptor: &id.OrganizationId{OrganizationID: "<org_id>"}},
},
--
GitLab