static topics pk replacement started

pavel-zhur · Sep 28, 2024 · c48e1db · c48e1db
1 parent f01fdd8
commit c48e1db
Show file tree

Hide file tree

Showing 9 changed files with 1,023 additions and 40 deletions.
diff --git a/OneShelf.Videos/OneShelf.Videos.BusinessLogic/Services/Service1.cs b/OneShelf.Videos/OneShelf.Videos.BusinessLogic/Services/Service1.cs
@@ -105,23 +105,23 @@ public async Task SaveMessages()
         var albums = await _videosDatabase.Albums
             .Where(x => x.UploadedAlbum == null)
             .Include(x => x.Constraints)
-            .ThenInclude(x => x.StaticTopic)
             .ToListAsync();
 
         var messages = (await _videosDatabase.Mediae
                 .Where(x => x.StaticMessage != null)
-                .Where(x => x.StaticMessage!.SelectedType.HasValue && x.StaticMessage.StaticTopicId.HasValue)
+                .Where(x => x.StaticMessage!.SelectedType.HasValue && x.StaticMessage.StaticTopic != null)
                 .Select(m => new
                 {
-                    TopicId = m.StaticMessage!.StaticTopicId,
+                    StaticTopicId = m.StaticMessage!.StaticTopic!.Id,
+                    m.StaticMessage.StaticTopicRootMessageIdOr0,
                     m.StaticMessage.Width,
                     m.StaticMessage.Height,
                     m.StaticMessage.Date,
                     m.StaticMessage.SelectedType,
                     m.Id,
                 })
                 .ToListAsync())
-            .ToLookup(x => x.TopicId!.Value);
+            .ToLookup(x => x.StaticTopicId);
 
         var uploadedItems = await _videosDatabase.UploadedItems
             .Where(i => _videosDatabase.InventoryItems.Any(j => j.Id == i.MediaItemId && (j.IsPhoto || j.MediaMetadataVideoStatus == "READY")))