Applied ITopicBindingModel to ITopicViewModel

JeremyCaney · JeremyCaney · commit ffe775e87789 · 2021-03-01T12:04:05.000-08:00
Since `ContentType` is defined on both `ITopicBindingModel` and `ITopicBindingModel`, and there's no other "pollution" from any otherwise unnecessary interface requirements on `ITopicBindingModel`, we can derive `ITopicBindingModel` from `ITopicBindingModel`, thus allowing them to share this definition, while also allowing implementations to satisfy both interfaces. This can also be applied to `TopicViewModel`.
diff --git a/OnTopic.ViewModels/TopicViewModel.cs b/OnTopic.ViewModels/TopicViewModel.cs
@@ -20,7 +20,7 @@ namespace OnTopic.ViewModels {
   ///   default implementations that can be used directly, used as base classes, or overwritten at the presentation level. They
   ///   are supplied for convenience to model factory default settings for out-of-the-box content types.
   /// </remarks>
-  public record TopicViewModel: ITopicViewModel, IKeyedTopicViewModel, IAssociatedTopicBindingModel {
+  public record TopicViewModel: ITopicViewModel, IKeyedTopicViewModel, IAssociatedTopicBindingModel, ITopicBindingModel {
 
     /*==========================================================================================================================
     | ID
diff --git a/OnTopic/Models/ITopicViewModel.cs b/OnTopic/Models/ITopicViewModel.cs
@@ -22,13 +22,13 @@ namespace OnTopic.Models {
   ///     provided via the public interface then it will instead need to be defined in some other way.
   ///   </para>
   ///   <para>
-  ///     For instance, in the default MVC library, the <c>TopicViewResult</c> class requires that the <see
-  ///     cref="Topic.ContentType"/> and <see cref="Topic.View"/> be supplied separately if they're not provided as part of a
-  ///     <see cref="ITopicViewModel"/>. The exact details of this will obviously vary based on the implementation of the
-  ///     presentation layer and any supporting libraries.
+  ///     For instance, in the default MVC library, the <c>TopicViewResult</c> class requires that the <see cref="Topic.
+  ///     ContentType"/> and <see cref="Topic.View"/> be supplied separately if they're not provided as part of a <see cref="
+  ///     ITopicViewModel"/>. The exact details of this will obviously vary based on the implementation of the presentation
+  ///     layer and any supporting libraries.
   ///   </para>
   /// </remarks>
-  public interface ITopicViewModel: IKeyedTopicViewModel, IAssociatedTopicBindingModel {
+  public interface ITopicViewModel: IKeyedTopicViewModel, IAssociatedTopicBindingModel, ITopicBindingModel {
 
     /*==========================================================================================================================
     | PROPERTY: ID
@@ -47,18 +47,6 @@ public interface ITopicViewModel: IKeyedTopicViewModel, IAssociatedTopicBindingM
     /// </summary>
     string? WebPath { get; init; }
 
-    /*==========================================================================================================================
-    | PROPERTY: CONTENT TYPE
-    \-------------------------------------------------------------------------------------------------------------------------*/
-    /// <summary>
-    ///   Gets the key name of the content type that the current topic represents.
-    /// </summary>
-    /// <remarks>
-    ///   Each topic is associated with a content type. The content type determines which attributes are displayed in the Topics
-    ///   Editor (via the <see cref="ContentTypeDescriptor.AttributeDescriptors"/> property).
-    /// </remarks>
-    string? ContentType { get; init; }
-
     /*==========================================================================================================================
     | PROPERTY: VIEW
     \-------------------------------------------------------------------------------------------------------------------------*/
@@ -67,10 +55,10 @@ public interface ITopicViewModel: IKeyedTopicViewModel, IAssociatedTopicBindingM
     /// </summary>
     /// <remarks>
     ///   This value can be set via the query string (via the <c>TopicViewResultExecutor</c> class), via the Accepts header
-    ///   (also via the <c>TopicViewResultExecutor</c> class), on the topic itself (via this property), or via the
-    ///   <see cref="ContentType"/>. By default, it will be set to the name of the <see cref="ContentType"/>; e.g., if the
-    ///   Content Type is "Page", then the view will be "Page". This will cause the <c>TopicViewResultExecutor</c> to look
-    ///   for a view at, for instance, <c>/Views/Page/Page.cshtml</c>.
+    ///   (also via the <c>TopicViewResultExecutor</c> class), on the topic itself (via this property), or via the <see cref="
+    ///   ITopicBindingModel.ContentType"/>. By default, it will be set to the name of the <see cref="ITopicBindingModel.
+    ///   ContentType"/>; e.g., if the Content Type is <c>Page</c>, then the view will be <c>Page</c>. This will cause the <c>
+    ///   TopicViewResultExecutor</c> to look for a view at, for instance, <c>/Views/Page/Page.cshtml</c>.
     /// </remarks>
     string? View { get; init; }
 
