Merge pull request #39 from granstel/youtube-fixup

Youtube fixup
granstel · Mar 4, 2024 · 29df307 · 29df307
2 parents 8f3192e + 96f0316
commit 29df307
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/Dodo1000Bot.Api/Dodo1000Bot.Api.csproj b/Dodo1000Bot.Api/Dodo1000Bot.Api.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>1.26.0</Version>
+    <Version>1.26.1</Version>
     <UserSecretsId>f449de95-800a-40ef-8716-6e80b7f0977d</UserSecretsId>
   </PropertyGroup>
 

diff --git a/Dodo1000Bot.Api/Properties/launchSettings.json b/Dodo1000Bot.Api/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "Dodo1000Bot.Api": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
-      "launchBrowser": true,
+      "launchBrowser": false,
       "applicationUrl": "https://localhost:1502;http://localhost:1402",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

diff --git a/Dodo1000Bot.Api/appsettings.json b/Dodo1000Bot.Api/appsettings.json
@@ -23,7 +23,7 @@
     "RefreshEveryTime": "0:10:00"
   },
   "Youtube": {
-    "RefreshEveryTime": "0:10:00",
+    "RefreshEveryTime": "0:15:00",
     "ApiKey": "",
     "Endpoint": "https://youtube.googleapis.com/youtube/v3/search",
     "Channels": [

diff --git a/Dodo1000Bot.Services/UnitsService.cs b/Dodo1000Bot.Services/UnitsService.cs
@@ -335,11 +335,11 @@ internal async Task CheckUnitsOfBrandAtCountryAndNotify(Brands brand, int countr
         _log.LogInformation("unitsList: {unitsList}", unitsList.Serialize());
         _log.LogInformation("unitsListSnapshot: {unitsListSnapshot}", unitsListSnapshot.Serialize());
 
-        const string formatOfDestinctions = "{0}-{1}";
+        const string formatOfDistinctions = "{0}-{1}";
 
-        var formattedDistinctions = unitsListSnapshot.Select(uls => string.Format(formatOfDestinctions, uls.Name, uls.StartDate));
+        var formattedDistinctions = unitsListSnapshot.Select(uls => string.Format(formatOfDistinctions, uls.Name, uls.StartDate));
         var difference = unitsList.ExceptBy(formattedDistinctions, 
-                                            ul => string.Format(formatOfDestinctions, ul.Name, ul.StartDate))
+                                            ul => string.Format(formatOfDistinctions, ul.Name, ul.StartDate))
             .Where(ul => ul.StartDate.Year == DateTime.Today.Date.Year).ToList();
 
         _log.LogInformation("difference: {difference}", difference.Serialize());

diff --git a/Dodo1000Bot.Services/YoutubeService.cs b/Dodo1000Bot.Services/YoutubeService.cs
@@ -45,8 +45,12 @@ public async Task CheckAndNotify(CancellationToken cancellationToken)
             var videosSnapshot = 
                 await _snapshotsRepository.Get<Video[]>(snapshotName, cancellationToken);
             var videos = await _youTubeClient.SearchVideos(channel, cancellationToken);
-
-            var difference = videos.ExceptBy(videosSnapshot.Data.Select(v => v.Id.VideoId), c => c.Id.VideoId);
+            const string formatOfDistinctions = "{0}-{1}";
+
+            var formattedDistinctions = videosSnapshot.Data
+                .Select(v => string.Format(formatOfDistinctions, v.Id.VideoId, v.Snippet.LiveBroadcastContent));
+            var difference = videos.ExceptBy(formattedDistinctions,
+                v => string.Format(formatOfDistinctions, v.Id.VideoId, v.Snippet.LiveBroadcastContent));
 
             foreach (var video in difference)
             {