fix ModelNodeArgs.fqn (#8364) (#8377)

(cherry picked from commit 9388030)

Co-authored-by: Michelle Ark <MichelleArk@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>

.changes/unreleased/Fixes-20230811-204144.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: fix fqn-selection for external versioned models
+time: 2023-08-11T20:41:44.725144-04:00
+custom:
+  Author: michelleark
+  Issue: "8374"

core/dbt/contracts/graph/node_args.py

@@ -29,3 +29,11 @@ def unique_id(self) -> str:
             unique_id = f"{unique_id}.v{self.version}"
 
         return unique_id
+
+    @property
+    def fqn(self) -> List[str]:
+        fqn = [self.package_name, self.name]
+        if self.version:
+            fqn.append(f"v{self.version}")
+
+        return fqn

core/dbt/contracts/graph/nodes.py

@@ -590,7 +590,7 @@ def from_args(cls, args: ModelNodeArgs) -> "ModelNode":
             name=args.name,
             package_name=args.package_name,
             unique_id=unique_id,
-            fqn=[args.package_name, args.name],
+            fqn=args.fqn,
             version=args.version,
             latest_version=args.latest_version,
             relation_name=args.relation_name,

tests/unit/test_contracts_graph_node_args.py

@@ -17,3 +17,22 @@ def test_model_node_args_unique_id_with_version(self) -> None:
             version="1",
         )
         assert model_node_args.unique_id == "model.package.name.v1"
+
+    def test_model_node_args_fqn(self) -> None:
+        model_node_args = ModelNodeArgs(
+            name="name",
+            package_name="package",
+            identifier="identifier",
+            schema="schema",
+        )
+        assert model_node_args.fqn == ["package", "name"]
+
+    def test_model_node_args_fqn_with_version(self) -> None:
+        model_node_args = ModelNodeArgs(
+            name="name",
+            package_name="package",
+            identifier="identifier",
+            schema="schema",
+            version="1",
+        )
+        assert model_node_args.fqn == ["package", "name", "v1"]