Fix more nullable reference warnings

Author: justcoding121

src/Bible.Alarm.Shared/Models/Media/AudioSource.cs

@@ -4,8 +4,8 @@ public class AudioSource
     {
         public int Id { get; set; }
 
-        public string Url { get; set; }
+        public string Url { get; set; } = string.Empty;
 
-        public string LookUpPath { get; set; }
+        public string LookUpPath { get; set; } = string.Empty;
     }
 }

src/Bible.Alarm.Shared/Models/Media/Bible/BibleBook.cs

@@ -7,11 +7,11 @@ public class BibleBook : IComparable
     {
         public int Id { get; set; }
 
-        public string Name { get; set; }
+        public string Name { get; set; } = string.Empty;
         public int Number { get; set; }
 
         public int BibleTranslationId { get; set; }
-        public BibleTranslation BibleTranslation { get; set; }
+        public BibleTranslation? BibleTranslation { get; set; }
 
         public List<BibleChapter> Chapters { get; set; } = new List<BibleChapter>();
 

src/Bible.Alarm.Shared/Models/Media/Bible/BibleChapter.cs

@@ -10,14 +10,15 @@ public class BibleChapter : IComparable
 
         public string Title => $"Chapter {Number}";
 
-        public AudioSource Source { get; set; }
+        public AudioSource? Source { get; set; }
 
         public int BibleBookId { get; set; }
-        public BibleBook Book { get; set; }
+        public BibleBook? Book { get; set; }
 
-        public int CompareTo(object obj)
+        public int CompareTo(object? obj)
         {
-            return Number.CompareTo((obj as BibleChapter).Number);
+            if (obj is not BibleChapter other) return 1;
+            return Number.CompareTo(other.Number);
         }
     }
 }

src/Bible.Alarm.Shared/Models/Media/Music/MusicTrack.cs

@@ -7,13 +7,14 @@ public class MusicTrack : IComparable
         public int Id { get; set; }
 
         public int Number { get; set; }
-        public string Title { get; set; }
+        public string Title { get; set; } = string.Empty;
 
-        public AudioSource Source { get; set; }
+        public AudioSource? Source { get; set; }
 
-        public int CompareTo(object obj)
+        public int CompareTo(object? obj)
         {
-            return Number.CompareTo((obj as MusicTrack).Number);
+            if (obj is not MusicTrack other) return 1;
+            return Number.CompareTo(other.Number);
         }
     }
 }

src/Bible.Alarm/Common/Extensions/CloneExtensions.cs

@@ -9,14 +9,21 @@ public static class CloneExtensions
 {
     public static T DeepClone<T>(this T obj)
     {
+        if (obj == null)
+            throw new ArgumentNullException(nameof(obj));
+        
         var settings = new JsonSerializerSettings
         {
             ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
             PreserveReferencesHandling = PreserveReferencesHandling.None,
             ContractResolver = new IgnoreNonSerializableContractResolver()
         };
         var json = JsonConvert.SerializeObject(obj, settings);
-        return JsonConvert.DeserializeObject<T>(json, settings);
+        var result = JsonConvert.DeserializeObject<T>(json, settings);
+        if (result == null)
+            throw new InvalidOperationException("Deserialization returned null");
+        
+        return result;
     }
 
     private class IgnoreNonSerializableContractResolver : DefaultContractResolver

src/Bible.Alarm/Models/Schedule/AlarmMusic.cs

@@ -8,14 +8,14 @@ public class AlarmMusic
     public int Id { get; set; }
 
     public MusicType MusicType { get; set; }
-    public string PublicationCode { get; set; }
+    public string PublicationCode { get; set; } = string.Empty;
 
-    public string LanguageCode { get; set; }
+    public string? LanguageCode { get; set; }
     public int TrackNumber { get; set; }
 
     //Always play current track.
     public bool Repeat { get; set; }
 
-    public virtual AlarmSchedule AlarmSchedule { get; set; }
+    public virtual AlarmSchedule? AlarmSchedule { get; set; }
     public int AlarmScheduleId { get; set; }
 }

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

@@ -10,7 +10,7 @@ public class AlarmSchedule : IComparable
 {
     public int Id { get; set; }
 
-    public string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
     public bool IsEnabled { get; set; }
 
     //24 hour based
@@ -33,9 +33,9 @@ public class AlarmSchedule : IComparable
 
     public bool NotificationEnabled { get; set; }
     public bool MusicEnabled { get; set; }
-    public virtual AlarmMusic Music { get; set; }
+    public virtual AlarmMusic? Music { get; set; }
 
-    public virtual BibleReadingSchedule BibleReadingSchedule { get; set; }
+    public virtual BibleReadingSchedule? BibleReadingSchedule { get; set; }
 
     public int SnoozeMinutes { get; set; } = 5;
 
@@ -92,9 +92,10 @@ private static void ValidateNextFire(CronExpression expression)
         if (nextFire == null) throw new Exception("Invalid alarm time.");
     }
 
-    public int CompareTo(object obj)
+    public int CompareTo(object? obj)
     {
-        return Id.CompareTo(((AlarmSchedule)obj).Id);
+        if (obj is not AlarmSchedule other) return 1;
+        return Id.CompareTo(other.Id);
     }
 
     public static async Task<AlarmSchedule> GetSampleSchedule(bool isNew, MediaDbContext mediaDbContext)
@@ -130,17 +131,28 @@ public static async Task<AlarmSchedule> GetSampleSchedule(bool isNew, MediaDbCon
                         == sample.BibleReadingSchedule.LanguageCode)
             .FirstOrDefaultAsync();
 
+        if (bible == null)
+            throw new InvalidOperationException("Bible translation not found for sample schedule");
+        
         var rnd = new Random();
         var book = bible.Books[rnd.Next() % bible.Books.Count];
+        if (sample.BibleReadingSchedule == null)
+            throw new InvalidOperationException("BibleReadingSchedule is null in sample schedule");
+        
         sample.BibleReadingSchedule.BookNumber = book.Number;
 
+        if (sample.Music == null)
+            throw new InvalidOperationException("Music is null in sample schedule");
+        
         var music = await mediaDbContext
             .MelodyMusic
             .Include(x => x.Tracks)
             .Where(x => x.Code
                         == sample.Music.PublicationCode)
             .FirstOrDefaultAsync();
 
+        if (music == null)
+            throw new InvalidOperationException("Melody music not found for sample schedule");
 
         var track = music.Tracks[rnd.Next() % music.Tracks.Count];
         sample.Music.TrackNumber = track.Number;

src/Bible.Alarm/Models/Schedule/BibleReadingSchedule.cs

@@ -5,13 +5,13 @@ public class BibleReadingSchedule
 {
     public int Id { get; set; }
 
-    public string LanguageCode { get; set; }
-    public string PublicationCode { get; set; }
+    public string LanguageCode { get; set; } = string.Empty;
+    public string PublicationCode { get; set; } = string.Empty;
 
     public int BookNumber { get; set; }
     public int ChapterNumber { get; set; }
     public TimeSpan FinishedDuration { get; set; }
 
-    public virtual AlarmSchedule AlarmSchedule { get; set; }
+    public virtual AlarmSchedule? AlarmSchedule { get; set; }
     public int AlarmScheduleId { get; set; }
 }

src/Bible.Alarm/Services/Media/PlaylistService.cs

@@ -135,6 +135,9 @@ public async Task MarkTrackAsFinished(NotificationDetail trackDetail)
             var next = await GetNextBibleChapter(trackDetail.LanguageCode, trackDetail.PublicationCode,
                 trackDetail.BookNumber, trackDetail.ChapterNumber);
 
+            if (next.Key == null || next.Value == null)
+                throw new InvalidOperationException($"Next chapter Key or Value is null");
+            
             bibleReadingSchedule.BookNumber = next.Key.Number;
             bibleReadingSchedule.ChapterNumber = next.Value.Number;
             bibleReadingSchedule.FinishedDuration = TimeSpan.Zero;
@@ -227,6 +230,8 @@ public async Task<List<PlayItem>> NextTracks(long scheduleId)
         }
 
         var chapterDetail = chapters[chapter];
+        if (chapterDetail.Source == null)
+            throw new InvalidOperationException($"Chapter {chapter} Source is null in book {bookNumber}");
 
         var publicationCode = bibleReadingSchedule.PublicationCode;
         var languageCode = bibleReadingSchedule.LanguageCode;
@@ -267,6 +272,11 @@ public async Task<List<PlayItem>> NextTracks(long scheduleId)
                 bibleReadingSchedule.PublicationCode,
                 bookNumber, chapter);
 
+            if (next.Key == null || next.Value == null)
+                throw new InvalidOperationException($"Next chapter Key or Value is null");
+            if (next.Value.Source == null)
+                throw new InvalidOperationException($"Next chapter Source is null");
+            
             bookNumber = next.Key.Number;
             chapter = next.Value.Number;
             url = next.Value.Source.Url;
@@ -323,8 +333,11 @@ public async Task MoveToPreviousBibleChapter(long scheduleId)
 
         var previous = await GetPreviousBibleChapter(languageCode, publicationCode, bookNumber, chapter);
 
-        bibleReadingSchedule.BookNumber = previous.Key.Number;
-        bibleReadingSchedule.ChapterNumber = previous.Value.Number;
+            if (previous.Key == null || previous.Value == null)
+                throw new InvalidOperationException($"Previous chapter Key or Value is null");
+            
+            bibleReadingSchedule.BookNumber = previous.Key.Number;
+            bibleReadingSchedule.ChapterNumber = previous.Value.Number;
         bibleReadingSchedule.FinishedDuration = TimeSpan.Zero;
 
         await scheduleDbContext.SaveChangesAsync();
@@ -432,6 +445,9 @@ private async Task<PlayItem> NextMusicUrlToPlay(AlarmSchedule schedule, bool nex
                     throw new InvalidOperationException($"Invalid track index {melodyTrackIndex} for {melodyTracks.Count} tracks");
 
                 var melodyTrack = melodyTracks[melodyTrackIndex];
+                if (melodyTrack.Source == null)
+                    throw new InvalidOperationException($"Melody track {melodyTrackIndex} Source is null");
+                
                 return new PlayItem(new NotificationDetail
                 {
                     ScheduleId = schedule.Id,
@@ -452,6 +468,9 @@ private async Task<PlayItem> NextMusicUrlToPlay(AlarmSchedule schedule, bool nex
                     throw new InvalidOperationException($"Invalid track index {vocalTrackIndex} for {vocalTracks.Count} tracks");
 
                 var vocalTrack = vocalTracks[vocalTrackIndex];
+                if (vocalTrack.Source == null)
+                    throw new InvalidOperationException($"Vocal track {vocalTrackIndex} Source is null");
+                
                 return new PlayItem(new NotificationDetail
                 {
                     ScheduleId = schedule.Id,

src/Bible.Alarm/Stores/State.cs

@@ -9,26 +9,26 @@ public class ApplicationState
 {
     public ObservableHashSet<AlarmSchedule> Schedules { get; set; }
 
-    public AlarmSchedule CurrentSchedule { get; set; }
+    public AlarmSchedule? CurrentSchedule { get; set; }
 
-    public AlarmMusic CurrentMusic { get; set; }
-    public AlarmMusic TentativeMusic { get; set; }
+    public AlarmMusic? CurrentMusic { get; set; }
+    public AlarmMusic? TentativeMusic { get; set; }
 
-    public BibleReadingSchedule CurrentBibleReadingSchedule { get; set; }
-    public BibleReadingSchedule TentativeBibleReadingSchedule { get; set; }
+    public BibleReadingSchedule? CurrentBibleReadingSchedule { get; set; }
+    public BibleReadingSchedule? TentativeBibleReadingSchedule { get; set; }
 
     public ApplicationState()
     {
         Schedules = new ObservableHashSet<AlarmSchedule>();
     }
 
     public ApplicationState(
-        ObservableHashSet<AlarmSchedule> schedules,
-        AlarmSchedule currentSchedule,
-        AlarmMusic currentMusic,
-        AlarmMusic tentativeMusic,
-        BibleReadingSchedule currentBibleReadingSchedule,
-        BibleReadingSchedule tentativeBibleReadingSchedule)
+        ObservableHashSet<AlarmSchedule>? schedules,
+        AlarmSchedule? currentSchedule,
+        AlarmMusic? currentMusic,
+        AlarmMusic? tentativeMusic,
+        BibleReadingSchedule? currentBibleReadingSchedule,
+        BibleReadingSchedule? tentativeBibleReadingSchedule)
     {
         Schedules = schedules ?? new ObservableHashSet<AlarmSchedule>();
         CurrentSchedule = currentSchedule;