Skip to content

feat(pr: issue-543): add tests for cgen-api #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
live-dev999 merged 7 commits into from
Feb 19, 2023
Merged

feat(pr: issue-543): add tests for cgen-api #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7b5a13
fix(issue-540): add docker of smart-subscriber service
live-dev999 Feb 7, 2023
4fa4936
fix(issue-540): add version controller of smart-subscriber service
live-dev999 Feb 7, 2023
faeab25
#543: add api service of community
live-dev999 Feb 9, 2023
ceeb5b1
#543: add empty project of client with react typescrpt
live-dev999 Feb 9, 2023
8e94a91
#543: add tests for cgen-api
live-dev999 Feb 13, 2023
e2b45d9
feat(issue-543): add tests for cgen-api
live-dev999 Feb 19, 2023
c91d246
feat(issue-543): update cgen-api in pfr-centr app
live-dev999 Feb 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 62 additions & 62 deletions ...ices/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<UserSecretsId>e238f36a-3514-4436-b624-9b4f799bb82d</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..\..</DockerfileContext>
<DockerComposeProjectPath>../docker-compose.dcproj</DockerComposeProjectPath>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<UserSecretsId>e238f36a-3514-4436-b624-9b4f799bb82d</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..\..</DockerfileContext>
<DockerComposeProjectPath>../docker-compose.dcproj</DockerComposeProjectPath>
</PropertyGroup>

<ItemGroup>
<Folder Include="wwwroot\" />
<Folder Include="Services\" />
<Folder Include="ViewModels\" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\"/>
<Folder Include="Services\"/>
<Folder Include="ViewModels\"/>
</ItemGroup>

<ItemGroup>
<ItemGroup>

<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.11" />
<PackageReference Include="O2NextGen.Sdk.NetCore.Models" Version="1.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
<PackageReference Include="QRCoder" Version="1.4.1" />
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
<PackageReference Include="MediatR" Version="11.1.0" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
</ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.0.0"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.11"/>
<PackageReference Include="O2NextGen.Sdk.NetCore.Models" Version="1.0.0"/>
<PackageReference Include="System.Drawing.Common" Version="5.0.2"/>
<PackageReference Include="QRCoder" Version="1.4.1"/>
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64"/>
<PackageReference Include="MediatR" Version="11.1.0"/>
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\O2NextGen.CertificateManagement.Business\O2NextGen.CertificateManagement.Business.csproj" />
<ProjectReference Include="..\O2NextGen.CertificateManagement.Data\O2NextGen.CertificateManagement.Data.csproj" />
<ProjectReference Include="..\O2NextGen.CertificateManagement.Impl\O2NextGen.CertificateManagement.Impl.csproj">
<GlobalPropertiesToRemove></GlobalPropertiesToRemove>
</ProjectReference>
<ProjectReference Include="..\O2NextGen.CertificateManagement.Domain\O2NextGen.CertificateManagement.Domain.csproj">
<GlobalPropertiesToRemove></GlobalPropertiesToRemove>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\O2NextGen.CertificateManagement.Business\O2NextGen.CertificateManagement.Business.csproj"/>
<ProjectReference Include="..\O2NextGen.CertificateManagement.Data\O2NextGen.CertificateManagement.Data.csproj"/>
<ProjectReference Include="..\O2NextGen.CertificateManagement.Impl\O2NextGen.CertificateManagement.Impl.csproj">
<GlobalPropertiesToRemove></GlobalPropertiesToRemove>
</ProjectReference>
<ProjectReference Include="..\O2NextGen.CertificateManagement.Domain\O2NextGen.CertificateManagement.Domain.csproj">
<GlobalPropertiesToRemove></GlobalPropertiesToRemove>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<_ContentIncludedByDefault Remove="Views\Certificates\Create.cshtml" />
<_ContentIncludedByDefault Remove="Views\Certificates\Detail.cshtml" />
<_ContentIncludedByDefault Remove="Views\Certificates\Index.cshtml" />
<_ContentIncludedByDefault Remove="Views\_ViewImports.cshtml" />
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="Views\Certificates\Create.cshtml"/>
<_ContentIncludedByDefault Remove="Views\Certificates\Detail.cshtml"/>
<_ContentIncludedByDefault Remove="Views\Certificates\Index.cshtml"/>
<_ContentIncludedByDefault Remove="Views\_ViewImports.cshtml"/>
</ItemGroup>

<ItemGroup>
<Compile Remove="Logs\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Logs\**"/>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Remove="Logs\**" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="Logs\**"/>
</ItemGroup>

<ItemGroup>
<None Remove="Logs\**" />
<None Remove="Services\" />
<None Remove="ViewModels\" />
<None Remove="MediatR" />
<None Remove="MediatR.Extensions.Microsoft.DependencyInjection" />
</ItemGroup>
<ItemGroup>
<None Remove="Logs\**"/>
<None Remove="Services\"/>
<None Remove="ViewModels\"/>
<None Remove="MediatR"/>
<None Remove="MediatR.Extensions.Microsoft.DependencyInjection"/>
</ItemGroup>

<ItemGroup>
<Content Remove="Logs\**" />
<Content Remove="Properties\launchSettings.json" />
</ItemGroup>
<ItemGroup>
<None Include="Properties\launchSettings.json" />
</ItemGroup>
<ItemGroup>
<Content Remove="Logs\**"/>
<Content Remove="Properties\launchSettings.json"/>
</ItemGroup>
<ItemGroup>
<None Include="Properties\launchSettings.json"/>
</ItemGroup>
</Project>
62 changes: 33 additions & 29 deletions ...rvices/c-gen/O2NextGen.CertificateManagement.Application/Controllers/VersionController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,47 @@
using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Reflection;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;

namespace O2NextGen.CertificateManagement.Application.Controllers
{
namespace O2NextGen.CertificateManagement.Application.Controllers;

[AllowAnonymous]
public class VersionController : ControllerBase
{
#region Fields
[AllowAnonymous]
[ApiController]
[Route("[controller]")]
public class VersionController : ControllerBase
{
#region Fields

private readonly IWebHostEnvironment _environment;
private readonly ILogger<VersionController> _logger;
private readonly IWebHostEnvironment _environment;
private readonly ILogger<VersionController> _logger;

#endregion
#endregion


#region Ctors
#region Ctors

public VersionController(IWebHostEnvironment environment, ILogger<VersionController> logger)
{
_environment = environment;
_logger = logger;
}
public VersionController(IWebHostEnvironment environment, ILogger<VersionController> logger)
{
_environment = environment;
_logger = logger;
}

#endregion
#endregion

[HttpGet("[controller]")]
public object Index()
[HttpGet]
public object Index()
{
var exVersion = GetVersion();
_logger.LogInformation($"get version - {exVersion}");
return new
{
var exVersion = Assembly.GetExecutingAssembly().GetName().Version;
_logger.LogInformation($"get version - {exVersion}");
return new
{
Environment = _environment.EnvironmentName,
Version = exVersion.ToString()
};
}
Environment = _environment.EnvironmentName,
Version = exVersion?.ToString()
};
}

protected virtual Version GetVersion()
{
var exVersion = Assembly.GetExecutingAssembly().GetName().Version;
return exVersion ?? throw new InvalidOperationException();
}
}
19 changes: 19 additions & 0 deletions src/Services/c-gen/O2NextGen.CertificateManagement.Application/CustomExtensionsMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using O2NextGen.CertificateManagement.Application.Services;

internal static class CustomExtensionsMethods
{
public static IServiceCollection AddCustomIntegrations(this IServiceCollection services,
IConfiguration configuration)
{
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
services.AddTransient<IIdentityService, IdentityService>();
services.AddTransient<ICustomerService, CustomerService>();
if (configuration["isTest"] == bool.FalseString.ToLowerInvariant())
services.AddHttpClient<IQrCodeService, QrCodeService>();


services.AddHttpClient<ITemplateService, TemplateService>();
// services.AddHttpClient<ISubscribeService, SubscribeService>();
return services;
}
}
9 changes: 5 additions & 4 deletions src/Services/c-gen/O2NextGen.CertificateManagement.Application/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
RUN apt-get update && apt-get install -y libgdiplus
WORKDIR /app
EXPOSE 80
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["O2NextGen.CertificateManagement.Application/O2NextGen.CertificateManagement.Application.csproj", "O2NextGen.CertificateManagement.Application/"]
COPY ["O2NextGen.CertificateManagement.Domain/O2NextGen.CertificateManagement.Domain.csproj", "O2NextGen.CertificateManagement.Domain/"]
COPY ["O2NextGen.CertificateManagement.Infrastructure/O2NextGen.CertificateManagement.Infrastructure.csproj", "O2NextGen.CertificateManagement.Infrastructure/"]
COPY ["O2NextGen.CertificateManagement.Application/O2NextGen.CertificateManagement.Application.csproj", "O2NextGen.CertificateManagement.Application/"]
COPY ["O2NextGen.CertificateManagement.Domain/O2NextGen.CertificateManagement.Domain.csproj", "O2NextGen.CertificateManagement.Domain/"]
COPY ["O2NextGen.CertificateManagement.Infrastructure/O2NextGen.CertificateManagement.Infrastructure.csproj", "O2NextGen.CertificateManagement.Infrastructure/"]
COPY ["O2NextGen.CertificateManagement.StartupTasks/O2NextGen.CertificateManagement.StartupTasks.csproj", "O2NextGen.CertificateManagement.StartupTasks/"]
RUN dotnet restore "O2NextGen.CertificateManagement.Application/O2NextGen.CertificateManagement.Application.csproj"
COPY . .
Expand Down
Loading