From 912e9229916e4d6b05b5c583b67574aaa495a79c Mon Sep 17 00:00:00 2001
From: SamMayWork <sam.may@kaleido.io>
Date: Thu, 1 Feb 2024 15:10:46 +0000
Subject: [PATCH] fix: merge in ID if not provided on an identity patch

Signed-off-by: SamMayWork <sam.may@kaleido.io>
---
 internal/networkmap/update_identity.go      |  8 ++-
 internal/networkmap/update_identity_test.go | 76 +++++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/internal/networkmap/update_identity.go b/internal/networkmap/update_identity.go
index a7435182e..d675c8e75 100644
--- a/internal/networkmap/update_identity.go
+++ b/internal/networkmap/update_identity.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -44,6 +44,12 @@ func (nm *networkMap) updateIdentityID(ctx context.Context, id *fftypes.UUID, dt
 		return nil, i18n.NewError(ctx, coremsgs.Msg404NoResult)
 	}
 
+	// We can't sparse merge the generic JSON fields, but we need to propagate the ID
+	if dto.IdentityProfile.Profile.GetString("id") == "" {
+		existingID := identity.IdentityProfile.Profile.GetString("id")
+		dto.IdentityProfile.Profile["id"] = existingID
+	}
+
 	var updateSigner *core.SignerRef
 
 	if nm.multiparty != nil {
diff --git a/internal/networkmap/update_identity_test.go b/internal/networkmap/update_identity_test.go
index 20f0ce921..08507082b 100644
--- a/internal/networkmap/update_identity_test.go
+++ b/internal/networkmap/update_identity_test.go
@@ -192,3 +192,79 @@ func TestUpdateIdentityProfileBadID(t *testing.T) {
 	_, err := nm.UpdateIdentity(nm.ctx, "badness", &core.IdentityUpdateDTO{}, true)
 	assert.Regexp(t, "FF00138", err)
 }
+
+func TestUpdateIdentityProfileExistingIdNotSpecified(t *testing.T) {
+
+	nm, cancel := newTestNetworkmap(t)
+	defer cancel()
+
+	identity := testOrg("org1")
+	identity.Profile["id"] = "member_0/node_aaaaaa"
+
+	mim := nm.identity.(*identitymanagermocks.Manager)
+	mim.On("CachedIdentityLookupByID", nm.ctx, identity.ID).Return(identity, nil)
+	signerRef := &core.SignerRef{Key: "0x12345"}
+	mim.On("ResolveIdentitySigner", nm.ctx, identity).Return(signerRef, nil)
+
+	mds := nm.defsender.(*definitionsmocks.Sender)
+
+	mds.On("UpdateIdentity", nm.ctx,
+		mock.AnythingOfType("*core.Identity"),
+		mock.MatchedBy(func(iden *core.IdentityUpdate) bool {
+			return iden.Updates.Profile.GetString("id") == "member_0/node_aaaaaa"
+		}),
+		mock.MatchedBy(func(sr *core.SignerRef) bool {
+			return sr.Key == "0x12345"
+		}),
+		true).Return(nil)
+
+	org, err := nm.UpdateIdentity(nm.ctx, identity.ID.String(), &core.IdentityUpdateDTO{
+		IdentityProfile: core.IdentityProfile{
+			Description: "new desc",
+			Profile:     fftypes.JSONObject{"new": "profile"},
+		},
+	}, true)
+	assert.NoError(t, err)
+	assert.NotNil(t, org)
+
+	mim.AssertExpectations(t)
+	mds.AssertExpectations(t)
+}
+
+func TestUpdateIdentityProfileOverwrite(t *testing.T) {
+
+	nm, cancel := newTestNetworkmap(t)
+	defer cancel()
+
+	identity := testOrg("org1")
+	identity.Profile["id"] = "member_0/node_aaaaaa"
+
+	mim := nm.identity.(*identitymanagermocks.Manager)
+	mim.On("CachedIdentityLookupByID", nm.ctx, identity.ID).Return(identity, nil)
+	signerRef := &core.SignerRef{Key: "0x12345"}
+	mim.On("ResolveIdentitySigner", nm.ctx, identity).Return(signerRef, nil)
+
+	mds := nm.defsender.(*definitionsmocks.Sender)
+
+	mds.On("UpdateIdentity", nm.ctx,
+		mock.AnythingOfType("*core.Identity"),
+		mock.MatchedBy(func(iden *core.IdentityUpdate) bool {
+			return iden.Updates.Profile.GetString("id") == "member_0/node_bbbbbb"
+		}),
+		mock.MatchedBy(func(sr *core.SignerRef) bool {
+			return sr.Key == "0x12345"
+		}),
+		true).Return(nil)
+
+	org, err := nm.UpdateIdentity(nm.ctx, identity.ID.String(), &core.IdentityUpdateDTO{
+		IdentityProfile: core.IdentityProfile{
+			Description: "new desc",
+			Profile:     fftypes.JSONObject{"new": "profile", "id": "member_0/node_bbbbbb"},
+		},
+	}, true)
+	assert.NoError(t, err)
+	assert.NotNil(t, org)
+
+	mim.AssertExpectations(t)
+	mds.AssertExpectations(t)
+}