Skip to content

feat(issue-197): add o2nextgen.sdk.netcore sdk #233

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 5 commits into from
Mar 24, 2022
Merged

feat(issue-197): add o2nextgen.sdk.netcore sdk #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecfab0e
chore(issue-197): code cleanup
live-dev999 Mar 24, 2022
4fabb81
feat(issue-197): add shared sdk lib with models
live-dev999 Mar 24, 2022
c0b276b
feat(issue-197): add sdk model lib to base solution
live-dev999 Mar 24, 2022
dbccf5a
faet(issue-197): add unittest project to solution
live-dev999 Mar 24, 2022
bf6c045
feat(issue-197): move exist models to sdk with share models
live-dev999 Mar 24, 2022
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
17 changes: 17 additions & 0 deletions src/O2NextGen-Prototypes.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2.Tracker.DbUtility", "Ser
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{5815FA40-82B7-400D-8FB0-667EED9DC622}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdks", "Sdks", "{033E8CA1-0464-45EB-B207-29EAB055FD9E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NG.Sdk.NetCore.Models", "SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NG.Sdk.NetCore.Models.csproj", "{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -249,6 +253,18 @@ Global
{5815FA40-82B7-400D-8FB0-667EED9DC622}.Release|x64.Build.0 = Release|Any CPU
{5815FA40-82B7-400D-8FB0-667EED9DC622}.Release|x86.ActiveCfg = Release|Any CPU
{5815FA40-82B7-400D-8FB0-667EED9DC622}.Release|x86.Build.0 = Release|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|x64.ActiveCfg = Debug|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|x64.Build.0 = Debug|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|x86.ActiveCfg = Debug|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|x86.Build.0 = Debug|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|Any CPU.Build.0 = Release|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|x64.ActiveCfg = Release|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|x64.Build.0 = Release|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|x86.ActiveCfg = Release|Any CPU
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -274,6 +290,7 @@ Global
{1F48ABFB-4C4A-4E0C-A155-3DBAC0676C95} = {0DB9F20A-FD40-4110-807E-AAEFEFCCD574}
{20D19B8A-3C6E-49B4-BBC9-51EA63B86147} = {0DB9F20A-FD40-4110-807E-AAEFEFCCD574}
{ECC10F39-5198-481C-91D9-40C09A0E323F} = {E88D3DAC-13D1-4711-9ADD-BE97A3A57212}
{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE} = {033E8CA1-0464-45EB-B207-29EAB055FD9E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5C9AF9F4-BF0A-486D-9F2E-17FE2F53F7E9}
Expand Down
7 changes: 7 additions & 0 deletions src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NG.Sdk.NetCore.Models.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion ...gement.Api/Models/CertificateViewModel.cs → ...Core.Models/c-gen/CertificateViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace O2NextGen.CertificateManagement.Api.Models
namespace O2NextGen.CertificateManagement.Api.Models.CGen
{
public class CertificateViewModel
{
Expand Down
17 changes: 17 additions & 0 deletions src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/e-sender/EmailRequestViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace O2NextGen.CertificateManagement.Api.Models.ESender
{
public class EmailRequestViewModel : IViewModel
{
public long Id { get; set; }
public string ExternalId { get; set; }
public long? ModifiedDate { get; set; }
public long? AddedDate { get; set; }
public long? DeletedDate { get; set; }
public bool? IsDeleted { get; set; }
public string From { get; set; }
public string To { get; set; }
public string Body { get; set; }
public string Subject { get; set; }
}
}

13 changes: 13 additions & 0 deletions src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/e-sender/IViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace O2NextGen.CertificateManagement.Api.Models.ESender
{
public interface IViewModel
{
long Id { get; set; }
string ExternalId { get; set; }
long? ModifiedDate { get; set; }
long? AddedDate { get; set; }
long? DeletedDate { get; set; }
bool? IsDeleted { get; set; }
}
}

36 changes: 36 additions & 0 deletions src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32112.339
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NG.Sdk.NetCore.Models", "O2NG.Sdk.NetCore.Models\O2NG.Sdk.NetCore.Models.csproj", "{89B48F28-7C0F-4329-9314-89511DB28429}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BEBD1434-109A-46D3-8377-50409D9E15FC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NG.Sdk.NetCore.Models", "Tests\Tests.O2NG.Sdk.NetCore.Models\Tests.O2NG.Sdk.NetCore.Models.csproj", "{9FA54822-4861-41BB-868F-476C517EF5D9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{89B48F28-7C0F-4329-9314-89511DB28429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89B48F28-7C0F-4329-9314-89511DB28429}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89B48F28-7C0F-4329-9314-89511DB28429}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89B48F28-7C0F-4329-9314-89511DB28429}.Release|Any CPU.Build.0 = Release|Any CPU
{9FA54822-4861-41BB-868F-476C517EF5D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FA54822-4861-41BB-868F-476C517EF5D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FA54822-4861-41BB-868F-476C517EF5D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FA54822-4861-41BB-868F-476C517EF5D9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{9FA54822-4861-41BB-868F-476C517EF5D9} = {BEBD1434-109A-46D3-8377-50409D9E15FC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A6924222-66FF-4D49-A1AB-943C94659F1D}
EndGlobalSection
EndGlobal
20 changes: 20 additions & 0 deletions ...O2NG.Sdk.NetCore/Tests/Tests.O2NG.Sdk.NetCore.Models/Tests.O2NG.Sdk.NetCore.Models.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="coverlet.collector" Version="3.0.2" />
</ItemGroup>

<ItemGroup>
<Folder Include="c-gen\" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
Expand Down
3 changes: 1 addition & 2 deletions src/Services/auth/O2NextGen.Auth.Web/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Text.Encodings.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.UI.Services;
Expand Down
3 changes: 1 addition & 2 deletions src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/CertificatesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using O2NextGen.CertificateManagement.Api.Models;
using O2NextGen.CertificateManagement.Api.Setup;
using O2NextGen.CertificateManagement.Business.Services;
using O2NextGen.CertificateManagement.Api.Mappings;
using O2NextGen.CertificateManagement.Api.Models.CGen;

namespace O2NextGen.CertificateManagement.Api.Controllers
{
Expand Down
3 changes: 1 addition & 2 deletions src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
Expand All @@ -7,7 +6,7 @@

namespace O2NextGen.CertificateManagement.Api.Controllers
{

[AllowAnonymous]
public class VersionController:ControllerBase
{
Expand Down
2 changes: 1 addition & 1 deletion src/Services/c-gen/O2NextGen.CertificateManagement.Api/Mappings/CertificateMappings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using O2NextGen.CertificateManagement.Api.Models;
using O2NextGen.CertificateManagement.Api.Models.CGen;
using O2NextGen.CertificateManagement.Business.Models;

namespace O2NextGen.CertificateManagement.Api.Mappings
Expand Down
1 change: 1 addition & 0 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
Expand Up @@ -30,6 +30,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NG.Sdk.NetCore.Models.csproj" />
<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">
Expand Down
1 change: 0 additions & 1 deletion src/Services/c-gen/O2NextGen.CertificateManagement.Impl/Services/CertificatesService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
Expand Down
2 changes: 1 addition & 1 deletion src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using O2NextGen.CertificateManagement.Api.Models.ESender;
using O2NextGen.ESender.Api.Helpers;
using O2NextGen.ESender.Api.Mappings;
using O2NextGen.ESender.Api.Models;
using O2NextGen.ESender.Business.Services;

namespace O2NextGen.ESender.Api.Controllers
Expand Down
2 changes: 1 addition & 1 deletion src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using O2NextGen.CertificateManagement.Api.Models.ESender;
using O2NextGen.ESender.Api.Helpers;
using O2NextGen.ESender.Api.Mappings;
using O2NextGen.ESender.Api.Models;
using O2NextGen.ESender.Business.Services;

namespace O2NextGen.ESender.Api.Controllers
Expand Down
3 changes: 1 addition & 2 deletions src/Services/e-sender/O2NextGen.ESender.Api/Controllers/VersionController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Reflection;
using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
Expand Down
5 changes: 0 additions & 5 deletions src/Services/e-sender/O2NextGen.ESender.Api/IoC/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
using System;
using System.Linq;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Formatters;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using O2NextGen.ESender.Api.Filters;
using O2NextGen.ESender.Api.Helpers;
using O2NextGen.ESender.Business.Services;
Expand Down
2 changes: 1 addition & 1 deletion src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using O2NextGen.CertificateManagement.Api.Models.ESender;
using O2NextGen.ESender.Api.Extensions;
using O2NextGen.ESender.Api.Models;
using O2NextGen.ESender.Business.Models;

namespace O2NextGen.ESender.Api.Mappings
Expand Down
2 changes: 1 addition & 1 deletion src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using O2NextGen.ESender.Api.Models;
using O2NextGen.CertificateManagement.Api.Models.ESender;
using O2NextGen.ESender.Business.Models;

namespace O2NextGen.ESender.Api.Mappings
Expand Down
27 changes: 0 additions & 27 deletions src/Services/e-sender/O2NextGen.ESender.Api/Models/EmailRequestViewModel.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<ItemGroup>
<Folder Include="wwwroot\" />
<Folder Include="Models\" />
<Folder Include="Views\" />
<Folder Include="Views\Board\" />
</ItemGroup>
Expand Down Expand Up @@ -39,6 +38,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NG.Sdk.NetCore.Models.csproj" />
<ProjectReference Include="..\O2NextGen.ESender.Business\O2NextGen.ESender.Business.csproj" />
<ProjectReference Include="..\O2NextGen.ESender.Impl\O2NextGen.ESender.Impl.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Services/e-sender/O2NextGen.ESender.Api/Views/_ViewImports.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@using O2NextGen.ESender.Api.Models
@using O2NextGen.CertificateManagement.Api.Models.ESender
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
5 changes: 1 addition & 4 deletions src/Services/on-tracker/O2.OnTracker.Api/Controllers/ValuesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Mvc;
using O2.Tracker.DbUtility;
Expand Down
9 changes: 1 addition & 8 deletions src/Services/on-tracker/O2.OnTracker.Api/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;

namespace O2.OnTracker.Api
{
Expand Down
3 changes: 1 addition & 2 deletions src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/VersionController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Reflection;
using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
Expand Down