Skip to content

Commit

Permalink
renaming: sources -> source, 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@pavel-zhur
pavel-zhur committed May 23, 2024
1 parent 71bb5de commit 9b93870
Show file tree
Hide file tree
Showing 50 changed files with 105 additions and 107 deletions.
14 changes: 7 additions & 7 deletions HarmonyDB and OneShelf.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Index.Api.Client"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OneShelf.Sources.Self", "OneShelf.Sources.Self", "{B9B1BB37-376A-413A-8F4C-CB6F61C70FE6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Sources.Api.Model", "HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Sources.Api.Model.csproj", "{8BEB2357-0B54-416C-AE1A-1409F46E13F5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Source.Api.Model", "HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Source.Api.Model.csproj", "{8BEB2357-0B54-416C-AE1A-1409F46E13F5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Sources.Api.Client", "HarmonyDB.Sources\HarmonyDB.Sources.Api.Client\HarmonyDB.Sources.Api.Client.csproj", "{AFF2ABDE-31BE-4B37-B28D-A675A9001B29}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Source.Api.Client", "HarmonyDB.Sources\HarmonyDB.Sources.Api.Client\HarmonyDB.Source.Api.Client.csproj", "{AFF2ABDE-31BE-4B37-B28D-A675A9001B29}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneShelf.Frontend.Api.Client", "OneShelf.Frontend\OneShelf.Frontend.Api.Client\OneShelf.Frontend.Api.Client.csproj", "{57EDF7D7-14B6-416B-B4F0-5A28D472D9BF}"
EndProject
Expand Down Expand Up @@ -157,13 +157,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CD898B20
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj", "{B5BF58FE-4FB4-4019-9E2A-E09223D36AD1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarmonyDB.Sources", "HarmonyDB.Sources", "{EA9513E0-A98A-40F1-B158-D3FEEF63BE65}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarmonyDB.Common", "HarmonyDB.Common", "{2950865E-9D1A-406E-B0C6-4C249E2E4D61}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarmonyDB.Common", "HarmonyDB.Common\HarmonyDB.Common\HarmonyDB.Common.csproj", "{36D7C835-0DE5-4FD3-A489-820A1D121EE4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneShelf.Common.Api.Client", "OneShelf.Common\OneShelf.Common.Api.Client\OneShelf.Common.Api.Client.csproj", "{92969108-D9C8-4FF8-B083-B10463EB0FEC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneShelf.Common.Api.Client", "OneShelf.Common\OneShelf.Common.Api.Client\OneShelf.Common.Api.Client.csproj", "{92969108-D9C8-4FF8-B083-B10463EB0FEC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarmonyDB.Source", "HarmonyDB.Source", "{3E91BCAD-3270-42AB-96BB-3F5A092CE64F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -456,8 +456,8 @@ Global
{0BC5AC04-6EC2-4EAC-B33F-999AC1196E08} = {7548FF8E-E1B9-4939-96E9-03DBD5236709}
{4F71D4FC-3171-432D-879B-99448B4D3498} = {2950865E-9D1A-406E-B0C6-4C249E2E4D61}
{39939E3D-6F08-446E-A04F-1E9AE30CCBFD} = {7548FF8E-E1B9-4939-96E9-03DBD5236709}
{8BEB2357-0B54-416C-AE1A-1409F46E13F5} = {EA9513E0-A98A-40F1-B158-D3FEEF63BE65}
{AFF2ABDE-31BE-4B37-B28D-A675A9001B29} = {EA9513E0-A98A-40F1-B158-D3FEEF63BE65}
{8BEB2357-0B54-416C-AE1A-1409F46E13F5} = {3E91BCAD-3270-42AB-96BB-3F5A092CE64F}
{AFF2ABDE-31BE-4B37-B28D-A675A9001B29} = {3E91BCAD-3270-42AB-96BB-3F5A092CE64F}
{57EDF7D7-14B6-416B-B4F0-5A28D472D9BF} = {EDC67D14-C978-46D5-A98B-743C1480C1A8}
{C1F71C37-1A69-4182-9876-9AA61D5BAF58} = {B9B1BB37-376A-413A-8F4C-CB6F61C70FE6}
{C59CD11B-E781-49A2-906E-D9F200CFA1B5} = {B9B1BB37-376A-413A-8F4C-CB6F61C70FE6}
Expand Down
20 changes: 10 additions & 10 deletions HarmonyDB.Index/HarmonyDB.Index.Api.Client/IndexApiClient.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using HarmonyDB.Index.Api.Model;
using HarmonyDB.Index.Api.Model.VInternal;
using HarmonyDB.Sources.Api.Model;
using HarmonyDB.Sources.Api.Model.V1;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Model;
using HarmonyDB.Source.Api.Model.V1;
using HarmonyDB.Source.Api.Model.V1.Api;
using Microsoft.Extensions.Options;
using OneShelf.Authorization.Api.Model;
using OneShelf.Common.Api.Client;
Expand All @@ -17,37 +17,37 @@ public IndexApiClient(IHttpClientFactory httpClientFactory, IOptions<ApiClientOp
}

public async Task<string> V1GetSongsDirect(string request)
=> await PostDirect(SourcesApiUrls.V1GetSongs, request);
=> await PostDirect(SourceApiUrls.V1GetSongs, request);

public async Task<GetSongResponse> V1GetSong(Identity identity, string externalId)
=> await Post<GetSongRequest, GetSongResponse>(SourcesApiUrls.V1GetSong, new()
=> await Post<GetSongRequest, GetSongResponse>(SourceApiUrls.V1GetSong, new()
{
Identity = identity,
ExternalId = externalId,
});

public async Task<GetSongsResponse> V1GetSongs(Identity identity, List<string> externalIds)
=> await Post<GetSongsRequest, GetSongsResponse>(SourcesApiUrls.V1GetSongs, new()
=> await Post<GetSongsRequest, GetSongsResponse>(SourceApiUrls.V1GetSongs, new()
{
Identity = identity,
ExternalIds = externalIds,
});

public async Task V1Ping()
=> await Ping(SourcesApiUrls.V1Ping);
=> await Ping(SourceApiUrls.V1Ping);

public async Task<SearchResponse> V1Search(SearchRequest request)
=> await Post<SearchRequest, SearchResponse>(SourcesApiUrls.V1Search, request);
=> await Post<SearchRequest, SearchResponse>(SourceApiUrls.V1Search, request);

public async Task<SearchHeader> V1GetSearchHeader(Identity identity, string externalId)
=> (await Post<GetSearchHeaderRequest, GetSearchHeaderResponse>(SourcesApiUrls.V1GetSearchHeader, new()
=> (await Post<GetSearchHeaderRequest, GetSearchHeaderResponse>(SourceApiUrls.V1GetSearchHeader, new()
{
Identity = identity,
ExternalId = externalId,
})).SearchHeader;

public async Task<Dictionary<string, UriAttributes>> V1GetSourcesAndExternalIds(Identity identity, IEnumerable<Uri> uris)
=> (await Post<GetSourcesAndExternalIdsRequest, GetSourcesAndExternalIdsResponse>(SourcesApiUrls.V1GetSourcesAndExternalIds, new()
=> (await Post<GetSourcesAndExternalIdsRequest, GetSourcesAndExternalIdsResponse>(SourceApiUrls.V1GetSourcesAndExternalIds, new()
{
Identity = identity,
Uris = uris.ToList(),
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Index/HarmonyDB.Index.Api.Model/HarmonyDB.Index.Api.Model.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ProjectReference Include="..\..\OneShelf.Authorization\OneShelf.Authorization.Api.Model\OneShelf.Authorization.Api.Model.csproj" />
<ProjectReference Include="..\..\OneShelf.Common\OneShelf.Common\OneShelf.Common.csproj" />
<ProjectReference Include="..\..\HarmonyDB.Common\HarmonyDB.Common.Representations.OneShelf\HarmonyDB.Common.Representations.OneShelf.csproj" />
<ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Sources.Api.Model.csproj" />
<ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Source.Api.Model.csproj" />
</ItemGroup>

<Target Condition="'$(PushNuget)'=='1'" Name="NugetPackAutoVersioning" AfterTargets="Build">
Expand Down
8 changes: 4 additions & 4 deletions HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSearchHeader.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using HarmonyDB.Index.BusinessLogic.Services;
using HarmonyDB.Sources.Api.Client;
using HarmonyDB.Sources.Api.Model;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Client;
using HarmonyDB.Source.Api.Model;
using HarmonyDB.Source.Api.Model.V1.Api;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.Functions.Worker;
Expand All @@ -23,7 +23,7 @@ public GetSearchHeader(ILoggerFactory loggerFactory, AuthorizationApiClient auth
_sourceResolver = sourceResolver;
}

[Function(SourcesApiUrls.V1GetSearchHeader)]
[Function(SourceApiUrls.V1GetSearchHeader)]
public Task<IActionResult> Run(
[HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] GetSearchHeaderRequest request)
=> RunHandler(req, request);
Expand Down
7 changes: 3 additions & 4 deletions HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSong.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using HarmonyDB.Index.Api.Services;
using HarmonyDB.Index.BusinessLogic.Services;
using HarmonyDB.Sources.Api.Client;
using HarmonyDB.Sources.Api.Model;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Model;
using HarmonyDB.Source.Api.Model.V1.Api;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.Functions.Worker;
Expand All @@ -22,7 +21,7 @@ public GetSong(ILoggerFactory loggerFactory, AuthorizationApiClient authorizatio
_commonExecutions = commonExecutions;
}

[Function(SourcesApiUrls.V1GetSong)]
[Function(SourceApiUrls.V1GetSong)]
public Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] GetSongRequest request)
=> RunHandler(req, request);

Expand Down
10 changes: 5 additions & 5 deletions HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSongs.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using HarmonyDB.Index.BusinessLogic.Services;
using HarmonyDB.Sources.Api.Client;
using HarmonyDB.Sources.Api.Model;
using HarmonyDB.Sources.Api.Model.V1;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Client;
using HarmonyDB.Source.Api.Model;
using HarmonyDB.Source.Api.Model.V1;
using HarmonyDB.Source.Api.Model.V1.Api;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.Functions.Worker;
Expand All @@ -25,7 +25,7 @@ public GetSongs(ILoggerFactory loggerFactory, AuthorizationApiClient authorizati
_sourceResolver = sourceResolver;
}

[Function(SourcesApiUrls.V1GetSongs)]
[Function(SourceApiUrls.V1GetSongs)]
public Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] GetSongsRequest request)
=> RunHandler(req, request);

Expand Down
7 changes: 3 additions & 4 deletions HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSourcesAndExternalIds.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using HarmonyDB.Index.Api.Services;
using HarmonyDB.Sources.Api.Client;
using HarmonyDB.Sources.Api.Model;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Model;
using HarmonyDB.Source.Api.Model.V1.Api;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.Functions.Worker;
Expand All @@ -23,7 +22,7 @@ public GetSourcesAndExternalIds(ILoggerFactory loggerFactory, AuthorizationApiCl
_commonExecutions = commonExecutions;
}

[Function(SourcesApiUrls.V1GetSourcesAndExternalIds)]
[Function(SourceApiUrls.V1GetSourcesAndExternalIds)]
public Task<IActionResult> Run(
[HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] GetSourcesAndExternalIdsRequest request)
=> RunHandler(req, request);
Expand Down
6 changes: 3 additions & 3 deletions HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Ping.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Net;
using HarmonyDB.Sources.Api.Client;
using HarmonyDB.Sources.Api.Model;
using HarmonyDB.Source.Api.Client;
using HarmonyDB.Source.Api.Model;
using Microsoft.Azure.Functions.Worker;
using Microsoft.Azure.Functions.Worker.Http;
using Microsoft.Extensions.Logging;
Expand All @@ -18,7 +18,7 @@ public Ping(ILoggerFactory loggerFactory, SourcesApiClient sourcesApiClient)
_logger = loggerFactory.CreateLogger<Ping>();
}

[Function(SourcesApiUrls.V1Ping)]
[Function(SourceApiUrls.V1Ping)]
public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")] HttpRequestData req)
{
_logger.LogInformation("C# HTTP trigger function processed a request.");
Expand Down
8 changes: 4 additions & 4 deletions HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/Search.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using HarmonyDB.Sources.Api.Client;
using HarmonyDB.Sources.Api.Model;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Client;
using HarmonyDB.Source.Api.Model;
using HarmonyDB.Source.Api.Model.V1.Api;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.Functions.Worker;
Expand All @@ -21,7 +21,7 @@ public Search(ILoggerFactory loggerFactory, AuthorizationApiClient authorization
_sourcesApiClient = sourcesApiClient;
}

[Function(SourcesApiUrls.V1Search)]
[Function(SourceApiUrls.V1Search)]
public Task<IActionResult> Run(
[HttpTrigger(AuthorizationLevel.Anonymous, "post")] HttpRequest req, [FromBody] SearchRequest request)
=> RunHandler(req, request);
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Index/HarmonyDB.Index.Api/Functions/VPublic/GetPublic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using HarmonyDB.Index.Api.Model;
using HarmonyDB.Index.Api.Model.VPublic;
using HarmonyDB.Index.Api.Services;
using HarmonyDB.Sources.Api.Model.V1;
using HarmonyDB.Source.Api.Model.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.Functions.Worker;
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Index/HarmonyDB.Index.Api/HarmonyDB.Index.Api.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ProjectReference Include="..\..\OneShelf.Common\OneShelf.Common.Compression\OneShelf.Common.Compression.csproj" />
<ProjectReference Include="..\..\HarmonyDB.Index\HarmonyDB.Index.Api.Model\HarmonyDB.Index.Api.Model.csproj" />
<ProjectReference Include="..\..\HarmonyDB.Index\HarmonyDB.Index.BusinessLogic\HarmonyDB.Index.BusinessLogic.csproj" />
<ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Client\HarmonyDB.Sources.Api.Client.csproj" />
<ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Client\HarmonyDB.Source.Api.Client.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Index/HarmonyDB.Index.Api/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using HarmonyDB.Index.Api.Services;
using HarmonyDB.Index.BusinessLogic;
using HarmonyDB.Index.BusinessLogic.Models;
using HarmonyDB.Sources.Api.Client;
using HarmonyDB.Source.Api.Client;
using Microsoft.Azure.Functions.Worker;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
Expand Down
4 changes: 2 additions & 2 deletions HarmonyDB.Index/HarmonyDB.Index.Api/Services/CommonExecutions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using HarmonyDB.Index.BusinessLogic.Services;
using HarmonyDB.Sources.Api.Client;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Client;
using HarmonyDB.Source.Api.Model.V1.Api;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using OneShelf.Common;
Expand Down
2 changes: 1 addition & 1 deletion ...lient/HarmonyDB.Sources.Api.Client.csproj → ...Client/HarmonyDB.Source.Api.Client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\HarmonyDB.Sources\HarmonyDB.Sources.Api.Model\HarmonyDB.Sources.Api.Model.csproj" />
<ProjectReference Include="..\HarmonyDB.Sources.Api.Model\HarmonyDB.Source.Api.Model.csproj" />
<ProjectReference Include="..\..\OneShelf.Common\OneShelf.Common.Api.Client\OneShelf.Common.Api.Client.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/IServiceCollectionExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;

namespace HarmonyDB.Sources.Api.Client;
namespace HarmonyDB.Source.Api.Client;

// ReSharper disable once InconsistentNaming
public static class IServiceCollectionExtensions
Expand Down
20 changes: 10 additions & 10 deletions HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourceApiClient.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using HarmonyDB.Sources.Api.Model;
using HarmonyDB.Sources.Api.Model.V1;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Model;
using HarmonyDB.Source.Api.Model.V1;
using HarmonyDB.Source.Api.Model.V1.Api;
using OneShelf.Authorization.Api.Model;
using OneShelf.Common.Api.Client;

namespace HarmonyDB.Sources.Api.Client;
namespace HarmonyDB.Source.Api.Client;

internal class SourceApiClient : ApiClientBase<SourceApiClient>
{
Expand All @@ -14,33 +14,33 @@ public SourceApiClient(ApiClientOptions<SourceApiClient> options, IHttpClientFac
}

public async Task<GetSongResponse> V1GetSong(Identity identity, string externalId)
=> await Post<GetSongRequest, GetSongResponse>(SourcesApiUrls.V1GetSong, new()
=> await Post<GetSongRequest, GetSongResponse>(SourceApiUrls.V1GetSong, new()
{
Identity = identity,
ExternalId = externalId,
});
public async Task<GetSongsResponse> V1GetSongs(Identity identity, IReadOnlyList<string> externalIds)
=> await Post<GetSongsRequest, GetSongsResponse>(SourcesApiUrls.V1GetSongs, new()
=> await Post<GetSongsRequest, GetSongsResponse>(SourceApiUrls.V1GetSongs, new()
{
Identity = identity,
ExternalIds = externalIds,
});

public async Task V1Ping()
=> await Ping(SourcesApiUrls.V1Ping);
=> await Ping(SourceApiUrls.V1Ping);

public async Task<SearchResponse> V1Search(SearchRequest request)
=> await Post<SearchRequest, SearchResponse>(SourcesApiUrls.V1Search, request);
=> await Post<SearchRequest, SearchResponse>(SourceApiUrls.V1Search, request);

public async Task<SearchHeader> V1GetSearchHeader(Identity identity, string externalId)
=> (await Post<GetSearchHeaderRequest, GetSearchHeaderResponse>(SourcesApiUrls.V1GetSearchHeader, new()
=> (await Post<GetSearchHeaderRequest, GetSearchHeaderResponse>(SourceApiUrls.V1GetSearchHeader, new()
{
Identity = identity,
ExternalId = externalId,
})).SearchHeader;

public async Task<Dictionary<string, UriAttributes>> V1GetSourcesAndExternalIds(Identity identity, IEnumerable<Uri> uris)
=> (await Post<GetSourcesAndExternalIdsRequest, GetSourcesAndExternalIdsResponse>(SourcesApiUrls.V1GetSourcesAndExternalIds, new()
=> (await Post<GetSourcesAndExternalIdsRequest, GetSourcesAndExternalIdsResponse>(SourceApiUrls.V1GetSourcesAndExternalIds, new()
{
Identity = identity,
Uris = uris.ToList(),
Expand Down
6 changes: 3 additions & 3 deletions HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClient.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using HarmonyDB.Sources.Api.Model.V1;
using HarmonyDB.Sources.Api.Model.V1.Api;
using HarmonyDB.Source.Api.Model.V1;
using HarmonyDB.Source.Api.Model.V1.Api;
using Microsoft.Extensions.Options;
using OneShelf.Authorization.Api.Model;
using OneShelf.Common;

namespace HarmonyDB.Sources.Api.Client;
namespace HarmonyDB.Source.Api.Client;

public class SourcesApiClient
{
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Sources/HarmonyDB.Sources.Api.Client/SourcesApiClientOptions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using OneShelf.Common.Api.Client;

namespace HarmonyDB.Sources.Api.Client;
namespace HarmonyDB.Source.Api.Client;

public class SourcesApiClientOptions
{
Expand Down
0 ....Model/HarmonyDB.Sources.Api.Model.csproj → ...i.Model/HarmonyDB.Source.Api.Model.csproj
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/SourcesApiUrls.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace HarmonyDB.Sources.Api.Model;
namespace HarmonyDB.Source.Api.Model;

public static class SourcesApiUrls
public static class SourceApiUrls
{
public const string V1GetSongs = nameof(V1GetSongs);
public const string V1GetSong = nameof(V1GetSong);
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderRequest.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using OneShelf.Authorization.Api.Model;

namespace HarmonyDB.Sources.Api.Model.V1.Api;
namespace HarmonyDB.Source.Api.Model.V1.Api;

public class GetSearchHeaderRequest : IRequestWithIdentity
{
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSearchHeaderResponse.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace HarmonyDB.Sources.Api.Model.V1.Api;
namespace HarmonyDB.Source.Api.Model.V1.Api;

public class GetSearchHeaderResponse
{
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongRequest.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using OneShelf.Authorization.Api.Model;

namespace HarmonyDB.Sources.Api.Model.V1.Api;
namespace HarmonyDB.Source.Api.Model.V1.Api;

public class GetSongRequest : IRequestWithIdentity
{
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongResponse.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace HarmonyDB.Sources.Api.Model.V1.Api;
namespace HarmonyDB.Source.Api.Model.V1.Api;

public class GetSongResponse
{
Expand Down
2 changes: 1 addition & 1 deletion HarmonyDB.Sources/HarmonyDB.Sources.Api.Model/V1/Api/GetSongsRequest.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using OneShelf.Authorization.Api.Model;

namespace HarmonyDB.Sources.Api.Model.V1.Api;
namespace HarmonyDB.Source.Api.Model.V1.Api;

public class GetSongsRequest : IRequestWithIdentity
{
Expand Down
Loading

0 comments on commit 9b93870

Please sign in to comment.