Update db schema

Author: justcoding121

src/Bible.Alarm.Shared/Database/Migrations/Schedule/20260111001000_UpdateToNextRelease.Designer.cs

@@ -15,16 +15,17 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "BibleReadingSchedules",
                 newName: "BiblePublicationSchedules");
 
-            // Rename BookNumber to SectionNumber and make it nullable
+            // Rename BookNumber to SectionCode and change type to string to match media index db
             migrationBuilder.RenameColumn(
                 name: "BookNumber",
                 table: "BiblePublicationSchedules",
-                newName: "SectionNumber");
+                newName: "SectionCode");
 
-            migrationBuilder.AlterColumn<int>(
-                name: "SectionNumber",
+            migrationBuilder.AlterColumn<string>(
+                name: "SectionCode",
                 table: "BiblePublicationSchedules",
-                type: "INTEGER",
+                type: "TEXT",
+                maxLength: 50,
                 nullable: true,
                 oldClrType: typeof(int),
                 oldType: "INTEGER");
@@ -251,17 +252,18 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 newName: "ChapterNumber");
 
             migrationBuilder.AlterColumn<int>(
-                name: "SectionNumber",
+                name: "SectionCode",
                 table: "BiblePublicationSchedules",
                 type: "INTEGER",
                 nullable: false,
                 defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "INTEGER",
+                oldClrType: typeof(string),
+                oldType: "TEXT",
+                oldMaxLength: 50,
                 oldNullable: true);
 
             migrationBuilder.RenameColumn(
-                name: "SectionNumber",
+                name: "SectionCode",
                 table: "BiblePublicationSchedules",
                 newName: "BookNumber");
 

src/Bible.Alarm.Shared/Database/Migrations/Schedule/20260111001000_UpdateToNextRelease.cs

@@ -176,8 +176,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<int>("AlarmScheduleId")
                         .HasColumnType("INTEGER");
 
-                    b.Property<int?>("SectionNumber")
-                        .HasColumnType("INTEGER");
+                    b.Property<string>("SectionCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
 
                     b.Property<int>("TrackNumber")
                         .HasColumnType("INTEGER");

src/Bible.Alarm.Shared/Database/Migrations/Schedule/ScheduleDbContextModelSnapshot.cs

@@ -66,17 +66,29 @@ public int CompareTo(object obj)
             return 1;
         }
 
-        // For Bible sections, try to compare by BookNum (from UrlParams) for proper ordering
-        // Otherwise compare by SectionCode
-        var thisBookNum = BookNum;
-        var otherBookNum = other.BookNum;
+        // Natural sort: if SectionCode is numeric, sort as int; otherwise sort as string
+        var thisIsNumeric = int.TryParse(SectionCode, out var thisNum);
+        var otherIsNumeric = int.TryParse(other.SectionCode, out var otherNum);
 
-        if (thisBookNum.HasValue && otherBookNum.HasValue)
+        if (thisIsNumeric && otherIsNumeric)
         {
-            return thisBookNum.Value.CompareTo(otherBookNum.Value);
+            // Both are numeric - compare as integers
+            return thisNum.CompareTo(otherNum);
         }
 
-        // Fallback to string comparison of SectionCode
+        if (thisIsNumeric && !otherIsNumeric)
+        {
+            // This is numeric, other is not - numeric comes first
+            return -1;
+        }
+        
+        if (!thisIsNumeric && otherIsNumeric)
+        {
+            // This is not numeric, other is - numeric comes first
+            return 1;
+        }
+        
+        // Both are non-numeric - compare as strings
         return string.Compare(SectionCode, other.SectionCode, StringComparison.OrdinalIgnoreCase);
     }
 }

src/Bible.Alarm.Shared/Models/Media/BiblePublications/BiblePublicationSection.cs

@@ -280,7 +280,7 @@ int GetPublicationSortPriority(string code)
                 TrackNumber = 1,
                 LanguageCode = bibleLanguageCode,
                 PublicationCode = biblePublicationCode,
-                SectionNumber = 1 // Will be updated below with a random section
+                SectionCode = "1" // Will be updated below with a random section
             }
         };
 
@@ -309,24 +309,8 @@ int GetPublicationSortPriority(string code)
             throw new InvalidOperationException("BiblePublicationSchedule is null in sample schedule");
         }
 
-        // Try to parse SectionCode to int for SectionNumber, or use BookNum
-        if (int.TryParse(section.SectionCode, out var sectionNumberInt))
-        {
-            sample.BiblePublicationSchedule.SectionNumber = sectionNumberInt;
-        }
-        else if (section.BookNum.HasValue)
-        {
-            sample.BiblePublicationSchedule.SectionNumber = section.BookNum.Value;
-        }
-        else
-        {
-            // Fallback: try to get from UrlParams
-            var booknumParam = section.UrlParams.FirstOrDefault(p => p.Key.Equals("booknum", StringComparison.OrdinalIgnoreCase));
-            if (booknumParam != null && int.TryParse(booknumParam.Value, out var booknum))
-            {
-                sample.BiblePublicationSchedule.SectionNumber = booknum;
-            }
-        }
+        // Use SectionCode directly to match media index db
+        sample.BiblePublicationSchedule.SectionCode = section.SectionCode;
 
         if (sample.Music == null)
         {

src/Bible.Alarm.Shared/Models/Schedule/AlarmSchedule.cs

@@ -23,11 +23,12 @@ public class BiblePublicationSchedule
     public string PublicationCode { get; set; } = string.Empty;
 
     /// <summary>
-    /// Section number for publications with sections.
+    /// Section code for publications with sections (e.g., "1" for book 1, "gen" for Genesis, section code for dramas).
     /// Null for publications without sections (e.g., dramas, videos).
+    /// Matches BiblePublicationSection.SectionCode for consistency.
     /// </summary>
-    [Range(1, 500)]
-    public int? SectionNumber { get; set; }
+    [MaxLength(50)]
+    public string? SectionCode { get; set; }
 
     /// <summary>
     /// Track number for traditional Bible readings, or track/part number for dramas.

src/Bible.Alarm.Shared/Models/Schedule/BiblePublicationSchedule.cs

@@ -132,7 +132,8 @@ public async Task<bool> FetchPublicationTracksAsync(
             var isVideo = categoryName.Equals("Dramas", StringComparison.OrdinalIgnoreCase) && 
                          PublicationTypeHelper.IsVideo(normalizedPublicationCode);
 
-            switch (publicationLanguage.HarvestType)
+            var harvestType = publicationLanguage.HarvestType ?? PublicationTypeHelper.GetHarvestType(normalizedPublicationCode);
+            switch (harvestType)
             {
                 case Models.Enums.HarvestType.MediatorSectioned:
                     // Drama publications use Mediator API
@@ -1223,7 +1224,7 @@ public async Task<bool> SeedEnglishPublicationAsync(
             else
             {
                 category = publicationLanguage.Category;
-                harvestType = publicationLanguage.HarvestType;
+                harvestType = publicationLanguage.HarvestType ?? PublicationTypeHelper.GetHarvestType(normalizedPublicationCode);
             }
 
             var categoryName = category.CategoryName;

src/Bible.Alarm.Shared/Services/Media/LanguageContentService.cs

@@ -69,6 +69,7 @@
 using Serilog;
 using Bible.Alarm.ViewModels.ScheduleViewModelHelpers;
 using Bible.Alarm.ViewModels.BiblePublications;
+using Bible.Alarm.ViewModels.Categories;
 #if WINDOWS
 using Bible.Alarm.Platforms.Windows.Services.UI;
 using Bible.Alarm.Platforms.Windows.Services.Handlers;

src/Bible.Alarm/Common/Helpers/ServiceRegistrationHelper.cs

@@ -89,16 +89,19 @@ private static void SetSectionName(
         BiblePublicationSchedule biblePublication,
         LookupDataLoader.LookupData lookupData)
     {
-        if (biblePublication.SectionNumber.HasValue && biblePublication.SectionNumber.Value > 0 &&
+        // Convert SectionCode to int for lookup key
+        if (!string.IsNullOrEmpty(biblePublication.SectionCode) && 
+            int.TryParse(biblePublication.SectionCode, out var sectionNum) && 
+            sectionNum > 0 &&
             !string.IsNullOrWhiteSpace(biblePublication.LanguageCode) &&
             !string.IsNullOrWhiteSpace(biblePublication.PublicationCode))
         {
-            var sectionKey = (biblePublication.LanguageCode, biblePublication.PublicationCode, biblePublication.SectionNumber.Value);
+            var sectionKey = (biblePublication.LanguageCode, biblePublication.PublicationCode, sectionNum);
             if (lookupData.Sections.TryGetValue(sectionKey, out var sectionName))
             {
                 scheduleStateItem.BiblePublicationSectionName = sectionName;
-                Log.Logger.Debug("Set BiblePublicationSectionName '{BiblePublicationSectionName}' for schedule {ScheduleId} (SectionNumber: {SectionNumber})",
-                    sectionName, schedule.Id, biblePublication.SectionNumber);
+                Log.Logger.Debug("Set BiblePublicationSectionName '{BiblePublicationSectionName}' for schedule {ScheduleId} (SectionCode: {SectionCode})",
+                    sectionName, schedule.Id, biblePublication.SectionCode);
             }
         }
     }

src/Bible.Alarm/Services/Bootstrap/ScheduleStatePopulatorHelpers/BiblePublicationDisplayNamePopulator.cs

@@ -27,9 +27,10 @@ public LookupKeys CollectKeys(List<AlarmSchedule> alarmSchedules)
                 if (!string.IsNullOrWhiteSpace(br.LanguageCode) && !string.IsNullOrWhiteSpace(br.PublicationCode))
                 {
                     publicationKeys.Add((br.LanguageCode, br.PublicationCode));
-                    if (br.SectionNumber.HasValue && br.SectionNumber.Value > 0)
+                    // Convert SectionCode to int for lookup key
+                    if (!string.IsNullOrEmpty(br.SectionCode) && int.TryParse(br.SectionCode, out var sectionNum) && sectionNum > 0)
                     {
-                        sectionKeys.Add((br.LanguageCode, br.PublicationCode, br.SectionNumber.Value));
+                        sectionKeys.Add((br.LanguageCode, br.PublicationCode, sectionNum));
                     }
                 }
             }