Merge pull request #1137 from SamSmithNZ-dotcom/FooFighterUpgrades

samsmithnz · web-flow · commit 847b29855f32 · 2025-12-24T07:46:45.000-05:00
Foo fighter upgrades
diff --git a/src/SamSmithNZ.Service/Controllers/FooFighters/AlbumController.cs b/src/SamSmithNZ.Service/Controllers/FooFighters/AlbumController.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.FooFighters;
 using SamSmithNZ.Service.DataAccess.FooFighters.Interfaces;
 using SamSmithNZ.Service.Models.FooFighters;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.FooFighters
 {
diff --git a/src/SamSmithNZ.Service/Controllers/FooFighters/AverageSetlistController.cs b/src/SamSmithNZ.Service/Controllers/FooFighters/AverageSetlistController.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.FooFighters;
 using SamSmithNZ.Service.DataAccess.FooFighters.Interfaces;
 using SamSmithNZ.Service.Models.FooFighters;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.FooFighters
 {
diff --git a/src/SamSmithNZ.Service/Controllers/FooFighters/ShowController.cs b/src/SamSmithNZ.Service/Controllers/FooFighters/ShowController.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.FooFighters;
 using SamSmithNZ.Service.DataAccess.FooFighters.Interfaces;
 using SamSmithNZ.Service.Models.FooFighters;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.FooFighters
 {
diff --git a/src/SamSmithNZ.Service/Controllers/FooFighters/SongController.cs b/src/SamSmithNZ.Service/Controllers/FooFighters/SongController.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.FooFighters;
 using SamSmithNZ.Service.DataAccess.FooFighters.Interfaces;
 using SamSmithNZ.Service.Models.FooFighters;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.FooFighters
 {
diff --git a/src/SamSmithNZ.Service/Controllers/FooFighters/YearController.cs b/src/SamSmithNZ.Service/Controllers/FooFighters/YearController.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.FooFighters;
 using SamSmithNZ.Service.DataAccess.FooFighters.Interfaces;
 using SamSmithNZ.Service.Models.FooFighters;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace SamSmithNZ.Service.Controllers.FooFighters
 {
diff --git a/src/SamSmithNZ.Service/DataAccess/FooFighters/AlbumDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/FooFighters/AlbumDataAccess.cs
@@ -13,20 +13,20 @@ public class AlbumDataAccess : BaseDataAccess<Album>, IAlbumDataAccess
     {
         public AlbumDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
 
         public async Task<List<Album>> GetList()
         {
-            return await base.GetList("FFL_GetAlbums");
+            return await GetList("FFL_GetAlbums");
         }
 
         public async Task<Album> GetItem(int albumCode)
         {
             DynamicParameters parameters = new();
             parameters.Add("@albumCode", albumCode, DbType.Int32);
 
-            return await base.GetItem("FFL_GetAlbums", parameters);
+            return await GetItem("FFL_GetAlbums", parameters);
         }
     }
 }
diff --git a/src/SamSmithNZ.Service/DataAccess/FooFighters/AverageSetlistDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/FooFighters/AverageSetlistDataAccess.cs
@@ -13,7 +13,7 @@ public class AverageSetlistDataAccess : BaseDataAccess<AverageSetlist>, IAverage
     {
         public AverageSetlistDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
 
         public async Task<List<AverageSetlist>> GetList(int yearCode, int minimumSongCount, bool showAllSongs)
@@ -23,7 +23,7 @@ public async Task<List<AverageSetlist>> GetList(int yearCode, int minimumSongCou
             parameters.Add("@ShowMinimumSongCount", minimumSongCount, DbType.Int32);
             parameters.Add("@ShowAllSongs", showAllSongs, DbType.Boolean);
 
-            return await base.GetList("FFL_GetAverageSetlist", parameters);
+            return await GetList("FFL_GetAverageSetlist", parameters);
         }
 
     }
diff --git a/src/SamSmithNZ.Service/DataAccess/FooFighters/ShowDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/FooFighters/ShowDataAccess.cs
@@ -13,39 +13,39 @@ public class ShowDataAccess : BaseDataAccess<Show>, IShowDataAccess
     {
         public ShowDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
 
         public async Task<List<Show>> GetListByYearAsync(int yearCode)
         {
             DynamicParameters parameters = new();
             parameters.Add("@yearCode", yearCode, DbType.Int32);
 
-            return await base.GetList("FFL_GetShows", parameters);
+            return await GetList("FFL_GetShows", parameters);
         }
 
         public async Task<List<Show>> GetListBySongAsync(int songCode)
         {
             DynamicParameters parameters = new();
             parameters.Add("@songCode", songCode, DbType.Int32);
 
-            return await base.GetList("FFL_GetShows", parameters);
+            return await GetList("FFL_GetShows", parameters);
         }
 
         public async Task<List<Show>> GetListByFFLCode()
         {
             DynamicParameters parameters = new();
             parameters.Add("@GetFFLCodes", true, DbType.Int32);
 
-            return await base.GetList("FFL_GetShows", parameters);
+            return await GetList("FFL_GetShows", parameters);
         }
 
         public async Task<Show> GetItem(int showCode)
         {
             DynamicParameters parameters = new();
             parameters.Add("@showCode", showCode, DbType.Int32);
 
-            return await base.GetItem("FFL_GetShows", parameters);
+            return await GetItem("FFL_GetShows", parameters);
         }
 
         public async Task<bool> SaveItem(Show show)
@@ -57,7 +57,7 @@ public async Task<bool> SaveItem(Show show)
             parameters.Add("@ShowCity", show.ShowCity, DbType.String);
             parameters.Add("@ShowCountry", show.ShowCountry, DbType.String);
 
-            return await base.SaveItem("FFL_SaveShow", parameters);
+            return await SaveItem("FFL_SaveShow", parameters);
         }
     }
 }
diff --git a/src/SamSmithNZ.Service/DataAccess/FooFighters/SongDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/FooFighters/SongDataAccess.cs
@@ -13,36 +13,36 @@ public class SongDataAccess : BaseDataAccess<Song>, ISongDataAccess
     {
         public SongDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
 
         public async Task<List<Song>> GetList()
         {
-            return await base.GetList("FFL_GetSongs");
+            return await GetList("FFL_GetSongs");
         }
 
         public async Task<List<Song>> GetListForAlbumAsync(int albumCode)
         {
             DynamicParameters parameters = new();
             parameters.Add("@AlbumCode", albumCode, DbType.Int32);
 
-            return await base.GetList("FFL_GetSongs", parameters);
+            return await GetList("FFL_GetSongs", parameters);
         }
 
         public async Task<List<Song>> GetListForShowAsync(int showCode)
         {
             DynamicParameters parameters = new();
             parameters.Add("@ShowCode", showCode, DbType.Int32);
 
-            return await base.GetList("FFL_GetSongs", parameters);
+            return await GetList("FFL_GetSongs", parameters);
         }
 
         public async Task<Song> GetItem(int songCode)
         {
             DynamicParameters parameters = new();
             parameters.Add("@SongCode", songCode, DbType.Int32);
 
-            return await base.GetItem("FFL_GetSongs", parameters);
+            return await GetItem("FFL_GetSongs", parameters);
         }
 
         public async Task<bool> SaveItem(int songCode, int showCode, int showSongOrder)
@@ -52,7 +52,7 @@ public async Task<bool> SaveItem(int songCode, int showCode, int showSongOrder)
             parameters.Add("@ShowCode", showCode, DbType.Int32);
             parameters.Add("@ShowSongOrder", showSongOrder, DbType.Int32);
 
-            return await base.SaveItem("FFL_SaveShowSong", parameters);
+            return await SaveItem("FFL_SaveShowSong", parameters);
         }
     }
 }
diff --git a/src/SamSmithNZ.Service/DataAccess/FooFighters/YearDataAccess.cs b/src/SamSmithNZ.Service/DataAccess/FooFighters/YearDataAccess.cs
@@ -11,12 +11,12 @@ public class YearDataAccess : BaseDataAccess<Year>, IYearDataAccess
     {
         public YearDataAccess(IConfiguration configuration)
         {
-            base.SetupConnectionString(configuration);
+            SetupConnectionString(configuration);
         }
 
         public async Task<List<Year>> GetList()
         {
-            return await base.GetList("FFL_GetYearList");
+            return await GetList("FFL_GetYearList");
         }
       
     }
diff --git a/src/SamSmithNZ.Service/Models/FooFighters/AverageSetlist.cs b/src/SamSmithNZ.Service/Models/FooFighters/AverageSetlist.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SamSmithNZ.Service.Models.FooFighters
+﻿namespace SamSmithNZ.Service.Models.FooFighters
 {
     public class AverageSetlist
     {
diff --git a/src/SamSmithNZ.Tests/FooFighters/AlbumTest.cs b/src/SamSmithNZ.Tests/FooFighters/AlbumTest.cs
@@ -24,10 +24,10 @@ public async Task AlbumsExistTest()
             List<Album> items = await controller.GetAlbums(); 
 
             //assert
-            Assert.IsTrue(items != null);
-            Assert.IsTrue(items.Count > 0); //There is more than one
-            Assert.IsTrue(items[0].AlbumCode > 0); //The first item has an id
-            Assert.IsTrue(items[0].AlbumName.Length > 0); //The first item has an name
+            Assert.IsNotNull(items);
+            Assert.IsNotEmpty(items); //There is more than one
+            Assert.IsGreaterThan(0, items[0].AlbumCode); //The first item has an id
+            Assert.IsGreaterThan(0, items[0].AlbumName.Length); //The first item has an name
         }
 
         [TestMethod()]
@@ -41,10 +41,10 @@ public async Task AlbumsGetFooFightersTest()
             Album item = await controller.GetAlbum(albumKey);
 
             //assert
-            Assert.IsTrue(item != null);
-            Assert.IsTrue(item.AlbumImage == "220px-FooFighters-FooFighters.jpg");
-            Assert.IsTrue(item.AlbumCode == 1);
-            Assert.IsTrue(item.AlbumName == "Foo Fighters");
+            Assert.IsNotNull(item);
+            Assert.AreEqual("220px-FooFighters-FooFighters.jpg", item.AlbumImage);
+            Assert.AreEqual(1, item.AlbumCode);
+            Assert.AreEqual("Foo Fighters", item.AlbumName);
             Assert.IsTrue(item.AlbumReleaseDate >= DateTime.MinValue);
         }
 
diff --git a/src/SamSmithNZ.Tests/FooFighters/AverageSongTest.cs b/src/SamSmithNZ.Tests/FooFighters/AverageSongTest.cs
@@ -26,8 +26,8 @@ public async Task AverageSetlistExistTest()
             List<AverageSetlist> items = await controller.GetAverageSetlist(yearCode, minimumSongCount, showAllSongs);
 
             //assert
-            Assert.IsTrue(items != null);
-            Assert.IsTrue(items.Count > 0);
+            Assert.IsNotNull(items);
+            Assert.IsNotEmpty(items);
         }
 
         [TestMethod()]
@@ -43,14 +43,14 @@ public async Task AverageSetlist2015Test()
             List<AverageSetlist> items = await controller.GetAverageSetlist(yearCode, minimumSongCount, showAllSongs);
 
             //assert
-            Assert.IsTrue(items != null);
-            Assert.IsTrue(items.Count > 0);
-            Assert.IsTrue(items[0].SongCode > 0);
-            Assert.IsTrue(items[0].SongName != "");
-            Assert.IsTrue(items[0].AvgShowSongOrder > 0);
-            Assert.IsTrue(items[0].SongCount > 0);
-            Assert.IsTrue(items[0].SongRank > 0);
-            Assert.IsTrue(items[0].YearCode > 0);
+            Assert.IsNotNull(items);
+            Assert.IsNotEmpty(items);
+            Assert.IsGreaterThan(0, items[0].SongCode);
+            Assert.AreNotEqual("", items[0].SongName);
+            Assert.IsGreaterThan(0, items[0].AvgShowSongOrder);
+            Assert.IsGreaterThan(0, items[0].SongCount);
+            Assert.IsGreaterThan(0, items[0].SongRank);
+            Assert.IsGreaterThan(0, items[0].YearCode);
         }
 
     }
diff --git a/src/SamSmithNZ.Tests/FooFighters/ShowTest.cs b/src/SamSmithNZ.Tests/FooFighters/ShowTest.cs
@@ -27,7 +27,7 @@ public async Task ShowsExistForSongTest()
             List<Show> items = await controller.GetShowsBySong(songKey);
 
             //assert
-            Assert.IsTrue(items != null);
+            Assert.IsNotNull(items);
             Assert.IsTrue(items.Count > 0);
         }
 
@@ -42,18 +42,18 @@ public async Task ShowsForSongTest()
             List<Show> items = await controller.GetShowsBySong(songKey);
 
             //assert
-            Assert.IsTrue(items != null);
+            Assert.IsNotNull(items);
             Assert.IsTrue(items.Count > 0);
-            Assert.IsTrue(items[0].Notes != "");
+            Assert.AreNotEqual("", items[0].Notes);
             Assert.IsTrue(items[0].NumberOfSongsPlayed >= 0);
-            Assert.IsTrue(items[0].ShowCity == "Portland, OR");
-            Assert.IsTrue(items[0].ShowCountry == null);
+            Assert.AreEqual("Portland, OR", items[0].ShowCity);
+            Assert.IsNull(items[0].ShowCountry);
             Assert.IsTrue(items[0].ShowDate >= DateTime.MinValue);
-            Assert.IsTrue(items[0].ShowCode == 3);
-            Assert.IsTrue(items[0].ShowLocation != "");
+            Assert.AreEqual(3, items[0].ShowCode);
+            Assert.AreNotEqual("", items[0].ShowLocation);
             Assert.IsTrue(items[0].LastUpdated > DateTime.MinValue);
-            Assert.IsTrue(items[0].FFLCode == 0);
-            Assert.IsTrue(items[0].FFLURL == null);
+            Assert.AreEqual(0, items[0].FFLCode);
+            Assert.IsNull(items[0].FFLURL);
         }
 
         [TestMethod()]
@@ -67,7 +67,7 @@ public async Task ShowsExistForYearTest()
             List<Show> items = await controller.GetShowsByYear(yearCode);
 
             //assert
-            Assert.IsTrue(items != null);
+            Assert.IsNotNull(items);
             Assert.IsTrue(items.Count > 0);
         }
 
@@ -82,13 +82,13 @@ public async Task ShowsForYearTest()
             List<Show> items = await controller.GetShowsByYear(yearCode);
 
             //assert
-            Assert.IsTrue(items != null);
+            Assert.IsNotNull(items);
             Assert.IsTrue(items.Count > 0);
             Assert.IsTrue(items[2].NumberOfSongsPlayed >= 0);
-            Assert.IsTrue(items[2].ShowCity == "Seattle, WA");
+            Assert.AreEqual("Seattle, WA", items[2].ShowCity);
             Assert.IsTrue(items[2].ShowDate >= DateTime.MinValue);
-            Assert.IsTrue(items[2].ShowCode == 4);
-            Assert.IsTrue(items[2].ShowLocation != "");
+            Assert.AreEqual(4, items[2].ShowCode);
+            Assert.AreNotEqual("", items[2].ShowLocation);
         }
 
 
@@ -103,19 +103,19 @@ public async Task Show3Test()
             Show result = await controller.GetShow(showKey);
 
             //assert
-            Assert.IsTrue(result != null);
+            Assert.IsNotNull(result);
             //Assert.IsTrue(result.IsCancelledShow == false);
             //Assert.IsTrue(result.IsPostponedShow == false);
             //Assert.IsTrue(result.Notes != "");
             //Assert.IsTrue(result.NumberOfRecordings >= 0);
-            Assert.IsTrue(result.NumberOfSongsPlayed >= 0);
+            Assert.IsGreaterThanOrEqualTo(0, result.NumberOfSongsPlayed);
             //Assert.IsTrue(result.NumberOfUnconfirmedRecordings >= 0);
             //Assert.IsTrue(result.OtherPerformers != "");
-            Assert.IsTrue(result.ShowCity == "Portland, OR");
+            Assert.AreEqual("Portland, OR", result.ShowCity);
             //Assert.IsTrue(result.ShowCountry == "United States");
             Assert.IsTrue(result.ShowDate >= DateTime.MinValue);
-            Assert.IsTrue(result.ShowCode == 3);
-            Assert.IsTrue(result.ShowLocation != "");
+            Assert.AreEqual(3, result.ShowCode);
+            Assert.AreNotEqual("", result.ShowLocation);
         }
 
         [TestMethod()]
@@ -129,7 +129,7 @@ public async Task Show4Test()
             Show result = await controller.GetShow(showKey);
 
             //assert
-            Assert.IsTrue(result == null);
+            Assert.IsNull(result);
             ////Assert.IsTrue(result.IsCancelledShow == false);
             ////Assert.IsTrue(result.IsPostponedShow == false);
             ////Assert.IsTrue(result.Notes != "");
diff --git a/src/SamSmithNZ.Tests/FooFighters/SongTest.cs b/src/SamSmithNZ.Tests/FooFighters/SongTest.cs
diff --git a/src/SamSmithNZ.Tests/FooFighters/YearTest.cs b/src/SamSmithNZ.Tests/FooFighters/YearTest.cs
diff --git a/src/SamSmithNZ.Web/Controllers/FooFightersController.cs b/src/SamSmithNZ.Web/Controllers/FooFightersController.cs
diff --git a/src/SamSmithNZ.Web/Services/FooFightersServiceAPIClient.cs b/src/SamSmithNZ.Web/Services/FooFightersServiceAPIClient.cs

Original file line number	Diff line number	Diff line change
`@@ -13,20 +13,20 @@ public class AlbumDataAccess : BaseDataAccess<Album>, IAlbumDataAccess`
`13`	`13`	`{`
`14`	`14`	`public AlbumDataAccess(IConfiguration configuration)`
`15`	`15`	`{`
`16`		`- base.SetupConnectionString(configuration);`
	`16`	`+ SetupConnectionString(configuration);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public async Task<List<Album>> GetList()`
`20`	`20`	`{`
`21`		`- return await base.GetList("FFL_GetAlbums");`
	`21`	`+ return await GetList("FFL_GetAlbums");`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public async Task<Album> GetItem(int albumCode)`
`25`	`25`	`{`
`26`	`26`	`DynamicParameters parameters = new();`
`27`	`27`	`parameters.Add("@albumCode", albumCode, DbType.Int32);`
`28`	`28`
`29`		`- return await base.GetItem("FFL_GetAlbums", parameters);`
	`29`	`+ return await GetItem("FFL_GetAlbums", parameters);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class AverageSetlistDataAccess : BaseDataAccess<AverageSetlist>, IAverage`
`13`	`13`	`{`
`14`	`14`	`public AverageSetlistDataAccess(IConfiguration configuration)`
`15`	`15`	`{`
`16`		`- base.SetupConnectionString(configuration);`
	`16`	`+ SetupConnectionString(configuration);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public async Task<List<AverageSetlist>> GetList(int yearCode, int minimumSongCount, bool showAllSongs)`
`@@ -23,7 +23,7 @@ public async Task<List<AverageSetlist>> GetList(int yearCode, int minimumSongCou`
`23`	`23`	`parameters.Add("@ShowMinimumSongCount", minimumSongCount, DbType.Int32);`
`24`	`24`	`parameters.Add("@ShowAllSongs", showAllSongs, DbType.Boolean);`
`25`	`25`
`26`		`- return await base.GetList("FFL_GetAverageSetlist", parameters);`
	`26`	`+ return await GetList("FFL_GetAverageSetlist", parameters);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,39 +13,39 @@ public class ShowDataAccess : BaseDataAccess<Show>, IShowDataAccess`
`13`	`13`	`{`
`14`	`14`	`public ShowDataAccess(IConfiguration configuration)`
`15`	`15`	`{`
`16`		`- base.SetupConnectionString(configuration);`
	`16`	`+ SetupConnectionString(configuration);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public async Task<List<Show>> GetListByYearAsync(int yearCode)`
`20`	`20`	`{`
`21`	`21`	`DynamicParameters parameters = new();`
`22`	`22`	`parameters.Add("@yearCode", yearCode, DbType.Int32);`
`23`	`23`
`24`		`- return await base.GetList("FFL_GetShows", parameters);`
	`24`	`+ return await GetList("FFL_GetShows", parameters);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public async Task<List<Show>> GetListBySongAsync(int songCode)`
`28`	`28`	`{`
`29`	`29`	`DynamicParameters parameters = new();`
`30`	`30`	`parameters.Add("@songCode", songCode, DbType.Int32);`
`31`	`31`
`32`		`- return await base.GetList("FFL_GetShows", parameters);`
	`32`	`+ return await GetList("FFL_GetShows", parameters);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public async Task<List<Show>> GetListByFFLCode()`
`36`	`36`	`{`
`37`	`37`	`DynamicParameters parameters = new();`
`38`	`38`	`parameters.Add("@GetFFLCodes", true, DbType.Int32);`
`39`	`39`
`40`		`- return await base.GetList("FFL_GetShows", parameters);`
	`40`	`+ return await GetList("FFL_GetShows", parameters);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public async Task<Show> GetItem(int showCode)`
`44`	`44`	`{`
`45`	`45`	`DynamicParameters parameters = new();`
`46`	`46`	`parameters.Add("@showCode", showCode, DbType.Int32);`
`47`	`47`
`48`		`- return await base.GetItem("FFL_GetShows", parameters);`
	`48`	`+ return await GetItem("FFL_GetShows", parameters);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public async Task<bool> SaveItem(Show show)`
`@@ -57,7 +57,7 @@ public async Task<bool> SaveItem(Show show)`
`57`	`57`	`parameters.Add("@ShowCity", show.ShowCity, DbType.String);`
`58`	`58`	`parameters.Add("@ShowCountry", show.ShowCountry, DbType.String);`
`59`	`59`
`60`		`- return await base.SaveItem("FFL_SaveShow", parameters);`
	`60`	`+ return await SaveItem("FFL_SaveShow", parameters);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,36 +13,36 @@ public class SongDataAccess : BaseDataAccess<Song>, ISongDataAccess`
`13`	`13`	`{`
`14`	`14`	`public SongDataAccess(IConfiguration configuration)`
`15`	`15`	`{`
`16`		`- base.SetupConnectionString(configuration);`
	`16`	`+ SetupConnectionString(configuration);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public async Task<List<Song>> GetList()`
`20`	`20`	`{`
`21`		`- return await base.GetList("FFL_GetSongs");`
	`21`	`+ return await GetList("FFL_GetSongs");`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public async Task<List<Song>> GetListForAlbumAsync(int albumCode)`
`25`	`25`	`{`
`26`	`26`	`DynamicParameters parameters = new();`
`27`	`27`	`parameters.Add("@AlbumCode", albumCode, DbType.Int32);`
`28`	`28`
`29`		`- return await base.GetList("FFL_GetSongs", parameters);`
	`29`	`+ return await GetList("FFL_GetSongs", parameters);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public async Task<List<Song>> GetListForShowAsync(int showCode)`
`33`	`33`	`{`
`34`	`34`	`DynamicParameters parameters = new();`
`35`	`35`	`parameters.Add("@ShowCode", showCode, DbType.Int32);`
`36`	`36`
`37`		`- return await base.GetList("FFL_GetSongs", parameters);`
	`37`	`+ return await GetList("FFL_GetSongs", parameters);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public async Task<Song> GetItem(int songCode)`
`41`	`41`	`{`
`42`	`42`	`DynamicParameters parameters = new();`
`43`	`43`	`parameters.Add("@SongCode", songCode, DbType.Int32);`
`44`	`44`
`45`		`- return await base.GetItem("FFL_GetSongs", parameters);`
	`45`	`+ return await GetItem("FFL_GetSongs", parameters);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public async Task<bool> SaveItem(int songCode, int showCode, int showSongOrder)`
`@@ -52,7 +52,7 @@ public async Task<bool> SaveItem(int songCode, int showCode, int showSongOrder)`
`52`	`52`	`parameters.Add("@ShowCode", showCode, DbType.Int32);`
`53`	`53`	`parameters.Add("@ShowSongOrder", showSongOrder, DbType.Int32);`
`54`	`54`
`55`		`- return await base.SaveItem("FFL_SaveShowSong", parameters);`
	`55`	`+ return await SaveItem("FFL_SaveShowSong", parameters);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ public class YearDataAccess : BaseDataAccess<Year>, IYearDataAccess`
`11`	`11`	`{`
`12`	`12`	`public YearDataAccess(IConfiguration configuration)`
`13`	`13`	`{`
`14`		`- base.SetupConnectionString(configuration);`
	`14`	`+ SetupConnectionString(configuration);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public async Task<List<Year>> GetList()`
`18`	`18`	`{`
`19`		`- return await base.GetList("FFL_GetYearList");`
	`19`	`+ return await GetList("FFL_GetYearList");`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`}`