add smart collections (#355)

* start to add smart collections

* add smart collection table; delete smart collection

* overwrite smart collections

* support scheduling smart collections

* update changelog

ErsatzTV.Infrastructure/Data/Configurations/Collection/SmartCollectionConfiguration.cs

@@ -0,0 +1,11 @@
+using ErsatzTV.Core.Domain;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ErsatzTV.Infrastructure.Data.Configurations
+{
+    public class SmartCollectionConfiguration : IEntityTypeConfiguration<SmartCollection>
+    {
+        public void Configure(EntityTypeBuilder<SmartCollection> builder) => builder.ToTable("SmartCollection");
+    }
+}

ErsatzTV.Infrastructure/Data/Repositories/MediaCollectionRepository.cs

@@ -5,8 +5,11 @@ using System.Threading.Tasks;
 using Dapper;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Core.Scheduling;
+using ErsatzTV.Core.Search;
 using ErsatzTV.Infrastructure.Extensions;
+using ErsatzTV.Infrastructure.Search;
 using LanguageExt;
 using Microsoft.EntityFrameworkCore;
 using static LanguageExt.Prelude;
@@ -16,12 +19,15 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
     public class MediaCollectionRepository : IMediaCollectionRepository
     {
         private readonly IDbConnection _dbConnection;
+        private readonly ISearchIndex _searchIndex;
         private readonly IDbContextFactory<TvContext> _dbContextFactory;
 
         public MediaCollectionRepository(
+            ISearchIndex searchIndex,
             IDbContextFactory<TvContext> dbContextFactory,
             IDbConnection dbConnection)
         {
+            _searchIndex = searchIndex;
             _dbContextFactory = dbContextFactory;
             _dbConnection = dbConnection;
         }
@@ -78,6 +84,53 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             return result.Distinct().ToList();
         }
 
+        public async Task<List<MediaItem>> GetSmartCollectionItems(int id)
+        {
+            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+
+            var result = new List<MediaItem>();
+
+            Option<SmartCollection> maybeCollection = await dbContext.SmartCollections
+                .SelectOneAsync(sc => sc.Id, sc => sc.Id == id);
+
+            foreach (SmartCollection collection in maybeCollection)
+            {
+                SearchResult searchResults = await _searchIndex.Search(collection.Query, 0, 0);
+                
+                var movieIds = searchResults.Items
+                    .Filter(i => i.Type == SearchIndex.MovieType)
+                    .Map(i => i.Id)
+                    .ToList();
+                result.AddRange(await GetMovieItems(dbContext, movieIds));
+
+                var showIds = searchResults.Items
+                    .Filter(i => i.Type == SearchIndex.ShowType)
+                    .Map(i => i.Id)
+                    .ToList();
+                result.AddRange(await GetShowItems(dbContext, showIds));
+
+                var artistIds = searchResults.Items
+                    .Filter(i => i.Type == SearchIndex.ArtistType)
+                    .Map(i => i.Id)
+                    .ToList();
+                result.AddRange(await GetArtistItems(dbContext, artistIds));
+                
+                var musicVideoIds = searchResults.Items
+                    .Filter(i => i.Type == SearchIndex.MusicVideoType)
+                    .Map(i => i.Id)
+                    .ToList();
+                result.AddRange(await GetMusicVideoItems(dbContext, musicVideoIds));
+                
+                var episodeIds = searchResults.Items
+                    .Filter(i => i.Type == SearchIndex.EpisodeType)
+                    .Map(i => i.Id)
+                    .ToList();
+                result.AddRange(await GetEpisodeItems(dbContext, episodeIds));
+            }
+
+            return result;
+        }
+
         public async Task<List<CollectionWithItems>> GetMultiCollectionCollections(int id)
         {
             await using TvContext dbContext = _dbContextFactory.CreateDbContext();
@@ -159,6 +212,14 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                     new { MultiCollectionId = multiCollectionId })
                 .Map(result => result.ToList());
 
+        public Task<List<int>> PlayoutIdsUsingSmartCollection(int smartCollectionId) =>
+            _dbConnection.QueryAsync<int>(
+                    @"SELECT DISTINCT p.PlayoutId
+                    FROM PlayoutProgramScheduleAnchor p
+                    WHERE p.SmartCollectionId = @SmartCollectionId",
+                    new { SmartCollectionId = smartCollectionId })
+                .Map(result => result.ToList());
+
         public Task<bool> IsCustomPlaybackOrder(int collectionId) =>
             _dbConnection.QuerySingleAsync<bool>(
                 @"SELECT IFNULL(MIN(UseCustomPlaybackOrder), 0) FROM Collection WHERE Id = @CollectionId",
@@ -172,12 +233,15 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             WHERE ci.CollectionId = @CollectionId",
                 new { CollectionId = collectionId });
 
-            return await dbContext.Movies
+            return await GetMovieItems(dbContext, ids);
+        }
+        
+        private static Task<List<Movie>> GetMovieItems(TvContext dbContext, IEnumerable<int> movieIds) =>
+            dbContext.Movies
                 .Include(m => m.MovieMetadata)
                 .Include(m => m.MediaVersions)
-                .Filter(m => ids.Contains(m.Id))
+                .Filter(m => movieIds.Contains(m.Id))
                 .ToListAsync();
-        }
 
         private async Task<List<MusicVideo>> GetArtistItems(TvContext dbContext, int collectionId)
         {
@@ -188,15 +252,17 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             WHERE ci.CollectionId = @CollectionId",
                 new { CollectionId = collectionId });
 
-            return await dbContext.MusicVideos
+            return await GetArtistItems(dbContext, ids);
+        }
+
+        private static Task<List<MusicVideo>> GetArtistItems(TvContext dbContext, IEnumerable<int> artistIds) =>
+            dbContext.MusicVideos
                 .Include(m => m.Artist)
                 .ThenInclude(a => a.ArtistMetadata)
                 .Include(m => m.MusicVideoMetadata)
                 .Include(m => m.MediaVersions)
-                .Filter(m => ids.Contains(m.Id))
+                .Filter(m => artistIds.Contains(m.Id))
                 .ToListAsync();
-        }
-
 
         private async Task<List<MusicVideo>> GetMusicVideoItems(TvContext dbContext, int collectionId)
         {
@@ -206,14 +272,17 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             WHERE ci.CollectionId = @CollectionId",
                 new { CollectionId = collectionId });
 
-            return await dbContext.MusicVideos
+            return await GetMusicVideoItems(dbContext, ids);
+        }
+        
+        private static Task<List<MusicVideo>> GetMusicVideoItems(TvContext dbContext, IEnumerable<int> musicVideoIds) =>
+            dbContext.MusicVideos
                 .Include(m => m.Artist)
                 .ThenInclude(a => a.ArtistMetadata)
                 .Include(m => m.MusicVideoMetadata)
                 .Include(m => m.MediaVersions)
-                .Filter(m => ids.Contains(m.Id))
+                .Filter(m => musicVideoIds.Contains(m.Id))
                 .ToListAsync();
-        }
 
         private async Task<List<Episode>> GetShowItems(TvContext dbContext, int collectionId)
         {
@@ -225,15 +294,18 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             WHERE ci.CollectionId = @CollectionId",
                 new { CollectionId = collectionId });
 
-            return await dbContext.Episodes
+            return await GetShowItems(dbContext, ids);
+        }
+        
+        private static Task<List<Episode>> GetShowItems(TvContext dbContext, IEnumerable<int> showIds) =>
+            dbContext.Episodes
                 .Include(e => e.EpisodeMetadata)
                 .Include(e => e.MediaVersions)
                 .Include(e => e.Season)
                 .ThenInclude(s => s.Show)
                 .ThenInclude(s => s.ShowMetadata)
-                .Filter(e => ids.Contains(e.Id))
+                .Filter(e => showIds.Contains(e.Id))
                 .ToListAsync();
-        }
 
         private async Task<List<Episode>> GetSeasonItems(TvContext dbContext, int collectionId)
         {
@@ -262,14 +334,17 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             WHERE ci.CollectionId = @CollectionId",
                 new { CollectionId = collectionId });
 
-            return await dbContext.Episodes
+            return await GetEpisodeItems(dbContext, ids);
+        }
+        
+        private static Task<List<Episode>> GetEpisodeItems(TvContext dbContext, IEnumerable<int> episodeIds) =>
+            dbContext.Episodes
                 .Include(e => e.EpisodeMetadata)
                 .Include(e => e.MediaVersions)
                 .Include(e => e.Season)
                 .ThenInclude(s => s.Show)
                 .ThenInclude(s => s.ShowMetadata)
-                .Filter(e => ids.Contains(e.Id))
+                .Filter(e => episodeIds.Contains(e.Id))
                 .ToListAsync();
-        }
     }
 }

ErsatzTV.Infrastructure/Data/TvContext.cs

@@ -59,6 +59,7 @@ namespace ErsatzTV.Infrastructure.Data
         public DbSet<Collection> Collections { get; set; }
         public DbSet<CollectionItem> CollectionItems { get; set; }
         public DbSet<MultiCollection> MultiCollections { get; set; }
+        public DbSet<SmartCollection> SmartCollections { get; set; }
         public DbSet<ProgramSchedule> ProgramSchedules { get; set; }
         public DbSet<ProgramScheduleItem> ProgramScheduleItems { get; set; }
         public DbSet<Playout> Playouts { get; set; }

ErsatzTV.Infrastructure/Migrations/20210910142324_Add_SmartCollection.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_SmartCollection : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "SmartCollection",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Name = table.Column<string>(type: "TEXT", nullable: true),
+                    Query = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SmartCollection", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "SmartCollection");
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20210910163032_Add_ProgramScheduleItemSmartCollection.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_ProgramScheduleItemSmartCollection : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "SmartCollectionId",
+                table: "ProgramScheduleItem",
+                type: "INTEGER",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProgramScheduleItem_SmartCollectionId",
+                table: "ProgramScheduleItem",
+                column: "SmartCollectionId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ProgramScheduleItem_SmartCollection_SmartCollectionId",
+                table: "ProgramScheduleItem",
+                column: "SmartCollectionId",
+                principalTable: "SmartCollection",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ProgramScheduleItem_SmartCollection_SmartCollectionId",
+                table: "ProgramScheduleItem");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ProgramScheduleItem_SmartCollectionId",
+                table: "ProgramScheduleItem");
+
+            migrationBuilder.DropColumn(
+                name: "SmartCollectionId",
+                table: "ProgramScheduleItem");
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20210910164712_Add_PlayoutProgramScheduleAnchorSmartCollection.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_PlayoutProgramScheduleAnchorSmartCollection : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "SmartCollectionId",
+                table: "PlayoutProgramScheduleAnchor",
+                type: "INTEGER",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PlayoutProgramScheduleAnchor_SmartCollectionId",
+                table: "PlayoutProgramScheduleAnchor",
+                column: "SmartCollectionId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PlayoutProgramScheduleAnchor_SmartCollection_SmartCollectionId",
+                table: "PlayoutProgramScheduleAnchor",
+                column: "SmartCollectionId",
+                principalTable: "SmartCollection",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PlayoutProgramScheduleAnchor_SmartCollection_SmartCollectionId",
+                table: "PlayoutProgramScheduleAnchor");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PlayoutProgramScheduleAnchor_SmartCollectionId",
+                table: "PlayoutProgramScheduleAnchor");
+
+            migrationBuilder.DropColumn(
+                name: "SmartCollectionId",
+                table: "PlayoutProgramScheduleAnchor");
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/TvContextModelSnapshot.cs

@@ -14,7 +14,7 @@ namespace ErsatzTV.Infrastructure.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "5.0.8");
+                .HasAnnotation("ProductVersion", "5.0.9");
 
             modelBuilder.Entity("ErsatzTV.Core.Domain.Actor", b =>
                 {
@@ -1106,6 +1106,9 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Property<int>("ProgramScheduleId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("SmartCollectionId")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("Id");
 
                     b.HasIndex("CollectionId");
@@ -1118,6 +1121,8 @@ namespace ErsatzTV.Infrastructure.Migrations
 
                     b.HasIndex("ProgramScheduleId");
 
+                    b.HasIndex("SmartCollectionId");
+
                     b.ToTable("PlayoutProgramScheduleAnchor");
                 });
 
@@ -1218,6 +1223,9 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Property<int>("ProgramScheduleId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("SmartCollectionId")
+                        .HasColumnType("INTEGER");
+
                     b.Property<TimeSpan?>("StartTime")
                         .HasColumnType("TEXT");
 
@@ -1231,6 +1239,8 @@ namespace ErsatzTV.Infrastructure.Migrations
 
                     b.HasIndex("ProgramScheduleId");
 
+                    b.HasIndex("SmartCollectionId");
+
                     b.ToTable("ProgramScheduleItem");
                 });
 
@@ -1349,6 +1359,23 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.ToTable("ShowMetadata");
                 });
 
+            modelBuilder.Entity("ErsatzTV.Core.Domain.SmartCollection", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Query")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SmartCollection");
+                });
+
             modelBuilder.Entity("ErsatzTV.Core.Domain.Studio", b =>
                 {
                     b.Property<int>("Id")
@@ -2338,6 +2365,10 @@ namespace ErsatzTV.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ErsatzTV.Core.Domain.SmartCollection", "SmartCollection")
+                        .WithMany()
+                        .HasForeignKey("SmartCollectionId");
+
                     b.OwnsOne("ErsatzTV.Core.Domain.CollectionEnumeratorState", "EnumeratorState", b1 =>
                         {
                             b1.Property<int>("PlayoutProgramScheduleAnchorId")
@@ -2368,6 +2399,8 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Navigation("Playout");
 
                     b.Navigation("ProgramSchedule");
+
+                    b.Navigation("SmartCollection");
                 });
 
             modelBuilder.Entity("ErsatzTV.Core.Domain.PlexConnection", b =>
@@ -2415,6 +2448,10 @@ namespace ErsatzTV.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ErsatzTV.Core.Domain.SmartCollection", "SmartCollection")
+                        .WithMany()
+                        .HasForeignKey("SmartCollectionId");
+
                     b.Navigation("Collection");
 
                     b.Navigation("MediaItem");
@@ -2422,6 +2459,8 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Navigation("MultiCollection");
 
                     b.Navigation("ProgramSchedule");
+
+                    b.Navigation("SmartCollection");
                 });
 
             modelBuilder.Entity("ErsatzTV.Core.Domain.SeasonMetadata", b =>

ErsatzTV.Infrastructure/Search/SearchIndex.cs

@@ -52,11 +52,11 @@ namespace ErsatzTV.Infrastructure.Search
         private const string DirectorField = "director";
         private const string WriterField = "writer";
 
-        private const string MovieType = "movie";
-        private const string ShowType = "show";
-        private const string ArtistType = "artist";
-        private const string MusicVideoType = "music_video";
-        private const string EpisodeType = "episode";
+        public const string MovieType = "movie";
+        public const string ShowType = "show";
+        public const string ArtistType = "artist";
+        public const string MusicVideoType = "music_video";
+        public const string EpisodeType = "episode";
         private readonly List<CultureInfo> _cultureInfos;
 
         private readonly ILogger<SearchIndex> _logger;
@@ -72,7 +72,7 @@ namespace ErsatzTV.Infrastructure.Search
             _initialized = false;
         }
 
-        public int Version => 14;
+        public int Version => 15;
 
         public Task<bool> Initialize(ILocalFileSystem localFileSystem)
         {
@@ -275,7 +275,7 @@ namespace ErsatzTV.Infrastructure.Search
                     var doc = new Document
                     {
                         new StringField(IdField, movie.Id.ToString(), Field.Store.YES),
-                        new StringField(TypeField, MovieType, Field.Store.NO),
+                        new StringField(TypeField, MovieType, Field.Store.YES),
                         new TextField(TitleField, metadata.Title, Field.Store.NO),
                         new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
                         new TextField(LibraryNameField, movie.LibraryPath.Library.Name, Field.Store.NO),
@@ -395,7 +395,7 @@ namespace ErsatzTV.Infrastructure.Search
                     var doc = new Document
                     {
                         new StringField(IdField, show.Id.ToString(), Field.Store.YES),
-                        new StringField(TypeField, ShowType, Field.Store.NO),
+                        new StringField(TypeField, ShowType, Field.Store.YES),
                         new TextField(TitleField, metadata.Title, Field.Store.NO),
                         new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
                         new TextField(LibraryNameField, show.LibraryPath.Library.Name, Field.Store.NO),
@@ -472,7 +472,7 @@ namespace ErsatzTV.Infrastructure.Search
                     var doc = new Document
                     {
                         new StringField(IdField, artist.Id.ToString(), Field.Store.YES),
-                        new StringField(TypeField, ArtistType, Field.Store.NO),
+                        new StringField(TypeField, ArtistType, Field.Store.YES),
                         new TextField(TitleField, metadata.Title, Field.Store.NO),
                         new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
                         new TextField(LibraryNameField, artist.LibraryPath.Library.Name, Field.Store.NO),
@@ -521,7 +521,7 @@ namespace ErsatzTV.Infrastructure.Search
                     var doc = new Document
                     {
                         new StringField(IdField, musicVideo.Id.ToString(), Field.Store.YES),
-                        new StringField(TypeField, MusicVideoType, Field.Store.NO),
+                        new StringField(TypeField, MusicVideoType, Field.Store.YES),
                         new TextField(TitleField, metadata.Title, Field.Store.NO),
                         new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
                         new TextField(LibraryNameField, musicVideo.LibraryPath.Library.Name, Field.Store.NO),
@@ -590,7 +590,7 @@ namespace ErsatzTV.Infrastructure.Search
 
                     var doc = new Document();
                     doc.Add(new StringField(IdField, episode.Id.ToString(), Field.Store.YES));
-                    doc.Add(new StringField(TypeField, EpisodeType, Field.Store.NO));
+                    doc.Add(new StringField(TypeField, EpisodeType, Field.Store.YES));
                     doc.Add(new TextField(TitleField, metadata.Title, Field.Store.NO));
                     doc.Add(new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO));
                     doc.Add(new TextField(LibraryNameField, episode.LibraryPath.Library.Name, Field.Store.NO));
@@ -654,7 +654,9 @@ namespace ErsatzTV.Infrastructure.Search
             }
         }
 
-        private SearchItem ProjectToSearchItem(Document doc) => new(Convert.ToInt32(doc.Get(IdField)));
+        private SearchItem ProjectToSearchItem(Document doc) => new(
+            doc.Get(TypeField),
+            Convert.ToInt32(doc.Get(IdField)));
 
         private Query ParseQuery(string searchQuery, QueryParser parser)
         {