diff --git a/src/.config/dotnet-tools.json b/.config/dotnet-tools.json similarity index 100% rename from src/.config/dotnet-tools.json rename to .config/dotnet-tools.json diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..eafc15f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,8 @@ +.devcontainer/ +.github/ +.vscode/ +chart/ +doc/ +src/*/bin/ +src/*/obj/ +test/ diff --git a/.github/workflows/pullrequest-verify.yaml b/.github/workflows/pullrequest-verify.yaml index 46e9ee0..61b1e66 100644 --- a/.github/workflows/pullrequest-verify.yaml +++ b/.github/workflows/pullrequest-verify.yaml @@ -7,22 +7,22 @@ on: jobs: verify-devcontainer: - uses: project-origin/.github/.github/workflows/reusable-verify-devcontainer.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-verify-devcontainer.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd verify-code: - uses: project-origin/.github/.github/workflows/reusable-verify-code.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-verify-code.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd verify-renovate-config: - uses: project-origin/.github/.github/workflows/reusable-verify-renovate.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-verify-renovate.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd verify-chart: - uses: project-origin/.github/.github/workflows/reusable-verify-chart.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-verify-chart.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd verify-container-build: - uses: project-origin/.github/.github/workflows/reusable-build-push-container-ghcr.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-build-push-container-ghcr.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd with: imagename: ghcr.io/project-origin/stamp version: test - context: ./src - dockerfile: ./src/Stamp.Dockerfile + context: . + dockerfile: Stamp.Dockerfile push: false diff --git a/.github/workflows/release-published.yaml b/.github/workflows/release-published.yaml index 1f01e73..7f50a74 100644 --- a/.github/workflows/release-published.yaml +++ b/.github/workflows/release-published.yaml @@ -6,24 +6,24 @@ on: jobs: define-version: - uses: project-origin/.github/.github/workflows/reusable-tag-version.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-tag-version.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd publish-container: needs: - define-version - uses: project-origin/.github/.github/workflows/reusable-build-push-container-ghcr.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-build-push-container-ghcr.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd with: imagename: ghcr.io/project-origin/stamp version: ${{ needs.define-version.outputs.version }} - context: ./src - dockerfile: ./src/Stamp.Dockerfile + context: . + dockerfile: Stamp.Dockerfile push: true publish-chart: needs: - define-version - publish-container - uses: project-origin/.github/.github/workflows/reusable-publish-chart.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-publish-chart.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd with: version: ${{ needs.define-version.outputs.version }} chart_folder: chart diff --git a/.github/workflows/sonarcloud.yaml b/.github/workflows/sonarcloud.yaml index 517b371..1713b27 100644 --- a/.github/workflows/sonarcloud.yaml +++ b/.github/workflows/sonarcloud.yaml @@ -10,6 +10,6 @@ on: jobs: analyse: - uses: project-origin/.github/.github/workflows/reusable-sonarcloud.yaml@b1a1034591b6f491085a0d9d259ae3b486487701 + uses: project-origin/.github/.github/workflows/reusable-sonarcloud.yaml@99575e8d3eda336ce2a339cc8c9f9235d26233bd secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..317b176 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,7 @@ + + + net8.0 + enable + IDE0005 + + diff --git a/Makefile b/Makefile index fa6fa21..77db661 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,3 @@ -src_path := src - -docfx_config := doc/docfx.json -docfx_site_dir := doc/_site - formatting_header := \033[1m formatting_command := \033[1;34m formatting_desc := \033[0;32m @@ -31,39 +26,43 @@ info: ## Lint the dotnet code lint: @echo "Verifying code formatting..." - dotnet format $(src_path) --verify-no-changes + dotnet format --verify-no-changes ## Does a dotnet clean clean: - dotnet clean $(src_path) + dotnet clean ## Restores all dotnet projects restore: - dotnet tool restore --tool-manifest src/.config/dotnet-tools.json - dotnet restore $(src_path) + dotnet tool restore + dotnet restore ## Builds all the code build: restore - dotnet build --no-restore $(src_path) + dotnet build --no-restore ## Formats files using dotnet format format: - dotnet format $(src_path) + dotnet format ## Run all tests test: build - dotnet test --no-build $(src_path) + dotnet test --no-build ## Tests run with the sonarcloud analyser sonarcloud-test: - dotnet test --no-build $(src_path) + dotnet test --no-build ## Run all Unit-tests unit-test: - dotnet test $(src_path) --filter 'FullyQualifiedName!~IntegrationTests' + dotnet test --filter 'FullyQualifiedName!~IntegrationTests' ## Builds the local container, creates kind cluster and installs chart, and verifies it works verify-chart: @kind version >/dev/null 2>&1 || { echo >&2 "kind not installed! kind is required to use recipe, please install or use devcontainer"; exit 1;} @helm version >/dev/null 2>&1 || { echo >&2 "helm not installed! helm is required to use recipe, please install or use devcontainer"; exit 1;} chart/run_kind_test.sh + +## Build the container image with tag ghcr.io/project-origin/stamp:test +build-container: + docker build -f Stamp.Dockerfile -t ghcr.io/project-origin/stamp:test . diff --git a/src/ProjectOrigin.Stamp.Server.sln b/ProjectOrigin.Stamp.sln similarity index 84% rename from src/ProjectOrigin.Stamp.Server.sln rename to ProjectOrigin.Stamp.sln index c6edb26..7efdf9e 100644 --- a/src/ProjectOrigin.Stamp.Server.sln +++ b/ProjectOrigin.Stamp.sln @@ -1,31 +1,31 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34728.123 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectOrigin.Stamp.Server", "ProjectOrigin.Stamp.Server\ProjectOrigin.Stamp.Server.csproj", "{47C61EF0-D925-40D4-8F2B-7168ADBC1243}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectOrigin.Stamp.Test", "ProjectOrigin.Stamp.Test\ProjectOrigin.Stamp.Test.csproj", "{C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {47C61EF0-D925-40D4-8F2B-7168ADBC1243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47C61EF0-D925-40D4-8F2B-7168ADBC1243}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47C61EF0-D925-40D4-8F2B-7168ADBC1243}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47C61EF0-D925-40D4-8F2B-7168ADBC1243}.Release|Any CPU.Build.0 = Release|Any CPU - {C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {B492A83E-C978-4BD5-BA69-80E159A70A75} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectOrigin.Stamp", "src\ProjectOrigin.Stamp\ProjectOrigin.Stamp.csproj", "{47C61EF0-D925-40D4-8F2B-7168ADBC1243}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectOrigin.Stamp.Test", "test\ProjectOrigin.Stamp.Test\ProjectOrigin.Stamp.Test.csproj", "{C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {47C61EF0-D925-40D4-8F2B-7168ADBC1243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47C61EF0-D925-40D4-8F2B-7168ADBC1243}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47C61EF0-D925-40D4-8F2B-7168ADBC1243}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47C61EF0-D925-40D4-8F2B-7168ADBC1243}.Release|Any CPU.Build.0 = Release|Any CPU + {C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C04F1F43-68E6-47F9-B67C-8D6C0D9DA0B2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B492A83E-C978-4BD5-BA69-80E159A70A75} + EndGlobalSection +EndGlobal diff --git a/Stamp.Dockerfile b/Stamp.Dockerfile new file mode 100644 index 0000000..18ba306 --- /dev/null +++ b/Stamp.Dockerfile @@ -0,0 +1,24 @@ +ARG PROJECT=ProjectOrigin.Stamp + +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.402 AS build +ARG PROJECT + +WORKDIR /builddir + +COPY .config .config +COPY Directory.Build.props Directory.Build.props +COPY protos protos +COPY src src + +RUN dotnet tool restore +RUN dotnet publish src/${PROJECT} -c Release -p:CustomAssemblyName=App -o /app/publish + +# ------- production image ------- +FROM mcr.microsoft.com/dotnet/aspnet:8.0.8-jammy-chiseled-extra AS production + +WORKDIR /app +COPY --from=build /app/publish . + +EXPOSE 5000 + +ENTRYPOINT ["dotnet", "App.dll"] diff --git a/chart/run_kind_test.sh b/chart/run_kind_test.sh index 58e56eb..cb2680c 100755 --- a/chart/run_kind_test.sh +++ b/chart/run_kind_test.sh @@ -41,9 +41,16 @@ trap 'debug; cleanup' ERR temp_folder=$(mktemp -d) values_filename=${temp_folder}/values.yaml -# create kind cluster + +# create kind cluster - async kind delete cluster -n ${cluster_name} -kind create cluster -n ${cluster_name} +kind create cluster -n ${cluster_name} & + +# build docker image - async +make build-container & + +# wait for cluster and container to be ready +wait # install rabbitmq-operator kubectl apply -f "https://github.com/rabbitmq/cluster-operator/releases/download/v2.5.0/cluster-operator.yml" @@ -51,9 +58,6 @@ kubectl apply -f "https://github.com/rabbitmq/cluster-operator/releases/download # install cnpg-operator helm install cnpg-operator cloudnative-pg --repo https://cloudnative-pg.io/charts --version 0.18.0 --namespace cnpg --create-namespace --wait -# build docker image -docker build -f src/Stamp.Dockerfile -t ghcr.io/project-origin/stamp:test src/ - # load docker image into cluster kind load -n ${cluster_name} docker-image ghcr.io/project-origin/stamp:test diff --git a/src/Protos/common.proto b/protos/common.proto similarity index 100% rename from src/Protos/common.proto rename to protos/common.proto diff --git a/src/Protos/electricity.proto b/protos/electricity.proto similarity index 100% rename from src/Protos/electricity.proto rename to protos/electricity.proto diff --git a/src/Protos/registry.proto b/protos/registry.proto similarity index 100% rename from src/Protos/registry.proto rename to protos/registry.proto diff --git a/src/.dockerignore b/src/.dockerignore deleted file mode 100644 index adc63f0..0000000 --- a/src/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -*/bin/ -*/obj/ diff --git a/src/ProjectOrigin.Stamp.Test/Extensions/MappingExtensions.cs b/src/ProjectOrigin.Stamp.Test/Extensions/MappingExtensions.cs deleted file mode 100644 index eb87230..0000000 --- a/src/ProjectOrigin.Stamp.Test/Extensions/MappingExtensions.cs +++ /dev/null @@ -1,13 +0,0 @@ - -namespace ProjectOrigin.Stamp.Test.Extensions; - -public static class MappingExtensions -{ - public static CertificateType MapToWalletModel(this Server.Services.REST.v1.CertificateType certificateType) => - certificateType switch - { - Server.Services.REST.v1.CertificateType.Consumption => CertificateType.Consumption, - Server.Services.REST.v1.CertificateType.Production => CertificateType.Production, - _ => throw new ArgumentOutOfRangeException(nameof(certificateType), certificateType, null) - }; -} diff --git a/src/ProjectOrigin.Stamp.Server/BackgroundServices/OutboxPollingWorker.cs b/src/ProjectOrigin.Stamp/BackgroundServices/OutboxPollingWorker.cs similarity index 93% rename from src/ProjectOrigin.Stamp.Server/BackgroundServices/OutboxPollingWorker.cs rename to src/ProjectOrigin.Stamp/BackgroundServices/OutboxPollingWorker.cs index c1a8e7e..556c003 100644 --- a/src/ProjectOrigin.Stamp.Server/BackgroundServices/OutboxPollingWorker.cs +++ b/src/ProjectOrigin.Stamp/BackgroundServices/OutboxPollingWorker.cs @@ -6,9 +6,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using ProjectOrigin.Stamp.Server.Database; +using ProjectOrigin.Stamp.Database; -namespace ProjectOrigin.Stamp.Server.BackgroundServices; +namespace ProjectOrigin.Stamp.BackgroundServices; public class OutboxPollingWorker : BackgroundService { @@ -36,7 +36,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) try { _logger.LogInformation("Processing outbox message {msgId}.", msg.Id); - var type = Type.GetType($"{msg.MessageType}, ProjectOrigin.Stamp.Server"); + var type = Type.GetType($"{msg.MessageType}, ProjectOrigin.Stamp"); var loadedObject = JsonSerializer.Deserialize(msg.JsonPayload, type!); await bus.Publish(loadedObject!, stoppingToken); diff --git a/src/ProjectOrigin.Stamp.Server/Database/IDbConnectionFactory.cs b/src/ProjectOrigin.Stamp/Database/IDbConnectionFactory.cs similarity index 68% rename from src/ProjectOrigin.Stamp.Server/Database/IDbConnectionFactory.cs rename to src/ProjectOrigin.Stamp/Database/IDbConnectionFactory.cs index 8007b3d..89c8afd 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/IDbConnectionFactory.cs +++ b/src/ProjectOrigin.Stamp/Database/IDbConnectionFactory.cs @@ -1,6 +1,6 @@ using System.Data; -namespace ProjectOrigin.Stamp.Server.Database; +namespace ProjectOrigin.Stamp.Database; public interface IDbConnectionFactory { diff --git a/src/ProjectOrigin.Stamp.Server/Database/IRepositoryUpgrader.cs b/src/ProjectOrigin.Stamp/Database/IRepositoryUpgrader.cs similarity index 73% rename from src/ProjectOrigin.Stamp.Server/Database/IRepositoryUpgrader.cs rename to src/ProjectOrigin.Stamp/Database/IRepositoryUpgrader.cs index ce08806..7e08281 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/IRepositoryUpgrader.cs +++ b/src/ProjectOrigin.Stamp/Database/IRepositoryUpgrader.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace ProjectOrigin.Stamp.Server.Database; +namespace ProjectOrigin.Stamp.Database; public interface IRepositoryUpgrader { diff --git a/src/ProjectOrigin.Stamp.Server/Database/IUnitOfWork.cs b/src/ProjectOrigin.Stamp/Database/IUnitOfWork.cs similarity index 77% rename from src/ProjectOrigin.Stamp.Server/Database/IUnitOfWork.cs rename to src/ProjectOrigin.Stamp/Database/IUnitOfWork.cs index fe4e34b..5e2e465 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/IUnitOfWork.cs +++ b/src/ProjectOrigin.Stamp/Database/IUnitOfWork.cs @@ -1,6 +1,6 @@ -using ProjectOrigin.Stamp.Server.Repositories; +using ProjectOrigin.Stamp.Repositories; -namespace ProjectOrigin.Stamp.Server.Database; +namespace ProjectOrigin.Stamp.Database; public interface IUnitOfWork { diff --git a/src/ProjectOrigin.Stamp.Server/Database/Mapping/ApplicationBuilderExtension.cs b/src/ProjectOrigin.Stamp/Database/Mapping/ApplicationBuilderExtension.cs similarity index 92% rename from src/ProjectOrigin.Stamp.Server/Database/Mapping/ApplicationBuilderExtension.cs rename to src/ProjectOrigin.Stamp/Database/Mapping/ApplicationBuilderExtension.cs index 28f006f..ad0e9b6 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/Mapping/ApplicationBuilderExtension.cs +++ b/src/ProjectOrigin.Stamp/Database/Mapping/ApplicationBuilderExtension.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; -namespace ProjectOrigin.Stamp.Server.Database.Mapping; +namespace ProjectOrigin.Stamp.Database.Mapping; public static class ApplicationBuilderExtension { diff --git a/src/ProjectOrigin.Stamp.Server/Database/Mapping/HDPrivateKeyTypeHandler.cs b/src/ProjectOrigin.Stamp/Database/Mapping/HDPrivateKeyTypeHandler.cs similarity index 91% rename from src/ProjectOrigin.Stamp.Server/Database/Mapping/HDPrivateKeyTypeHandler.cs rename to src/ProjectOrigin.Stamp/Database/Mapping/HDPrivateKeyTypeHandler.cs index ad66686..5c90b88 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/Mapping/HDPrivateKeyTypeHandler.cs +++ b/src/ProjectOrigin.Stamp/Database/Mapping/HDPrivateKeyTypeHandler.cs @@ -2,7 +2,7 @@ using Dapper; using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; -namespace ProjectOrigin.Stamp.Server.Database.Mapping; +namespace ProjectOrigin.Stamp.Database.Mapping; public class HDPrivateKeyTypeHandler : SqlMapper.TypeHandler { diff --git a/src/ProjectOrigin.Stamp.Server/Database/Mapping/HDPublicKeyTypeHandler.cs b/src/ProjectOrigin.Stamp/Database/Mapping/HDPublicKeyTypeHandler.cs similarity index 91% rename from src/ProjectOrigin.Stamp.Server/Database/Mapping/HDPublicKeyTypeHandler.cs rename to src/ProjectOrigin.Stamp/Database/Mapping/HDPublicKeyTypeHandler.cs index d9d5762..4e4dc14 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/Mapping/HDPublicKeyTypeHandler.cs +++ b/src/ProjectOrigin.Stamp/Database/Mapping/HDPublicKeyTypeHandler.cs @@ -2,7 +2,7 @@ using Dapper; using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; -namespace ProjectOrigin.Stamp.Server.Database.Mapping; +namespace ProjectOrigin.Stamp.Database.Mapping; public class HDPublicKeyTypeHandler : SqlMapper.TypeHandler { diff --git a/src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresConnectionFactory.cs b/src/ProjectOrigin.Stamp/Database/Postgres/PostgresConnectionFactory.cs similarity index 88% rename from src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresConnectionFactory.cs rename to src/ProjectOrigin.Stamp/Database/Postgres/PostgresConnectionFactory.cs index 61678c9..af0d7a4 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresConnectionFactory.cs +++ b/src/ProjectOrigin.Stamp/Database/Postgres/PostgresConnectionFactory.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Options; using Npgsql; -namespace ProjectOrigin.Stamp.Server.Database.Postgres; +namespace ProjectOrigin.Stamp.Database.Postgres; public class PostgresConnectionFactory : IDbConnectionFactory { diff --git a/src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresOptions.cs b/src/ProjectOrigin.Stamp/Database/Postgres/PostgresOptions.cs similarity index 74% rename from src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresOptions.cs rename to src/ProjectOrigin.Stamp/Database/Postgres/PostgresOptions.cs index 4923bdb..6eed9f7 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresOptions.cs +++ b/src/ProjectOrigin.Stamp/Database/Postgres/PostgresOptions.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ProjectOrigin.Stamp.Server.Database.Postgres; +namespace ProjectOrigin.Stamp.Database.Postgres; public sealed class PostgresOptions { diff --git a/src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresUpgrader.cs b/src/ProjectOrigin.Stamp/Database/Postgres/PostgresUpgrader.cs similarity index 98% rename from src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresUpgrader.cs rename to src/ProjectOrigin.Stamp/Database/Postgres/PostgresUpgrader.cs index c47f334..1898c2a 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/Postgres/PostgresUpgrader.cs +++ b/src/ProjectOrigin.Stamp/Database/Postgres/PostgresUpgrader.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace ProjectOrigin.Stamp.Server.Database.Postgres; +namespace ProjectOrigin.Stamp.Database.Postgres; public class PostgresUpgrader : IRepositoryUpgrader { diff --git a/src/ProjectOrigin.Stamp.Server/Database/Postgres/Scripts/0001.sql b/src/ProjectOrigin.Stamp/Database/Postgres/Scripts/0001.sql similarity index 100% rename from src/ProjectOrigin.Stamp.Server/Database/Postgres/Scripts/0001.sql rename to src/ProjectOrigin.Stamp/Database/Postgres/Scripts/0001.sql diff --git a/src/ProjectOrigin.Stamp.Server/Database/Postgres/Scripts/0002.sql b/src/ProjectOrigin.Stamp/Database/Postgres/Scripts/0002.sql similarity index 100% rename from src/ProjectOrigin.Stamp.Server/Database/Postgres/Scripts/0002.sql rename to src/ProjectOrigin.Stamp/Database/Postgres/Scripts/0002.sql diff --git a/src/ProjectOrigin.Stamp.Server/Database/Postgres/Scripts/0003.sql b/src/ProjectOrigin.Stamp/Database/Postgres/Scripts/0003.sql similarity index 100% rename from src/ProjectOrigin.Stamp.Server/Database/Postgres/Scripts/0003.sql rename to src/ProjectOrigin.Stamp/Database/Postgres/Scripts/0003.sql diff --git a/src/ProjectOrigin.Stamp.Server/Database/Postgres/Scripts/0004.sql b/src/ProjectOrigin.Stamp/Database/Postgres/Scripts/0004.sql similarity index 100% rename from src/ProjectOrigin.Stamp.Server/Database/Postgres/Scripts/0004.sql rename to src/ProjectOrigin.Stamp/Database/Postgres/Scripts/0004.sql diff --git a/src/ProjectOrigin.Stamp.Server/Database/UnitOfWork.cs b/src/ProjectOrigin.Stamp/Database/UnitOfWork.cs similarity index 97% rename from src/ProjectOrigin.Stamp.Server/Database/UnitOfWork.cs rename to src/ProjectOrigin.Stamp/Database/UnitOfWork.cs index 3c3e12c..a4f1275 100644 --- a/src/ProjectOrigin.Stamp.Server/Database/UnitOfWork.cs +++ b/src/ProjectOrigin.Stamp/Database/UnitOfWork.cs @@ -1,8 +1,8 @@ using System; using System.Data; -using ProjectOrigin.Stamp.Server.Repositories; +using ProjectOrigin.Stamp.Repositories; -namespace ProjectOrigin.Stamp.Server.Database; +namespace ProjectOrigin.Stamp.Database; public class UnitOfWork : IUnitOfWork, IDisposable { diff --git a/src/ProjectOrigin.Stamp.Server/EventHandlers/IssueInRegistryConsumer.cs b/src/ProjectOrigin.Stamp/EventHandlers/IssueInRegistryConsumer.cs similarity index 90% rename from src/ProjectOrigin.Stamp.Server/EventHandlers/IssueInRegistryConsumer.cs rename to src/ProjectOrigin.Stamp/EventHandlers/IssueInRegistryConsumer.cs index 69dab8b..163a4ae 100644 --- a/src/ProjectOrigin.Stamp.Server/EventHandlers/IssueInRegistryConsumer.cs +++ b/src/ProjectOrigin.Stamp/EventHandlers/IssueInRegistryConsumer.cs @@ -8,15 +8,14 @@ using ProjectOrigin.Electricity.V1; using ProjectOrigin.PedersenCommitment; using ProjectOrigin.Registry.V1; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Exceptions; -using ProjectOrigin.Stamp.Server.Helpers; -using ProjectOrigin.Stamp.Server.Models; -using ProjectOrigin.Stamp.Server.Options; -using ProjectOrigin.Stamp.Server.ValueObjects; -using GranularCertificateType = ProjectOrigin.Stamp.Server.Models.GranularCertificateType; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Helpers; +using ProjectOrigin.Stamp.Models; +using ProjectOrigin.Stamp.Options; +using ProjectOrigin.Stamp.ValueObjects; +using GranularCertificateType = ProjectOrigin.Stamp.Models.GranularCertificateType; -namespace ProjectOrigin.Stamp.Server.EventHandlers; +namespace ProjectOrigin.Stamp.EventHandlers; public class CertificateStoredEvent { diff --git a/src/ProjectOrigin.Stamp.Server/EventHandlers/MarkCertificateAsIssuedConsumer.cs b/src/ProjectOrigin.Stamp/EventHandlers/MarkCertificateAsIssuedConsumer.cs similarity index 93% rename from src/ProjectOrigin.Stamp.Server/EventHandlers/MarkCertificateAsIssuedConsumer.cs rename to src/ProjectOrigin.Stamp/EventHandlers/MarkCertificateAsIssuedConsumer.cs index 1247302..ac8e4f8 100644 --- a/src/ProjectOrigin.Stamp.Server/EventHandlers/MarkCertificateAsIssuedConsumer.cs +++ b/src/ProjectOrigin.Stamp/EventHandlers/MarkCertificateAsIssuedConsumer.cs @@ -3,13 +3,13 @@ using MassTransit; using Microsoft.Extensions.Logging; using System.Text.Json; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Extensions; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Extensions; +using ProjectOrigin.Stamp.Models; using Microsoft.Extensions.Options; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Options; -namespace ProjectOrigin.Stamp.Server.EventHandlers; +namespace ProjectOrigin.Stamp.EventHandlers; public record CertificateIssuedInRegistryEvent { diff --git a/src/ProjectOrigin.Stamp.Server/EventHandlers/RejectCertificateConsumer.cs b/src/ProjectOrigin.Stamp/EventHandlers/RejectCertificateConsumer.cs similarity index 94% rename from src/ProjectOrigin.Stamp.Server/EventHandlers/RejectCertificateConsumer.cs rename to src/ProjectOrigin.Stamp/EventHandlers/RejectCertificateConsumer.cs index 7f13a4d..ba3affd 100644 --- a/src/ProjectOrigin.Stamp.Server/EventHandlers/RejectCertificateConsumer.cs +++ b/src/ProjectOrigin.Stamp/EventHandlers/RejectCertificateConsumer.cs @@ -3,10 +3,10 @@ using MassTransit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Options; -namespace ProjectOrigin.Stamp.Server.EventHandlers; +namespace ProjectOrigin.Stamp.EventHandlers; public record CertificateFailedInRegistryEvent { diff --git a/src/ProjectOrigin.Stamp.Server/EventHandlers/SendToWalletConsumer.cs b/src/ProjectOrigin.Stamp/EventHandlers/SendToWalletConsumer.cs similarity index 96% rename from src/ProjectOrigin.Stamp.Server/EventHandlers/SendToWalletConsumer.cs rename to src/ProjectOrigin.Stamp/EventHandlers/SendToWalletConsumer.cs index af1fd23..3f14d25 100644 --- a/src/ProjectOrigin.Stamp.Server/EventHandlers/SendToWalletConsumer.cs +++ b/src/ProjectOrigin.Stamp/EventHandlers/SendToWalletConsumer.cs @@ -8,12 +8,12 @@ using MassTransit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Exceptions; -using ProjectOrigin.Stamp.Server.Models; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Exceptions; +using ProjectOrigin.Stamp.Models; +using ProjectOrigin.Stamp.Options; -namespace ProjectOrigin.Stamp.Server.EventHandlers; +namespace ProjectOrigin.Stamp.EventHandlers; public record CertificateMarkedAsIssuedEvent { diff --git a/src/ProjectOrigin.Stamp.Server/EventHandlers/WaitForCommittedRegistryTransactionConsumer.cs b/src/ProjectOrigin.Stamp/EventHandlers/WaitForCommittedRegistryTransactionConsumer.cs similarity index 94% rename from src/ProjectOrigin.Stamp.Server/EventHandlers/WaitForCommittedRegistryTransactionConsumer.cs rename to src/ProjectOrigin.Stamp/EventHandlers/WaitForCommittedRegistryTransactionConsumer.cs index 63e5354..fa8f221 100644 --- a/src/ProjectOrigin.Stamp.Server/EventHandlers/WaitForCommittedRegistryTransactionConsumer.cs +++ b/src/ProjectOrigin.Stamp/EventHandlers/WaitForCommittedRegistryTransactionConsumer.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; using System.Threading.Tasks; using Grpc.Core; using Grpc.Net.Client; @@ -7,11 +6,11 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using ProjectOrigin.Registry.V1; -using ProjectOrigin.Stamp.Server.Exceptions; -using ProjectOrigin.Stamp.Server.Options; -using RegistryOptions = ProjectOrigin.Stamp.Server.Options.RegistryOptions; +using ProjectOrigin.Stamp.Exceptions; +using ProjectOrigin.Stamp.Options; +using RegistryOptions = ProjectOrigin.Stamp.Options.RegistryOptions; -namespace ProjectOrigin.Stamp.Server.EventHandlers; +namespace ProjectOrigin.Stamp.EventHandlers; public record CertificateSentToRegistryEvent { diff --git a/src/ProjectOrigin.Stamp.Server/Exceptions/CertificateDomainException.cs b/src/ProjectOrigin.Stamp/Exceptions/CertificateDomainException.cs similarity index 76% rename from src/ProjectOrigin.Stamp.Server/Exceptions/CertificateDomainException.cs rename to src/ProjectOrigin.Stamp/Exceptions/CertificateDomainException.cs index bed34be..202bf33 100644 --- a/src/ProjectOrigin.Stamp.Server/Exceptions/CertificateDomainException.cs +++ b/src/ProjectOrigin.Stamp/Exceptions/CertificateDomainException.cs @@ -1,7 +1,6 @@ using System; -using System.Runtime.Serialization; -namespace ProjectOrigin.Stamp.Server.Exceptions; +namespace ProjectOrigin.Stamp.Exceptions; [Serializable] public class CertificateDomainException : Exception diff --git a/src/ProjectOrigin.Stamp.Server/Exceptions/TransientException.cs b/src/ProjectOrigin.Stamp/Exceptions/TransientException.cs similarity index 83% rename from src/ProjectOrigin.Stamp.Server/Exceptions/TransientException.cs rename to src/ProjectOrigin.Stamp/Exceptions/TransientException.cs index 186abeb..efe1789 100644 --- a/src/ProjectOrigin.Stamp.Server/Exceptions/TransientException.cs +++ b/src/ProjectOrigin.Stamp/Exceptions/TransientException.cs @@ -1,6 +1,6 @@ using System; -namespace ProjectOrigin.Stamp.Server.Exceptions; +namespace ProjectOrigin.Stamp.Exceptions; [Serializable] public class TransientException : Exception diff --git a/src/ProjectOrigin.Stamp.Server/Exceptions/WalletException.cs b/src/ProjectOrigin.Stamp/Exceptions/WalletException.cs similarity index 75% rename from src/ProjectOrigin.Stamp.Server/Exceptions/WalletException.cs rename to src/ProjectOrigin.Stamp/Exceptions/WalletException.cs index 7cccb9c..edabf5f 100644 --- a/src/ProjectOrigin.Stamp.Server/Exceptions/WalletException.cs +++ b/src/ProjectOrigin.Stamp/Exceptions/WalletException.cs @@ -1,6 +1,6 @@ using System; -namespace ProjectOrigin.Stamp.Server.Exceptions; +namespace ProjectOrigin.Stamp.Exceptions; [Serializable] public class WalletException : Exception diff --git a/src/ProjectOrigin.Stamp.Server/Extensions/DateTmeOffsetExtension.cs b/src/ProjectOrigin.Stamp/Extensions/DateTmeOffsetExtension.cs similarity index 81% rename from src/ProjectOrigin.Stamp.Server/Extensions/DateTmeOffsetExtension.cs rename to src/ProjectOrigin.Stamp/Extensions/DateTmeOffsetExtension.cs index 1f54860..e37d446 100644 --- a/src/ProjectOrigin.Stamp.Server/Extensions/DateTmeOffsetExtension.cs +++ b/src/ProjectOrigin.Stamp/Extensions/DateTmeOffsetExtension.cs @@ -1,6 +1,6 @@ using System; -namespace ProjectOrigin.Stamp.Server.Extensions; +namespace ProjectOrigin.Stamp.Extensions; public static class DateTmeOffsetExtension { diff --git a/src/ProjectOrigin.Stamp.Server/Extensions/IBusRegistrationConfiguratorExtensions.cs b/src/ProjectOrigin.Stamp/Extensions/IBusRegistrationConfiguratorExtensions.cs similarity index 90% rename from src/ProjectOrigin.Stamp.Server/Extensions/IBusRegistrationConfiguratorExtensions.cs rename to src/ProjectOrigin.Stamp/Extensions/IBusRegistrationConfiguratorExtensions.cs index 81444af..619255a 100644 --- a/src/ProjectOrigin.Stamp.Server/Extensions/IBusRegistrationConfiguratorExtensions.cs +++ b/src/ProjectOrigin.Stamp/Extensions/IBusRegistrationConfiguratorExtensions.cs @@ -1,10 +1,9 @@ using System; using MassTransit; -using ProjectOrigin.Stamp.Server.EventHandlers; -using ProjectOrigin.Stamp.Server.Options; -using ProjectOrigin.Stamp.Server.Serialization; +using ProjectOrigin.Stamp.Options; +using ProjectOrigin.Stamp.Serialization; -namespace ProjectOrigin.Stamp.Server.Extensions; +namespace ProjectOrigin.Stamp.Extensions; public static class IBusRegistrationConfiguratorExtensions { diff --git a/src/ProjectOrigin.Stamp.Server/Extensions/IConfigurationExtensions.cs b/src/ProjectOrigin.Stamp/Extensions/IConfigurationExtensions.cs similarity index 97% rename from src/ProjectOrigin.Stamp.Server/Extensions/IConfigurationExtensions.cs rename to src/ProjectOrigin.Stamp/Extensions/IConfigurationExtensions.cs index 6d41196..6b6310d 100644 --- a/src/ProjectOrigin.Stamp.Server/Extensions/IConfigurationExtensions.cs +++ b/src/ProjectOrigin.Stamp/Extensions/IConfigurationExtensions.cs @@ -4,12 +4,12 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using ProjectOrigin.Stamp.Server.Database; +using ProjectOrigin.Stamp.Database; using Serilog; using Serilog.Enrichers.Span; using Serilog.Formatting.Json; -namespace ProjectOrigin.Stamp.Server.Extensions; +namespace ProjectOrigin.Stamp.Extensions; public static class IConfigurationExtensions { diff --git a/src/ProjectOrigin.Stamp.Server/Extensions/IServiceCollectionExtensions.cs b/src/ProjectOrigin.Stamp/Extensions/IServiceCollectionExtensions.cs similarity index 83% rename from src/ProjectOrigin.Stamp.Server/Extensions/IServiceCollectionExtensions.cs rename to src/ProjectOrigin.Stamp/Extensions/IServiceCollectionExtensions.cs index 22195e3..fc84425 100644 --- a/src/ProjectOrigin.Stamp.Server/Extensions/IServiceCollectionExtensions.cs +++ b/src/ProjectOrigin.Stamp/Extensions/IServiceCollectionExtensions.cs @@ -1,10 +1,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Protocols.Configuration; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Database.Postgres; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Database.Postgres; -namespace ProjectOrigin.Stamp.Server.Extensions; +namespace ProjectOrigin.Stamp.Extensions; public static class IServiceCollectionExtensions { diff --git a/src/ProjectOrigin.Stamp.Server/Helpers/KeyGenerator.cs b/src/ProjectOrigin.Stamp/Helpers/KeyGenerator.cs similarity index 91% rename from src/ProjectOrigin.Stamp.Server/Helpers/KeyGenerator.cs rename to src/ProjectOrigin.Stamp/Helpers/KeyGenerator.cs index e15a9cb..46644c2 100644 --- a/src/ProjectOrigin.Stamp.Server/Helpers/KeyGenerator.cs +++ b/src/ProjectOrigin.Stamp/Helpers/KeyGenerator.cs @@ -1,9 +1,9 @@ using Microsoft.Extensions.Options; using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Options; -namespace ProjectOrigin.Stamp.Server.Helpers; +namespace ProjectOrigin.Stamp.Helpers; public interface IKeyGenerator { diff --git a/src/ProjectOrigin.Stamp.Server/Helpers/Registry.cs b/src/ProjectOrigin.Stamp/Helpers/Registry.cs similarity index 98% rename from src/ProjectOrigin.Stamp.Server/Helpers/Registry.cs rename to src/ProjectOrigin.Stamp/Helpers/Registry.cs index 447600c..62be057 100644 --- a/src/ProjectOrigin.Stamp.Server/Helpers/Registry.cs +++ b/src/ProjectOrigin.Stamp/Helpers/Registry.cs @@ -7,11 +7,11 @@ using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; using ProjectOrigin.PedersenCommitment; using ProjectOrigin.Registry.V1; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Models; using GranularCertificateType = ProjectOrigin.Electricity.V1.GranularCertificateType; using PublicKey = ProjectOrigin.Electricity.V1.PublicKey; -namespace ProjectOrigin.Stamp.Server.Helpers; +namespace ProjectOrigin.Stamp.Helpers; public static class Registry { diff --git a/src/ProjectOrigin.Stamp.Server/Models/GranularCertificate.cs b/src/ProjectOrigin.Stamp/Models/GranularCertificate.cs similarity index 95% rename from src/ProjectOrigin.Stamp.Server/Models/GranularCertificate.cs rename to src/ProjectOrigin.Stamp/Models/GranularCertificate.cs index 7b577c5..da65686 100644 --- a/src/ProjectOrigin.Stamp.Server/Models/GranularCertificate.cs +++ b/src/ProjectOrigin.Stamp/Models/GranularCertificate.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using ProjectOrigin.Stamp.Server.Exceptions; +using ProjectOrigin.Stamp.Exceptions; -namespace ProjectOrigin.Stamp.Server.Models; +namespace ProjectOrigin.Stamp.Models; public enum GranularCertificateType { diff --git a/src/ProjectOrigin.Stamp.Server/Models/OutboxMessage.cs b/src/ProjectOrigin.Stamp/Models/OutboxMessage.cs similarity index 85% rename from src/ProjectOrigin.Stamp.Server/Models/OutboxMessage.cs rename to src/ProjectOrigin.Stamp/Models/OutboxMessage.cs index fd55adf..c265845 100644 --- a/src/ProjectOrigin.Stamp.Server/Models/OutboxMessage.cs +++ b/src/ProjectOrigin.Stamp/Models/OutboxMessage.cs @@ -1,6 +1,6 @@ using System; -namespace ProjectOrigin.Stamp.Server.Models; +namespace ProjectOrigin.Stamp.Models; public record OutboxMessage { diff --git a/src/ProjectOrigin.Stamp.Server/Models/Recipient.cs b/src/ProjectOrigin.Stamp/Models/Recipient.cs similarity index 89% rename from src/ProjectOrigin.Stamp.Server/Models/Recipient.cs rename to src/ProjectOrigin.Stamp/Models/Recipient.cs index 71f5e52..95c032a 100644 --- a/src/ProjectOrigin.Stamp.Server/Models/Recipient.cs +++ b/src/ProjectOrigin.Stamp/Models/Recipient.cs @@ -1,7 +1,7 @@ using System; using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; -namespace ProjectOrigin.Stamp.Server.Models; +namespace ProjectOrigin.Stamp.Models; public class Recipient { diff --git a/src/ProjectOrigin.Stamp.Server/Models/WithdrawnCertificate.cs b/src/ProjectOrigin.Stamp/Models/WithdrawnCertificate.cs similarity index 85% rename from src/ProjectOrigin.Stamp.Server/Models/WithdrawnCertificate.cs rename to src/ProjectOrigin.Stamp/Models/WithdrawnCertificate.cs index 55bf785..0c26189 100644 --- a/src/ProjectOrigin.Stamp.Server/Models/WithdrawnCertificate.cs +++ b/src/ProjectOrigin.Stamp/Models/WithdrawnCertificate.cs @@ -1,6 +1,6 @@ using System; -namespace ProjectOrigin.Stamp.Server.Models; +namespace ProjectOrigin.Stamp.Models; public record WithdrawnCertificate { diff --git a/src/ProjectOrigin.Stamp.Server/Options/MessageBrokerOptions.cs b/src/ProjectOrigin.Stamp/Options/MessageBrokerOptions.cs similarity index 95% rename from src/ProjectOrigin.Stamp.Server/Options/MessageBrokerOptions.cs rename to src/ProjectOrigin.Stamp/Options/MessageBrokerOptions.cs index 8e929c1..8221dd1 100644 --- a/src/ProjectOrigin.Stamp.Server/Options/MessageBrokerOptions.cs +++ b/src/ProjectOrigin.Stamp/Options/MessageBrokerOptions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace ProjectOrigin.Stamp.Server.Options; +namespace ProjectOrigin.Stamp.Options; public class MessageBrokerOptions : IValidatableObject { diff --git a/src/ProjectOrigin.Stamp.Server/Options/MessageBrokerType.cs b/src/ProjectOrigin.Stamp/Options/MessageBrokerType.cs similarity index 75% rename from src/ProjectOrigin.Stamp.Server/Options/MessageBrokerType.cs rename to src/ProjectOrigin.Stamp/Options/MessageBrokerType.cs index 8fc4c5d..45c6492 100644 --- a/src/ProjectOrigin.Stamp.Server/Options/MessageBrokerType.cs +++ b/src/ProjectOrigin.Stamp/Options/MessageBrokerType.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace ProjectOrigin.Stamp.Server.Options; +namespace ProjectOrigin.Stamp.Options; [JsonConverter(typeof(JsonStringEnumConverter))] public enum MessageBrokerType { InMemory, RabbitMq } diff --git a/src/ProjectOrigin.Stamp.Server/Options/OtlpOptions.cs b/src/ProjectOrigin.Stamp/Options/OtlpOptions.cs similarity index 95% rename from src/ProjectOrigin.Stamp.Server/Options/OtlpOptions.cs rename to src/ProjectOrigin.Stamp/Options/OtlpOptions.cs index 4acbd61..55bcc57 100644 --- a/src/ProjectOrigin.Stamp.Server/Options/OtlpOptions.cs +++ b/src/ProjectOrigin.Stamp/Options/OtlpOptions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace ProjectOrigin.Stamp.Server.Options; +namespace ProjectOrigin.Stamp.Options; public record OtlpOptions() : IValidatableObject { diff --git a/src/ProjectOrigin.Stamp.Server/Options/RabbitMqOptions.cs b/src/ProjectOrigin.Stamp/Options/RabbitMqOptions.cs similarity index 88% rename from src/ProjectOrigin.Stamp.Server/Options/RabbitMqOptions.cs rename to src/ProjectOrigin.Stamp/Options/RabbitMqOptions.cs index b8ae9d6..93c668c 100644 --- a/src/ProjectOrigin.Stamp.Server/Options/RabbitMqOptions.cs +++ b/src/ProjectOrigin.Stamp/Options/RabbitMqOptions.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ProjectOrigin.Stamp.Server.Options; +namespace ProjectOrigin.Stamp.Options; public class RabbitMqOptions { diff --git a/src/ProjectOrigin.Stamp.Server/Options/RegistryOptions.cs b/src/ProjectOrigin.Stamp/Options/RegistryOptions.cs similarity index 97% rename from src/ProjectOrigin.Stamp.Server/Options/RegistryOptions.cs rename to src/ProjectOrigin.Stamp/Options/RegistryOptions.cs index 73c07e4..75032c8 100644 --- a/src/ProjectOrigin.Stamp.Server/Options/RegistryOptions.cs +++ b/src/ProjectOrigin.Stamp/Options/RegistryOptions.cs @@ -6,7 +6,7 @@ using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; -namespace ProjectOrigin.Stamp.Server.Options; +namespace ProjectOrigin.Stamp.Options; public class Registry { diff --git a/src/ProjectOrigin.Stamp.Server/Options/RestApiOptions.cs b/src/ProjectOrigin.Stamp/Options/RestApiOptions.cs similarity index 82% rename from src/ProjectOrigin.Stamp.Server/Options/RestApiOptions.cs rename to src/ProjectOrigin.Stamp/Options/RestApiOptions.cs index bf7fb71..8b076ef 100644 --- a/src/ProjectOrigin.Stamp.Server/Options/RestApiOptions.cs +++ b/src/ProjectOrigin.Stamp/Options/RestApiOptions.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Microsoft.AspNetCore.Http; -namespace ProjectOrigin.Stamp.Server.Options; +namespace ProjectOrigin.Stamp.Options; public class RestApiOptions { diff --git a/src/ProjectOrigin.Stamp.Server/Options/RetryOptions.cs b/src/ProjectOrigin.Stamp/Options/RetryOptions.cs similarity index 86% rename from src/ProjectOrigin.Stamp.Server/Options/RetryOptions.cs rename to src/ProjectOrigin.Stamp/Options/RetryOptions.cs index 47e5832..3127323 100644 --- a/src/ProjectOrigin.Stamp.Server/Options/RetryOptions.cs +++ b/src/ProjectOrigin.Stamp/Options/RetryOptions.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ProjectOrigin.Stamp.Server.Options; +namespace ProjectOrigin.Stamp.Options; public class RetryOptions { public const string Retry = nameof(Retry); diff --git a/src/ProjectOrigin.Stamp.Server/Program.cs b/src/ProjectOrigin.Stamp/Program.cs similarity index 92% rename from src/ProjectOrigin.Stamp.Server/Program.cs rename to src/ProjectOrigin.Stamp/Program.cs index 7531a1d..2fe1ce2 100644 --- a/src/ProjectOrigin.Stamp.Server/Program.cs +++ b/src/ProjectOrigin.Stamp/Program.cs @@ -1,11 +1,10 @@ using System; -using System.Collections; using System.Linq; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Extensions; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Extensions; using Serilog; var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); diff --git a/src/ProjectOrigin.Stamp.Server/ProjectOrigin.Stamp.Server.csproj b/src/ProjectOrigin.Stamp/ProjectOrigin.Stamp.csproj similarity index 90% rename from src/ProjectOrigin.Stamp.Server/ProjectOrigin.Stamp.Server.csproj rename to src/ProjectOrigin.Stamp/ProjectOrigin.Stamp.csproj index b82aad1..4fa15ac 100644 --- a/src/ProjectOrigin.Stamp.Server/ProjectOrigin.Stamp.Server.csproj +++ b/src/ProjectOrigin.Stamp/ProjectOrigin.Stamp.csproj @@ -1,8 +1,6 @@ - net8.0 - enable disable true $(NoWarn);1591 @@ -48,13 +46,13 @@ - + https://raw.githubusercontent.com/project-origin/registry/v2.0.2/protos/common.proto - + https://raw.githubusercontent.com/project-origin/registry/v2.0.2/protos/registry.proto - + https://raw.githubusercontent.com/project-origin/verifier_electricity/v1.2.0/protos/electricity.proto diff --git a/src/ProjectOrigin.Stamp.Server/Properties/launchSettings.json b/src/ProjectOrigin.Stamp/Properties/launchSettings.json similarity index 83% rename from src/ProjectOrigin.Stamp.Server/Properties/launchSettings.json rename to src/ProjectOrigin.Stamp/Properties/launchSettings.json index 16a5741..b224a1c 100644 --- a/src/ProjectOrigin.Stamp.Server/Properties/launchSettings.json +++ b/src/ProjectOrigin.Stamp/Properties/launchSettings.json @@ -1,12 +1,12 @@ -{ - "profiles": { - "ProjectOrigin.Stamp.Server": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:57881;http://localhost:57882" - } - } -} \ No newline at end of file +{ + "profiles": { + "ProjectOrigin.Stamp": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:57881;http://localhost:57882" + } + } +} diff --git a/src/ProjectOrigin.Stamp.Server/Repositories/CertificateRepository.cs b/src/ProjectOrigin.Stamp/Repositories/CertificateRepository.cs similarity index 96% rename from src/ProjectOrigin.Stamp.Server/Repositories/CertificateRepository.cs rename to src/ProjectOrigin.Stamp/Repositories/CertificateRepository.cs index 41b11e7..2f7393a 100644 --- a/src/ProjectOrigin.Stamp.Server/Repositories/CertificateRepository.cs +++ b/src/ProjectOrigin.Stamp/Repositories/CertificateRepository.cs @@ -1,13 +1,13 @@ using System.Data; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Models; using System.Threading.Tasks; using Dapper; using System; using System.Collections.Generic; using System.Linq; -using ProjectOrigin.Stamp.Server.ValueObjects; +using ProjectOrigin.Stamp.ValueObjects; -namespace ProjectOrigin.Stamp.Server.Repositories; +namespace ProjectOrigin.Stamp.Repositories; public interface ICertificateRepository { @@ -141,7 +141,7 @@ public async Task SetState(Guid certificateId, string registryName, IssuedState var rowsChanged = await _connection.ExecuteAsync( @"UPDATE Certificates SET issued_state = @state, - rejection_reason = @rejectionReason + rejection_reason = @rejectionReason WHERE id = @certificateId AND registry_name = @registryName", new diff --git a/src/ProjectOrigin.Stamp.Server/Repositories/OutboxMessageRepository.cs b/src/ProjectOrigin.Stamp/Repositories/OutboxMessageRepository.cs similarity index 94% rename from src/ProjectOrigin.Stamp.Server/Repositories/OutboxMessageRepository.cs rename to src/ProjectOrigin.Stamp/Repositories/OutboxMessageRepository.cs index 5289073..4e45678 100644 --- a/src/ProjectOrigin.Stamp.Server/Repositories/OutboxMessageRepository.cs +++ b/src/ProjectOrigin.Stamp/Repositories/OutboxMessageRepository.cs @@ -1,10 +1,10 @@ using Dapper; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Models; using System; using System.Data; using System.Threading.Tasks; -namespace ProjectOrigin.Stamp.Server.Repositories; +namespace ProjectOrigin.Stamp.Repositories; public interface IOutboxMessageRepository { diff --git a/src/ProjectOrigin.Stamp.Server/Repositories/RecipientRepository.cs b/src/ProjectOrigin.Stamp/Repositories/RecipientRepository.cs similarity index 94% rename from src/ProjectOrigin.Stamp.Server/Repositories/RecipientRepository.cs rename to src/ProjectOrigin.Stamp/Repositories/RecipientRepository.cs index aab0a49..785c0d8 100644 --- a/src/ProjectOrigin.Stamp.Server/Repositories/RecipientRepository.cs +++ b/src/ProjectOrigin.Stamp/Repositories/RecipientRepository.cs @@ -2,9 +2,9 @@ using System.Data; using System.Threading.Tasks; using Dapper; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Models; -namespace ProjectOrigin.Stamp.Server.Repositories; +namespace ProjectOrigin.Stamp.Repositories; public interface IRecipientRepository { diff --git a/src/ProjectOrigin.Stamp.Server/Repositories/WithdrawnCertificateRepository.cs b/src/ProjectOrigin.Stamp/Repositories/WithdrawnCertificateRepository.cs similarity index 93% rename from src/ProjectOrigin.Stamp.Server/Repositories/WithdrawnCertificateRepository.cs rename to src/ProjectOrigin.Stamp/Repositories/WithdrawnCertificateRepository.cs index a832788..852d7bf 100644 --- a/src/ProjectOrigin.Stamp.Server/Repositories/WithdrawnCertificateRepository.cs +++ b/src/ProjectOrigin.Stamp/Repositories/WithdrawnCertificateRepository.cs @@ -2,9 +2,9 @@ using System.Data; using System.Threading.Tasks; using Dapper; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Models; -namespace ProjectOrigin.Stamp.Server.Repositories; +namespace ProjectOrigin.Stamp.Repositories; public interface IWithdrawnCertificateRepository { diff --git a/src/ProjectOrigin.Stamp.Server/Serialization/IHDPublicKeyConverter.cs b/src/ProjectOrigin.Stamp/Serialization/IHDPublicKeyConverter.cs similarity index 95% rename from src/ProjectOrigin.Stamp.Server/Serialization/IHDPublicKeyConverter.cs rename to src/ProjectOrigin.Stamp/Serialization/IHDPublicKeyConverter.cs index b519eeb..c61af07 100644 --- a/src/ProjectOrigin.Stamp.Server/Serialization/IHDPublicKeyConverter.cs +++ b/src/ProjectOrigin.Stamp/Serialization/IHDPublicKeyConverter.cs @@ -5,7 +5,7 @@ using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; using Swashbuckle.AspNetCore.SwaggerGen; -namespace ProjectOrigin.Stamp.Server.Serialization; +namespace ProjectOrigin.Stamp.Serialization; public class IHDPublicKeyConverter : JsonConverter { diff --git a/src/ProjectOrigin.Stamp.Server/Serialization/TransactionConverter.cs b/src/ProjectOrigin.Stamp/Serialization/TransactionConverter.cs similarity index 91% rename from src/ProjectOrigin.Stamp.Server/Serialization/TransactionConverter.cs rename to src/ProjectOrigin.Stamp/Serialization/TransactionConverter.cs index 2a20314..505731d 100644 --- a/src/ProjectOrigin.Stamp.Server/Serialization/TransactionConverter.cs +++ b/src/ProjectOrigin.Stamp/Serialization/TransactionConverter.cs @@ -4,7 +4,7 @@ using Google.Protobuf; using ProjectOrigin.Registry.V1; -namespace ProjectOrigin.Stamp.Server.Serialization; +namespace ProjectOrigin.Stamp.Serialization; public class TransactionConverter : JsonConverter { diff --git a/src/ProjectOrigin.Stamp.Server/Services/REST/AddStampTagDocumentFilter.cs b/src/ProjectOrigin.Stamp/Services/REST/AddStampTagDocumentFilter.cs similarity index 92% rename from src/ProjectOrigin.Stamp.Server/Services/REST/AddStampTagDocumentFilter.cs rename to src/ProjectOrigin.Stamp/Services/REST/AddStampTagDocumentFilter.cs index 2e400bc..a8ad206 100644 --- a/src/ProjectOrigin.Stamp.Server/Services/REST/AddStampTagDocumentFilter.cs +++ b/src/ProjectOrigin.Stamp/Services/REST/AddStampTagDocumentFilter.cs @@ -2,7 +2,7 @@ using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; -namespace ProjectOrigin.Stamp.Server.Services.REST; +namespace ProjectOrigin.Stamp.Services.REST; public class AddStampTagDocumentFilter : IDocumentFilter { diff --git a/src/ProjectOrigin.Stamp.Server/Services/REST/PathBaseDocumentFilter.cs b/src/ProjectOrigin.Stamp/Services/REST/PathBaseDocumentFilter.cs similarity index 88% rename from src/ProjectOrigin.Stamp.Server/Services/REST/PathBaseDocumentFilter.cs rename to src/ProjectOrigin.Stamp/Services/REST/PathBaseDocumentFilter.cs index 993f325..7d1ba7e 100644 --- a/src/ProjectOrigin.Stamp.Server/Services/REST/PathBaseDocumentFilter.cs +++ b/src/ProjectOrigin.Stamp/Services/REST/PathBaseDocumentFilter.cs @@ -1,10 +1,10 @@ using System.Linq; using Microsoft.Extensions.Options; using Microsoft.OpenApi.Models; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Options; using Swashbuckle.AspNetCore.SwaggerGen; -namespace ProjectOrigin.Stamp.Server.Services.REST; +namespace ProjectOrigin.Stamp.Services.REST; public class PathBaseDocumentFilter : IDocumentFilter { diff --git a/src/ProjectOrigin.Stamp.Server/Services/REST/v1/CertificatesController.cs b/src/ProjectOrigin.Stamp/Services/REST/v1/CertificatesController.cs similarity index 95% rename from src/ProjectOrigin.Stamp.Server/Services/REST/v1/CertificatesController.cs rename to src/ProjectOrigin.Stamp/Services/REST/v1/CertificatesController.cs index d854be8..712b2d1 100644 --- a/src/ProjectOrigin.Stamp.Server/Services/REST/v1/CertificatesController.cs +++ b/src/ProjectOrigin.Stamp/Services/REST/v1/CertificatesController.cs @@ -6,13 +6,13 @@ using MassTransit; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.EventHandlers; -using ProjectOrigin.Stamp.Server.Extensions; -using ProjectOrigin.Stamp.Server.Models; -using ProjectOrigin.Stamp.Server.ValueObjects; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.EventHandlers; +using ProjectOrigin.Stamp.Extensions; +using ProjectOrigin.Stamp.Models; +using ProjectOrigin.Stamp.ValueObjects; -namespace ProjectOrigin.Stamp.Server.Services.REST.v1; +namespace ProjectOrigin.Stamp.Services.REST.v1; [ApiController] public class CertificatesController : ControllerBase diff --git a/src/ProjectOrigin.Stamp.Server/Services/REST/v1/MappingExtensions.cs b/src/ProjectOrigin.Stamp/Services/REST/v1/MappingExtensions.cs similarity index 82% rename from src/ProjectOrigin.Stamp.Server/Services/REST/v1/MappingExtensions.cs rename to src/ProjectOrigin.Stamp/Services/REST/v1/MappingExtensions.cs index 8b329c0..e80ba40 100644 --- a/src/ProjectOrigin.Stamp.Server/Services/REST/v1/MappingExtensions.cs +++ b/src/ProjectOrigin.Stamp/Services/REST/v1/MappingExtensions.cs @@ -1,7 +1,7 @@ using System; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Models; -namespace ProjectOrigin.Stamp.Server.Services.REST.v1; +namespace ProjectOrigin.Stamp.Services.REST.v1; public static class MappingExtensions { diff --git a/src/ProjectOrigin.Stamp.Server/Services/REST/v1/RecipientController.cs b/src/ProjectOrigin.Stamp/Services/REST/v1/RecipientController.cs similarity index 94% rename from src/ProjectOrigin.Stamp.Server/Services/REST/v1/RecipientController.cs rename to src/ProjectOrigin.Stamp/Services/REST/v1/RecipientController.cs index bf8b34e..260a361 100644 --- a/src/ProjectOrigin.Stamp.Server/Services/REST/v1/RecipientController.cs +++ b/src/ProjectOrigin.Stamp/Services/REST/v1/RecipientController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; using System; using System.Threading.Tasks; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Models; using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; using Microsoft.AspNetCore.Http; -namespace ProjectOrigin.Stamp.Server.Services.REST.v1; +namespace ProjectOrigin.Stamp.Services.REST.v1; [ApiController] public class RecipientController : ControllerBase diff --git a/src/ProjectOrigin.Stamp.Server/Services/REST/v1/WithdrawCertificateController.cs b/src/ProjectOrigin.Stamp/Services/REST/v1/WithdrawCertificateController.cs similarity index 93% rename from src/ProjectOrigin.Stamp.Server/Services/REST/v1/WithdrawCertificateController.cs rename to src/ProjectOrigin.Stamp/Services/REST/v1/WithdrawCertificateController.cs index 12ee003..7cc534f 100644 --- a/src/ProjectOrigin.Stamp.Server/Services/REST/v1/WithdrawCertificateController.cs +++ b/src/ProjectOrigin.Stamp/Services/REST/v1/WithdrawCertificateController.cs @@ -6,11 +6,11 @@ using Microsoft.Extensions.Options; using ProjectOrigin.Electricity.V1; using ProjectOrigin.Registry.V1; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Helpers; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Helpers; +using ProjectOrigin.Stamp.Options; -namespace ProjectOrigin.Stamp.Server.Services.REST.v1; +namespace ProjectOrigin.Stamp.Services.REST.v1; [ApiController] public class WithdrawnCertificatesController : ControllerBase diff --git a/src/ProjectOrigin.Stamp.Server/Startup.cs b/src/ProjectOrigin.Stamp/Startup.cs similarity index 91% rename from src/ProjectOrigin.Stamp.Server/Startup.cs rename to src/ProjectOrigin.Stamp/Startup.cs index 8442a85..4a3667b 100644 --- a/src/ProjectOrigin.Stamp.Server/Startup.cs +++ b/src/ProjectOrigin.Stamp/Startup.cs @@ -17,18 +17,18 @@ using OpenTelemetry.Trace; using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; -using ProjectOrigin.Stamp.Server.BackgroundServices; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Database.Mapping; -using ProjectOrigin.Stamp.Server.Database.Postgres; -using ProjectOrigin.Stamp.Server.Extensions; -using ProjectOrigin.Stamp.Server.Options; -using ProjectOrigin.Stamp.Server.Serialization; -using ProjectOrigin.Stamp.Server.Services.REST; -using ProjectOrigin.Stamp.Server.EventHandlers; -using ProjectOrigin.Stamp.Server.Helpers; - -namespace ProjectOrigin.Stamp.Server; +using ProjectOrigin.Stamp.BackgroundServices; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Database.Mapping; +using ProjectOrigin.Stamp.Database.Postgres; +using ProjectOrigin.Stamp.Extensions; +using ProjectOrigin.Stamp.Options; +using ProjectOrigin.Stamp.Serialization; +using ProjectOrigin.Stamp.Services.REST; +using ProjectOrigin.Stamp.EventHandlers; +using ProjectOrigin.Stamp.Helpers; + +namespace ProjectOrigin.Stamp; public class Startup { @@ -89,7 +89,7 @@ public void ConfigureServices(IServiceCollection services) services.AddOpenTelemetry() .ConfigureResource(r => { - r.AddService("ProjectOrigin.Stamp.Server", + r.AddService("ProjectOrigin.Stamp", serviceInstanceId: Environment.MachineName); }) .WithMetrics(metrics => metrics diff --git a/src/ProjectOrigin.Stamp.Server/ValueObjects/Period.cs b/src/ProjectOrigin.Stamp/ValueObjects/Period.cs similarity index 94% rename from src/ProjectOrigin.Stamp.Server/ValueObjects/Period.cs rename to src/ProjectOrigin.Stamp/ValueObjects/Period.cs index 1f536a6..950fcce 100644 --- a/src/ProjectOrigin.Stamp.Server/ValueObjects/Period.cs +++ b/src/ProjectOrigin.Stamp/ValueObjects/Period.cs @@ -2,7 +2,7 @@ using Google.Protobuf.WellKnownTypes; using ProjectOrigin.Electricity.V1; -namespace ProjectOrigin.Stamp.Server.ValueObjects; +namespace ProjectOrigin.Stamp.ValueObjects; public class Period : ValueObject { diff --git a/src/ProjectOrigin.Stamp.Server/ValueObjects/ValueObject.cs b/src/ProjectOrigin.Stamp/ValueObjects/ValueObject.cs similarity index 97% rename from src/ProjectOrigin.Stamp.Server/ValueObjects/ValueObject.cs rename to src/ProjectOrigin.Stamp/ValueObjects/ValueObject.cs index f8a8315..ae38bce 100644 --- a/src/ProjectOrigin.Stamp.Server/ValueObjects/ValueObject.cs +++ b/src/ProjectOrigin.Stamp/ValueObjects/ValueObject.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; -namespace ProjectOrigin.Stamp.Server.ValueObjects; +namespace ProjectOrigin.Stamp.ValueObjects; public abstract class ValueObject : IEquatable { diff --git a/src/ProjectOrigin.Stamp.Server/appsettings.json b/src/ProjectOrigin.Stamp/appsettings.json similarity index 100% rename from src/ProjectOrigin.Stamp.Server/appsettings.json rename to src/ProjectOrigin.Stamp/appsettings.json diff --git a/src/Stamp.Dockerfile b/src/Stamp.Dockerfile deleted file mode 100644 index e4626b9..0000000 --- a/src/Stamp.Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -ARG PROJECT=ProjectOrigin.Stamp.Server -ARG USER=dotnetuser - -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.402 AS build -ARG PROJECT - -WORKDIR /src - -COPY ./Protos ./Protos -COPY ./${PROJECT} ./${PROJECT} - -RUN dotnet restore ${PROJECT} -RUN dotnet build ${PROJECT} -c Release --no-restore -o /app/build -RUN dotnet publish ${PROJECT} -c Release -o /app/publish - -# ------- production image ------- -FROM mcr.microsoft.com/dotnet/aspnet:8.0.8 AS production -ARG PROJECT -ARG USER - -ENV USER=dotnetuser -ENV APPLICATION=${PROJECT} -RUN groupadd -r "$USER" && useradd -r -g "$USER" "$USER" - -WORKDIR /app -COPY --chown=root:root --from=build /app/publish . -RUN chmod -R 655 . - -USER $USER -EXPOSE 5000 -ENTRYPOINT ["/bin/sh", "-c", "dotnet ${APPLICATION}.dll \"${@}\"", "--" ] diff --git a/src/ProjectOrigin.Stamp.Test/BackgroundServices/OutboxPollingWorkerTests.cs b/test/ProjectOrigin.Stamp.Test/BackgroundServices/OutboxPollingWorkerTests.cs similarity index 93% rename from src/ProjectOrigin.Stamp.Test/BackgroundServices/OutboxPollingWorkerTests.cs rename to test/ProjectOrigin.Stamp.Test/BackgroundServices/OutboxPollingWorkerTests.cs index 73e5dc8..739a4f4 100644 --- a/src/ProjectOrigin.Stamp.Test/BackgroundServices/OutboxPollingWorkerTests.cs +++ b/test/ProjectOrigin.Stamp.Test/BackgroundServices/OutboxPollingWorkerTests.cs @@ -1,17 +1,17 @@ using System.Text.Json; using MassTransit; using NSubstitute; -using ProjectOrigin.Stamp.Server.Database; +using ProjectOrigin.Stamp.Database; using Xunit; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using ProjectOrigin.Stamp.Server.BackgroundServices; -using ProjectOrigin.Stamp.Server.Extensions; -using ProjectOrigin.Stamp.Server.Models; -using ProjectOrigin.Stamp.Server.Repositories; +using ProjectOrigin.Stamp.BackgroundServices; +using ProjectOrigin.Stamp.Extensions; +using ProjectOrigin.Stamp.Models; +using ProjectOrigin.Stamp.Repositories; using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; -using ProjectOrigin.Stamp.Server.EventHandlers; -using ProjectOrigin.Stamp.Server.ValueObjects; +using ProjectOrigin.Stamp.EventHandlers; +using ProjectOrigin.Stamp.ValueObjects; namespace ProjectOrigin.Stamp.Test.BackgroundServices; diff --git a/src/ProjectOrigin.Stamp.Test/CertificateIssuingTests.cs b/test/ProjectOrigin.Stamp.Test/CertificateIssuingTests.cs similarity index 98% rename from src/ProjectOrigin.Stamp.Test/CertificateIssuingTests.cs rename to test/ProjectOrigin.Stamp.Test/CertificateIssuingTests.cs index f9ab337..b0a5ca8 100644 --- a/src/ProjectOrigin.Stamp.Test/CertificateIssuingTests.cs +++ b/test/ProjectOrigin.Stamp.Test/CertificateIssuingTests.cs @@ -1,10 +1,9 @@ using System.Net; -using ProjectOrigin.Stamp.Server; using ProjectOrigin.Stamp.Test.TestClassFixtures; using FluentAssertions; using ProjectOrigin.Stamp.Test.Extensions; using Xunit; -using CertificateType = ProjectOrigin.Stamp.Server.Services.REST.v1.CertificateType; +using CertificateType = ProjectOrigin.Stamp.Services.REST.v1.CertificateType; namespace ProjectOrigin.Stamp.Test; diff --git a/src/ProjectOrigin.Stamp.Test/Extensions/DateTimeOffsetExtensions.cs b/test/ProjectOrigin.Stamp.Test/Extensions/DateTimeOffsetExtensions.cs similarity index 100% rename from src/ProjectOrigin.Stamp.Test/Extensions/DateTimeOffsetExtensions.cs rename to test/ProjectOrigin.Stamp.Test/Extensions/DateTimeOffsetExtensions.cs diff --git a/src/ProjectOrigin.Stamp.Test/Extensions/HttpClientExtensions.cs b/test/ProjectOrigin.Stamp.Test/Extensions/HttpClientExtensions.cs similarity index 97% rename from src/ProjectOrigin.Stamp.Test/Extensions/HttpClientExtensions.cs rename to test/ProjectOrigin.Stamp.Test/Extensions/HttpClientExtensions.cs index 48cf390..517f738 100644 --- a/src/ProjectOrigin.Stamp.Test/Extensions/HttpClientExtensions.cs +++ b/test/ProjectOrigin.Stamp.Test/Extensions/HttpClientExtensions.cs @@ -3,7 +3,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using FluentAssertions; -using ProjectOrigin.Stamp.Server.Services.REST.v1; +using ProjectOrigin.Stamp.Services.REST.v1; namespace ProjectOrigin.Stamp.Test.Extensions; diff --git a/src/ProjectOrigin.Stamp.Test/Extensions/IContainerExtensions.cs b/test/ProjectOrigin.Stamp.Test/Extensions/IContainerExtensions.cs similarity index 100% rename from src/ProjectOrigin.Stamp.Test/Extensions/IContainerExtensions.cs rename to test/ProjectOrigin.Stamp.Test/Extensions/IContainerExtensions.cs diff --git a/test/ProjectOrigin.Stamp.Test/Extensions/MappingExtensions.cs b/test/ProjectOrigin.Stamp.Test/Extensions/MappingExtensions.cs new file mode 100644 index 0000000..1d70c83 --- /dev/null +++ b/test/ProjectOrigin.Stamp.Test/Extensions/MappingExtensions.cs @@ -0,0 +1,13 @@ + +namespace ProjectOrigin.Stamp.Test.Extensions; + +public static class MappingExtensions +{ + public static CertificateType MapToWalletModel(this Services.REST.v1.CertificateType certificateType) => + certificateType switch + { + Services.REST.v1.CertificateType.Consumption => CertificateType.Consumption, + Services.REST.v1.CertificateType.Production => CertificateType.Production, + _ => throw new ArgumentOutOfRangeException(nameof(certificateType), certificateType, null) + }; +} diff --git a/src/ProjectOrigin.Stamp.Test/Extensions/WalletServiceClientExtensions.cs b/test/ProjectOrigin.Stamp.Test/Extensions/WalletServiceClientExtensions.cs similarity index 96% rename from src/ProjectOrigin.Stamp.Test/Extensions/WalletServiceClientExtensions.cs rename to test/ProjectOrigin.Stamp.Test/Extensions/WalletServiceClientExtensions.cs index a8e9498..28d29ac 100644 --- a/src/ProjectOrigin.Stamp.Test/Extensions/WalletServiceClientExtensions.cs +++ b/test/ProjectOrigin.Stamp.Test/Extensions/WalletServiceClientExtensions.cs @@ -1,11 +1,9 @@ -using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; -using ProjectOrigin.HierarchicalDeterministicKeys.Interfaces; using System.Diagnostics; using System.Net.Http.Json; using System.Text; using System.Text.Json; using System.Text.Json.Serialization; -using ProjectOrigin.Stamp.Server.Services.REST.v1; +using ProjectOrigin.Stamp.Services.REST.v1; namespace ProjectOrigin.Stamp.Test.Extensions; diff --git a/src/ProjectOrigin.Stamp.Test/Options/RegistryOptionsTests.cs b/test/ProjectOrigin.Stamp.Test/Options/RegistryOptionsTests.cs similarity index 83% rename from src/ProjectOrigin.Stamp.Test/Options/RegistryOptionsTests.cs rename to test/ProjectOrigin.Stamp.Test/Options/RegistryOptionsTests.cs index e8aba3f..520425b 100644 --- a/src/ProjectOrigin.Stamp.Test/Options/RegistryOptionsTests.cs +++ b/test/ProjectOrigin.Stamp.Test/Options/RegistryOptionsTests.cs @@ -1,12 +1,9 @@ using System.Text; using FluentAssertions; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Options; using Xunit; -namespace ProjectOrigin.Stamp.Test.Options; +namespace ProjectOrigin.Stamp.Test.OptionsTests; public class RegistryOptionsTests { @@ -16,7 +13,7 @@ public void ShouldTellSupportedRegistriesOnNotFoundRegistry() { var registryOptions = new RegistryOptions { - Registries = new List + Registries = new List { new() { Name = "Narnia", Address = "http://foo"}, new() {Name = "TestRegistry", Address = "http://foo" }, diff --git a/src/ProjectOrigin.Stamp.Test/ProjectOrigin.Stamp.Test.csproj b/test/ProjectOrigin.Stamp.Test/ProjectOrigin.Stamp.Test.csproj similarity index 82% rename from src/ProjectOrigin.Stamp.Test/ProjectOrigin.Stamp.Test.csproj rename to test/ProjectOrigin.Stamp.Test/ProjectOrigin.Stamp.Test.csproj index 4f9f967..652a9b6 100644 --- a/src/ProjectOrigin.Stamp.Test/ProjectOrigin.Stamp.Test.csproj +++ b/test/ProjectOrigin.Stamp.Test/ProjectOrigin.Stamp.Test.csproj @@ -1,27 +1,25 @@ - - - - net8.0 - enable - enable - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + enable + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + diff --git a/src/ProjectOrigin.Stamp.Test/REST/RecipientControllerTests.cs b/test/ProjectOrigin.Stamp.Test/REST/RecipientControllerTests.cs similarity index 94% rename from src/ProjectOrigin.Stamp.Test/REST/RecipientControllerTests.cs rename to test/ProjectOrigin.Stamp.Test/REST/RecipientControllerTests.cs index 258b949..7451d1c 100644 --- a/src/ProjectOrigin.Stamp.Test/REST/RecipientControllerTests.cs +++ b/test/ProjectOrigin.Stamp.Test/REST/RecipientControllerTests.cs @@ -2,9 +2,8 @@ using System.Net.Http.Json; using FluentAssertions; using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; -using ProjectOrigin.Stamp.Server; -using ProjectOrigin.Stamp.Server.Repositories; -using ProjectOrigin.Stamp.Server.Services.REST.v1; +using ProjectOrigin.Stamp.Repositories; +using ProjectOrigin.Stamp.Services.REST.v1; using ProjectOrigin.Stamp.Test.Extensions; using ProjectOrigin.Stamp.Test.TestClassFixtures; using Xunit; diff --git a/src/ProjectOrigin.Stamp.Test/REST/WithdrawCertificateControllerTests.cs b/test/ProjectOrigin.Stamp.Test/REST/WithdrawCertificateControllerTests.cs similarity index 96% rename from src/ProjectOrigin.Stamp.Test/REST/WithdrawCertificateControllerTests.cs rename to test/ProjectOrigin.Stamp.Test/REST/WithdrawCertificateControllerTests.cs index c5bd375..3b53259 100644 --- a/src/ProjectOrigin.Stamp.Test/REST/WithdrawCertificateControllerTests.cs +++ b/test/ProjectOrigin.Stamp.Test/REST/WithdrawCertificateControllerTests.cs @@ -1,10 +1,8 @@ using System.Net; -using ProjectOrigin.Stamp.Server; using ProjectOrigin.Stamp.Test.TestClassFixtures; using FluentAssertions; using ProjectOrigin.Stamp.Test.Extensions; using Xunit; -using CertificateType = ProjectOrigin.Stamp.Server.Services.REST.v1.CertificateType; namespace ProjectOrigin.Stamp.Test; diff --git a/src/ProjectOrigin.Stamp.Test/Repositories/CertificateRepositoryTests.cs b/test/ProjectOrigin.Stamp.Test/Repositories/CertificateRepositoryTests.cs similarity index 98% rename from src/ProjectOrigin.Stamp.Test/Repositories/CertificateRepositoryTests.cs rename to test/ProjectOrigin.Stamp.Test/Repositories/CertificateRepositoryTests.cs index 76c6773..d97869b 100644 --- a/src/ProjectOrigin.Stamp.Test/Repositories/CertificateRepositoryTests.cs +++ b/test/ProjectOrigin.Stamp.Test/Repositories/CertificateRepositoryTests.cs @@ -1,9 +1,9 @@ using FluentAssertions; using Npgsql; -using ProjectOrigin.Stamp.Server.Repositories; +using ProjectOrigin.Stamp.Repositories; using ProjectOrigin.Stamp.Test.TestClassFixtures; -using ProjectOrigin.Stamp.Server.Models; -using ProjectOrigin.Stamp.Server.ValueObjects; +using ProjectOrigin.Stamp.Models; +using ProjectOrigin.Stamp.ValueObjects; using Xunit; namespace ProjectOrigin.Stamp.Test.Repositories; diff --git a/src/ProjectOrigin.Stamp.Test/Repositories/OutboxMessageRepositoryTests.cs b/test/ProjectOrigin.Stamp.Test/Repositories/OutboxMessageRepositoryTests.cs similarity index 91% rename from src/ProjectOrigin.Stamp.Test/Repositories/OutboxMessageRepositoryTests.cs rename to test/ProjectOrigin.Stamp.Test/Repositories/OutboxMessageRepositoryTests.cs index 989a301..259cb2c 100644 --- a/src/ProjectOrigin.Stamp.Test/Repositories/OutboxMessageRepositoryTests.cs +++ b/test/ProjectOrigin.Stamp.Test/Repositories/OutboxMessageRepositoryTests.cs @@ -2,11 +2,11 @@ using FluentAssertions; using Npgsql; using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; -using ProjectOrigin.Stamp.Server.EventHandlers; -using ProjectOrigin.Stamp.Server.Extensions; -using ProjectOrigin.Stamp.Server.Models; -using ProjectOrigin.Stamp.Server.Repositories; -using ProjectOrigin.Stamp.Server.ValueObjects; +using ProjectOrigin.Stamp.EventHandlers; +using ProjectOrigin.Stamp.Extensions; +using ProjectOrigin.Stamp.Models; +using ProjectOrigin.Stamp.Repositories; +using ProjectOrigin.Stamp.ValueObjects; using ProjectOrigin.Stamp.Test.TestClassFixtures; using Xunit; @@ -55,7 +55,7 @@ public async Task CreateGetAndParseOutboxMessage() queriedMessage.Should().BeEquivalentTo(message); - var type = Type.GetType($"{queriedMessage!.MessageType}, ProjectOrigin.Stamp.Server"); + var type = Type.GetType($"{queriedMessage!.MessageType}, ProjectOrigin.Stamp"); var loadedObject = JsonSerializer.Deserialize(queriedMessage.JsonPayload, type!); loadedObject.Should().BeEquivalentTo(payloadObj); } diff --git a/src/ProjectOrigin.Stamp.Test/Repositories/RecipientRepositoryTests.cs b/test/ProjectOrigin.Stamp.Test/Repositories/RecipientRepositoryTests.cs similarity index 95% rename from src/ProjectOrigin.Stamp.Test/Repositories/RecipientRepositoryTests.cs rename to test/ProjectOrigin.Stamp.Test/Repositories/RecipientRepositoryTests.cs index 5a1f86f..54c6419 100644 --- a/src/ProjectOrigin.Stamp.Test/Repositories/RecipientRepositoryTests.cs +++ b/test/ProjectOrigin.Stamp.Test/Repositories/RecipientRepositoryTests.cs @@ -1,8 +1,8 @@ using FluentAssertions; -using ProjectOrigin.Stamp.Server.Repositories; +using ProjectOrigin.Stamp.Repositories; using Npgsql; using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; -using ProjectOrigin.Stamp.Server.Models; +using ProjectOrigin.Stamp.Models; using ProjectOrigin.Stamp.Test.TestClassFixtures; using Xunit; diff --git a/src/ProjectOrigin.Stamp.Test/Repositories/WithdrawnCertificateRepositoryTests.cs b/test/ProjectOrigin.Stamp.Test/Repositories/WithdrawnCertificateRepositoryTests.cs similarity index 95% rename from src/ProjectOrigin.Stamp.Test/Repositories/WithdrawnCertificateRepositoryTests.cs rename to test/ProjectOrigin.Stamp.Test/Repositories/WithdrawnCertificateRepositoryTests.cs index 1cc55f5..9bee791 100644 --- a/src/ProjectOrigin.Stamp.Test/Repositories/WithdrawnCertificateRepositoryTests.cs +++ b/test/ProjectOrigin.Stamp.Test/Repositories/WithdrawnCertificateRepositoryTests.cs @@ -1,6 +1,6 @@ using FluentAssertions; using Npgsql; -using ProjectOrigin.Stamp.Server.Repositories; +using ProjectOrigin.Stamp.Repositories; using ProjectOrigin.Stamp.Test.TestClassFixtures; using Xunit; diff --git a/src/ProjectOrigin.Stamp.Test/Some.cs b/test/ProjectOrigin.Stamp.Test/Some.cs similarity index 89% rename from src/ProjectOrigin.Stamp.Test/Some.cs rename to test/ProjectOrigin.Stamp.Test/Some.cs index eff7037..9037566 100644 --- a/src/ProjectOrigin.Stamp.Test/Some.cs +++ b/test/ProjectOrigin.Stamp.Test/Some.cs @@ -1,5 +1,5 @@ using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; -using ProjectOrigin.Stamp.Server.Services.REST.v1; +using ProjectOrigin.Stamp.Services.REST.v1; using ProjectOrigin.Stamp.Test.Extensions; using System.Text; @@ -27,7 +27,7 @@ public static string Gsrn() return sb.ToString(); } - public static CertificateDto CertificateDto(string gridArea = "DK", uint quantity = 10, DateTimeOffset? start = null, DateTimeOffset? end = null, string? gsrn = null, Server.Services.REST.v1.CertificateType type = Server.Services.REST.v1.CertificateType.Consumption) + public static CertificateDto CertificateDto(string gridArea = "DK", uint quantity = 10, DateTimeOffset? start = null, DateTimeOffset? end = null, string? gsrn = null, Services.REST.v1.CertificateType type = Services.REST.v1.CertificateType.Consumption) { var startTime = start ?? DateTimeOffset.UtcNow; var endTime = end ?? DateTimeOffset.UtcNow.AddHours(1); diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/EntireStackeFixture.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/EntireStackeFixture.cs similarity index 96% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/EntireStackeFixture.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/EntireStackeFixture.cs index 105344a..c661583 100644 --- a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/EntireStackeFixture.cs +++ b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/EntireStackeFixture.cs @@ -1,4 +1,3 @@ -using ProjectOrigin.Stamp.Server; using Xunit; namespace ProjectOrigin.Stamp.Test.TestClassFixtures; diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/PostgresDatabaseFixture.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/PostgresDatabaseFixture.cs similarity index 90% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/PostgresDatabaseFixture.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/PostgresDatabaseFixture.cs index 6f99676..5b0d896 100644 --- a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/PostgresDatabaseFixture.cs +++ b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/PostgresDatabaseFixture.cs @@ -1,9 +1,8 @@ using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; using ProjectOrigin.HierarchicalDeterministicKeys.Implementations; -using ProjectOrigin.Stamp.Server.Database; -using ProjectOrigin.Stamp.Server.Database.Mapping; -using ProjectOrigin.Stamp.Server.Database.Postgres; +using ProjectOrigin.Stamp.Database; +using ProjectOrigin.Stamp.Database.Mapping; +using ProjectOrigin.Stamp.Database.Postgres; using Testcontainers.PostgreSql; using Xunit; diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/ProjectOriginStack.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/ProjectOriginStack.cs similarity index 97% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/ProjectOriginStack.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/ProjectOriginStack.cs index 75f69ad..32221aa 100644 --- a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/ProjectOriginStack.cs +++ b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/ProjectOriginStack.cs @@ -7,7 +7,7 @@ using DotNet.Testcontainers.Builders; using DotNet.Testcontainers.Containers; using Microsoft.IdentityModel.Tokens; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Options; using Testcontainers.PostgreSql; namespace ProjectOrigin.Stamp.Test.TestClassFixtures; @@ -67,7 +67,7 @@ public ProjectOriginStack() { "DK1", Encoding.UTF8.GetBytes(Dk1IssuerKey.ExportPkixText()) }, { "DK2", Encoding.UTF8.GetBytes(Dk2IssuerKey.ExportPkixText()) }, }, - Registries = new List + Registries = new List { new() {Name = RegistryName, Address = RegistryUrl } } diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/RabbitMqContainer.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/RabbitMqContainer.cs similarity index 97% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/RabbitMqContainer.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/RabbitMqContainer.cs index 2a17ef3..b16428c 100644 --- a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/RabbitMqContainer.cs +++ b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/RabbitMqContainer.cs @@ -1,7 +1,7 @@ using System.Text.RegularExpressions; using DotNet.Testcontainers.Builders; using DotNet.Testcontainers.Images; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Options; using Testcontainers.RabbitMq; using Xunit; diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/RegistryFixture.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/RegistryFixture.cs similarity index 100% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/RegistryFixture.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/RegistryFixture.cs diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/StackTestCollection.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/StackTestCollection.cs similarity index 88% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/StackTestCollection.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/StackTestCollection.cs index a2476bb..501d696 100644 --- a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/StackTestCollection.cs +++ b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/StackTestCollection.cs @@ -1,5 +1,4 @@ -using ProjectOrigin.Stamp.Test.TestClassFixtures; using Xunit; namespace ProjectOrigin.Stamp.Test.TestClassFixtures; diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerFixture.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerFixture.cs similarity index 95% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerFixture.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerFixture.cs index 6f35f79..b39da18 100644 --- a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerFixture.cs +++ b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerFixture.cs @@ -22,15 +22,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; using ProjectOrigin.Stamp.Test.TestClassFixtures.TestServerHelpers; -using System.IdentityModel.Tokens.Jwt; -using System.Net.Http.Headers; -using System.Security.Claims; -using ProjectOrigin.Stamp.Server.Options; +using ProjectOrigin.Stamp.Options; using Xunit.Abstractions; -using ProjectOrigin.HierarchicalDeterministicKeys; -using System.Text; namespace ProjectOrigin.Stamp.Test.TestClassFixtures { @@ -65,7 +59,7 @@ public class TestServerFixture : IDisposable where TStartup : class public RegistryOptions RegistryOptions { get; set; } = new() { - Registries = new List(), + Registries = new List(), IssuerPrivateKeyPems = new Dictionary() }; diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerHelpers/ForwardLoggingProvider.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerHelpers/ForwardLoggingProvider.cs similarity index 100% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerHelpers/ForwardLoggingProvider.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerHelpers/ForwardLoggingProvider.cs diff --git a/src/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerHelpers/TestServerContext.cs b/test/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerHelpers/TestServerContext.cs similarity index 100% rename from src/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerHelpers/TestServerContext.cs rename to test/ProjectOrigin.Stamp.Test/TestClassFixtures/TestServerHelpers/TestServerContext.cs diff --git a/src/ProjectOrigin.Stamp.Test/ValueObjects/PeriodTests.cs b/test/ProjectOrigin.Stamp.Test/ValueObjects/PeriodTests.cs similarity index 97% rename from src/ProjectOrigin.Stamp.Test/ValueObjects/PeriodTests.cs rename to test/ProjectOrigin.Stamp.Test/ValueObjects/PeriodTests.cs index e662d59..80748fc 100644 --- a/src/ProjectOrigin.Stamp.Test/ValueObjects/PeriodTests.cs +++ b/test/ProjectOrigin.Stamp.Test/ValueObjects/PeriodTests.cs @@ -1,5 +1,5 @@ using FluentAssertions; -using ProjectOrigin.Stamp.Server.ValueObjects; +using ProjectOrigin.Stamp.ValueObjects; using Xunit; namespace ProjectOrigin.Stamp.Test.ValueObjects; diff --git a/src/ProjectOrigin.Stamp.Test/rabbitmq.dockerfile b/test/ProjectOrigin.Stamp.Test/rabbitmq.dockerfile similarity index 100% rename from src/ProjectOrigin.Stamp.Test/rabbitmq.dockerfile rename to test/ProjectOrigin.Stamp.Test/rabbitmq.dockerfile