Skip to content

Commit

Permalink
refactor: Restructure solution
Browse files Browse the repository at this point in the history
  • Loading branch information
@oboukli
oboukli committed Apr 6, 2024
1 parent a969218 commit bf3b15c
Show file tree
Hide file tree
Showing 20 changed files with 113 additions and 109 deletions.
12 changes: 8 additions & 4 deletions Aktabook.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bus", "Bus", "{AEE37ED9-309
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus", "src\Aktabook.Bus\Aktabook.Bus.csproj", "{10723647-7D1B-46F6-84F5-ADC1E90D9397}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus.Common", "src\Aktabook.Bus.Common\Aktabook.Bus.Common.csproj", "{468BB6F7-B6F5-4275-A857-7CC3F3B976E7}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Infrastructure.BusInfra", "src\Aktabook.Infrastructure.BusInfra\Aktabook.Infrastructure.BusInfra.csproj", "{468BB6F7-B6F5-4275-A857-7CC3F3B976E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus.IntegrationTest", "test\Aktabook.Bus.IntegrationTest\Aktabook.Bus.IntegrationTest.csproj", "{4F936CF1-3082-449E-9192-267E57B5D19A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus.UnitTest", "test\Aktabook.Bus.UnitTest\Aktabook.Bus.UnitTest.csproj", "{F62DCDA3-055E-4989-9950-FC589CA35802}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Bus.Common.UnitTest", "test\Aktabook.Bus.Common.UnitTest\Aktabook.Bus.Common.UnitTest.csproj", "{BE9A6FDC-4490-4223-B4B9-5C78133A8FA5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Infrastructure.BusInfra.UnitTest", "test\Aktabook.Infrastructure.BusInfra.UnitTest\Aktabook.Infrastructure.BusInfra.UnitTest.csproj", "{BE9A6FDC-4490-4223-B4B9-5C78133A8FA5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Diagnostics.HealthChecks", "src\Aktabook.Diagnostics.HealthChecks\Aktabook.Diagnostics.HealthChecks.csproj", "{C05A9CF0-7446-43C0-B3CE-C66228259D34}"
EndProject
Expand All @@ -71,6 +71,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Diagnostics.OpenTe
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aktabook.Infrastructure.Configuration.UnitTest", "test\Aktabook.Infrastructure.Configuration.UnitTest\Aktabook.Infrastructure.Configuration.UnitTest.csproj", "{F7F83AFB-F8E0-4617-B709-E4D534959DFA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosts", "Hosts", "{6DEAE75C-FDB3-42F0-8649-00BFF4FABE89}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -98,16 +100,18 @@ Global
{2A3030AD-21F8-493C-9872-71840C5BF871} = {E2A34458-3906-44C1-B217-594E447CF882}
{1F90D50C-2623-44A1-B38F-CE8CC560306D} = {3944B810-DA18-43D2-9099-F1972C14C393}
{10723647-7D1B-46F6-84F5-ADC1E90D9397} = {AEE37ED9-309D-4DA6-989A-67095A554204}
{468BB6F7-B6F5-4275-A857-7CC3F3B976E7} = {AEE37ED9-309D-4DA6-989A-67095A554204}
{4F936CF1-3082-449E-9192-267E57B5D19A} = {AEE37ED9-309D-4DA6-989A-67095A554204}
{F62DCDA3-055E-4989-9950-FC589CA35802} = {AEE37ED9-309D-4DA6-989A-67095A554204}
{BE9A6FDC-4490-4223-B4B9-5C78133A8FA5} = {AEE37ED9-309D-4DA6-989A-67095A554204}
{93EE2508-9865-49A5-AFEE-936C55C84332} = {0269BDFF-5922-419C-AB58-33F0950D51DB}
{C05A9CF0-7446-43C0-B3CE-C66228259D34} = {0269BDFF-5922-419C-AB58-33F0950D51DB}
{E99C3CCF-3CD4-4D4B-8140-39B5D97BEB86} = {0269BDFF-5922-419C-AB58-33F0950D51DB}
{F9E057DA-CC3B-4360-A05B-20C076D5FEAA} = {0269BDFF-5922-419C-AB58-33F0950D51DB}
{96C20188-B83A-406F-9F0A-8E6B88DFD2E0} = {0269BDFF-5922-419C-AB58-33F0950D51DB}
{F7F83AFB-F8E0-4617-B709-E4D534959DFA} = {3944B810-DA18-43D2-9099-F1972C14C393}
{468BB6F7-B6F5-4275-A857-7CC3F3B976E7} = {3944B810-DA18-43D2-9099-F1972C14C393}
{BE9A6FDC-4490-4223-B4B9-5C78133A8FA5} = {3944B810-DA18-43D2-9099-F1972C14C393}
{AEE37ED9-309D-4DA6-989A-67095A554204} = {6DEAE75C-FDB3-42F0-8649-00BFF4FABE89}
{0B0D178E-9980-4BB2-B29F-2CA6EE52852D} = {6DEAE75C-FDB3-42F0-8649-00BFF4FABE89}
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DA28654A-6A2F-493C-8F4F-23B88D77D2AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion src/Aktabook.Bus/Aktabook.Bus.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Aktabook.Bus.Common\Aktabook.Bus.Common.csproj"/>
<ProjectReference Include="..\Aktabook.Infrastructure.BusInfra\Aktabook.Infrastructure.BusInfra.csproj" />
<ProjectReference Include="..\Aktabook.Connectors.OpenLibrary\Aktabook.Connectors.OpenLibrary.csproj"/>
<ProjectReference Include="..\Aktabook.Data\Aktabook.Data.csproj"/>
<ProjectReference Include="..\Aktabook.Diagnostics.HealthChecks\Aktabook.Diagnostics.HealthChecks.csproj"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Aktabook.Bus/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
using Aktabook.Application;
using Aktabook.Application.Services;
using Aktabook.Bus;
using Aktabook.Bus.Common;
using Aktabook.Connectors.OpenLibrary;
using Aktabook.Connectors.OpenLibrary.DependencyInjection;
using Aktabook.Data;
using Aktabook.Data.Constants;
using Aktabook.Diagnostics.OpenTelemetry;
using Aktabook.Infrastructure.BusInfra;
using Aktabook.Infrastructure.Configuration;
using Aktabook.Services.BookInfoRequestService;
using Microsoft.EntityFrameworkCore;
Expand Down
28 changes: 14 additions & 14 deletions src/Aktabook.Bus/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1540,20 +1540,6 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.bus.common": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.connectors.openlibrary": {
"type": "Project",
"dependencies": {
Expand Down Expand Up @@ -1612,6 +1598,20 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.infrastructure.businfra": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.infrastructure.configuration": {
"type": "Project",
"dependencies": {
Expand Down
0 ...ook.Bus.Common/Aktabook.Bus.Common.csproj → ...a/Aktabook.Infrastructure.BusInfra.csproj
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tabook.Bus.Common/BusMessageConvention.cs → ...tructure.BusInfra/BusMessageConvention.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Aktabook.Application.Messages.Commands;
using Aktabook.Application.Messages.Events;

namespace Aktabook.Bus.Common;
namespace Aktabook.Infrastructure.BusInfra;

public class BusMessageConvention : IMessageConvention
{
Expand Down
2 changes: 1 addition & 1 deletion ...us.Common/DefaultEndpointConfiguration.cs → ....BusInfra/DefaultEndpointConfiguration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// SPDX-License-Identifier: MIT

namespace Aktabook.Bus.Common;
namespace Aktabook.Infrastructure.BusInfra;

public static class DefaultEndpointConfiguration
{
Expand Down
0 src/Aktabook.Bus.Common/packages.lock.json → ...nfrastructure.BusInfra/packages.lock.json
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Aktabook.PublicApi.V1/Aktabook.PublicApi.V1.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<ItemGroup>
<ProjectReference Include="..\Aktabook.Application\Aktabook.Application.csproj"/>
<ProjectReference Include="..\Aktabook.Bus.Common\Aktabook.Bus.Common.csproj"/>
<ProjectReference Include="..\Aktabook.Infrastructure.BusInfra\Aktabook.Infrastructure.BusInfra.csproj" />
<ProjectReference Include="..\Aktabook.Infrastructure.Configuration\Aktabook.Infrastructure.Configuration.csproj"/>
<ProjectReference Include="..\Aktabook.Services.BookInfoRequestService\Aktabook.Services.BookInfoRequestService.csproj"/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Aktabook.PublicApi.V1/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
using Aktabook.Application;
using Aktabook.Application.MessageHandlers;
using Aktabook.Application.Messages.Commands;
using Aktabook.Bus.Common;
using Aktabook.Data.Constants;
using Aktabook.Infrastructure.BusInfra;
using Aktabook.Infrastructure.Configuration;
using Aktabook.PublicApi.V1.DependencyInjection;
using Aktabook.PublicApi.V1.Validators;
Expand Down
28 changes: 14 additions & 14 deletions src/Aktabook.PublicApi.V1/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1504,20 +1504,6 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.bus.common": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.data": {
"type": "Project",
"dependencies": {
Expand All @@ -1539,6 +1525,20 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.infrastructure.businfra": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.infrastructure.configuration": {
"type": "Project",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion test/Aktabook.Bus.IntegrationTest/Aktabook.Bus.IntegrationTest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Aktabook.Application\Aktabook.Application.csproj"/>
<ProjectReference Include="..\..\src\Aktabook.Bus.Common\Aktabook.Bus.Common.csproj"/>
<ProjectReference Include="..\..\src\Aktabook.Infrastructure.BusInfra\Aktabook.Infrastructure.BusInfra.csproj" />
<ProjectReference Include="..\..\src\Aktabook.Infrastructure.Configuration\Aktabook.Infrastructure.Configuration.csproj"/>
<ProjectReference Include="..\Aktabook.Data.Testing\Aktabook.Data.Testing.csproj"/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Aktabook.Bus.IntegrationTest/Fixtures/BusEndpointFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
using System.Threading.Tasks;
using Aktabook.Application;
using Aktabook.Application.Messages.Commands;
using Aktabook.Bus.Common;
using Aktabook.Data.Testing.Fixtures;
using Aktabook.Infrastructure.BusInfra;
using Aktabook.Infrastructure.Configuration;
using NServiceBus;

Expand Down
28 changes: 14 additions & 14 deletions test/Aktabook.Bus.IntegrationTest/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1289,20 +1289,6 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.bus.common": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.data": {
"type": "Project",
"dependencies": {
Expand Down Expand Up @@ -1339,6 +1325,20 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.infrastructure.businfra": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.infrastructure.configuration": {
"type": "Project",
"dependencies": {
Expand Down
30 changes: 15 additions & 15 deletions test/Aktabook.Bus.UnitTest/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1989,12 +1989,12 @@
"aktabook.bus": {
"type": "Project",
"dependencies": {
"Aktabook.Bus.Common": "[1.0.0, )",
"Aktabook.Connectors.OpenLibrary": "[1.0.0, )",
"Aktabook.Data": "[1.0.0, )",
"Aktabook.Diagnostics.HealthChecks": "[1.0.0, )",
"Aktabook.Diagnostics.OpenTelemetry": "[1.0.0, )",
"Aktabook.Diagnostics.Process": "[1.0.0, )",
"Aktabook.Infrastructure.BusInfra": "[1.0.0, )",
"Aktabook.Infrastructure.Configuration": "[1.0.0, )",
"Aktabook.Services.BookInfoRequestService": "[1.0.0, )",
"AspNetCore.HealthChecks.Rabbitmq": "[6.0.2, )",
Expand Down Expand Up @@ -2025,20 +2025,6 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.bus.common": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.connectors.openlibrary": {
"type": "Project",
"dependencies": {
Expand Down Expand Up @@ -2097,6 +2083,20 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.infrastructure.businfra": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.infrastructure.configuration": {
"type": "Project",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion ...tTest/Aktabook.Bus.Common.UnitTest.csproj → ...k.Infrastructure.BusInfra.UnitTest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Aktabook.Bus.Common\Aktabook.Bus.Common.csproj"/>
<ProjectReference Include="..\..\src\Aktabook.Infrastructure.BusInfra\Aktabook.Infrastructure.BusInfra.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ....UnitTest/BusMessageConventionUnitTest.cs → ....UnitTest/BusMessageConventionUnitTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using FluentAssertions;
using Xunit;

namespace Aktabook.Bus.Common.UnitTest;
namespace Aktabook.Infrastructure.BusInfra.UnitTest;

public class BusMessageConventionUnitTest
{
Expand Down
16 changes: 8 additions & 8 deletions ...ok.Bus.Common.UnitTest/packages.lock.json → ...ture.BusInfra.UnitTest/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1214,23 +1214,23 @@
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.bus.common": {
"aktabook.domain": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
}
},
"aktabook.domain": {
"aktabook.infrastructure.businfra": {
"type": "Project",
"dependencies": {
"Aktabook.Application": "[1.0.0, )",
"Microsoft.Extensions.Diagnostics.HealthChecks": "[6.0.25, )",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.25, )",
"Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )",
"NServiceBus": "[8.1.6, )",
"NServiceBus.Newtonsoft.Json": "[3.0.0, )",
"System.Drawing.Common": "[6.0.0, )",
"System.Net.Http": "[4.3.4, )",
"System.Text.RegularExpressions": "[4.3.1, )"
Expand Down
Loading

0 comments on commit bf3b15c

Please sign in to comment.