diff --git a/src/Band/Controllers/BandController.cs b/src/Band/Controllers/BandController.cs index d694605..a254132 100644 --- a/src/Band/Controllers/BandController.cs +++ b/src/Band/Controllers/BandController.cs @@ -31,57 +31,57 @@ public class BandController(BandService pushPostService, Dictionary logger, AppSettings appSettings, IHttp return result; } - public Models.Profile.Root? GetProfile(Dictionary? tokens, string bandKey) { + public Models.Profile.Root? GetProfile(Dictionary? tokens) { Models.Profile.Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -97,13 +97,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetProfile(_Logger, httpClient, token, bandKey); + result = GetProfile(_Logger, httpClient, token, _Band.Key); httpClient.Dispose(); } return result; } - private static Models.Profile.Root? GetProfile(ILogger logger, HttpClient httpClient, Token token, string bandKey) { + private static Models.Profile.Root? GetProfile(ILogger logger, HttpClient httpClient, Token token, string? bandKey) { Models.Profile.Root? result; Uri requestUri = new($"{httpClient.BaseAddress}v2/profile?access_token={token.AccessToken}&band_key={bandKey}"); Task httpResponseMessage = httpClient.GetAsync(requestUri); @@ -112,7 +112,7 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp return result; } - public Models.Posts.Root? GetPosts(Dictionary? tokens, string bandKey) { + public Models.Posts.Root? GetPosts(Dictionary? tokens) { Models.Posts.Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -120,13 +120,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetPosts(_Logger, httpClient, token, bandKey); + result = GetPosts(_Logger, httpClient, token, _Band.Key); httpClient.Dispose(); } return result; } - private static Models.Posts.Root? GetPosts(ILogger logger, HttpClient httpClient, Token token, string bandKey) { + private static Models.Posts.Root? GetPosts(ILogger logger, HttpClient httpClient, Token token, string? bandKey) { Models.Posts.Root? result; Uri requestUri = new($"{httpClient.BaseAddress}v2/band/posts?access_token={token.AccessToken}&band_key={bandKey}&locale=en_US"); Task httpResponseMessage = httpClient.GetAsync(requestUri); @@ -135,7 +135,7 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp return result; } - public Models.Post.Root? GetPost(Dictionary? tokens, string bandKey, string postKey) { + public Models.Post.Root? GetPost(Dictionary? tokens, string postKey) { Models.Post.Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -143,13 +143,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetPost(_Logger, httpClient, token, bandKey, postKey); + result = GetPost(_Logger, httpClient, token, _Band.Key, postKey); httpClient.Dispose(); } return result; } - private static Models.Post.Root? GetPost(ILogger logger, HttpClient httpClient, Token token, string bandKey, string postKey) { + private static Models.Post.Root? GetPost(ILogger logger, HttpClient httpClient, Token token, string? bandKey, string postKey) { Models.Post.Root? result; Uri requestUri = new($"{httpClient.BaseAddress}v2/band/post?access_token={token.AccessToken}&band_key={bandKey}&post_key={postKey}"); Task httpResponseMessage = httpClient.GetAsync(requestUri); @@ -158,7 +158,7 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp return result; } - public Models.Comments.Root? GetComments(Dictionary? tokens, string bandKey, string postKey, string sort) { + public Models.Comments.Root? GetComments(Dictionary? tokens, string postKey, string sort) { Models.Comments.Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -166,13 +166,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetComments(_Logger, httpClient, token, bandKey, postKey, sort); + result = GetComments(_Logger, httpClient, token, _Band.Key, postKey, sort); httpClient.Dispose(); } return result; } - private static Models.Comments.Root? GetComments(ILogger logger, HttpClient httpClient, Token token, string bandKey, string postKey, string sort) { + private static Models.Comments.Root? GetComments(ILogger logger, HttpClient httpClient, Token token, string? bandKey, string postKey, string sort) { Models.Comments.Root? result; Uri requestUri = new($"{httpClient.BaseAddress}v2/band/post/comments?access_token={token.AccessToken}&band_key={bandKey}&post_key={postKey}&sort={sort}"); Task httpResponseMessage = httpClient.GetAsync(requestUri); @@ -181,7 +181,7 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp return result; } - public Models.Albums.Root? GetAlbums(Dictionary? tokens, string bandKey) { + public Models.Albums.Root? GetAlbums(Dictionary? tokens) { Models.Albums.Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -189,13 +189,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetAlbums(_Logger, httpClient, token, bandKey); + result = GetAlbums(_Logger, httpClient, token, _Band.Key); httpClient.Dispose(); } return result; } - private static Models.Albums.Root? GetAlbums(ILogger logger, HttpClient httpClient, Token token, string bandKey) { + private static Models.Albums.Root? GetAlbums(ILogger logger, HttpClient httpClient, Token token, string? bandKey) { Models.Albums.Root? result; Uri requestUri = new($"{httpClient.BaseAddress}v2/band/albums?access_token={token.AccessToken}&band_key={bandKey}"); Task httpResponseMessage = httpClient.GetAsync(requestUri); @@ -204,7 +204,7 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp return result; } - public Models.Photos.Root? GetPhotos(Dictionary? tokens, string bandKey, string photoAlbumKey) { + public Models.Photos.Root? GetPhotos(Dictionary? tokens, string photoAlbumKey) { Models.Photos.Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -212,13 +212,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetPhotos(_Logger, httpClient, token, bandKey, photoAlbumKey); + result = GetPhotos(_Logger, httpClient, token, _Band.Key, photoAlbumKey); httpClient.Dispose(); } return result; } - private static Models.Photos.Root? GetPhotos(ILogger logger, HttpClient httpClient, Token token, string bandKey, string photoAlbumKey) { + private static Models.Photos.Root? GetPhotos(ILogger logger, HttpClient httpClient, Token token, string? bandKey, string photoAlbumKey) { Models.Photos.Root? result; Uri requestUri = new($"{httpClient.BaseAddress}v2/band/album/photos?access_token={token.AccessToken}&band_key={bandKey}&photo_album_key={photoAlbumKey}"); Task httpResponseMessage = httpClient.GetAsync(requestUri); @@ -227,7 +227,7 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp return result; } - public Models.Permissions.Root? GetPermissions(Dictionary? tokens, string bandKey, string permissions) { + public Models.Permissions.Root? GetPermissions(Dictionary? tokens, string permissions) { Models.Permissions.Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -235,13 +235,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetPermissions(_Logger, httpClient, token, bandKey, permissions); + result = GetPermissions(_Logger, httpClient, token, _Band.Key, permissions); httpClient.Dispose(); } return result; } - private static Models.Permissions.Root? GetPermissions(ILogger logger, HttpClient httpClient, Token token, string bandKey, string permissions) { + private static Models.Permissions.Root? GetPermissions(ILogger logger, HttpClient httpClient, Token token, string? bandKey, string permissions) { Models.Permissions.Root? result; Uri requestUri = new($"{httpClient.BaseAddress}v2/band/permissions?access_token={token.AccessToken}&band_key={bandKey}&permissions={permissions}"); Task httpResponseMessage = httpClient.GetAsync(requestUri); @@ -250,7 +250,7 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp return result; } - public Root? WritePost(Dictionary? tokens, string bandKey, string message) { + public Root? WritePost(Dictionary? tokens, string message) { Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -258,13 +258,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetPostCreate(_Logger, httpClient, token, bandKey, message); + result = GetPostCreate(_Logger, httpClient, token, _Band.Key, message); httpClient.Dispose(); } return result; } - private static Root? GetPostCreate(ILogger logger, HttpClient httpClient, Token token, string bandKey, string message) { + private static Root? GetPostCreate(ILogger logger, HttpClient httpClient, Token token, string? bandKey, string message) { Root? result; List> formData = [ new KeyValuePair("access_token", token.AccessToken), @@ -280,7 +280,7 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp return result; } - public Root? WritePostComment(Dictionary? tokens, string bandKey, string postKey, string message) { + public Root? WritePostComment(Dictionary? tokens, string postKey, string message) { Root? result; Token? token = GetToken(tokens); if (token is null) { @@ -288,13 +288,13 @@ public class BandService(ILogger logger, AppSettings appSettings, IHttp result = null; } else { HttpClient httpClient = _HttpClientFactory.CreateClient(nameof(AppSettings.Settings.Band)); - result = GetPostCommentCreate(_Logger, httpClient, token, bandKey, postKey, message); + result = GetPostCommentCreate(_Logger, httpClient, token, _Band.Key, postKey, message); httpClient.Dispose(); } return result; } - private static Root? GetPostCommentCreate(ILogger logger, HttpClient httpClient, Token token, string bandKey, string postKey, string message) { + private static Root? GetPostCommentCreate(ILogger logger, HttpClient httpClient, Token token, string? bandKey, string postKey, string message) { Root? result; List> formData = [ new KeyValuePair("access_token", token.AccessToken),