Eliminated GQL modeling drift around ResourceView: accounts should be under headers, not at the top

zaychenko-sergei · zaychenko-sergei · commit 0cda2428ec09 · 2026-06-29T18:58:42.000+03:00
diff --git a/resources/schema.gql b/resources/schema.gql
@@ -3857,6 +3857,11 @@ type Resource {
 	status: JSON
 }
 
+type ResourceAccount {
+	id: AccountID!
+	name: AccountName
+}
+
 input ResourceAccountSelectorInput {
 	byId: AccountID
 	byName: AccountName
@@ -4000,8 +4005,7 @@ enum ResourceHeaderValidationProblemCode {
 
 type ResourceHeaders {
 	id: ResourceID!
-	accountId: AccountID!
-	accountName: AccountName
+	account: ResourceAccount!
 	name: String!
 	description: String
 	labels: JSON!
diff --git a/src/adapter/graphql/src/queries/resources/models.rs b/src/adapter/graphql/src/queries/resources/models.rs
@@ -617,8 +617,7 @@ impl From<BatchGetResourceProblem> for BatchResourceProblem {
 #[derive(SimpleObject, Debug, Clone)]
 pub struct ResourceHeaders {
     pub id: ResourceID,
-    pub account_id: AccountID<'static>,
-    pub account_name: Option<AccountName<'static>>,
+    pub account: ResourceAccount,
     pub name: String,
     pub description: Option<String>,
     pub labels: serde_json::Value,
@@ -630,15 +629,23 @@ pub struct ResourceHeaders {
     pub last_reconciled_at: Option<DateTime<Utc>>,
 }
 
+#[derive(SimpleObject, Debug, Clone)]
+pub struct ResourceAccount {
+    pub id: AccountID<'static>,
+    pub name: Option<AccountName<'static>>,
+}
+
 impl From<kamu_resources::ResourceView> for ResourceHeaders {
     fn from(value: kamu_resources::ResourceView) -> Self {
         let labels = serde_json::to_value(value.headers.labels).unwrap();
         let annotations = serde_json::to_value(value.headers.annotations).unwrap();
 
         Self {
             id: value.headers.id.into(),
-            account_id: value.account.id.into(),
-            account_name: value.account.name.map(Into::into),
+            account: ResourceAccount {
+                id: value.headers.account.id.into(),
+                name: value.headers.account.name.map(Into::into),
+            },
             name: value.headers.name.clone(),
             description: value.headers.description,
             labels,
diff --git a/src/app/cli/src/commands/apply_command.rs b/src/app/cli/src/commands/apply_command.rs
@@ -675,7 +675,7 @@ impl ApplyPrinter<'_> {
             fn new(resource: &'a ResourceView) -> Self {
                 Self {
                     id: &resource.headers.id,
-                    account: &resource.account,
+                    account: &resource.headers.account,
                     name: &resource.headers.name,
                     description: &resource.headers.description,
                     labels: &resource.headers.labels,
diff --git a/src/app/cli/src/commands/get_resource_command.rs b/src/app/cli/src/commands/get_resource_command.rs
@@ -130,7 +130,7 @@ impl GetResourceCommand {
             fn new(resource: &'a kamu_resources::ResourceView) -> Self {
                 Self {
                     id: &resource.headers.id,
-                    account: &resource.account,
+                    account: &resource.headers.account,
                     name: &resource.headers.name,
                     description: &resource.headers.description,
                     labels: &resource.headers.labels,
diff --git a/src/domain/resources/domain/src/views/resource_view.rs b/src/domain/resources/domain/src/views/resource_view.rs
@@ -29,7 +29,6 @@ pub struct ResourceIdentityView {
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ResourceView {
     pub schema: String,
-    pub account: ResourceViewAccount,
     pub headers: ResourceViewHeaders,
     pub last_reconciled_at: Option<DateTime<Utc>>,
     pub spec: serde_json::Value,
@@ -49,6 +48,7 @@ pub struct ResourceViewAccount {
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ResourceViewHeaders {
     pub id: ResourceID,
+    pub account: ResourceViewAccount,
     pub name: ResourceName,
     pub description: Option<String>,
     pub labels: BTreeMap<String, String>,
@@ -62,9 +62,15 @@ pub struct ResourceViewHeaders {
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 impl ResourceViewHeaders {
-    pub fn simple(now: DateTime<Utc>, id: ResourceID, name: impl Into<ResourceName>) -> Self {
+    pub fn simple(
+        now: DateTime<Utc>,
+        id: ResourceID,
+        account: ResourceViewAccount,
+        name: impl Into<ResourceName>,
+    ) -> Self {
         Self {
             id,
+            account,
             name: name.into(),
             description: None,
             labels: BTreeMap::new(),
@@ -77,8 +83,14 @@ impl ResourceViewHeaders {
     }
 
     pub fn from_owned(id: ResourceID, headers: ResourceHeaders) -> Self {
+        let account = ResourceViewAccount {
+            id: headers.account.clone(),
+            name: None,
+        };
+
         Self {
             id,
+            account,
             name: headers.name,
             description: headers.description,
             labels: headers.labels,
@@ -89,6 +101,11 @@ impl ResourceViewHeaders {
             deleted_at: headers.deleted_at,
         }
     }
+
+    pub fn with_account(mut self, account: ResourceViewAccount) -> Self {
+        self.account = account;
+        self
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/domain/resources/facade-tests/tests/contract/account_scoping.rs b/src/domain/resources/facade-tests/tests/contract/account_scoping.rs
@@ -171,8 +171,11 @@ pub async fn test_default_account_selector_resolves_current_account(
         .await
         .unwrap();
 
-    assert_eq!(view.account.id, h.account_id(TestAccount::Alice));
-    assert_eq!(view.account.name, Some(h.account_name(TestAccount::Alice)));
+    assert_eq!(view.headers.account.id, h.account_id(TestAccount::Alice));
+    assert_eq!(
+        view.headers.account.name,
+        Some(h.account_name(TestAccount::Alice))
+    );
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -205,7 +208,7 @@ pub async fn test_account_by_name_resolves_correctly(h: &impl FacadeContractHarn
         .await
         .unwrap();
 
-    assert_eq!(view.account.id, h.account_id(TestAccount::Alice));
+    assert_eq!(view.headers.account.id, h.account_id(TestAccount::Alice));
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -237,7 +240,7 @@ pub async fn test_account_by_id_resolves_correctly(h: &impl FacadeContractHarnes
         .await
         .unwrap();
 
-    assert_eq!(view.account.id, h.account_id(TestAccount::Alice));
+    assert_eq!(view.headers.account.id, h.account_id(TestAccount::Alice));
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/domain/resources/facade/src/facade/graphql/cynic_api/conversions.rs b/src/domain/resources/facade/src/facade/graphql/cynic_api/conversions.rs
@@ -50,15 +50,16 @@ impl TryFrom<fragments::Resource> for domain::ResourceView {
 
         Ok(Self {
             schema: value.schema,
-            account: domain::ResourceViewAccount {
-                id: value.headers.account_id,
-                name: value
-                    .headers
-                    .account_name
-                    .map(|name| odf::AccountName::new_unchecked(&name.0)),
-            },
             headers: domain::ResourceViewHeaders {
                 id: value.headers.id,
+                account: domain::ResourceViewAccount {
+                    id: value.headers.account.id,
+                    name: value
+                        .headers
+                        .account
+                        .name
+                        .map(|name| odf::AccountName::new_unchecked(&name.0)),
+                },
                 name: value.headers.name,
                 description: value.headers.description,
                 labels,
diff --git a/src/domain/resources/facade/src/facade/graphql/cynic_api/fragments.rs b/src/domain/resources/facade/src/facade/graphql/cynic_api/fragments.rs
@@ -216,8 +216,7 @@ pub(crate) struct Resource {
 #[derive(cynic::QueryFragment, Debug, Clone)]
 pub(crate) struct ResourceHeaders {
     pub id: kamu_resources::ResourceID,
-    pub account_id: odf::AccountID,
-    pub account_name: Option<AccountName>,
+    pub account: ResourceAccount,
     pub name: String,
     pub description: Option<String>,
     pub labels: serde_json::Value,
@@ -231,6 +230,14 @@ pub(crate) struct ResourceHeaders {
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+#[derive(cynic::QueryFragment, Debug, Clone)]
+pub(crate) struct ResourceAccount {
+    pub id: odf::AccountID,
+    pub name: Option<AccountName>,
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(cynic::QueryFragment, Debug, Clone)]
 pub(crate) struct ResourceIdentity {
     pub id: kamu_resources::ResourceID,
diff --git a/src/domain/resources/facade/src/facade/local/helpers/manifest_support.rs b/src/domain/resources/facade/src/facade/local/helpers/manifest_support.rs
@@ -87,7 +87,6 @@ pub(crate) fn resource_view_to_manifest(
 ) -> Result<ResourceManifest, InternalError> {
     let ResourceView {
         schema,
-        account,
         headers,
         spec,
         ..
@@ -103,8 +102,8 @@ pub(crate) fn resource_view_to_manifest(
         headers: kamu_resources::ResourceManifestHeaders {
             id: None,
             account: Some(kamu_resources::ResourceAccountRef {
-                id: Some(account.id),
-                name: account.name.map(|name| name.to_string()),
+                id: Some(headers.account.id),
+                name: headers.account.name.map(|name| name.to_string()),
             }),
             name: headers.name,
             description: headers.description,
diff --git a/src/domain/resources/facade/src/facade/local/local_resource_facade_impl.rs b/src/domain/resources/facade/src/facade/local/local_resource_facade_impl.rs
@@ -394,7 +394,7 @@ impl ResourceFacade for LocalResourceFacadeImpl {
         Ok(match plan {
             ApplyManifestPlanningDecision::Planned(mut plan) => {
                 plan.warnings.splice(0..0, prepared.header_warnings);
-                plan.resource.account = ResourceViewAccount {
+                plan.resource.headers.account = ResourceViewAccount {
                     id: prepared.target_account.id,
                     name: Some(prepared.target_account.name),
                 };
@@ -425,7 +425,7 @@ impl ResourceFacade for LocalResourceFacadeImpl {
         Ok(match result {
             ApplyManifestApplicationDecision::Applied(mut result) => {
                 result.warnings.splice(0..0, prepared.header_warnings);
-                result.resource.account = ResourceViewAccount {
+                result.resource.headers.account = ResourceViewAccount {
                     id: prepared.target_account.id,
                     name: Some(prepared.target_account.name),
                 };
@@ -641,10 +641,10 @@ impl LocalResourceFacadeImpl {
             .await?;
 
         Ok(ResourceView {
-            account: ResourceViewAccount {
+            headers: view.headers.with_account(ResourceViewAccount {
                 id: target_account.id,
                 name: Some(target_account.name),
-            },
+            }),
             ..view
         })
     }
@@ -720,11 +720,11 @@ impl LocalResourceFacadeImpl {
 
                     let resource = ResourceView {
                         schema: snapshot.schema,
-                        account: ResourceViewAccount {
-                            id: target_account.id.clone(),
-                            name: Some(target_account.name.clone()),
-                        },
-                        headers: ResourceViewHeaders::from_owned(id, snapshot.headers),
+                        headers: ResourceViewHeaders::from_owned(id, snapshot.headers)
+                            .with_account(ResourceViewAccount {
+                                id: target_account.id.clone(),
+                                name: Some(target_account.name.clone()),
+                            }),
                         last_reconciled_at: snapshot.last_reconciled_at,
                         spec: snapshot.spec,
                         status: snapshot.status,
diff --git a/src/domain/resources/services/src/crud_dispatchers/resource_crud_dispatcher_helpers.rs b/src/domain/resources/services/src/crud_dispatchers/resource_crud_dispatcher_helpers.rs
@@ -29,7 +29,6 @@ use kamu_resources::{
     ResourceStatusSummaryView,
     ResourceSummaryView,
     ResourceView,
-    ResourceViewAccount,
     ResourceViewHeaders,
 };
 use serde::Serialize;
@@ -141,10 +140,6 @@ where
 
     Ok(ResourceView {
         schema: R::DESCRIPTOR.schema.to_string(),
-        account: ResourceViewAccount {
-            id: headers.account.clone(),
-            name: None,
-        },
         headers: ResourceViewHeaders::from_owned(id, headers),
         last_reconciled_at: status.resource_status().last_reconciled_at(),
         spec: serde_json::to_value(spec).int_err()?,
@@ -187,10 +182,6 @@ pub(crate) fn resource_snapshot_to_view(snapshot: ResourceSnapshot) -> ResourceV
 
     ResourceView {
         schema,
-        account: ResourceViewAccount {
-            id: headers.account.clone(),
-            name: None,
-        },
         headers: ResourceViewHeaders::from_owned(id, headers),
         last_reconciled_at,
         spec,
diff --git a/src/domain/resources/services/tests/tests/crud_dispatchers/test_resource_crud_dispatcher.rs b/src/domain/resources/services/tests/tests/crud_dispatchers/test_resource_crud_dispatcher.rs
@@ -198,7 +198,7 @@ async fn test_apply_update_returns_applied_updated() {
     let id = applied1.resource.headers.id;
 
     // Second apply with same account but different spec value — Update
-    let account_id = applied1.resource.account.id.clone();
+    let account_id = applied1.resource.headers.account.id.clone();
     let req2 = ResourceCrudDispatcherApplyRequest {
         id: Some(id),
         headers: BaseResourceServiceHarness::make_headers_input(account_id, "res-a"),
@@ -224,7 +224,7 @@ async fn test_apply_untouched_returns_applied_untouched() {
     let decision1 = harness.dispatcher().apply(req1).await.unwrap();
     let applied1 = decision1.expect_applied();
     let id = applied1.resource.headers.id;
-    let account_id = applied1.resource.account.id.clone();
+    let account_id = applied1.resource.headers.account.id.clone();
 
     // Second apply — identical spec and headers
     let req2 = ResourceCrudDispatcherApplyRequest {
diff --git a/src/domain/resources/services/tests/tests/crud_dispatchers/test_resource_crud_dispatcher_diff_helpers.rs b/src/domain/resources/services/tests/tests/crud_dispatchers/test_resource_crud_dispatcher_diff_helpers.rs
@@ -26,11 +26,15 @@ fn make_view(name: &str, value: &str) -> ResourceView {
     let id = make_id();
     ResourceView {
         schema: "TestResource".to_string(),
-        account: ResourceViewAccount {
-            id: make_account_id(),
-            name: None,
-        },
-        headers: ResourceViewHeaders::simple(Utc::now(), id, name.to_string()),
+        headers: ResourceViewHeaders::simple(
+            Utc::now(),
+            id,
+            ResourceViewAccount {
+                id: make_account_id(),
+                name: None,
+            },
+            name.to_string(),
+        ),
         last_reconciled_at: None,
         spec: serde_json::json!({ "value": value }),
         status: None,
@@ -166,15 +170,16 @@ fn test_make_changes_detects_spec_field_change() {
 fn test_make_changes_identical_before_after_returns_no_field_changes() {
     let ts = chrono::Utc::now().trunc_subsecs(6);
     let id = make_id();
+    let account_id = make_account_id();
 
     let make = || ResourceView {
         schema: "TestResource".to_string(),
-        account: ResourceViewAccount {
-            id: make_account_id(),
-            name: None,
-        },
         headers: ResourceViewHeaders {
             id,
+            account: ResourceViewAccount {
+                id: account_id.clone(),
+                name: None,
+            },
             name: "res".to_string(),
             description: None,
             labels: Default::default(),
@@ -217,12 +222,12 @@ fn test_timestamp_precision_normalized_avoids_spurious_diffs() {
 
     let make_view_ts = |updated_at| ResourceView {
         schema: "TestResource".to_string(),
-        account: ResourceViewAccount {
-            id: account_id.clone(),
-            name: None,
-        },
         headers: ResourceViewHeaders {
             id,
+            account: ResourceViewAccount {
+                id: account_id.clone(),
+                name: None,
+            },
             name: "res".to_string(),
             description: None,
             labels: Default::default(),
