Made first schema work, made first sync work and display from db

Tv7Playlist.Data/Migrations/20190124231927_InitialCreate.Designer.cs

@@ -9,7 +9,7 @@ using Tv7Playlist.Data;
 namespace Tv7Playlist.Data.Migrations
 {
     [DbContext(typeof(PlaylistContext))]
-    [Migration("20190124230424_InitialCreate")]
+    [Migration("20190124231927_InitialCreate")]
     partial class InitialCreate
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -31,6 +31,8 @@ namespace Tv7Playlist.Data.Migrations
 
                     b.Property<string>("NameOverride");
 
+                    b.Property<int>("Position");
+
                     b.Property<int>("TrackNumber");
 
                     b.Property<string>("Url");

Tv7Playlist.Data/Migrations/20190124231927_InitialCreate.cs

@@ -12,6 +12,7 @@ namespace Tv7Playlist.Data.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(nullable: false),
+                    Position = table.Column<int>(nullable: false),
                     TrackNumber = table.Column<int>(nullable: false),
                     Name = table.Column<string>(nullable: true),
                     NameOverride = table.Column<string>(nullable: true),

Tv7Playlist.Data/Migrations/PlaylistContextModelSnapshot.cs

@@ -29,6 +29,8 @@ namespace Tv7Playlist.Data.Migrations
 
                     b.Property<string>("NameOverride");
 
+                    b.Property<int>("Position");
+
                     b.Property<int>("TrackNumber");
 
                     b.Property<string>("Url");

Tv7Playlist.Data/PlaylistEntry.cs

@@ -6,6 +6,7 @@ namespace Tv7Playlist.Data
     {
         public Guid Id { get; set; }
 
+        public int Position { get; set; }
         public int TrackNumber { get; set; }
 
         public string Name { get; set; }

Tv7Playlist/Controllers/HomeController.cs

@@ -1,11 +1,15 @@
 using System;
+using System.Collections.Immutable;
 using System.Diagnostics;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Tv7Playlist.Core;
+using Tv7Playlist.Data;
 using Tv7Playlist.Models;
 
 namespace Tv7Playlist.Controllers
@@ -14,19 +18,19 @@ namespace Tv7Playlist.Controllers
     {
         private readonly ILogger<HomeController> _logger;
         private readonly IAppConfig _appConfig;
-        private readonly IPlaylistLoader _playlistLoader;
+        private readonly PlaylistContext _playlistContext;
 
-        public HomeController(ILogger<HomeController> logger, IAppConfig appConfig, IPlaylistLoader playlistLoader)
+        public HomeController(ILogger<HomeController> logger, IAppConfig appConfig, PlaylistContext playlistContext)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _appConfig = appConfig ?? throw new ArgumentNullException(nameof(appConfig));
-            _playlistLoader = playlistLoader ?? throw new ArgumentNullException(nameof(playlistLoader));
+            _playlistContext = playlistContext ?? throw new ArgumentNullException(nameof(playlistContext));
         }
 
         public async Task<IActionResult> Index()
         {
-            var tracks = await _playlistLoader.LoadPlaylistFromUrl(_appConfig.TV7Url);
+            var playlistEntries = await _playlistContext.PlaylistEntries.AsNoTracking().OrderBy(e => e.TrackNumber).ToListAsync();
-            var model = new HomeModel(tracks);
+            var model = new HomeModel(playlistEntries);
 
             return View(model);
         }

Tv7Playlist/Controllers/PlaylistApiController.cs

@@ -20,8 +20,8 @@ namespace Tv7Playlist.Controllers
         private readonly PlaylistContext _playlistContext;
         private readonly IPlaylistLoader _playlistLoader;
 
-        public PlaylistApiController(ILogger<HomeController> logger, PlaylistContext playlistContext,
+        public PlaylistApiController(ILogger<HomeController> logger, PlaylistContext playlistContext, IPlaylistLoader playlistLoader,
-            IPlaylistLoader playlistLoader, IAppConfig appConfig)
+            IAppConfig appConfig)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _playlistContext = playlistContext ?? throw new ArgumentNullException(nameof(playlistContext));
@@ -36,9 +36,12 @@ namespace Tv7Playlist.Controllers
             //TODO: Refactor to post method
             _logger.LogDebug("Synchronizing playlist from server...");
 
+            var existingEntries = await _playlistContext.PlaylistEntries.ToDictionaryAsync(e => e.TrackNumber);
             var tracks = await _playlistLoader.LoadPlaylistFromUrl(_appConfig.TV7Url);
-            await MarkNotAvailableEntriesAsync(tracks);
+
-            await AddOrUpdateEntriesAsync(tracks);
+            MarkNotAvailableEntries(existingEntries, tracks);
+            AddOrUpdateEntries(existingEntries, tracks);
+
             _logger.LogDebug("Synchronizing playlist completed saving changes...");
 
             await _playlistContext.SaveChangesAsync();
@@ -47,17 +50,23 @@ namespace Tv7Playlist.Controllers
             return Ok();
         }
 
-        private async Task AddOrUpdateEntriesAsync(IEnumerable<ParsedTrack> tracks)
+        private void AddOrUpdateEntries(Dictionary<int, PlaylistEntry> existingEntries, IEnumerable<ParsedTrack> tracks)
         {
             foreach (var track in tracks)
             {
-                var entry = await _playlistContext.PlaylistEntries.Where(e => e.TrackNumber == track.Id).FirstOrDefaultAsync();
+                if (!existingEntries.TryGetValue(track.Id, out var entry))
-                if (entry == null)
                 {
                     _logger.LogInformation($"Adding playlist entry {track.Id} - {track.Name}");
-                    entry = new PlaylistEntry {Id = Guid.NewGuid(), TrackNumber = track.Id, IsEnabled = true};
+                    entry = new PlaylistEntry
+                    {
+                        Id = Guid.NewGuid(), Position = track.Id, TrackNumber = track.Id, IsEnabled = true
+                    };
                     _playlistContext.PlaylistEntries.Add(entry);
                 }
+                else
+                {
+                    _logger.LogInformation($"Updating playlist entry {track.Id} - {track.Name}");
+                }
 
                 entry.IsAvailable = true;
                 entry.Name = track.Name;
@@ -65,10 +74,10 @@ namespace Tv7Playlist.Controllers
             }
         }
 
-        private async Task MarkNotAvailableEntriesAsync(IReadOnlyCollection<ParsedTrack> tracks)
+        private void MarkNotAvailableEntries(Dictionary<int, PlaylistEntry> existingEntries,
+            IReadOnlyCollection<ParsedTrack> tracks)
         {
-            var unavailableEntries =
+            var unavailableEntries = existingEntries.Where(e => tracks.All(t => t.Id != e.Key)).Select(e => e.Value);
-                await _playlistContext.PlaylistEntries.Where(e => tracks.All(t => t.Id != e.TrackNumber)).ToListAsync();
             foreach (var entry in unavailableEntries)
             {
                 _logger.LogInformation($"Channel {entry.TrackNumber} - {entry.Name} is no longer available.");

Tv7Playlist/Models/HomeModel.cs

@@ -1,16 +1,16 @@
 using System;
 using System.Collections.Generic;
-using Tv7Playlist.Core.Parsers;
+using Tv7Playlist.Data;
 
 namespace Tv7Playlist.Models
 {
     public class HomeModel
     {
-        public IReadOnlyCollection<ParsedTrack> Tracks { get; }
+        public HomeModel(List<PlaylistEntry> playlistEntries)
-
-        public HomeModel(IReadOnlyCollection<ParsedTrack> tracks)
         {
-            Tracks = tracks ?? throw new ArgumentNullException(nameof(tracks));
+            PlaylistEntries = playlistEntries ?? throw new ArgumentNullException(nameof(playlistEntries));
         }
+
+        public List<PlaylistEntry> PlaylistEntries { get; }
     }
 }

Tv7Playlist/Views/Home/Index.cshtml

@@ -10,18 +10,20 @@
         <th>Name</th>
         <th>Name override</th>
         <th>Enabled</th>
+        <th>Available</th>
         <th>URL</th>
     </tr>
 
     @{
-    foreach (var track in Model.Tracks)
+    foreach (var track in Model.PlaylistEntries)
     {
         <tr>
-            <td></td>
+            <td>@track.Position</td>
-            <td>@track.Id</td>
+            <td>@track.TrackNumber</td>
             <td>@track.Name</td>
-            <td></td>
+            <td>@track.NameOverride</td>
-            <td></td>
+            <td>@track.IsEnabled</td>
+            <td>@track.IsAvailable</td>
             <td>@track.Url</td>
         </tr>
     }