Move and clean models in preparation of moving subscribe in WA

leotsarev · leotsarev · commit d67c77a51639 · 2021-05-03T19:38:24.000+03:00
diff --git a/Joinrpg.sln b/Joinrpg.sln
@@ -105,6 +105,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JoinRpg.BlobStorage", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JoinRpg.WebComponents", "src\JoinRpg.WebComponents\JoinRpg.WebComponents.csproj", "{80AF606D-0576-480E-8D2E-AE736C2EE73C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JoinRpg.Web.GameSubscribe", "src\JoinRpg.Web.GameSubscribe\JoinRpg.Web.GameSubscribe.csproj", "{C5FDCE34-6DE6-444A-B066-3F80D0527053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -267,6 +269,10 @@ Global
 		{80AF606D-0576-480E-8D2E-AE736C2EE73C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80AF606D-0576-480E-8D2E-AE736C2EE73C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80AF606D-0576-480E-8D2E-AE736C2EE73C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5FDCE34-6DE6-444A-B066-3F80D0527053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5FDCE34-6DE6-444A-B066-3F80D0527053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5FDCE34-6DE6-444A-B066-3F80D0527053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5FDCE34-6DE6-444A-B066-3F80D0527053}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -302,6 +308,7 @@ Global
 		{AC09C4CB-0D6C-4301-A4BF-8129A9881BE5} = {B8A1A61E-CD98-49F5-98BA-30B0869576B1}
 		{3623C97E-251A-4233-A359-18F76F9598C8} = {7645AC35-A68C-40EF-8AAD-1BF62D822E4C}
 		{80AF606D-0576-480E-8D2E-AE736C2EE73C} = {B3BB8906-62C8-44A0-822C-566A144C05AE}
+		{C5FDCE34-6DE6-444A-B066-3F80D0527053} = {B3BB8906-62C8-44A0-822C-566A144C05AE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1A5E4F92-A0F4-4350-92C7-361C88D58588}
diff --git a/src/JoinRpg.DI/JoinrpgMainModule.cs b/src/JoinRpg.DI/JoinrpgMainModule.cs
@@ -17,7 +17,7 @@ protected override void Load(ContainerBuilder builder)
         {
             _ = builder.RegisterTypes(RepositoriesRegistraton.GetTypes().ToArray()).AsImplementedInterfaces();
             _ = builder.RegisterTypes(Services.Impl.Services.GetTypes().ToArray()).AsImplementedInterfaces();
-            _ = builder.RegisterTypes(WebPortal.Managers.Registration.GetTypes().ToArray()).AsSelf();
+            _ = builder.RegisterTypes(WebPortal.Managers.Registration.GetTypes().ToArray()).AsSelf().AsImplementedInterfaces();
 
             _ = builder.RegisterType<ExportDataServiceImpl>().As<IExportDataService>();
             _ = builder.RegisterType<EmailServiceImpl>().As<IEmailService>();
diff --git a/src/JoinRpg.Portal/Controllers/GameSubscribeController.cs b/src/JoinRpg.Portal/Controllers/GameSubscribeController.cs
@@ -7,6 +7,7 @@
 using JoinRpg.Portal.Infrastructure.Authentication;
 using JoinRpg.Portal.Infrastructure.Authorization;
 using JoinRpg.Services.Interfaces;
+using JoinRpg.Web.GameSubscribe;
 using JoinRpg.Web.Models;
 using JoinRpg.Web.Models.Subscribe;
 using JoinRpg.WebPortal.Managers.Subscribe;
@@ -21,31 +22,33 @@ public class GameSubscribeController : Common.ControllerGameBase
         private readonly IUserSubscribeRepository userSubscribeRepository;
         private readonly IUserRepository userRepository;
         private readonly IUriService uriService;
-        private readonly SubscribeViewService subscribeViewService;
+        private readonly IGameSubscribeClient subscribeClient;
 
         public GameSubscribeController(
             IUserSubscribeRepository userSubscribeRepository,
             IUserRepository userRepository,
             IUriService uriService,
             IProjectRepository projectRepository,
             IProjectService projectService,
-            SubscribeViewService subscribeViewService)
+            IGameSubscribeClient subscribeClient
+            )
             : base(projectRepository, projectService, userRepository)
         {
             this.userSubscribeRepository = userSubscribeRepository;
             this.userRepository = userRepository;
             this.uriService = uriService;
-            this.subscribeViewService = subscribeViewService;
+            this.subscribeClient = subscribeClient;
         }
 
         [HttpGet("{masterId}")]
         public async Task<ActionResult> ByMaster(int projectId, int masterId)
         {
-            var subscribeViewModel = await subscribeViewService.GetSubscribeForMaster(projectId, masterId);
+            var subscribeViewModel = await subscribeClient.GetSubscribeForMaster(projectId, masterId);
 
             var user = await UserRepository.GetById(masterId);
             var currentUser = await userRepository.GetById(User.GetUserIdOrDefault()!.Value);
 
+
             return View(
                 new SubscribeByMasterPageViewModel(
                     new UserProfileDetailsViewModel(user, currentUser),
diff --git a/src/JoinRpg.Portal/Views/GameSubscribe/_SubscribeOptions.cshtml b/src/JoinRpg.Portal/Views/GameSubscribe/_SubscribeOptions.cshtml
@@ -1,4 +1,4 @@
-﻿@using JoinRpg.Web.Models.Subscribe
+﻿@using JoinRpg.Web.GameSubscribe
 @model SubscribeOptionsViewModel 
 @{
     SubscribeOptionsViewModel disabledFlags = new SubscribeOptionsViewModel();
diff --git a/src/JoinRpg.Web.GameSubscribe/IGameSubscribeClient.cs b/src/JoinRpg.Web.GameSubscribe/IGameSubscribeClient.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace JoinRpg.Web.GameSubscribe
+{
+    public interface IGameSubscribeClient
+    {
+        Task<SubscribeListViewModel> GetSubscribeForMaster(int projectId, int masterId);
+    }
+}
diff --git a/src/JoinRpg.Web.GameSubscribe/JoinRpg.Web.GameSubscribe.csproj b/src/JoinRpg.Web.GameSubscribe/JoinRpg.Web.GameSubscribe.csproj
@@ -0,0 +1,25 @@
+﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\JoinRpg.WebComponents\JoinRpg.WebComponents.csproj" />
+    <ProjectReference Include="..\JoinRpg.PrimitiveTypes\JoinRpg.PrimitiveTypes.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/JoinRpg.Web.GameSubscribe/SubscribeListItemViewModel.cs b/src/JoinRpg.Web.GameSubscribe/SubscribeListItemViewModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace JoinRpg.Web.Models.Subscribe
+namespace JoinRpg.Web.GameSubscribe
 {
     public class SubscribeListItemViewModel
     {
diff --git a/src/JoinRpg.Web.GameSubscribe/SubscribeListViewModel.cs b/src/JoinRpg.Web.GameSubscribe/SubscribeListViewModel.cs
@@ -1,4 +1,4 @@
-namespace JoinRpg.Web.Models.Subscribe
+namespace JoinRpg.Web.GameSubscribe
 {
     public class SubscribeListViewModel
     {
diff --git a/src/JoinRpg.Web.GameSubscribe/SubscribeOptionsViewModel.cs b/src/JoinRpg.Web.GameSubscribe/SubscribeOptionsViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using JoinRpg.DataModel;
 
-namespace JoinRpg.Web.Models.Subscribe
+namespace JoinRpg.Web.GameSubscribe
 {
     public class SubscribeOptionsViewModel : ISubscriptionOptions
     {
diff --git a/src/JoinRpg.WebPortal.Managers/JoinRpg.WebPortal.Managers.csproj b/src/JoinRpg.WebPortal.Managers/JoinRpg.WebPortal.Managers.csproj
@@ -3,11 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
-
-    <ItemGroup>
-    </ItemGroup>
     
   <ItemGroup>
+    <ProjectReference Include="..\JoinRpg.Web.GameSubscribe\JoinRpg.Web.GameSubscribe.csproj" />
     <ProjectReference Include="..\JoinRpg.Interfaces\JoinRpg.Interfaces.csproj" />
     <ProjectReference Include="..\JoinRpg.WebPortal.Models\JoinRpg.WebPortal.Models.csproj" />
   </ItemGroup>
diff --git a/src/JoinRpg.WebPortal.Managers/Subscribe/Builders.cs b/src/JoinRpg.WebPortal.Managers/Subscribe/Builders.cs
@@ -5,6 +5,7 @@
 using JoinRpg.Data.Interfaces.Subscribe;
 using JoinRpg.DataModel;
 using JoinRpg.Services.Interfaces;
+using JoinRpg.Web.GameSubscribe;
 
 namespace JoinRpg.Web.Models.Subscribe
 {
diff --git a/src/JoinRpg.WebPortal.Managers/Subscribe/SubscribeViewService.cs b/src/JoinRpg.WebPortal.Managers/Subscribe/SubscribeViewService.cs
@@ -2,11 +2,12 @@
 using JoinRpg.Data.Interfaces;
 using JoinRpg.Interfaces;
 using JoinRpg.Services.Interfaces;
+using JoinRpg.Web.GameSubscribe;
 using JoinRpg.Web.Models.Subscribe;
 
 namespace JoinRpg.WebPortal.Managers.Subscribe
 {
-    public class SubscribeViewService
+    public class SubscribeViewService : IGameSubscribeClient
     {
         private readonly IUriService uriService;
         private readonly IUserSubscribeRepository userSubscribeRepository;
diff --git a/src/JoinRpg.WebPortal.Models/JoinRpg.WebPortal.Models.csproj b/src/JoinRpg.WebPortal.Models/JoinRpg.WebPortal.Models.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\JoinRpg.Web.GameSubscribe\JoinRpg.Web.GameSubscribe.csproj" />
     <ProjectReference Include="..\JoinRpg.PrimitiveTypes\JoinRpg.PrimitiveTypes.csproj" />
     <ProjectReference Include="..\JoinRpg.CommonUI.Models\JoinRpg.CommonUI.Models.csproj" />
     <ProjectReference Include="..\JoinRpg.Data.Interfaces\JoinRpg.Data.Interfaces.csproj" />
diff --git a/src/JoinRpg.WebPortal.Models/Subscribe/SubscribeByMasterPageViewModel.cs b/src/JoinRpg.WebPortal.Models/Subscribe/SubscribeByMasterPageViewModel.cs
@@ -1,3 +1,5 @@
+using JoinRpg.Web.GameSubscribe;
+
 namespace JoinRpg.Web.Models.Subscribe
 {
     public record SubscribeByMasterPageViewModel
diff --git a/src/JoinRpg.WebPortal.Models/Subscribe/SubscribeSettingsViewModel.cs b/src/JoinRpg.WebPortal.Models/Subscribe/SubscribeSettingsViewModel.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using JoinRpg.DataModel;
 using JoinRpg.Domain;
+using JoinRpg.Web.GameSubscribe;
 
 namespace JoinRpg.Web.Models.Subscribe
 {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected override void Load(ContainerBuilder builder)`
`17`	`17`	`{`
`18`	`18`	`_ = builder.RegisterTypes(RepositoriesRegistraton.GetTypes().ToArray()).AsImplementedInterfaces();`
`19`	`19`	`_ = builder.RegisterTypes(Services.Impl.Services.GetTypes().ToArray()).AsImplementedInterfaces();`
`20`		`- _ = builder.RegisterTypes(WebPortal.Managers.Registration.GetTypes().ToArray()).AsSelf();`
	`20`	`+ _ = builder.RegisterTypes(WebPortal.Managers.Registration.GetTypes().ToArray()).AsSelf().AsImplementedInterfaces();`
`21`	`21`
`22`	`22`	`_ = builder.RegisterType<ExportDataServiceImpl>().As<IExportDataService>();`
`23`	`23`	`_ = builder.RegisterType<EmailServiceImpl>().As<IEmailService>();`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@using JoinRpg.Web.Models.Subscribe`
	`1`	`+@using JoinRpg.Web.GameSubscribe`
`2`	`2`	`@model SubscribeOptionsViewModel`
`3`	`3`	`@{`
`4`	`4`	`SubscribeOptionsViewModel disabledFlags = new SubscribeOptionsViewModel();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace JoinRpg.Web.Models.Subscribe`
	`3`	`+namespace JoinRpg.Web.GameSubscribe`
`4`	`4`	`{`
`5`	`5`	`public class SubscribeListItemViewModel`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.ComponentModel.DataAnnotations;`
`2`	`2`	`using JoinRpg.DataModel;`
`3`	`3`
`4`		`-namespace JoinRpg.Web.Models.Subscribe`
	`4`	`+namespace JoinRpg.Web.GameSubscribe`
`5`	`5`	`{`
`6`	`6`	`public class SubscribeOptionsViewModel : ISubscriptionOptions`
`7`	`7`	`{`