Merge pull request #3667 from goadesign/fix/interceptor_pkg_path

Properly handle interceptor types in custom packages

Author: raphael

codegen/service/interceptors_test.go

@@ -181,6 +181,34 @@ func TestCollectAttributes(t *testing.T) {
 			},
 			want: []*AttributeData{nil},
 		},
+		{
+			name: "user-type-with-package",
+			attrNames: &expr.AttributeExpr{
+				Type: &expr.Object{
+					{Name: "user", Attribute: &expr.AttributeExpr{Type: expr.String}},
+				},
+			},
+			parent: &expr.AttributeExpr{
+				Type: &expr.Object{
+					{Name: "user", Attribute: &expr.AttributeExpr{
+						Type: &expr.UserTypeExpr{
+							AttributeExpr: &expr.AttributeExpr{
+								Type: &expr.Object{
+									{Name: "name", Attribute: &expr.AttributeExpr{Type: expr.Primitive(expr.StringKind)}},
+								},
+								Meta: map[string][]string{
+									"struct:pkg:path": {"goa.design/goa/example/user"},
+								},
+							},
+							TypeName: "User",
+						},
+					}},
+				},
+			},
+			want: []*AttributeData{
+				{Name: "User", TypeRef: "*user.User", Pointer: false},
+			},
+		},
 	}
 
 	for _, tc := range cases {

codegen/service/service_data.go

@@ -1476,9 +1476,13 @@ func collectAttributes(attrNames, parent *expr.AttributeExpr, scope *codegen.Nam
 		if parentAttr == nil {
 			continue
 		}
+		var pkg string
+		if loc := codegen.UserTypeLocation(parentAttr.Type); loc != nil {
+			pkg = loc.PackageName()
+		}
 		data[i] = &AttributeData{
 			Name:    codegen.Goify(nat.Name, true),
-			TypeRef: scope.GoTypeRef(parentAttr),
+			TypeRef: scope.GoFullTypeRef(parentAttr, pkg),
 			Pointer: parent.IsPrimitivePointer(nat.Name, true),
 		}
 	}