Cleanup underlying models, fix remaining compiler errors

Author: Arlodotexe

src/Models/IProjectRoleCollection.cs

@@ -12,19 +12,3 @@ public interface IProjectRoleCollection
     /// </summary>
     ProjectRole[] Projects { get; set; }
 }
-
-/// <summary>
-/// A container for a project and a corresponding role.
-/// </summary>
-public record ProjectRole
-{
-    /// <summary>
-    /// The project ID.
-    /// </summary>
-    public required Cid ProjectId { get; init; }
-
-    /// <summary>
-    /// The role of the project.
-    /// </summary>
-    public required DagCid Role { get; init; }
-}

src/Models/IPublisherRoleCollection.cs

@@ -12,19 +12,3 @@ public interface IPublisherRoleCollection
     /// </summary>
     public PublisherRole[] Publishers { get; set; }
 }
-
-/// <summary>
-/// A container for a Publisher and a corresponding role.
-/// </summary>
-public record PublisherRole
-{
-    /// <summary>
-    /// The publisher ID.
-    /// </summary>
-    public required Cid PublisherId { get; init; }
-
-    /// <summary>
-    /// The role of the publisher.
-    /// </summary>
-    public required DagCid Role { get; init; }
-}

src/Models/IPublisherRoleGraphCollection.cs

@@ -0,0 +1,18 @@
+namespace WindowsAppCommunity.Sdk.Models;
+
+/// <summary>
+/// Represents a collection of publishers and their roles, where each publisher can have child and parent publishers.
+/// This interface is used to manage hierarchical relationships between publishers.
+/// </summary>
+public interface IPublisherRoleGraphNodeCollection
+{
+    /// <summary>
+    /// A list of other publishers who are managed under this publisher.
+    /// </summary>
+    public PublisherRoleCollection ParentPublishers { get; set; }
+
+    /// <summary>
+    /// A list of other publishers who are managed under this publisher.
+    /// </summary>
+    public PublisherRoleCollection ChildPublishers { get; set; }
+}

src/Models/IUserRoleCollection.cs

@@ -12,19 +12,3 @@ public interface IUserRoleCollection
     /// </summary>
     public UserRole[] Users { get; set; }
 }
-
-/// <summary>
-/// A container for a user and a corresponding role.
-/// </summary>
-public record UserRole
-{
-    /// <summary>
-    /// The user ID.
-    /// </summary>
-    public required Cid UserId { get; init; }
-
-    /// <summary>
-    /// The role of the user.
-    /// </summary>
-    public required DagCid Role { get; init; } 
-}

src/Models/ProjectRole.cs

@@ -0,0 +1,19 @@
+using Ipfs;
+
+namespace WindowsAppCommunity.Sdk.Models;
+
+/// <summary>
+/// A container for a project and a corresponding role.
+/// </summary>
+public record ProjectRole
+{
+    /// <summary>
+    /// The project ID.
+    /// </summary>
+    public required Cid ProjectId { get; init; }
+
+    /// <summary>
+    /// The role of the project.
+    /// </summary>
+    public required DagCid Role { get; init; }
+}

src/Models/Publisher.cs

@@ -7,7 +7,7 @@ namespace WindowsAppCommunity.Sdk.Models;
 /// <summary>
 /// Represents a content publisher.
 /// </summary>
-public record Publisher : IEntity, ILinkCollection, IProjectCollection, IUserRoleCollection, IConnections, IAccentColor, ISources<Cid>
+public record Publisher : IEntity, ILinkCollection, IProjectCollection, IUserRoleCollection, IPublisherRoleGraphNodeCollection, IConnections, IAccentColor, ISources<Cid>
 {
     /// <summary>
     /// The name of the publisher.
@@ -52,12 +52,12 @@ public record Publisher : IEntity, ILinkCollection, IProjectCollection, IUserRol
     /// <summary>
     /// A list of other publishers who are managed under this publisher.
     /// </summary>
-    public PublisherRole[] ParentPublishers { get; set; } = [];
+    public PublisherRoleCollection ParentPublishers { get; set; } = new();
 
     /// <summary>
     /// A list of other publishers who are managed under this publisher.
     /// </summary>
-    public PublisherRole[] ChildPublishers { get; set; } = [];
+    public PublisherRoleCollection ChildPublishers { get; set; } = new();
 
     /// <summary>
     /// Holds information about publisher assets that have been published for consumption by an end user, such as a Microsoft Store app, a package on nuget.org, a git repo, etc.

src/Models/PublisherRole.cs

@@ -0,0 +1,19 @@
+using Ipfs;
+
+namespace WindowsAppCommunity.Sdk.Models;
+
+/// <summary>
+/// A container for a Publisher and a corresponding role.
+/// </summary>
+public record PublisherRole
+{
+    /// <summary>
+    /// The publisher ID.
+    /// </summary>
+    public required Cid PublisherId { get; init; }
+
+    /// <summary>
+    /// The role of the publisher.
+    /// </summary>
+    public required DagCid Role { get; init; }
+}

src/Models/PublisherRoleCollection.cs

@@ -0,0 +1,8 @@
+namespace WindowsAppCommunity.Sdk.Models;
+
+/// <inheritdoc/>
+public record PublisherRoleCollection : IPublisherRoleCollection
+{
+    /// <inheritdoc />
+    public PublisherRole[] Publishers { get; set; } = [];
+}

src/Models/UserRole.cs

@@ -0,0 +1,19 @@
+using Ipfs;
+
+namespace WindowsAppCommunity.Sdk.Models;
+
+/// <summary>
+/// A container for a user and a corresponding role.
+/// </summary>
+public record UserRole
+{
+    /// <summary>
+    /// The user ID.
+    /// </summary>
+    public required Cid UserId { get; init; }
+
+    /// <summary>
+    /// The role of the user.
+    /// </summary>
+    public required DagCid Role { get; init; } 
+}

src/Nomad/ModifiablePublisherRoleCollection.cs

@@ -151,22 +151,22 @@ public override async Task ApplyEntryUpdateAsync(EventStreamEntry<DagCid> stream
     public async Task ApplyAddPublisherRoleEntryAsync(EventStreamEntry<DagCid> streamEntry, ValueUpdateEvent updateEvent, IReadOnlyPublisherRole publisher, CancellationToken cancellationToken)
     {
         var roleCid = await Client.Dag.PutAsync(publisher.Role, pin: KuboOptions.ShouldPin, cancel: cancellationToken);
-        Inner.Inner = [.. Inner.Inner, new PublisherRole { PublisherId = publisher.Id, Role = (DagCid)roleCid }];
+        Inner.Inner.Publishers = [.. Inner.Inner.Publishers, new PublisherRole { PublisherId = publisher.Id, Role = (DagCid)roleCid }];
         PublishersAdded?.Invoke(this, [publisher]);
     }
 
     /// <inheritdoc/>
     public async Task ApplyRemovePublisherRoleEntryAsync(EventStreamEntry<DagCid> streamEntry, ValueUpdateEvent updateEvent, IReadOnlyPublisherRole publisher, CancellationToken cancellationToken)
     {
         var roleCid = await Client.Dag.PutAsync(publisher.Role, pin: KuboOptions.ShouldPin, cancel: cancellationToken);
-        Inner.Inner = [.. Inner.Inner.Where(x => x.PublisherId != publisher.Id && x.Role != (DagCid)roleCid)];
+        Inner.Inner.Publishers = [.. Inner.Inner.Publishers.Where(x => x.PublisherId != publisher.Id && x.Role != (DagCid)roleCid)];
         PublishersRemoved?.Invoke(this, [publisher]);
     }
 
     /// <inheritdoc/>
     public override Task ResetEventStreamPositionAsync(CancellationToken cancellationToken)
     {
-        Inner.Inner = [];
+        Inner.Inner.Publishers = [];
         return Task.CompletedTask;
     }
 }