Implement BusinessDocumentBase combining BusinessBase and BusinessListBase

.gitignore

@@ -183,4 +183,6 @@ Source/Csla.Xaml.Uwp/project.lock.json
 .vscode
 .idea
 Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/PTracker.db
+Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/PTracker.db-shm
+Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/PTracker.db-wal
 .claude/settings.local.json

Samples/ProjectTracker/Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CslaVersion>10.0.0-beta-0022-gbd53196668</CslaVersion>
+    <CslaVersion>10.1.0-g660c07ebcb</CslaVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Csla" Version="$(CslaVersion)" />

Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/Pages/EditProject.razor

@@ -126,7 +126,7 @@ else
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (var item in vm.Model.Resources)
+                        @foreach (var item in vm.Model)
                         {
                             <tr>
                                 <td>@item.FirstName</td>
@@ -195,7 +195,7 @@ else
         viewMode = SubViewModes.Select;
         var portal = ApplicationContext.GetRequiredService<IDataPortal<ResourceList>>();
         _resourceList = (await portal.FetchAsync())
-                          .Where(r => !vm.Model.Resources.Contains(r.Id)).ToList();
+                          .Where(r => !vm.Model.Contains(r.Id)).ToList();
         StateHasChanged();
     }
 
@@ -219,14 +219,14 @@ else
     private void AddResource()
     {
         selectedResource.ApplyEdit();
-        if (!vm.Model.Resources.Contains(selectedResource.ResourceId))
-            vm.Model.Resources.Add(selectedResource);
+        if (!vm.Model.Contains(selectedResource.ResourceId))
+            vm.Model.Add(selectedResource);
         ShowDefaultView();
     }
 
     private void EditResource(int resourceId)
     {
-        selectedResource = vm.Model.Resources
+        selectedResource = vm.Model
           .Where(r => r.ResourceId == resourceId).FirstOrDefault();
         if (selectedResource != null)
         {
@@ -237,6 +237,6 @@ else
 
     private void RemoveResource(int resourceId)
     {
-        vm.Model.Resources.Remove(resourceId);
+        vm.Model.Remove(resourceId);
     }
 }

Samples/ProjectTracker/ProjectTracker.BusinessLibrary/Admin/RoleEditList.cs

@@ -10,7 +10,7 @@ namespace Admin
     /// Used to maintain the list of roles
     /// in the system.
     /// </summary>
-    public class RoleEditList : BusinessListBase<RoleEditList, RoleEdit>
+    public class RoleEditList : CslaBaseTypes.BusinessDocumentBase<RoleEditList, RoleEdit>
     {
       /// <summary>
       /// Remove a role based on the role's
@@ -65,11 +65,8 @@ private void Fetch([Inject] IRoleDal dal, [Inject] IChildDataPortal<RoleEdit> ro
       [Update]
       private void Update()
       {
-        using (LoadListMode)
-        {
-          Child_Update();
-        }
+        Child_Update();
       }
     }
   }
-}
+}

Samples/ProjectTracker/ProjectTracker.BusinessLibrary/Admin/RoleEditManager.cs

@@ -49,7 +49,7 @@ private void SaveRoleEdit()
         list.Add(RoleEdit);
       else
         item.Name = RoleEdit.Name;
-      list.Save();
+      list = (RoleEditList)list.Save();
     }
   }
 }

Samples/ProjectTracker/ProjectTracker.BusinessLibrary/CslaBaseTypes/BusinessDocumentBase.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace ProjectTracker.Library.CslaBaseTypes
+{
+  [Serializable]
+  public abstract class BusinessDocumentBase<T, C> : Csla.BusinessDocumentBase<T, C>
+    where T : Csla.BusinessDocumentBase<T, C>
+    where C : notnull, Csla.Core.IEditableBusinessObject
+  {
+
+  }
+}

Samples/ProjectTracker/ProjectTracker.BusinessLibrary/ProjectEdit.cs

@@ -8,7 +8,7 @@
 namespace ProjectTracker.Library
 {
   [CslaImplementProperties]
-  public partial class ProjectEdit : CslaBaseTypes.BusinessBase<ProjectEdit>
+  public partial class ProjectEdit : CslaBaseTypes.BusinessDocumentBase<ProjectEdit, ProjectResourceEdit>
   {
     [Browsable(false)]
     [EditorBrowsable(EditorBrowsableState.Never)]
@@ -28,93 +28,77 @@ public partial class ProjectEdit : CslaBaseTypes.BusinessBase<ProjectEdit>
 
     public partial string Description { get; set; }
 
-    public partial ProjectResources Resources { get; private set; }
-
     public override string ToString()
     {
       return Id.ToString();
     }
 
+    public async Task<ProjectResourceEdit> AssignAsync(int resourceId)
+    {
+      var portal = ApplicationContext.GetRequiredService<IDataPortal<ProjectResourceEditCreator>>();
+      var resourceCreator = await portal.FetchAsync(resourceId);
+      var resourceEdit = resourceCreator.ProjectResource;
+      this.Add(resourceEdit);
+      return resourceEdit;
+    }
+
+    public void Remove(int resourceId)
+    {
+      var item = this.FirstOrDefault(r => r.ResourceId == resourceId);
+      if (item != null)
+        Remove(item);
+    }
+
+    public bool Contains(int resourceId)
+    {
+      return this.Any(r => r.ResourceId == resourceId);
+    }
+
+    public bool ContainsDeleted(int resourceId)
+    {
+      return DeletedList.Any(r => r.ResourceId == resourceId);
+    }
+
     protected override void AddBusinessRules()
     {
       base.AddBusinessRules();
-      //BusinessRules.AddRule(new Csla.Rules.CommonRules.Required(NameProperty));
       BusinessRules.AddRule(
-        new StartDateGTEndDate { 
-          PrimaryProperty = StartedProperty, 
+        new StartDateGTEndDate {
+          PrimaryProperty = StartedProperty,
           AffectedProperties = { EndedProperty } });
       BusinessRules.AddRule(
-        new StartDateGTEndDate { 
-          PrimaryProperty = EndedProperty, 
+        new StartDateGTEndDate {
+          PrimaryProperty = EndedProperty,
           AffectedProperties = { StartedProperty } });
 
       BusinessRules.AddRule(
         new Csla.Rules.CommonRules.IsInRole(
-          Csla.Rules.AuthorizationActions.WriteProperty, 
-          NameProperty, 
+          Csla.Rules.AuthorizationActions.WriteProperty,
+          NameProperty,
           "ProjectManager"));
       BusinessRules.AddRule(new Csla.Rules.CommonRules.IsInRole(
         Csla.Rules.AuthorizationActions.WriteProperty, StartedProperty, Security.Roles.ProjectManager));
       BusinessRules.AddRule(new Csla.Rules.CommonRules.IsInRole(
         Csla.Rules.AuthorizationActions.WriteProperty, EndedProperty, Security.Roles.ProjectManager));
       BusinessRules.AddRule(new Csla.Rules.CommonRules.IsInRole(
         Csla.Rules.AuthorizationActions.WriteProperty, DescriptionProperty, Security.Roles.ProjectManager));
-      BusinessRules.AddRule(new NoDuplicateResource { PrimaryProperty = ResourcesProperty });
     }
 
     [EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
     [ObjectAuthorizationRules]
     public static void AddObjectAuthorizationRules()
     {
       Csla.Rules.BusinessRules.AddRule(
-        typeof(ProjectEdit), 
+        typeof(ProjectEdit),
         new Csla.Rules.CommonRules.IsInRole(
-          Csla.Rules.AuthorizationActions.CreateObject, 
+          Csla.Rules.AuthorizationActions.CreateObject,
           "ProjectManager"));
-      Csla.Rules.BusinessRules.AddRule(typeof(ProjectEdit), 
+      Csla.Rules.BusinessRules.AddRule(typeof(ProjectEdit),
         new Csla.Rules.CommonRules.IsInRole(Csla.Rules.AuthorizationActions.EditObject, Security.Roles.ProjectManager));
-      Csla.Rules.BusinessRules.AddRule(typeof(ProjectEdit), 
+      Csla.Rules.BusinessRules.AddRule(typeof(ProjectEdit),
         new Csla.Rules.CommonRules.IsInRole(Csla.Rules.AuthorizationActions.DeleteObject, Security.Roles.ProjectManager, Security.Roles.Administrator));
     }
 
-    protected override void OnChildChanged(Csla.Core.ChildChangedEventArgs e)
-    {
-      if (e.ChildObject is ProjectResources)
-      {
-        BusinessRules.CheckRules(ResourcesProperty);
-        OnPropertyChanged(ResourcesProperty);
-      }
-      base.OnChildChanged(e);
-    }
-
-    private class NoDuplicateResource : Csla.Rules.BusinessRule
-    {
-      protected override void Execute(Csla.Rules.IRuleContext context)
-      {
-        if (context.Target is not ProjectEdit target)
-          return;
-        try
-        {
-          var resources = target.Resources;
-          if (resources is null)
-            return;
-          foreach (var item in resources)
-          {
-            var count = resources.Count(r => r.ResourceId == item.ResourceId);
-            if (count > 1)
-            {
-              context.AddErrorResult("Duplicate resources not allowed");
-              return;
-            }
-          }
-        }
-        catch
-        {
-          // Resources may not be loaded yet
-        }
-      }
-    }
-
     private class StartDateGTEndDate : Csla.Rules.BusinessRule
     {
       protected override void Execute(Csla.Rules.IRuleContext context)
@@ -131,14 +115,13 @@ protected override void Execute(Csla.Rules.IRuleContext context)
 
     [Create]
     [RunLocal]
-    private void Create([Inject]IChildDataPortal<ProjectResources> portal)
+    private void Create()
     {
-      LoadProperty(ResourcesProperty, portal!.CreateChild()!);
       BusinessRules.CheckRules();
     }
 
     [Fetch]
-    private void Fetch(int id, [Inject] IProjectDal dal, [Inject] IChildDataPortal<ProjectResources> portal)
+    private void Fetch(int id, [Inject] IProjectDal dal, [Inject] IAssignmentDal assignmentDal, [Inject] IChildDataPortal<ProjectResourceEdit> childPortal)
     {
       var data = dal.Fetch(id) ?? throw new DataNotFoundException("Project");
       using (BypassPropertyChecks)
@@ -149,7 +132,12 @@ private void Fetch(int id, [Inject] IProjectDal dal, [Inject] IChildDataPortal<P
         Started = data.Started;
         Ended = data.Ended;
         TimeStamp = data.LastChanged ?? Array.Empty<byte>();
-        Resources = portal!.FetchChild(id)!;
+      }
+      using (LoadListMode)
+      {
+        var assignments = assignmentDal.FetchForProject(id);
+        foreach (var item in assignments)
+          Add(childPortal.FetchChild(item));
       }
     }
 
@@ -170,6 +158,7 @@ private void Insert([Inject] IProjectDal dal)
         TimeStamp = item.LastChanged;
       }
       FieldManager.UpdateChildren(this);
+      Child_Update(this);
     }
 
     [Update]
@@ -190,15 +179,16 @@ private void Update([Inject] IProjectDal dal)
         TimeStamp = item.LastChanged;
       }
       FieldManager.UpdateChildren(this.Id);
+      Child_Update(this.Id);
     }
 
     [DeleteSelf]
     private void DeleteSelf([Inject] IProjectDal dal)
     {
       using (BypassPropertyChecks)
       {
-        Resources?.Clear();
-        FieldManager.UpdateChildren(this);
+        Clear();
+        Child_Update(this);
         Delete(this.Id, dal);
       }
     }
@@ -209,4 +199,4 @@ private void Delete(int id, [Inject] IProjectDal dal)
       dal.Delete(id);
     }
   }
-}
+}