Merge pull request #452 from hjotha/submit/change-member-inherited-attribute

fix: resolve bare change members against inherited attributes

Author: ako

mdl/executor/cmd_microflows_builder_actions.go

@@ -1176,6 +1176,8 @@ func (fb *flowBuilder) resolveMemberChange(mc *microflows.MemberChange, memberNa
 				if strings.Contains(memberName, ".") {
 					// Already qualified, don't double-qualify
 					mc.AttributeQualifiedName = memberName
+				} else if attrQN, ok := fb.resolveAttributeInEntityHierarchy(entityQN, memberName); ok {
+					mc.AttributeQualifiedName = attrQN
 				} else {
 					mc.AttributeQualifiedName = entityQN + "." + memberName
 				}
@@ -1187,6 +1189,43 @@ func (fb *flowBuilder) resolveMemberChange(mc *microflows.MemberChange, memberNa
 	resolveMemberChangeFallback(mc, memberName, entityQN)
 }
 
+func (fb *flowBuilder) resolveAttributeInEntityHierarchy(entityQN, attrName string) (string, bool) {
+	if fb == nil || fb.backend == nil || entityQN == "" || attrName == "" {
+		return "", false
+	}
+	seen := make(map[string]bool)
+	for currentQN := entityQN; currentQN != ""; {
+		if seen[currentQN] {
+			return "", false
+		}
+		seen[currentQN] = true
+
+		parts := strings.SplitN(currentQN, ".", 2)
+		if len(parts) != 2 {
+			return "", false
+		}
+		mod, err := fb.backend.GetModuleByName(parts[0])
+		if err != nil || mod == nil {
+			return "", false
+		}
+		dm, err := fb.backend.GetDomainModel(mod.ID)
+		if err != nil || dm == nil {
+			return "", false
+		}
+		entity := dm.FindEntityByName(parts[1])
+		if entity == nil {
+			return "", false
+		}
+		for _, attr := range entity.Attributes {
+			if attr != nil && attr.Name == attrName {
+				return currentQN + "." + attrName, true
+			}
+		}
+		currentQN = entity.GeneralizationRef
+	}
+	return "", false
+}
+
 // resolveMemberChangeFallback preserves the authored member name shape when the
 // entity metadata is unavailable.
 //

mdl/executor/cmd_microflows_change_inherited_attribute_test.go

@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package executor
+
+import (
+	"testing"
+
+	"github.com/mendixlabs/mxcli/mdl/backend/mock"
+	"github.com/mendixlabs/mxcli/model"
+	"github.com/mendixlabs/mxcli/sdk/domainmodel"
+	"github.com/mendixlabs/mxcli/sdk/microflows"
+)
+
+func TestResolveMemberChange_BareInheritedAttributeUsesDeclaringEntity(t *testing.T) {
+	appModuleID := model.ID("synthetic-app-module")
+	baseModuleID := model.ID("synthetic-base-module")
+	backend := &mock.MockBackend{
+		GetModuleByNameFunc: func(name string) (*model.Module, error) {
+			switch name {
+			case "SyntheticApp":
+				return &model.Module{BaseElement: model.BaseElement{ID: appModuleID}, Name: name}, nil
+			case "SyntheticBase":
+				return &model.Module{BaseElement: model.BaseElement{ID: baseModuleID}, Name: name}, nil
+			default:
+				return nil, nil
+			}
+		},
+		GetDomainModelFunc: func(id model.ID) (*domainmodel.DomainModel, error) {
+			switch id {
+			case appModuleID:
+				return &domainmodel.DomainModel{
+					ContainerID: appModuleID,
+					Entities: []*domainmodel.Entity{
+						{
+							Name:              "Account",
+							GeneralizationRef: "SyntheticBase.User",
+						},
+					},
+				}, nil
+			case baseModuleID:
+				return &domainmodel.DomainModel{
+					ContainerID: baseModuleID,
+					Entities: []*domainmodel.Entity{
+						{
+							Name: "User",
+							Attributes: []*domainmodel.Attribute{
+								{Name: "CanUseWebService", Type: &domainmodel.BooleanAttributeType{}},
+							},
+						},
+					},
+				}, nil
+			default:
+				return nil, nil
+			}
+		},
+	}
+
+	fb := &flowBuilder{backend: backend}
+	mc := &microflows.MemberChange{}
+
+	fb.resolveMemberChange(mc, "CanUseWebService", "SyntheticApp.Account")
+
+	if got, want := mc.AttributeQualifiedName, "SyntheticBase.User.CanUseWebService"; got != want {
+		t.Fatalf("AttributeQualifiedName = %q, want %q", got, want)
+	}
+	if mc.AssociationQualifiedName != "" {
+		t.Fatalf("AssociationQualifiedName = %q, want empty", mc.AssociationQualifiedName)
+	}
+}