Fixed type constraint on DigitalFormReportDataModel

InABox.Core/DigitalForms/DigitalFormReportDataModel.cs

@@ -16,7 +16,7 @@ namespace InABox.Core
     /// <typeparam name="T">
     ///     Should always be an EntityForm<,></typeparam>
     public class DigitalFormReportDataModel<T> : AutoDataModel<T>, IDigitalFormReportDataModel
-        where T : Entity, IRemotable, IPersistent, IEntityForm, new()
+        where T : Entity, IRemotable, IPersistent, IDigitalFormInstance, new()
     {
 
         private Guid? FormId { get; set; } = null;
@@ -81,12 +81,12 @@ namespace InABox.Core
 
             if(FormDataTable == null)
             {
-                LoadFormDataTable(FormId ?? ExtractValues<T, Guid>(x => (x as IDigitalFormInstance)!.Form.ID).FirstOrDefault());
+                LoadFormDataTable(FormId ?? ExtractValues<T, Guid>(x => x.Form.ID).FirstOrDefault());
             }
 
             var idList = ExtractValues<T, Guid>(x => x.ID);
-            var jsonLists = ExtractValues<T, string>(x => (x as IDigitalFormInstance)!.FormData, false).ToList();
-            var blobLists = ExtractValues<T, string?>(x => (x as IDigitalFormInstance)!.BlobData, false).ToList();
+            var jsonLists = ExtractValues<T, string>(x => x.FormData, false).ToList();
+            var blobLists = ExtractValues<T, string?>(x => x.BlobData, false).ToList();
 
             for(var i = 0; i < jsonLists.Count; ++i)
             {