Create Wishmaster.Backend

gluschenko · gluschenko · commit 0f3c45d81fad · 2022-08-10T23:25:01.000+03:00
diff --git a/src/CodeBaseResearch.sln b/src/CodeBaseResearch.sln
@@ -45,7 +45,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{34CB
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{1A11F1C7-3BEF-41B9-AA32-4089A82D52F5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wishmaster.ViewModels", "Wishmaster.ViewModels\Wishmaster.ViewModels.csproj", "{2C0C33D9-F77C-4BC9-A76B-6E4684C44484}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wishmaster.ViewModels", "Wishmaster.ViewModels\Wishmaster.ViewModels.csproj", "{2C0C33D9-F77C-4BC9-A76B-6E4684C44484}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wishmaster.Backend", "Wishmaster.Backend\Wishmaster.Backend.csproj", "{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -105,6 +107,10 @@ Global
 		{2C0C33D9-F77C-4BC9-A76B-6E4684C44484}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C0C33D9-F77C-4BC9-A76B-6E4684C44484}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C0C33D9-F77C-4BC9-A76B-6E4684C44484}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -125,6 +131,7 @@ Global
 		{34CB587C-1143-49CD-998B-9D2EC0433B8A} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
 		{1A11F1C7-3BEF-41B9-AA32-4089A82D52F5} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
 		{2C0C33D9-F77C-4BC9-A76B-6E4684C44484} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
+		{88324AD6-95BB-4005-A3A6-8F5BBE67FDDA} = {1F050E3A-0A38-4AF1-B07C-B617830BF970}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32FDA729-10C6-4F1C-A4ED-3CF3428EA708}
diff --git a/src/Wishmaster.Backend/Controllers/AppDataController.cs b/src/Wishmaster.Backend/Controllers/AppDataController.cs
@@ -1,12 +1,12 @@
 ﻿using System.Linq;
 using Microsoft.AspNetCore.Mvc;
-using Wishmaster.Mvc;
-using Wishmaster.Services;
+using Wishmaster.Backend.Mvc;
+using Wishmaster.Backend.Services;
 using Wishmaster.ViewModels;
 
-namespace Wishmaster.Controllers
+namespace Wishmaster.Backend.Controllers
 {
-    [Route("api")]
+    [Route("api/app-data")]
     public class AppDataController : BaseController
     {
         private readonly INavigationService _navigationService;
@@ -17,16 +17,16 @@ public AppDataController(INavigationService navigationService)
         }
 
         [HttpGet("get-app-data")]
-        public IActionResult GetAppData()
+        public ActionResult<AppDataViewModel> GetAppData()
         {
             var links = _navigationService.GetSidebarLinks();
 
-            var viewModel = new AppDataViewModel 
+            var viewModel = new AppDataViewModel
             {
                 SidebarNavigation = links.Select(x => x.ToViewModel()).ToArray(),
             };
 
-            return Success(viewModel);
+            return Json(viewModel);
         }
     }
 }
diff --git a/src/Wishmaster.Backend/Controllers/SpaceController.cs b/src/Wishmaster.Backend/Controllers/SpaceController.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using Microsoft.AspNetCore.Mvc;
-using Wishmaster.Mvc;
+using Wishmaster.Backend.Mvc;
 
-namespace Wishmaster.Controllers
+namespace Wishmaster.Backend.Controllers
 {
     [Route("api/space")]
     public class SpaceController : BaseController
@@ -13,9 +13,9 @@ public SpaceController()
         }
 
         [HttpGet("list")]
-        public IActionResult List()
+        public ActionResult<string> List()
         {
-            return Success("HELLO");
+            return Json("HELLO");
         }
     }
 }
diff --git a/src/Wishmaster.Backend/Models/AppData.cs b/src/Wishmaster.Backend/Models/AppData.cs
@@ -1,13 +1,13 @@
 ﻿using System.Collections.Generic;
 using System.Windows;
 
-namespace Wishmaster.Models
+namespace Wishmaster.Backend.Models
 {
     public class AppData
     {
         public int? WindowWidth { get; set; }
         public int? WindowHeight { get; set; }
-        public WindowState? WindowState { get; set; }
+        public int? WindowState { get; set; }
 
         public string AccessToken { get; set; } = "";
         public List<ScopeDataItem> Scopes { get; set; } = new List<ScopeDataItem>();
diff --git a/src/Wishmaster.Backend/Models/Navigation/NavLink.cs b/src/Wishmaster.Backend/Models/Navigation/NavLink.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using Wishmaster.ViewModels;
 
-namespace Wishmaster.Models.Navigation
+namespace Wishmaster.Backend.Models.Navigation
 {
     public class NavLink
     {
diff --git a/src/Wishmaster.Backend/Mvc/ApiResponse.cs b/src/Wishmaster.Backend/Mvc/ApiResponse.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Wishmaster.Mvc
+namespace Wishmaster.Backend.Mvc
 {
     public class ApiResponse<T>
     {
diff --git a/src/Wishmaster.Backend/Mvc/BaseController.cs b/src/Wishmaster.Backend/Mvc/BaseController.cs
@@ -0,0 +1,29 @@
+﻿using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Newtonsoft.Json;
+
+namespace Wishmaster.Backend.Mvc
+{
+    public abstract class BaseController : Controller
+    {
+        [NonAction]
+        protected ActionResult<ApiResponse<T>> Success<T>(T model)
+            => ApiResponse<T>.Success(model);
+
+        [NonAction]
+        protected ActionResult<ApiResponse<object>> Success(object? model = null)
+            => Success<object>(model!);
+
+        [NonAction]
+        protected ActionResult<ApiResponse<object>> Failure(ResultCode errorCode, string message)
+            => ApiResponse<object>.Failure(errorCode, message);
+
+        [NonAction]
+        protected ActionResult<ApiResponse<object>> Failure(ModelStateDictionary modelState)
+        {
+            var messages = modelState.Values.SelectMany(x => x.Errors, (x, y) => y.ErrorMessage);
+            return ApiResponse<object>.Failure(ResultCode.BadRequest, JsonConvert.SerializeObject(messages));
+        }
+    }
+}
diff --git a/src/Wishmaster.Backend/Mvc/UrlHelperAccessor.cs b/src/Wishmaster.Backend/Mvc/UrlHelperAccessor.cs
@@ -1,9 +1,10 @@
-﻿using Microsoft.AspNetCore.Mvc;
+﻿using System;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Wishmaster.Mvc
+namespace Wishmaster.Backend.Mvc
 {
     public class UrlHelperAccessor
     {
@@ -23,7 +24,7 @@ public IUrlHelper GetHelper()
         {
             return _actionContextAccessor.ActionContext != null
                 ? _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext)
-                : throw new System.Exception("Service currently created not by controller action");
+                : throw new Exception("Service currently created not by controller action");
         }
     }
 
diff --git a/src/Wishmaster.Backend/Services/AppDataProvider.cs b/src/Wishmaster.Backend/Services/AppDataProvider.cs
@@ -1,6 +1,6 @@
-﻿using Wishmaster.Models;
+﻿using Wishmaster.Backend.Models;
 
-namespace Wishmaster.Services
+namespace Wishmaster.Backend.Services
 {
     public interface IAppDataProvider
     {
diff --git a/src/Wishmaster.Backend/Services/DataManager.cs b/src/Wishmaster.Backend/Services/DataManager.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using Newtonsoft.Json;
 
-namespace Wishmaster.Services
+namespace Wishmaster.Backend.Services
 {
     public class DataManager<T>
     {
diff --git a/src/Wishmaster.Backend/Services/NavigationService.cs b/src/Wishmaster.Backend/Services/NavigationService.cs
@@ -1,9 +1,9 @@
 ﻿using System.Collections.Generic;
-using Wishmaster.Controllers;
-using Wishmaster.Models.Navigation;
-using Wishmaster.Mvc;
+using Wishmaster.Backend.Controllers;
+using Wishmaster.Backend.Models.Navigation;
+using Wishmaster.Backend.Mvc;
 
-namespace Wishmaster.Services
+namespace Wishmaster.Backend.Services
 {
     public interface INavigationService
     {
@@ -23,7 +23,7 @@ public IEnumerable<NavLink> GetSidebarLinks()
         {
             var urlHelper = _urlHelperAccessor.GetHelper();
 
-            return new[] 
+            return new[]
             {
                 new NavLink("Spaces", urlHelper.Action<SpaceController>(x => nameof(x.List))),
             };
diff --git a/src/Wishmaster.Backend/Services/SpaceService.cs b/src/Wishmaster.Backend/Services/SpaceService.cs
@@ -4,7 +4,7 @@
 using Wishmaster.DataAccess;
 using Wishmaster.DataAccess.Models;
 
-namespace Wishmaster.Services
+namespace Wishmaster.Backend.Services
 {
     public interface ISpaceService
     {
diff --git a/src/Wishmaster.Backend/Services/UrlHelperExtensions.cs b/src/Wishmaster.Backend/Services/UrlHelperExtensions.cs
diff --git a/src/Wishmaster.Backend/ViewModels/ViewModelExtensions.cs b/src/Wishmaster.Backend/ViewModels/ViewModelExtensions.cs
@@ -1,12 +1,13 @@
 ﻿using Wishmaster.DataAccess.Models;
+using Wishmaster.ViewModels;
 
-namespace Wishmaster.ViewModels
+namespace Wishmaster.Backend.ViewModels
 {
     public static class ViewModelExtensions
     {
         public static SpaceItemViewModel ToViewModel(this Space space)
         {
-            return new SpaceItemViewModel 
+            return new SpaceItemViewModel
             {
                 Uid = space.Uid,
                 Name = space.Name,
diff --git a/src/Wishmaster.Backend/Wishmaster.Backend.csproj b/src/Wishmaster.Backend/Wishmaster.Backend.csproj
@@ -0,0 +1,27 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Wishmaster.DataAccess\Wishmaster.DataAccess.csproj" />
+    <ProjectReference Include="..\Wishmaster.ViewModels\Wishmaster.ViewModels.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NSwag.AspNetCore" Version="13.16.1" />
+    <PackageReference Include="GitLabApiClient" Version="1.8.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Octokit" Version="1.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Wishmaster/App.xaml.cs b/src/Wishmaster/App.xaml.cs
@@ -7,8 +7,8 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Wishmaster.DataAccess;
-using Wishmaster.Mvc;
-using Wishmaster.Services;
+using Wishmaster.Backend.Mvc;
+using Wishmaster.Backend.Services;
 using Wishmaster.Views;
 
 namespace Wishmaster
@@ -27,6 +27,7 @@ public App()
                 })
                 .ConfigureServices((context, services) =>
                 {
+                    services.AddOpenApiDocument();
                     services.AddSingleton<INavigationService, NavigationService>();
                     services.AddDbContext<Db>(options =>
                     {
diff --git a/src/Wishmaster/Mvc/BaseController.cs b/src/Wishmaster/Mvc/BaseController.cs
diff --git a/src/Wishmaster/Views/MainWindow.xaml.cs b/src/Wishmaster/Views/MainWindow.xaml.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Windows;
-using Wishmaster.Models;
+using Wishmaster.Backend.Models;
+using Wishmaster.Backend.Services;
 using Wishmaster.Services;
 
 namespace Wishmaster.Views
@@ -26,7 +27,7 @@ private void Start()
 
             Width = _appData.WindowWidth ?? ActualWidth;
             Height = _appData.WindowHeight ?? ActualHeight;
-            WindowState = _appData.WindowState ?? WindowState;
+            WindowState = (WindowState?)_appData.WindowState ?? WindowState;
         }
 
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
@@ -52,7 +53,7 @@ private void MainWindow_Closing(object? sender, System.ComponentModel.CancelEven
                     {
                         _appData.WindowWidth = (int)ActualWidth;
                         _appData.WindowHeight = (int)ActualHeight;
-                        _appData.WindowState = WindowState;
+                        _appData.WindowState = (int)WindowState;
                     }
                     else
                     {
diff --git a/src/Wishmaster/WebStartup.cs b/src/Wishmaster/WebStartup.cs
@@ -2,11 +2,13 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
+using Wishmaster.Backend.Controllers;
 
 namespace Wishmaster
 {
@@ -23,6 +25,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services
                 .AddControllers()
+                .AddApplicationPart(Assembly.Load(typeof(AppDataController).Assembly.FullName!))
                 .AddNewtonsoftJson(x => x.SerializerSettings.Formatting = Newtonsoft.Json.Formatting.Indented);
         }
 
diff --git a/src/Wishmaster/Wishmaster.csproj b/src/Wishmaster/Wishmaster.csproj
diff --git a/src/Wishmaster/client-app/src/models.ts b/src/Wishmaster/client-app/src/models.ts
diff --git a/src/Wishmaster/models.nswag b/src/Wishmaster/models.nswag
diff --git a/src/Wishmaster/models_new.nswag b/src/Wishmaster/models_new.nswag

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`using System.Linq;`
`2`	`2`	`using Microsoft.AspNetCore.Mvc;`
`3`		`-using Wishmaster.Mvc;`
`4`		`-using Wishmaster.Services;`
	`3`	`+using Wishmaster.Backend.Mvc;`
	`4`	`+using Wishmaster.Backend.Services;`
`5`	`5`	`using Wishmaster.ViewModels;`
`6`	`6`
`7`		`-namespace Wishmaster.Controllers`
	`7`	`+namespace Wishmaster.Backend.Controllers`
`8`	`8`	`{`
`9`		`- [Route("api")]`
	`9`	`+ [Route("api/app-data")]`
`10`	`10`	`public class AppDataController : BaseController`
`11`	`11`	`{`
`12`	`12`	`private readonly INavigationService _navigationService;`
`@@ -17,16 +17,16 @@ public AppDataController(INavigationService navigationService)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`[HttpGet("get-app-data")]`
`20`		`- public IActionResult GetAppData()`
	`20`	`+ public ActionResult<AppDataViewModel> GetAppData()`
`21`	`21`	`{`
`22`	`22`	`var links = _navigationService.GetSidebarLinks();`
`23`	`23`
`24`		`- var viewModel = new AppDataViewModel`
	`24`	`+ var viewModel = new AppDataViewModel`
`25`	`25`	`{`
`26`	`26`	`SidebarNavigation = links.Select(x => x.ToViewModel()).ToArray(),`
`27`	`27`	`};`
`28`	`28`
`29`		`- return Success(viewModel);`
	`29`	`+ return Json(viewModel);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Microsoft.AspNetCore.Mvc;`
`3`		`-using Wishmaster.Mvc;`
	`3`	`+using Wishmaster.Backend.Mvc;`
`4`	`4`
`5`		`-namespace Wishmaster.Controllers`
	`5`	`+namespace Wishmaster.Backend.Controllers`
`6`	`6`	`{`
`7`	`7`	`[Route("api/space")]`
`8`	`8`	`public class SpaceController : BaseController`
`@@ -13,9 +13,9 @@ public SpaceController()`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`[HttpGet("list")]`
`16`		`- public IActionResult List()`
	`16`	`+ public ActionResult<string> List()`
`17`	`17`	`{`
`18`		`- return Success("HELLO");`
	`18`	`+ return Json("HELLO");`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Windows;`
`3`	`3`
`4`		`-namespace Wishmaster.Models`
	`4`	`+namespace Wishmaster.Backend.Models`
`5`	`5`	`{`
`6`	`6`	`public class AppData`
`7`	`7`	`{`
`8`	`8`	`public int? WindowWidth { get; set; }`
`9`	`9`	`public int? WindowHeight { get; set; }`
`10`		`- public WindowState? WindowState { get; set; }`
	`10`	`+ public int? WindowState { get; set; }`
`11`	`11`
`12`	`12`	`public string AccessToken { get; set; } = "";`
`13`	`13`	`public List<ScopeDataItem> Scopes { get; set; } = new List<ScopeDataItem>();`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using Wishmaster.ViewModels;`
`5`	`5`
`6`		`-namespace Wishmaster.Models.Navigation`
	`6`	`+namespace Wishmaster.Backend.Models.Navigation`
`7`	`7`	`{`
`8`	`8`	`public class NavLink`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace Wishmaster.Mvc`
	`3`	`+namespace Wishmaster.Backend.Mvc`
`4`	`4`	`{`
`5`	`5`	`public class ApiResponse<T>`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`		`-using Microsoft.AspNetCore.Mvc;`
	`1`	`+using System;`
	`2`	`+using Microsoft.AspNetCore.Mvc;`
`2`	`3`	`using Microsoft.AspNetCore.Mvc.Infrastructure;`
`3`	`4`	`using Microsoft.AspNetCore.Mvc.Routing;`
`4`	`5`	`using Microsoft.Extensions.DependencyInjection;`
`5`	`6`
`6`		`-namespace Wishmaster.Mvc`
	`7`	`+namespace Wishmaster.Backend.Mvc`
`7`	`8`	`{`
`8`	`9`	`public class UrlHelperAccessor`
`9`	`10`	`{`
`@@ -23,7 +24,7 @@ public IUrlHelper GetHelper()`
`23`	`24`	`{`
`24`	`25`	`return _actionContextAccessor.ActionContext != null`
`25`	`26`	`? _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext)`
`26`		`- : throw new System.Exception("Service currently created not by controller action");`
	`27`	`+ : throw new Exception("Service currently created not by controller action");`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-using Wishmaster.Models;`
	`1`	`+using Wishmaster.Backend.Models;`
`2`	`2`
`3`		`-namespace Wishmaster.Services`
	`3`	`+namespace Wishmaster.Backend.Services`
`4`	`4`	`{`
`5`	`5`	`public interface IAppDataProvider`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.IO;`
`3`	`3`	`using Newtonsoft.Json;`
`4`	`4`
`5`		`-namespace Wishmaster.Services`
	`5`	`+namespace Wishmaster.Backend.Services`
`6`	`6`	`{`
`7`	`7`	`public class DataManager<T>`
`8`	`8`	`{`