Removes field 'ChannelId' from YTS videos

Jellyfish-Insights · Mar 3, 2022 · 4ac1cd4 · 4ac1cd4
1 parent c1f4cc1
commit 4ac1cd4
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 13 deletions.
diff --git a/DataLakeModels/DataLakeYouTubeStudioContext.cs b/DataLakeModels/DataLakeYouTubeStudioContext.cs
@@ -14,7 +14,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) {
 
             modelBuilder.Entity<Video>()
                 .HasKey(table => new {
-                table.ChannelId,
                 table.VideoId,
                 table.ValidityStart,
                 table.Metric,

diff --git a/...odels/Migrations/DataLakeYouTubeStudio/20220222210844_RemoveChannelIdYTSVideo.Designer.cs b/...odels/Migrations/DataLakeYouTubeStudio/20220222210844_RemoveChannelIdYTSVideo.Designer.cs
diff --git a/DataLakeModels/Migrations/DataLakeYouTubeStudio/20220222210844_RemoveChannelIdYTSVideo.cs b/DataLakeModels/Migrations/DataLakeYouTubeStudio/20220222210844_RemoveChannelIdYTSVideo.cs
@@ -0,0 +1,63 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DataLakeModels.Migrations.DataLakeYouTubeStudio
+{
+    public partial class RemoveChannelIdYTSVideo : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_Videos",
+                schema: "youtube_studio_v1",
+                table: "Videos");
+
+            migrationBuilder.DropColumn(
+                name: "ChannelId",
+                schema: "youtube_studio_v1",
+                table: "Videos");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "UpdateDate",
+                schema: "youtube_studio_v1",
+                table: "Groups",
+                nullable: true,
+                oldClrType: typeof(DateTime));
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_Videos",
+                schema: "youtube_studio_v1",
+                table: "Videos",
+                columns: new[] { "VideoId", "ValidityStart", "Metric", "EventDate" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_Videos",
+                schema: "youtube_studio_v1",
+                table: "Videos");
+
+            migrationBuilder.AddColumn<string>(
+                name: "ChannelId",
+                schema: "youtube_studio_v1",
+                table: "Videos",
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "UpdateDate",
+                schema: "youtube_studio_v1",
+                table: "Groups",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldNullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_Videos",
+                schema: "youtube_studio_v1",
+                table: "Videos",
+                columns: new[] { "ChannelId", "VideoId", "ValidityStart", "Metric", "EventDate" });
+        }
+    }
+}
diff --git a/DataLakeModels/Migrations/DataLakeYouTubeStudio/DataLakeYouTubeStudioContextModelSnapshot.cs b/DataLakeModels/Migrations/DataLakeYouTubeStudio/DataLakeYouTubeStudioContextModelSnapshot.cs
@@ -31,7 +31,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<string>("Title");
 
-                    b.Property<DateTime>("UpdateDate");
+                    b.Property<DateTime?>("UpdateDate");
 
                     b.HasKey("GroupId");
 
@@ -60,8 +60,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("DataLakeModels.Models.YouTube.Studio.Video", b =>
                 {
-                    b.Property<string>("ChannelId");
-
                     b.Property<string>("VideoId");
 
                     b.Property<DateTime>("ValidityStart");
@@ -75,7 +73,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<double>("Value");
 
-                    b.HasKey("ChannelId", "VideoId", "ValidityStart", "Metric", "EventDate");
+                    b.HasKey("VideoId", "ValidityStart", "Metric", "EventDate");
 
                     b.ToTable("Videos");
                 });

diff --git a/DataLakeModels/Models/YouTube/Studio/Video.cs b/DataLakeModels/Models/YouTube/Studio/Video.cs
@@ -10,15 +10,13 @@ public Video(
             DateTime validityStart,
             DateTime validityEnd,
             DateTime eventDate,
-            string channelId,
             string videoId,
             string metric,
             double value
             ) {
             ValidityStart = validityStart;
             ValidityEnd = validityEnd;
             EventDate = eventDate;
-            ChannelId = channelId;
             VideoId = videoId;
             Metric = metric;
             Value = value;
@@ -30,14 +28,12 @@ public Video() {}
         public DateTime ValidityEnd { get; set; }
         [Column(TypeName = "date")]
         public DateTime EventDate { get; set; }
-        public string ChannelId { get; set; }
         public string VideoId { get; set; }
         public string Metric { get; set; }
         public double Value { get; set; }
 
         bool IEquatable<Video>.Equals(Video other) {
-            return ChannelId == other.ChannelId &&
-                   VideoId == other.VideoId &&
+            return VideoId == other.VideoId &&
                    Metric == other.Metric &&
                    EventDate == other.EventDate &&
                    (
@@ -51,7 +47,6 @@ public override string ToString() {
                 ValidityStart: {ValidityStart},
                 ValidityEnd: {ValidityEnd},
                 EventDate: {EventDate},
-                ChannelId: {ChannelId},
                 VideoId: {VideoId},
                 Metric: {Metric},
                 Value: {Value}

diff --git a/Jobs.Fetcher.YouTubeStudio/Helpers/DbWriter.cs b/Jobs.Fetcher.YouTubeStudio/Helpers/DbWriter.cs
@@ -36,7 +36,6 @@ public static Video DTOToVideo(Video_DTO dto) {
                        ValidityStart = validityStart,
                        ValidityEnd = validityEnd,
                        EventDate = eventTime.ToUniversalTime().Date,
-                       ChannelId = dto.ChannelId,
                        VideoId = dto.VideoId,
                        Metric = dto.Metric,
                        Value = dto.Value

diff --git a/Test/YouTubeStudioFetcherTest.cs b/Test/YouTubeStudioFetcherTest.cs
@@ -212,7 +212,6 @@ protected void DeleteAllVideos(DataLakeYouTubeStudioContext ctx) {
         protected Func<Video, bool> FindDTO(Video_DTO videoDTO) {
             return v =>
                    v.VideoId == videoDTO.VideoId
-                   && v.ChannelId == videoDTO.ChannelId
                    && v.EventDate == DbWriter.EpochToDateTime(videoDTO.EventDate).ToUniversalTime().Date
                    && v.Metric == videoDTO.Metric
                    && v.Value == videoDTO.Value;