Merge pull request #1388 from delebash/master

Added IncludedUntil Date

Source/DataLayer/EfClasses/Book.cs

@@ -73,7 +73,8 @@ namespace DataLayer
             ContentType contentType,
             IEnumerable<Contributor> authors,
             IEnumerable<Contributor> narrators,
-            string localeName)
+            string localeName
+            )
         {
             // validate
             ArgumentValidator.EnsureNotNull(audibleProductId, nameof(audibleProductId));

Source/DataLayer/EfClasses/LibraryBook.cs

@@ -13,7 +13,8 @@ namespace DataLayer
 
         public bool IsDeleted { get; set; }
         public bool AbsentFromLastScan { get; set; }
-
+        
+        public DateTime? IncludedUntil { get; private set; }
         private LibraryBook() { }
         public LibraryBook(Book book, DateTime dateAdded, string account)
         {
@@ -26,7 +27,7 @@ namespace DataLayer
         }
 
         public void SetAccount(string account) => Account = account;
-
-		public override string ToString() => $"{DateAdded:d} {Book}";
-	}
-}
+        public void SetIncludedUntil(DateTime? includedUntil) => IncludedUntil = includedUntil;
+        public override string ToString() => $"{DateAdded:d} {Book}";
+    }
+}

Source/DataLayer/Migrations/20251020175053_AddIncludedUntil.Designer.cs

@@ -0,0 +1,477 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20251020175053_AddIncludedUntil")]
+    partial class AddIncludedUntil
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "9.0.8");
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.Property<int>("_categoriesCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("_categoryLaddersCategoryLadderId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("_categoriesCategoryId", "_categoryLaddersCategoryLadderId");
+
+                    b.HasIndex("_categoryLaddersCategoryLadderId");
+
+                    b.ToTable("CategoryCategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSpatial")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Subtitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CategoryLadderId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "CategoryLadderId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("CategoryLadderId");
+
+                    b.ToTable("BookCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.ToTable("Categories");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Property<int>("CategoryLadderId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryLadderId");
+
+                    b.ToTable("CategoryLadders");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AbsentFromLastScan")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("IncludedUntil")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("CategoryCategoryLadder", b =>
+                {
+                    b.HasOne("DataLayer.Category", null)
+                        .WithMany()
+                        .HasForeignKey("_categoriesCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", null)
+                        .WithMany()
+                        .HasForeignKey("_categoryLaddersCategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<bool>("IsFinished")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<DateTime?>("LastDownloaded")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<string>("LastDownloadedFileVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<long?>("LastDownloadedFormat")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("LastDownloadedVersion")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookCategory", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("CategoriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.CategoryLadder", "CategoryLadder")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("CategoryLadderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("CategoryLadder");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("CategoriesLink");
+
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.CategoryLadder", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer/Migrations/20251020175053_AddIncludedUntil.cs

@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddIncludedUntil : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "IncludedUntil",
+                table: "LibraryBooks",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IncludedUntil",
+                table: "LibraryBooks");
+        }
+    }
+}

Source/DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace DataLayer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "9.0.7");
+            modelBuilder.HasAnnotation("ProductVersion", "9.0.8");
 
             modelBuilder.Entity("CategoryCategoryLadder", b =>
                 {
@@ -194,6 +194,9 @@ namespace DataLayer.Migrations
                     b.Property<DateTime>("DateAdded")
                         .HasColumnType("TEXT");
 
+                    b.Property<DateTime?>("IncludedUntil")
+                        .HasColumnType("TEXT");
+
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
 

Source/DtoImporterService/BookImporter.cs

@@ -111,7 +111,8 @@ namespace DtoImporterService
 					contentType,
 					authors,
 					narrators,
-					importItem.LocaleName)
+					importItem.LocaleName
+					)
 					).Entity;
 				Cache.Add(book.AudibleProductId, book);
 			}

Source/DtoImporterService/LibraryBookImporter.cs

@@ -8,121 +8,136 @@ using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
-	public class LibraryBookImporter : ItemsImporterBase
-	{
-		protected override IValidator Validator => new LibraryValidator();
+    public class LibraryBookImporter : ItemsImporterBase
+    {
+  	  protected override IValidator Validator => new LibraryValidator();
 
-		private BookImporter bookImporter { get; }
+  	  private BookImporter bookImporter { get; }
 
-		public LibraryBookImporter(LibationContext context) : base(context)
-		{
-			bookImporter = new BookImporter(DbContext);
-		}
+  	  public LibraryBookImporter(LibationContext context) : base(context)
+  	  {
+  		  bookImporter = new BookImporter(DbContext);
+  	  }
 
-		protected override int DoImport(IEnumerable<ImportItem> importItems)
-		{
-			bookImporter.Import(importItems);
+  	  protected override int DoImport(IEnumerable<ImportItem> importItems)
+  	  {
+  		  bookImporter.Import(importItems);
 
-			var qtyNew = upsertLibraryBooks(importItems);
-			return qtyNew;
-		}
+  		  var qtyNew = upsertLibraryBooks(importItems);
+  		  return qtyNew;
+  	  }
 
-		private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
-		{
-			// technically, we should be able to have duplicate books from separate accounts.
-			// this would violate the current pk and would be difficult to deal with elsewhere:
-			// - what to show in the grid
-			// - which to consider liberated
-			//
-			// sqlite cannot alter pk. the work around is an extensive headache
-			// - update: now possible in .net5/efcore5
-			//
-			// currently, inserting LibraryBook will throw error if the same book is in multiple accounts for the same region.
-			//
-			// CURRENT SOLUTION: don't re-insert
+  	  private int upsertLibraryBooks(IEnumerable<ImportItem> importItems)
+  	  {
+  		  // technically, we should be able to have duplicate books from separate accounts.
+  		  // this would violate the current pk and would be difficult to deal with elsewhere:
+  		  // - what to show in the grid
+  		  // - which to consider liberated
+  		  //
+  		  // sqlite cannot alter pk. the work around is an extensive headache
+  		  // - update: now possible in .net5/efcore5
+  		  //
+  		  // currently, inserting LibraryBook will throw error if the same book is in multiple accounts for the same region.
+  		  //
+  		  // CURRENT SOLUTION: don't re-insert
 
 
-			//When Books are upserted during the BookImporter run, they are linked to their LibraryBook in the DbContext
-			//instance. If a LibraryBook has a null book here, that means it's Book was not imported during by BookImporter.
-			//There should never be duplicates, but this is defensive.
-			var existingEntries = DbContext.LibraryBooks.AsEnumerable().Where(l => l.Book is not null).ToDictionarySafe(l => l.Book.AudibleProductId);
+  		  //When Books are upserted during the BookImporter run, they are linked to their LibraryBook in the DbContext
+  		  //instance. If a LibraryBook has a null book here, that means it's Book was not imported during by BookImporter.
+  		  //There should never be duplicates, but this is defensive.
+  		  var existingEntries = DbContext.LibraryBooks.AsEnumerable().Where(l => l.Book is not null).ToDictionarySafe(l => l.Book.AudibleProductId);
 
-			//If importItems are contains duplicates by asin, keep the Item that's "available"
-			var uniqueImportItems = ToDictionarySafe(importItems, dto => dto.DtoItem.ProductId, tieBreak);
+  		  //If importItems are contains duplicates by asin, keep the Item that's "available"
+  		  var uniqueImportItems = ToDictionarySafe(importItems, dto => dto.DtoItem.ProductId, tieBreak);
 
-			int qtyNew = 0;
+  		  int qtyNew = 0;			
 
-			foreach (var item in uniqueImportItems.Values)
-			{
-				if (existingEntries.TryGetValue(item.DtoItem.ProductId, out LibraryBook existing))
-				{
-					if (existing.Account != item.AccountId)
-					{
-						//Book is absent from the existing LibraryBook's account. Use the alternate account.
-						existing.SetAccount(item.AccountId);
-					}
+  		  foreach (var item in uniqueImportItems.Values)
+  		  {
+  			  if (existingEntries.TryGetValue(item.DtoItem.ProductId, out LibraryBook existing))
+  			  {
+  				  if (existing.Account != item.AccountId)
+  				  {
+  					  //Book is absent from the existing LibraryBook's account. Use the alternate account.
+  					  existing.SetAccount(item.AccountId);
+  				  }
 
-					existing.AbsentFromLastScan = isUnavailable(item);
-				}
-				else
-				{
-					var libraryBook = new LibraryBook(
-						bookImporter.Cache[item.DtoItem.ProductId],
-						item.DtoItem.DateAdded,
-						item.AccountId)
-						{
-							AbsentFromLastScan = isUnavailable(item)
-						};
+  				  existing.AbsentFromLastScan = isUnavailable(item);
+  			  }
+  			  else
+  			  {
+  				  existing = new LibraryBook(
+  					  bookImporter.Cache[item.DtoItem.ProductId],
+  					  item.DtoItem.DateAdded,
+  					  item.AccountId)
+  					  {
+  						  AbsentFromLastScan = isUnavailable(item)
+  					  };
 
-					try
-					{
-						DbContext.LibraryBooks.Add(libraryBook);
-						qtyNew++;
-					}
-					catch (Exception ex)
-					{
-						Serilog.Log.Logger.Error(ex, "Error adding library book. {@DebugInfo}", new { libraryBook.Book, libraryBook.Account });
-					}
-				}
-			}
+  				  try
+  				  {
+  					  DbContext.LibraryBooks.Add(existing);
+  					  qtyNew++;
+  				  }
+  				  catch (Exception ex)
+  				  {
+  					  Serilog.Log.Logger.Error(ex, "Error adding library book. {@DebugInfo}", new { existing.Book, existing.Account });
+  				  }
+  			  }
+  			  
+  			  existing.SetIncludedUntil(GetExpirationDate(item));
+  		  }
 
-			var scannedAccounts = importItems.Select(i => i.AccountId).Distinct().ToList();
+  		  var scannedAccounts = importItems.Select(i => i.AccountId).Distinct().ToList();
 
-			//If an existing Book wasn't found in the import, the owning LibraryBook's Book will be null.
-			//Only change AbsentFromLastScan for LibraryBooks of accounts that were scanned.
-			foreach (var nullBook in DbContext.LibraryBooks.AsEnumerable().Where(lb => lb.Book is null && lb.Account.In(scannedAccounts)))
-				nullBook.AbsentFromLastScan = true;
+  		  //If an existing Book wasn't found in the import, the owning LibraryBook's Book will be null.
+  		  //Only change AbsentFromLastScan for LibraryBooks of accounts that were scanned.
+  		  foreach (var nullBook in DbContext.LibraryBooks.AsEnumerable().Where(lb => lb.Book is null && lb.Account.In(scannedAccounts)))
+  			  nullBook.AbsentFromLastScan = true;
 
-			return qtyNew;
-		}		
+  		  return qtyNew;
+  	  }		
 
-		private static Dictionary<TKey, TSource> ToDictionarySafe<TKey, TSource>(IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TSource, TSource> tieBreaker)
-		{
-			var dictionary = new Dictionary<TKey, TSource>();
+  	  private static Dictionary<TKey, TSource> ToDictionarySafe<TKey, TSource>(IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TSource, TSource> tieBreaker)
+  	  {
+  		  var dictionary = new Dictionary<TKey, TSource>();
 
-			foreach (TSource newItem in source)
-			{
-				TKey key = keySelector(newItem);
+  		  foreach (TSource newItem in source)
+  		  {
+  			  TKey key = keySelector(newItem);
 
-				dictionary[key]
-					= dictionary.TryGetValue(key, out TSource existingItem)
-					? tieBreaker(existingItem, newItem)
-					: newItem;
-			}
-			return dictionary;
-		}
+  			  dictionary[key]
+  				  = dictionary.TryGetValue(key, out TSource existingItem)
+  				  ? tieBreaker(existingItem, newItem)
+  				  : newItem;
+  		  }
+  		  return dictionary;
+  	  }
 
-		private static ImportItem tieBreak(ImportItem item1, ImportItem item2)
-			=> isUnavailable(item1) && !isUnavailable(item2) ? item2 : item1;
+  	  private static ImportItem tieBreak(ImportItem item1, ImportItem item2)
+  		  => isUnavailable(item1) && !isUnavailable(item2) ? item2 : item1;
 
-		private static bool isUnavailable(ImportItem item)
-			=> isFutureRelease(item) || isPlusTitleUnavailable(item);
+  	  private static bool isUnavailable(ImportItem item)
+  		  => isFutureRelease(item) || isPlusTitleUnavailable(item);
 
         private static bool isFutureRelease(ImportItem item)
-			=> item.DtoItem.IssueDate is DateTimeOffset dt && dt > DateTimeOffset.UtcNow;
+  		  => item.DtoItem.IssueDate is DateTimeOffset dt && dt > DateTimeOffset.UtcNow;
 
-		private static bool isPlusTitleUnavailable(ImportItem item)
-			=> item.DtoItem.ContentType is null
-			|| (item.DtoItem.IsAyce is true && item.DtoItem.Plans?.Any(p => p.IsAyce) is not true);
-	}
-}
+  	  private static bool isPlusTitleUnavailable(ImportItem item)
+  		  => item.DtoItem.ContentType is null
+  		  || (item.DtoItem.IsAyce is true && item.DtoItem.Plans?.Any(p => p.IsAyce) is not true);
+
+  	  /// <summary>
+  	  /// Determines when your audible plus or free book will expire from your library  
+  	  /// plan.IsAyce from underlying AudibleApi project determines the plans to look at, first plan found is used.
+  	  /// In some cases current date is later than end date so exclude.
+  	  /// </summary>
+  	  /// <returns>The DateTime that this title will become unavailable, otherwise null</returns>
+  	  private static DateTime? GetExpirationDate(ImportItem item)
+  		  => item.DtoItem.Plans
+  		  ?.Where(p => p.IsAyce)
+  		  .Select(p => p.EndDate)
+  		  .FirstOrDefault(end => end.HasValue && end.Value.Year is not (2099 or 9999) && end.Value.LocalDateTime >= DateTime.Now) 
+  		  ?.DateTime;
+    }
+}

Source/LibationAvalonia/Controls/ThemePreviewControl.axaml.cs

@@ -4,6 +4,7 @@ using Dinah.Core.ErrorHandling;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
 using LibationUiBase.ProcessQueue;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs

@@ -477,6 +477,7 @@ namespace LibationAvalonia.ViewModels
 		public DataGridLength PurchaseDateWidth { get => getColumnWidth("PurchaseDate", 75); set => setColumnWidth("PurchaseDate", value); }
 		public DataGridLength MyRatingWidth { get => getColumnWidth("MyRating", 95); set => setColumnWidth("MyRating", value); }
 		public DataGridLength MiscWidth { get => getColumnWidth("Misc", 140); set => setColumnWidth("Misc", value); }
+		public DataGridLength IncludedUntilWidth { get => getColumnWidth("IncludedUntil", 140); set => setColumnWidth("IncludedUntil", value); }
 		public DataGridLength LastDownloadWidth { get => getColumnWidth("LastDownload", 100); set => setColumnWidth("LastDownload", value); }
 		public DataGridLength BookTagsWidth { get => getColumnWidth("BookTags", 100); set => setColumnWidth("BookTags", value); }
 		public DataGridLength IsSpatialWidth { get => getColumnWidth("IsSpatial", 100); set => setColumnWidth("IsSpatial", value); }

Source/LibationAvalonia/Views/ProductsDisplay.axaml

@@ -213,6 +213,16 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 				
+				<controls:DataGridTemplateColumnExt Header="Included&#xA;Until" MinWidth="10" Width="{CompiledBinding IncludedUntilWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="IncludedUntil" ClipboardContentBinding="{Binding IncludedUntil}">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate x:DataType="uibase:GridEntry">
+							<Panel Opacity="{CompiledBinding Liberate.Opacity}">
+								<TextBlock Text="{CompiledBinding IncludedUntil}" TextWrapping="WrapWithOverflow" />
+							</Panel>
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</controls:DataGridTemplateColumnExt>
+				
 				<controls:DataGridTemplateColumnExt Header="Last&#xA;Download" MinWidth="10" Width="{CompiledBinding LastDownloadWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="LastDownload" ClipboardContentBinding="{Binding LastDownload}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:GridEntry">

Source/LibationFileManager/Configuration.PersistentSettings.cs

@@ -209,7 +209,8 @@ namespace LibationFileManager
 		private static readonly EquatableDictionary<string, bool> DefaultColumns = new([
 			new ("SeriesOrder", false),
 			new ("LastDownload", false),
-			new ("IsSpatial", false)
+			new ("IsSpatial", false),
+			new ("IncludedUntil", false), 
 			]);
 		public bool GetColumnVisibility(string columnName)
 			=> GridColumnsVisibilities.TryGetValue(columnName, out var isVisible) ? isVisible

Source/LibationUiBase/GridView/GridEntry.cs

@@ -49,6 +49,7 @@ namespace LibationUiBase.GridView
 		private string _bookTags;
 		private Rating _myRating;
 		private bool _isSpatial;
+		private string _includedUntil;
 		public abstract bool? Remove { get; set; }
 		public EntryStatus Liberate { get => _liberate; private set => RaiseAndSetIfChanged(ref _liberate, value); }
 		public string PurchaseDate { get => _purchasedate; protected set => RaiseAndSetIfChanged(ref _purchasedate, value); }
@@ -66,6 +67,7 @@ namespace LibationUiBase.GridView
 		public Rating ProductRating { get => _productrating; private set => RaiseAndSetIfChanged(ref _productrating, value); }
 		public string BookTags { get => _bookTags; private set => RaiseAndSetIfChanged(ref _bookTags, value); }
 		public bool IsSpatial { get => _isSpatial; protected set => RaiseAndSetIfChanged(ref _isSpatial, value); }
+		public string IncludedUntil { get => _includedUntil; protected set => RaiseAndSetIfChanged(ref _includedUntil, value); }
 
 		public Rating MyRating
 		{
@@ -120,14 +122,18 @@ namespace LibationUiBase.GridView
 			SeriesIndex = Book.SeriesLink.FirstOrDefault()?.Index ?? 0;
 			BookTags = GetBookTags();
 			IsSpatial = Book.IsSpatial;
+			IncludedUntil = GetIncludedUntilString();
+			
 
 			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
 		}
 
 		protected abstract string GetBookTags();
 		protected virtual DateTime GetPurchaseDate() => LibraryBook.DateAdded;
+		protected virtual DateTime? GetIncludedUntil() => LibraryBook.IncludedUntil;
 		protected virtual int GetLengthInMinutes() => Book.LengthInMinutes;
 		protected string GetPurchaseDateString() => GetPurchaseDate().ToString("d");
+		protected string GetIncludedUntilString() => GetIncludedUntil()?.ToString("d") ?? string.Empty;
 		protected string GetBookLengthString()
 		{
 			int bookLenMins = GetLengthInMinutes();
@@ -208,6 +214,7 @@ namespace LibationUiBase.GridView
 			nameof(Liberate) => Liberate,
 			nameof(DateAdded) => DateAdded,
 			nameof(IsSpatial) => IsSpatial,
+			nameof(IncludedUntil) => GetIncludedUntil() ?? default,
 			_ => null
 		};
 		

Source/LibationUiBase/GridView/SeriesEntry.cs

@@ -102,5 +102,6 @@ namespace LibationUiBase.GridView
 		protected override string GetBookTags() => null;
 		protected override int GetLengthInMinutes() => Children.Count == 0 ? 0 : Children.Sum(c => c.LibraryBook.Book.LengthInMinutes);
 		protected override DateTime GetPurchaseDate() => Children.Count == 0 ? default : Children.Min(c => c.LibraryBook.DateAdded);
+		protected override DateTime? GetIncludedUntil() => Children.Count == 0 ? default : Children.Min(c => c.LibraryBook.IncludedUntil);
 	}
 }

Source/LibationWinForms/GridView/ProductsGrid.Designer.cs

@@ -54,6 +54,7 @@ namespace LibationWinForms.GridView
 			lastDownloadedGVColumn = new LastDownloadedGridViewColumn();
 			isSpatialGVColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
 			tagAndDetailsGVColumn = new EditTagsDataGridViewImageButtonColumn();
+			includedUntilGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			((System.ComponentModel.ISupportInitialize)gridEntryDataGridView).BeginInit();
 			((System.ComponentModel.ISupportInitialize)syncBindingSource).BeginInit();
 			SuspendLayout();
@@ -66,7 +67,7 @@ namespace LibationWinForms.GridView
 			gridEntryDataGridView.AllowUserToResizeRows = false;
 			gridEntryDataGridView.AutoGenerateColumns = false;
 			gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { removeGVColumn, liberateGVColumn, coverGVColumn, titleGVColumn, authorsGVColumn, narratorsGVColumn, lengthGVColumn, seriesGVColumn, seriesOrderGVColumn, descriptionGVColumn, categoryGVColumn, productRatingGVColumn, purchaseDateGVColumn, myRatingGVColumn, miscGVColumn, lastDownloadedGVColumn, isSpatialGVColumn, tagAndDetailsGVColumn });
+			gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { removeGVColumn, liberateGVColumn, coverGVColumn, titleGVColumn, authorsGVColumn, narratorsGVColumn, lengthGVColumn, seriesGVColumn, seriesOrderGVColumn, descriptionGVColumn, categoryGVColumn, productRatingGVColumn, purchaseDateGVColumn, myRatingGVColumn, miscGVColumn, lastDownloadedGVColumn, isSpatialGVColumn, tagAndDetailsGVColumn, includedUntilGVColumn });
 			gridEntryDataGridView.ContextMenuStrip = showHideColumnsContextMenuStrip;
 			gridEntryDataGridView.DataSource = syncBindingSource;
 			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -276,6 +277,16 @@ namespace LibationWinForms.GridView
 			tagAndDetailsGVColumn.ScaleFactor = 0F;
 			tagAndDetailsGVColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
 			// 
+			// includedUntilGVColumn
+			// 
+			includedUntilGVColumn.DataPropertyName = "IncludedUntil";
+			includedUntilGVColumn.HeaderText = "Included Until";
+			includedUntilGVColumn.MinimumWidth = 10;
+			includedUntilGVColumn.Name = "includedUntilGVColumn";
+			includedUntilGVColumn.ReadOnly = true;
+			includedUntilGVColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			includedUntilGVColumn.Width = 108;
+			// 
 			// ProductsGrid
 			// 
 			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -314,5 +325,6 @@ namespace LibationWinForms.GridView
 		private LastDownloadedGridViewColumn lastDownloadedGVColumn;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn isSpatialGVColumn;
 		private EditTagsDataGridViewImageButtonColumn tagAndDetailsGVColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn includedUntilGVColumn;
 	}
 }