Merge pull request #1138 from SamSmithNZ-dotcom/ITunesupgrades

samsmithnz · web-flow · commit 7b6bd6370a67 · 2025-12-24T10:12:00.000-05:00
Updated Itunes
diff --git a/src/SamSmithNZ.Service/Controllers/ITunes/MovementController.cs b/src/SamSmithNZ.Service/Controllers/ITunes/MovementController.cs
@@ -1,10 +1,8 @@
 ﻿using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using SamSmithNZ.Service.DataAccess.ITunes;
 using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;
 using SamSmithNZ.Service.Models.ITunes;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.ITunes
 {
diff --git a/src/SamSmithNZ.Service/Controllers/ITunes/PlaylistController.cs b/src/SamSmithNZ.Service/Controllers/ITunes/PlaylistController.cs
@@ -1,10 +1,8 @@
 ﻿using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using SamSmithNZ.Service.DataAccess.ITunes;
 using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;
 using SamSmithNZ.Service.Models.ITunes;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.ITunes
 {
diff --git a/src/SamSmithNZ.Service/Controllers/ITunes/TopArtistsController.cs b/src/SamSmithNZ.Service/Controllers/ITunes/TopArtistsController.cs
@@ -1,10 +1,8 @@
 ﻿using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using SamSmithNZ.Service.DataAccess.ITunes;
 using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;
 using SamSmithNZ.Service.Models.ITunes;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.ITunes
 {
diff --git a/src/SamSmithNZ.Service/Controllers/ITunes/TrackController.cs b/src/SamSmithNZ.Service/Controllers/ITunes/TrackController.cs
@@ -1,10 +1,8 @@
 ﻿using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using SamSmithNZ.Service.DataAccess.ITunes;
 using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;
 using SamSmithNZ.Service.Models.ITunes;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.ITunes
 {
diff --git a/src/SamSmithNZ.Service/DataAccess/ITunes/Interfaces/IMovementDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/ITunes/Interfaces/IMovementDataAccess.cs
@@ -1,10 +1,5 @@
-﻿using Dapper;
-using SamSmithNZ.Service.DataAccess.Base;
-using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;
-using SamSmithNZ.Service.Models.ITunes;
-using System;
+﻿using SamSmithNZ.Service.Models.ITunes;
 using System.Collections.Generic;
-using System.Data;
 using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.DataAccess.ITunes.Interfaces
diff --git a/src/SamSmithNZ.Service/DataAccess/ITunes/Interfaces/IPlaylistDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/ITunes/Interfaces/IPlaylistDataAccess.cs
@@ -1,8 +1,5 @@
-﻿using Dapper;
-using SamSmithNZ.Service.Models.ITunes;
-using System;
+﻿using SamSmithNZ.Service.Models.ITunes;
 using System.Collections.Generic;
-using System.Data;
 using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.DataAccess.ITunes.Interfaces
diff --git a/src/SamSmithNZ.Service/DataAccess/ITunes/MovementDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/ITunes/MovementDataAccess.cs
@@ -13,7 +13,7 @@ public class MovementDataAccess : BaseDataAccess<Movement>, IMovementDataAccess
     {
         public MovementDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
 
         public async Task<List<Movement>> GetList(int playlistCode, bool showJustSummary)
@@ -22,15 +22,15 @@ public async Task<List<Movement>> GetList(int playlistCode, bool showJustSummary
             parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);
             parameters.Add("@ShowJustSummary", showJustSummary, DbType.Boolean);
 
-            return await base.GetList("ITunes_GetMovement", parameters);
+            return await GetList("ITunes_GetMovement", parameters);
         }        
 
         public async Task<List<Movement>> GetList(bool showJustSummary)
         {
             DynamicParameters parameters = new();
             parameters.Add("@ShowJustSummary", showJustSummary, DbType.Boolean);
 
-            return await base.GetList("ITunes_GetMovement", parameters);
+            return await GetList("ITunes_GetMovement", parameters);
         }        
         
     }
diff --git a/src/SamSmithNZ.Service/DataAccess/ITunes/PlaylistDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/ITunes/PlaylistDataAccess.cs
@@ -3,7 +3,6 @@
 using SamSmithNZ.Service.DataAccess.Base;
 using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;
 using SamSmithNZ.Service.Models.ITunes;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Threading.Tasks;
@@ -14,37 +13,38 @@ public class PlaylistDataAccess : BaseDataAccess<Playlist>, IPlaylistDataAccess
     {
         public PlaylistDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
+
         public async Task<List<Playlist>> GetList()
         {
             DynamicParameters parameters = new();
 
-            return await base.GetList("ITunes_GetPlaylists", parameters);
+            return await GetList("ITunes_GetPlaylists", parameters);
         }
 
         public async Task<Playlist> GetItem(int playlistCode)
         {
             DynamicParameters parameters = new();
             parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);
 
-            return await base.GetItem("ITunes_GetPlaylists", parameters);
+            return await GetItem("ITunes_GetPlaylists", parameters);
         }
 
         //public async Task<int> SaveItem(DateTime dteDate)
         //{
         //    DynamicParameters parameters = new();
         //    parameters.Add("@PlaylistDate", dteDate, DbType.DateTime);
 
-        //    return await base.GetScalarItem<int>("ITunes_ImportCreateNewPlayList", parameters);
+        //    return await GetScalarItem<int>("ITunes_ImportCreateNewPlayList", parameters);
         //}
 
         //public async Task<bool> DeleteItem(int playlistCode)
         //{
         //    DynamicParameters parameters = new();
         //    parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);
 
-        //    return await base.SaveItem("ITunes_ImportDeletePlaylistTracks", parameters);
+        //    return await SaveItem("ITunes_ImportDeletePlaylistTracks", parameters);
         //}
 
     }
diff --git a/src/SamSmithNZ.Service/DataAccess/ITunes/TopArtistsDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/ITunes/TopArtistsDataAccess.cs
@@ -3,7 +3,6 @@
 using SamSmithNZ.Service.DataAccess.Base;
 using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;
 using SamSmithNZ.Service.Models.ITunes;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Threading.Tasks;
@@ -14,7 +13,7 @@ public class TopArtistsDataAccess : BaseDataAccess<TopArtists>, ITopArtistsDataA
     {
         public TopArtistsDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
 
         public async Task<List<TopArtists>> GetList(int playlistCode, bool showJustSummary)
@@ -23,15 +22,15 @@ public async Task<List<TopArtists>> GetList(int playlistCode, bool showJustSumma
             parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);
             parameters.Add("@ShowJustSummary", showJustSummary, DbType.Boolean);
 
-            return await base.GetList("ITunes_GetTopArtists", parameters);
+            return await GetList("ITunes_GetTopArtists", parameters);
         }
      
         public async Task<List<TopArtists>> GetList(bool showJustSummary)
         {
             DynamicParameters parameters = new();
             parameters.Add("@ShowJustSummary", showJustSummary, DbType.Boolean);
 
-            return await base.GetList("ITunes_GetTopArtists", parameters);
+            return await GetList("ITunes_GetTopArtists", parameters);
         }  
 
     }
diff --git a/src/SamSmithNZ.Service/DataAccess/ITunes/TrackDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/ITunes/TrackDataAccess.cs
@@ -3,7 +3,6 @@
 using SamSmithNZ.Service.DataAccess.Base;
 using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;
 using SamSmithNZ.Service.Models.ITunes;
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Threading.Tasks;
@@ -14,7 +13,7 @@ public class TrackDataAccess : BaseDataAccess<Track>, ITrackDataAccess
     {
         public TrackDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
 
         public async Task<List<Track>> GetList(int playlistCode, bool showJustSummary)
@@ -23,7 +22,7 @@ public async Task<List<Track>> GetList(int playlistCode, bool showJustSummary)
             parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);
             parameters.Add("@ShowJustSummary", showJustSummary, DbType.Boolean);
 
-            return await base.GetList("ITunes_GetTracks", parameters);
+            return await GetList("ITunes_GetTracks", parameters);
         }
 
         //public async Task<Track> GetItem(int playlistCode, bool showJustSummary, String trackName)
@@ -33,7 +32,7 @@ public async Task<List<Track>> GetList(int playlistCode, bool showJustSummary)
         //    parameters.Add("@ShowJustSummary", showJustSummary, DbType.Boolean);
         //    parameters.Add("@TrackName", trackName, DbType.String);
 
-        //    return await base.GetItem("ITunes_GetTracks", parameters);
+        //    return await GetItem("ITunes_GetTracks", parameters);
         //}
 
         //public async Task<bool> SaveItem(Track track)
@@ -47,7 +46,7 @@ public async Task<List<Track>> GetList(int playlistCode, bool showJustSummary)
         //    parameters.Add("@Ranking", track.Ranking, DbType.Int32);
         //    parameters.Add("@Rating", track.Rating, DbType.Int32);
 
-        //    return await base.SaveItem("ITunes_ImportInsertTrack", parameters);
+        //    return await SaveItem("ITunes_ImportInsertTrack", parameters);
         //}
 
         //public async Task<List<Track>> ValidateTracksForPlaylist(int playlistCode)
@@ -56,7 +55,7 @@ public async Task<List<Track>> GetList(int playlistCode, bool showJustSummary)
         //    parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);
         //    int timeOut = 3600; //One hour
 
-        //    return await base.GetList("ITunes_ImportValidateTracksForDuplicates", parameters, timeOut);
+        //    return await GetList("ITunes_ImportValidateTracksForDuplicates", parameters, timeOut);
         //}
 
         //public async Task<bool> SetTrackRanksForPlaylist(int playlistCode)
@@ -65,7 +64,7 @@ public async Task<List<Track>> GetList(int playlistCode, bool showJustSummary)
         //    parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);
         //    int timeOut = 3600; //One hour
 
-        //    return await base.SaveItem("ITunes_ImportSetTrackRanks", parameters, timeOut);
+        //    return await SaveItem("ITunes_ImportSetTrackRanks", parameters, timeOut);
         //}
 
     }
diff --git a/src/SamSmithNZ.Web/Controllers/iTunesController.cs b/src/SamSmithNZ.Web/Controllers/iTunesController.cs
@@ -19,29 +19,31 @@ public ITunesController(IITunesServiceApiClient ServiceApiClient  )
         public async Task<IActionResult> Index()
         {
             bool showJustSummary = true;
-            List<TopArtists> topArtists = await _ServiceApiClient.GetTopArtistsSummary(showJustSummary);
-            List<Playlist> playlists = await _ServiceApiClient.GetPlaylists(showJustSummary);
+            Task<List<TopArtists>> topArtistsTask = _ServiceApiClient.GetTopArtistsSummary(showJustSummary);
+            Task<List<Playlist>> playlistsTask = _ServiceApiClient.GetPlaylists(showJustSummary);
+            await Task.WhenAll(topArtistsTask, playlistsTask);
 
             return View(new IndexViewModel
             {
-                TopArtists = topArtists,
-                Playlists = playlists
+                TopArtists = await topArtistsTask,
+                Playlists = await playlistsTask
             });
         }
 
         public async Task<IActionResult> PlayList(int playlistCode, bool showJustSummary = true)
         {
-            Playlist playlist = await _ServiceApiClient.GetPlaylist(playlistCode);
-            List<TopArtists> topArtists = await _ServiceApiClient.GetTopArtistsByPlaylist(playlistCode, showJustSummary);
-            List<Movement> movements = await _ServiceApiClient.GetMovementsByPlaylist(playlistCode, showJustSummary);
-            List<Track> tracks = await _ServiceApiClient.GetTracks(playlistCode, showJustSummary);
+            Task<Playlist> playlistTask = _ServiceApiClient.GetPlaylist(playlistCode);
+            Task<List<TopArtists>> topArtistsTask = _ServiceApiClient.GetTopArtistsByPlaylist(playlistCode, showJustSummary);
+            Task<List<Movement>> movementsTask = _ServiceApiClient.GetMovementsByPlaylist(playlistCode, showJustSummary);
+            Task<List<Track>> tracksTask = _ServiceApiClient.GetTracks(playlistCode, showJustSummary);
+            await Task.WhenAll(playlistTask, topArtistsTask, movementsTask, tracksTask);
 
             return View(new PlaylistViewModel
             {
-                Playlist = playlist,
-                TopArtists = topArtists,
-                Movements = movements,
-                Tracks = tracks
+                Playlist = await playlistTask,
+                TopArtists = await topArtistsTask,
+                Movements = await movementsTask,
+                Tracks = await tracksTask
             });
         }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class MovementDataAccess : BaseDataAccess<Movement>, IMovementDataAccess`
`13`	`13`	`{`
`14`	`14`	`public MovementDataAccess(IConfiguration configuration)`
`15`	`15`	`{`
`16`		`- base.SetupConnectionString(configuration);`
	`16`	`+ SetupConnectionString(configuration);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public async Task<List<Movement>> GetList(int playlistCode, bool showJustSummary)`
`@@ -22,15 +22,15 @@ public async Task<List<Movement>> GetList(int playlistCode, bool showJustSummary`
`22`	`22`	`parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);`
`23`	`23`	`parameters.Add("@ShowJustSummary", showJustSummary, DbType.Boolean);`
`24`	`24`
`25`		`- return await base.GetList("ITunes_GetMovement", parameters);`
	`25`	`+ return await GetList("ITunes_GetMovement", parameters);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public async Task<List<Movement>> GetList(bool showJustSummary)`
`29`	`29`	`{`
`30`	`30`	`DynamicParameters parameters = new();`
`31`	`31`	`parameters.Add("@ShowJustSummary", showJustSummary, DbType.Boolean);`
`32`	`32`
`33`		`- return await base.GetList("ITunes_GetMovement", parameters);`
	`33`	`+ return await GetList("ITunes_GetMovement", parameters);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using SamSmithNZ.Service.DataAccess.Base;`
`4`	`4`	`using SamSmithNZ.Service.DataAccess.ITunes.Interfaces;`
`5`	`5`	`using SamSmithNZ.Service.Models.ITunes;`
`6`		`-using System;`
`7`	`6`	`using System.Collections.Generic;`
`8`	`7`	`using System.Data;`
`9`	`8`	`using System.Threading.Tasks;`
`@@ -14,37 +13,38 @@ public class PlaylistDataAccess : BaseDataAccess<Playlist>, IPlaylistDataAccess`
`14`	`13`	`{`
`15`	`14`	`public PlaylistDataAccess(IConfiguration configuration)`
`16`	`15`	`{`
`17`		`- base.SetupConnectionString(configuration);`
	`16`	`+ SetupConnectionString(configuration);`
`18`	`17`	`}`
	`18`	`+`
`19`	`19`	`public async Task<List<Playlist>> GetList()`
`20`	`20`	`{`
`21`	`21`	`DynamicParameters parameters = new();`
`22`	`22`
`23`		`- return await base.GetList("ITunes_GetPlaylists", parameters);`
	`23`	`+ return await GetList("ITunes_GetPlaylists", parameters);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public async Task<Playlist> GetItem(int playlistCode)`
`27`	`27`	`{`
`28`	`28`	`DynamicParameters parameters = new();`
`29`	`29`	`parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);`
`30`	`30`
`31`		`- return await base.GetItem("ITunes_GetPlaylists", parameters);`
	`31`	`+ return await GetItem("ITunes_GetPlaylists", parameters);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`//public async Task<int> SaveItem(DateTime dteDate)`
`35`	`35`	`//{`
`36`	`36`	`// DynamicParameters parameters = new();`
`37`	`37`	`// parameters.Add("@PlaylistDate", dteDate, DbType.DateTime);`
`38`	`38`
`39`		`- // return await base.GetScalarItem<int>("ITunes_ImportCreateNewPlayList", parameters);`
	`39`	`+ // return await GetScalarItem<int>("ITunes_ImportCreateNewPlayList", parameters);`
`40`	`40`	`//}`
`41`	`41`
`42`	`42`	`//public async Task<bool> DeleteItem(int playlistCode)`
`43`	`43`	`//{`
`44`	`44`	`// DynamicParameters parameters = new();`
`45`	`45`	`// parameters.Add("@PlaylistCode", playlistCode, DbType.Int32);`
`46`	`46`
`47`		`- // return await base.SaveItem("ITunes_ImportDeletePlaylistTracks", parameters);`
	`47`	`+ // return await SaveItem("ITunes_ImportDeletePlaylistTracks", parameters);`
`48`	`48`	`//}`
`49`	`49`
`50`	`50`	`}`