Refactor MutationRequest with detail grouping

Author: rian-be

src/Governance/Abstractions/Requests/Factory/MutationRequestFactory.cs

@@ -78,19 +78,28 @@ public static MutationRequest Pending(
     {
         return new MutationRequest
         {
-            StateId = stateId,
-            StateType = stateType,
-            MutationType = mutationType,
-            Intent = intent,
-            Context = context,
-            Status = MutationRequestStatus.Pending,
-            PendingReason = pendingReason,
+            Scope = new MutationRequestScopeDetails
+            {
+                StateId = stateId,
+                StateType = stateType,
+                MutationType = mutationType
+            },
+            Payload = new MutationRequestPayloadDetails
+            {
+                Intent = intent,
+                Context = context
+            },
+            Lifecycle = new MutationRequestLifecycleDetails
+            {
+                Status = MutationRequestStatus.Pending,
+                PendingReason = pendingReason,
+                ExpiresAt = expiresAt
+            },
             Requirements = requirements ?? [],
             Versioning = new MutationRequestVersioningDetails
             {
                 ExpectedStateVersion = expectedStateVersion
             },
-            ExpiresAt = expiresAt,
             Metadata = metadata ?? new Dictionary<string, object>(),
             Decisions =
             [
@@ -171,20 +180,29 @@ public static MutationRequest PendingApproval(
 
         return new MutationRequest
         {
-            StateId = stateId,
-            StateType = stateType,
-            MutationType = mutationType,
-            Intent = intent,
-            Context = context,
-            Status = MutationRequestStatus.Pending,
-            PendingReason = PendingMutationReason.Approval,
+            Scope = new MutationRequestScopeDetails
+            {
+                StateId = stateId,
+                StateType = stateType,
+                MutationType = mutationType
+            },
+            Payload = new MutationRequestPayloadDetails
+            {
+                Intent = intent,
+                Context = context
+            },
+            Lifecycle = new MutationRequestLifecycleDetails
+            {
+                Status = MutationRequestStatus.Pending,
+                PendingReason = PendingMutationReason.Approval,
+                ExpiresAt = expiresAt
+            },
             Requirements = requirements,
             ApprovalRequirements = approvalRequirements,
             Versioning = new MutationRequestVersioningDetails
             {
                 ExpectedStateVersion = expectedStateVersion
             },
-            ExpiresAt = expiresAt,
             Metadata = metadata ?? new Dictionary<string, object>(),
             Decisions =
             [
@@ -257,12 +275,21 @@ public static MutationRequest Approved(
     {
         return new MutationRequest
         {
-            StateId = stateId,
-            StateType = stateType,
-            MutationType = mutationType,
-            Intent = intent,
-            Context = context,
-            Status = MutationRequestStatus.Approved,
+            Scope = new MutationRequestScopeDetails
+            {
+                StateId = stateId,
+                StateType = stateType,
+                MutationType = mutationType
+            },
+            Payload = new MutationRequestPayloadDetails
+            {
+                Intent = intent,
+                Context = context
+            },
+            Lifecycle = new MutationRequestLifecycleDetails
+            {
+                Status = MutationRequestStatus.Approved
+            },
             Versioning = new MutationRequestVersioningDetails
             {
                 ExpectedStateVersion = expectedStateVersion

src/Governance/Abstractions/Requests/Model/MutationRequest.cs

@@ -1,3 +1,4 @@
+using System.Text.Json.Serialization;
 using ModularityKit.Mutator.Abstractions.Context;
 using ModularityKit.Mutator.Abstractions.Effects;
 using ModularityKit.Mutator.Abstractions.Intent;
@@ -19,45 +20,25 @@ public sealed record MutationRequest
     public string RequestId { get; init; } = Guid.NewGuid().ToString();
 
     /// <summary>
-    /// Identifier of the state targeted by this request.
+    /// Target scope details for the governed request.
     /// </summary>
-    public string StateId { get; init; } = string.Empty;
+    public MutationRequestScopeDetails Scope { get; init; } = new();
 
     /// <summary>
-    /// Logical state type targeted by the request.
+    /// Submitted mutation payload details for the governed request.
     /// </summary>
-    public string StateType { get; init; } = string.Empty;
+    public MutationRequestPayloadDetails Payload { get; init; } = new();
 
     /// <summary>
-    /// CLR type name of the underlying mutation.
+    /// Lifecycle state and lifecycle timestamps associated with the request.
     /// </summary>
-    public string MutationType { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Intent associated with the requested mutation.
-    /// </summary>
-    public MutationIntent Intent { get; init; } = null!;
-
-    /// <summary>
-    /// Request context describing who requested the mutation and why.
-    /// </summary>
-    public MutationContext Context { get; init; } = null!;
+    public MutationRequestLifecycleDetails Lifecycle { get; init; } = new();
 
     /// <summary>
     /// Governed execution-specific details associated with this request.
     /// </summary>
     public GovernedExecutionDetails Execution { get; init; } = new();
 
-    /// <summary>
-    /// Current lifecycle status of the request.
-    /// </summary>
-    public MutationRequestStatus Status { get; init; } = MutationRequestStatus.Created;
-
-    /// <summary>
-    /// Reason why the request is pending, if it has not executed yet.
-    /// </summary>
-    public PendingMutationReason? PendingReason { get; init; }
-
     /// <summary>
     /// Requirements that must be fulfilled before execution may proceed.
     /// </summary>
@@ -89,22 +70,37 @@ public sealed record MutationRequest
     public MutationRequestVersioningDetails Versioning { get; init; } = new();
 
     /// <summary>
-    /// Optional expiration time for pending requests.
+    /// Additional governance metadata carried by the request.
     /// </summary>
-    public DateTimeOffset? ExpiresAt { get; init; }
+    public IReadOnlyDictionary<string, object> Metadata { get; init; } = new Dictionary<string, object>();
 
-    /// <summary>
-    /// Timestamp when the request was first created.
-    /// </summary>
-    public DateTimeOffset CreatedAt { get; init; } = DateTimeOffset.UtcNow;
+    [JsonIgnore]
+    public string StateId => Scope.StateId;
 
-    /// <summary>
-    /// Timestamp of the last lifecycle update applied to the request.
-    /// </summary>
-    public DateTimeOffset UpdatedAt { get; init; } = DateTimeOffset.UtcNow;
+    [JsonIgnore]
+    public string StateType => Scope.StateType;
 
-    /// <summary>
-    /// Additional governance metadata carried by the request.
-    /// </summary>
-    public IReadOnlyDictionary<string, object> Metadata { get; init; } = new Dictionary<string, object>();
+    [JsonIgnore]
+    public string MutationType => Scope.MutationType;
+
+    [JsonIgnore]
+    public MutationIntent Intent => Payload.Intent;
+
+    [JsonIgnore]
+    public MutationContext Context => Payload.Context;
+
+    [JsonIgnore]
+    public MutationRequestStatus Status => Lifecycle.Status;
+
+    [JsonIgnore]
+    public PendingMutationReason? PendingReason => Lifecycle.PendingReason;
+
+    [JsonIgnore]
+    public DateTimeOffset? ExpiresAt => Lifecycle.ExpiresAt;
+
+    [JsonIgnore]
+    public DateTimeOffset CreatedAt => Lifecycle.CreatedAt;
+
+    [JsonIgnore]
+    public DateTimeOffset UpdatedAt => Lifecycle.UpdatedAt;
 }

src/Governance/Abstractions/Requests/Model/MutationRequestLifecycleDetails.cs

@@ -0,0 +1,34 @@
+using ModularityKit.Mutator.Governance.Abstractions.Lifecycle.Model;
+
+namespace ModularityKit.Mutator.Governance.Abstractions.Requests.Model;
+
+/// <summary>
+/// Groups lifecycle state and lifecycle timestamps associated with a governed request.
+/// </summary>
+public sealed record MutationRequestLifecycleDetails
+{
+    /// <summary>
+    /// Current lifecycle status of the request.
+    /// </summary>
+    public MutationRequestStatus Status { get; init; } = MutationRequestStatus.Created;
+
+    /// <summary>
+    /// Reason why the request is pending, if it has not executed yet.
+    /// </summary>
+    public PendingMutationReason? PendingReason { get; init; }
+
+    /// <summary>
+    /// Optional expiration time for pending requests.
+    /// </summary>
+    public DateTimeOffset? ExpiresAt { get; init; }
+
+    /// <summary>
+    /// Timestamp when the request was first created.
+    /// </summary>
+    public DateTimeOffset CreatedAt { get; init; } = DateTimeOffset.UtcNow;
+
+    /// <summary>
+    /// Timestamp of the last lifecycle update applied to the request.
+    /// </summary>
+    public DateTimeOffset UpdatedAt { get; init; } = DateTimeOffset.UtcNow;
+}

src/Governance/Abstractions/Requests/Model/MutationRequestPayloadDetails.cs

@@ -0,0 +1,20 @@
+using ModularityKit.Mutator.Abstractions.Context;
+using ModularityKit.Mutator.Abstractions.Intent;
+
+namespace ModularityKit.Mutator.Governance.Abstractions.Requests.Model;
+
+/// <summary>
+/// Groups the submitted mutation intent and requester context carried by a governed request.
+/// </summary>
+public sealed record MutationRequestPayloadDetails
+{
+    /// <summary>
+    /// Intent associated with the requested mutation.
+    /// </summary>
+    public MutationIntent Intent { get; init; } = null!;
+
+    /// <summary>
+    /// Request context describing who requested the mutation and why.
+    /// </summary>
+    public MutationContext Context { get; init; } = null!;
+}

src/Governance/Abstractions/Requests/Model/MutationRequestScopeDetails.cs

@@ -0,0 +1,22 @@
+namespace ModularityKit.Mutator.Governance.Abstractions.Requests.Model;
+
+/// <summary>
+/// Groups target scope identifiers for a governed mutation request.
+/// </summary>
+public sealed record MutationRequestScopeDetails
+{
+    /// <summary>
+    /// Identifier of the state targeted by this request.
+    /// </summary>
+    public string StateId { get; init; } = string.Empty;
+
+    /// <summary>
+    /// Logical state type targeted by the request.
+    /// </summary>
+    public string StateType { get; init; } = string.Empty;
+
+    /// <summary>
+    /// CLR type name of the underlying mutation.
+    /// </summary>
+    public string MutationType { get; init; } = string.Empty;
+}