Skip to content

Commit ed18c58

Browse files
samsmithnzsamsmithnz
authored
Merge pull request #1136 from SamSmithNZ-dotcom/GuitarTabUpgrades
Guitar tab upgrades
2 parents 08f2e35 + b70b486 commit ed18c58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+281
-293
lines changed

‎src/SamSmithNZ.Service/Controllers/GuitarTab/ArtistController.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using Microsoft.AspNetCore.Mvc;
2-
using Microsoft.Extensions.Logging;
3-
using System.Collections.Generic;
4-
using System.Threading.Tasks;
5-
using SamSmithNZ.Service.DataAccess.GuitarTab;
62
using SamSmithNZ.Service.DataAccess.GuitarTab.Interfaces;
73
using SamSmithNZ.Service.Models.GuitarTab;
4+
using System.Collections.Generic;
5+
using System.Threading.Tasks;
86

97
namespace SamSmithNZ.Service.Controllers.GuitarTab
108
{

‎src/SamSmithNZ.Service/Controllers/GuitarTab/RatingController.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using Microsoft.AspNetCore.Mvc;
2-
using Microsoft.Extensions.Logging;
3-
using System.Collections.Generic;
4-
using System.Threading.Tasks;
5-
using SamSmithNZ.Service.DataAccess.GuitarTab;
62
using SamSmithNZ.Service.DataAccess.GuitarTab.Interfaces;
73
using SamSmithNZ.Service.Models.GuitarTab;
4+
using System.Collections.Generic;
5+
using System.Threading.Tasks;
86

97
namespace SamSmithNZ.Service.Controllers.GuitarTab
108
{

‎src/SamSmithNZ.Service/Controllers/GuitarTab/SearchController.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
using Microsoft.AspNetCore.Mvc;
2-
using Microsoft.Extensions.Logging;
3-
using System.Collections.Generic;
4-
using System.Threading.Tasks;
5-
using SamSmithNZ.Service.DataAccess.GuitarTab;
62
using SamSmithNZ.Service.DataAccess.GuitarTab.Interfaces;
73
using SamSmithNZ.Service.Models.GuitarTab;
84
using System;
5+
using System.Collections.Generic;
6+
using System.Threading.Tasks;
97

108
namespace SamSmithNZ.Service.Controllers.GuitarTab
119
{

‎src/SamSmithNZ.Service/Controllers/GuitarTab/TabController.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using Microsoft.AspNetCore.Mvc;
2-
using Microsoft.Extensions.Logging;
3-
using System.Collections.Generic;
4-
using System.Threading.Tasks;
5-
using SamSmithNZ.Service.DataAccess.GuitarTab;
62
using SamSmithNZ.Service.DataAccess.GuitarTab.Interfaces;
73
using SamSmithNZ.Service.Models.GuitarTab;
4+
using System.Collections.Generic;
5+
using System.Threading.Tasks;
86

97
namespace SamSmithNZ.Service.Controllers.GuitarTab
108
{

‎src/SamSmithNZ.Service/Controllers/GuitarTab/TrackOrderController.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using Microsoft.AspNetCore.Mvc;
2-
using Microsoft.Extensions.Logging;
3-
using System.Collections.Generic;
4-
using System.Threading.Tasks;
5-
using SamSmithNZ.Service.DataAccess.GuitarTab;
62
using SamSmithNZ.Service.DataAccess.GuitarTab.Interfaces;
73
using SamSmithNZ.Service.Models.GuitarTab;
4+
using System.Collections.Generic;
5+
using System.Threading.Tasks;
86

97
namespace SamSmithNZ.Service.Controllers.GuitarTab
108
{

‎src/SamSmithNZ.Service/Controllers/GuitarTab/TuningController.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using Microsoft.AspNetCore.Mvc;
2-
using Microsoft.Extensions.Logging;
3-
using System.Collections.Generic;
4-
using System.Threading.Tasks;
5-
using SamSmithNZ.Service.DataAccess.GuitarTab;
62
using SamSmithNZ.Service.DataAccess.GuitarTab.Interfaces;
73
using SamSmithNZ.Service.Models.GuitarTab;
4+
using System.Collections.Generic;
5+
using System.Threading.Tasks;
86

97
namespace SamSmithNZ.Service.Controllers.GuitarTab
108
{

‎src/SamSmithNZ.Service/DataAccess/GuitarTab/AlbumDataAccess.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public class AlbumDataAccess : BaseDataAccess<Album>, IAlbumDataAccess
1313
{
1414
public AlbumDataAccess(IConfiguration configuration)
1515
{
16-
base.SetupConnectionString(configuration);
16+
SetupConnectionString(configuration);
1717
}
1818

1919
public async Task<List<Album>> GetList(bool isAdmin)
2020
{
2121
DynamicParameters parameters = new();
2222
parameters.Add("@IsAdmin", isAdmin, DbType.Boolean);
2323

24-
return await base.GetList("Tab_GetAlbums", parameters);
24+
return await GetList("Tab_GetAlbums", parameters);
2525
}
2626

2727
public async Task<Album> GetItem(int albumCode, bool isAdmin)
@@ -30,7 +30,7 @@ public async Task<Album> GetItem(int albumCode, bool isAdmin)
3030
parameters.Add("@AlbumCode", albumCode, DbType.Int32);
3131
parameters.Add("@IsAdmin", isAdmin, DbType.Boolean);
3232

33-
return await base.GetItem("Tab_GetAlbums", parameters);
33+
return await GetItem("Tab_GetAlbums", parameters);
3434
}
3535

3636
public async Task<Album> SaveItem(Album item)
@@ -46,7 +46,7 @@ public async Task<Album> SaveItem(Album item)
4646
parameters.Add("@IncludeInIndex", item.IncludeInIndex, DbType.Boolean);
4747
parameters.Add("@IncludeOnWebsite", item.IncludeOnWebsite, DbType.Boolean);
4848

49-
item.AlbumCode = await base.GetScalarItem<int>("Tab_SaveAlbum", parameters);
49+
item.AlbumCode = await GetScalarItem<int>("Tab_SaveAlbum", parameters);
5050
return item;
5151
}
5252

‎src/SamSmithNZ.Service/DataAccess/GuitarTab/ArtistDataAccess.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ArtistDataAccess : BaseDataAccess<Artist>, IArtistDataAccess
1313
{
1414
public ArtistDataAccess(IConfiguration configuration)
1515
{
16-
base.SetupConnectionString(configuration);
16+
SetupConnectionString(configuration);
1717
}
1818

1919
public async Task<List<Artist>> GetList(bool? includeAllItems, bool isAdmin)
@@ -25,7 +25,7 @@ public async Task<List<Artist>> GetList(bool? includeAllItems, bool isAdmin)
2525
}
2626
parameters.Add("@IsAdmin", isAdmin, DbType.Boolean);
2727

28-
return await base.GetList("Tab_GetArtists", parameters);
28+
return await GetList("Tab_GetArtists", parameters);
2929
}
3030

3131
}

‎src/SamSmithNZ.Service/DataAccess/GuitarTab/RatingDataAccess.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
using Dapper;
2-
using Microsoft.Extensions.Configuration;
1+
using Microsoft.Extensions.Configuration;
32
using SamSmithNZ.Service.DataAccess.Base;
43
using SamSmithNZ.Service.DataAccess.GuitarTab.Interfaces;
54
using SamSmithNZ.Service.Models.GuitarTab;
65
using System.Collections.Generic;
7-
using System.Data;
86
using System.Threading.Tasks;
97

108
namespace SamSmithNZ.Service.DataAccess.GuitarTab
@@ -13,12 +11,12 @@ public class RatingDataAccess : BaseDataAccess<Rating>, IRatingDataAccess
1311
{
1412
public RatingDataAccess(IConfiguration configuration)
1513
{
16-
base.SetupConnectionString(configuration);
14+
SetupConnectionString(configuration);
1715
}
1816

1917
public async Task<List<Rating>> GetList()
2018
{
21-
return await base.GetList("Tab_GetRatings");
19+
return await GetList("Tab_GetRatings");
2220
}
2321

2422
}

‎src/SamSmithNZ.Service/DataAccess/GuitarTab/SearchDataAccess.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ public class SearchDataAccess : BaseDataAccess<Search>, ISearchDataAccess
1414
{
1515
public SearchDataAccess(IConfiguration configuration)
1616
{
17-
base.SetupConnectionString(configuration);
17+
SetupConnectionString(configuration);
1818
}
1919

2020
public async Task<List<Search>> GetList(Guid? recordid)
2121
{
2222
DynamicParameters parameters = new();
2323
parameters.Add("@RecordId", recordid, DbType.Guid);
2424

25-
return await base.GetList("Tab_GetSearchResults", parameters);
25+
return await GetList("Tab_GetSearchResults", parameters);
2626
}
2727

2828
public async Task<Guid> SaveItem(string searchText)
2929
{
3030
DynamicParameters parameters = new();
3131
parameters.Add("@SearchText", searchText, DbType.String);
3232

33-
return await base.GetScalarItem<Guid>("Tab_SaveSearchParameters", parameters);
33+
return await GetScalarItem<Guid>("Tab_SaveSearchParameters", parameters);
3434
}
3535

3636
}

0 commit comments

Comments
 (0)