Enabling support for tracking Video Watch Time

pticostaricags · Apr 11, 2024 · df4bf72 · df4bf72
1 parent 504278e
commit df4bf72
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Models/FairPlayTube/VideoWatchTime.cs b/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Models/FairPlayTube/VideoWatchTime.cs
@@ -29,7 +29,7 @@ public partial class VideoWatchTime
 
     public DateTimeOffset SessionStartDatetime { get; set; }
 
-    public int WatchTime { get; set; }
+    public double WatchTime { get; set; }
 
     [StringLength(450)]
     public string WatchedByApplicationUserId { get; set; }

diff --git a/src/FairPlayCombinedSln/FairPlayCombined.Models/FairPlayTube/VideoInfo/VideoInfoModel.cs b/src/FairPlayCombinedSln/FairPlayCombined.Models/FairPlayTube/VideoInfo/VideoInfoModel.cs
@@ -26,5 +26,7 @@ public class VideoInfoModel : IListModel
         public string[]? VideoKeywords { get; set; }
         public string[]? VideoTopics { get; set; }
         public string? EnglishCaptions { get; set; }
+        public int LifetimeSessions { get; set; }
+        public TimeSpan LifetimeWatchTime { get; set; }
     }
 }
diff --git a/...layCombinedSln/FairPlayCombined.Models/FairPlayTube/VideoWatchTime/VideoWatchTimeModel.cs b/...layCombinedSln/FairPlayCombined.Models/FairPlayTube/VideoWatchTime/VideoWatchTimeModel.cs
@@ -18,7 +18,7 @@ public class VideoWatchTimeModel: IListModel
         public Guid? SessionId { get; set; }= Guid.Empty;
         [Required]
         public DateTimeOffset? SessionStartDatetime { get; set; }
-        public int WatchTime { get; set; }
+        public double WatchTime { get; set; }
         [StringLength(450)]
         public string? WatchedByApplicationUserId { get; set; }
     }

diff --git a/src/FairPlayCombinedSln/FairPlayCombined.Services/FairPlayTube/VideoInfoService.cs b/src/FairPlayCombinedSln/FairPlayCombined.Services/FairPlayTube/VideoInfoService.cs
@@ -111,8 +111,9 @@ CancellationToken cancellationToken
                     VideoLanguageCode = p.VideoLanguageCode,
                     VideoVisibilityId = p.VideoVisibilityId,
                     ThumbnailUrl = p.ThumbnailUrl,
-                    YouTubeVideoId = p.YouTubeVideoId
-
+                    YouTubeVideoId = p.YouTubeVideoId,
+                    LifetimeSessions = p.VideoWatchTime.Count,
+                    LifetimeWatchTime = TimeSpan.FromSeconds(p.VideoWatchTime.Sum(p=>p.WatchTime))
                 });
             if (!String.IsNullOrEmpty(orderByString))
                 query = query.OrderBy(orderByString);

diff --git a/src/FairPlayCombinedSln/FairPlayCombinedDb/FairPlayTube/Tables/VideoWatchTime.sql b/src/FairPlayCombinedSln/FairPlayCombinedDb/FairPlayTube/Tables/VideoWatchTime.sql
@@ -4,7 +4,7 @@
     [VideoInfoId] BIGINT NOT NULL, 
     [SessionId] UNIQUEIDENTIFIER NOT NULL, 
     [SessionStartDatetime] DATETIMEOFFSET NOT NULL, 
-    [WatchTime] INT NOT NULL, 
+    [WatchTime] FLOAT NOT NULL, 
     [WatchedByApplicationUserId] NVARCHAR(450) NULL, 
     CONSTRAINT [FK_VideoWatchTime_VideoInfo] FOREIGN KEY ([VideoInfoId]) REFERENCES [FairPlayTube].[VideoInfo]([VideoInfoId]), 
     CONSTRAINT [FK_VideoWatchTime_AspNetUsers] FOREIGN KEY ([WatchedByApplicationUserId]) REFERENCES [dbo].[AspNetUsers]([Id])

diff --git a/src/FairPlayCombinedSln/FairPlayTube/Components/Pages/Home.razor b/src/FairPlayCombinedSln/FairPlayTube/Components/Pages/Home.razor
@@ -25,6 +25,8 @@
                 </div>
                 <div>
                     <FluentLabel Typo="Typography.Body">@singleItem.Name</FluentLabel>
+                    <FluentLabel Typo="Typography.Body">Views: @singleItem.LifetimeSessions</FluentLabel>
+                    <FluentLabel Typo="Typography.Body">Watch Time(hh:mm:ss): @singleItem.LifetimeWatchTime</FluentLabel>
                 </div>
                 <div>
                     <FluentButton Type="ButtonType.Button" Appearance="Appearance.Accent"

diff --git a/src/FairPlayCombinedSln/FairPlayTube/Components/Pages/Public/WatchVideo.razor b/src/FairPlayCombinedSln/FairPlayTube/Components/Pages/Public/WatchVideo.razor
@@ -62,7 +62,7 @@ else
     private string? VideoUrl { get; set; }
     private SupportedLanguageModel[]? SupportedLanguages { get; set; }
     private DotNetObjectReference<WatchVideo>? dotNetObjectReference;
-
+    private bool IsSessionCreated { get; set; } = false;
     protected override void OnInitialized()
     {
         this.dotNetObjectReference = DotNetObjectReference.Create<WatchVideo>(this);
@@ -92,13 +92,13 @@ else
     }
 
     [JSInvokable]
-    public async void UpdateWatchTime(int watchTime, string currentSessionGuid)
+    public async void UpdateWatchTime(double watchTime, string currentSessionGuid)
     {
         try
         {
             var currentUserId = this.userProviderService.GetCurrentUserId();
             System.Diagnostics.Debug.WriteLine($"Watch Time (s): {watchTime}. Session: {currentSessionGuid}");
-            if (watchTime == 1)
+            if (!IsSessionCreated)
             {
                 await this.videoWatchTimeService.CreateVideoWatchTimeAsync(
                     this.VideoId!,
@@ -108,8 +108,9 @@ else
                         SessionId = Guid.Parse(currentSessionGuid),
                         WatchTime = watchTime
                     }, cancellationToken: cancellationTokenSource.Token);
+                this.IsSessionCreated = true;
             }
-            else if (watchTime % 30 == 0)
+            else
             {
                 await this.videoWatchTimeService.UpdateVideoWatchTimeAsync(
                     this.VideoId!,