Refactoring

The main server owns the migrations, it's the server part,
it's simpler.

It's Yavsc, not one of its lib.

.github/workflows/buildAndTest.yml

@@ -44,7 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/main.yml

@@ -1,7 +0,0 @@
-on: workflow_call
-jobs:
-  my_first_job:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run my action
-        uses: ./.github/worklflows/dotnet

.gitignore

@@ -7,6 +7,7 @@
 .paket/
 .vs/
 .sass-cache/
+.private/
 
 /out
 bin

.vscode/launch.json

@@ -4,6 +4,32 @@
     // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "C#: sampleWebAsWebApiClient Debug",
+            "type": "dotnet",
+            "request": "launch",
+            "projectPath": "${workspaceFolder}/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj"
+        },
+        {
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/bin/Debug/<target-framework>/<project-name.dll>",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
         
         
    /*   {
@@ -43,7 +69,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/Yavsc/bin/Debug/net8.0/Yavsc.dll",
+            "program": "${workspaceFolder}/src/Yavsc/bin/Debug/net9.0/Yavsc.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/Yavsc",
             "stopAtEntry": false,
@@ -83,6 +109,11 @@
              "serverReadyAction": {
                 "action": "openExternally",
                 "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "presentation": {
+                "hidden": false,
+                "group": "run",
+                "order": 1
             }
         },
         {

.vscode/settings.json

@@ -1,20 +1,9 @@
 {
-    "dotnet-test-explorer.testProjectPath": "**/*Tests.@(csproj|vbproj|fsproj)",
-    "sqltools.connections": [
-        {
-            "previewLimit": 50,
-            "server": "localhost",
-            "port": 5432,
-            "driver": "PostgreSQL",
-            "name": "yavscdev",
-            "group": "yavsc",
-            "database": "YavscDev",
-            "username": "yavscdev",
-            "password": "admin"
-        }
-    ],
+    "dotnet-test-explorer.testProjectPath": "test/**/*Tests.csproj",
+   
     "cSpell.words": [
         "appsettings",
+        "Cratie",
         "Newtonsoft",
         "Npgsql",
         "Yavsc"

.vscode/tasks.json

@@ -9,8 +9,12 @@
             "args": [
                 "build",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+                "/consoleloggerparameters:NoSummary;ForceNoAlign",
+
             ],
+			"group": "build",
+			"isBuildCommand": true,
+			"isTestCommand": false,
             "problemMatcher": "$msCompile"
         },
 		{

Directory.Packages.props

@@ -0,0 +1,50 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="AsciiDocNet" Version="1.0.0" />
+    <PackageVersion Include="bootstrap" Version="5.3.7" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3746" />
+    <PackageVersion Include="Google.Apis.Compute.v1" Version="1.70.0.3829" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8" Version="8.0.5-preview-net9" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="8.0.5-preview-net9" />
+    <PackageVersion Include="IdentityModel.AspNetCore" Version="4.3.0" />
+    <PackageVersion Include="MailKit" Version="4.13.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Antiforgery" Version="2.3.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.3.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.Playwright" Version="1.53.0" />
+    <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
+    <PackageVersion Include="MimeKit" Version="4.13.0" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+    <PackageVersion Include="PayPalMerchantSDK" Version="2.16.250" />
+    <PackageVersion Include="pazof.rules" Version="1.1.3" />
+    <PackageVersion Include="popper.js" Version="1.16.1" />
+    <PackageVersion Include="RazorEngine.NetCore" Version="3.1.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.10" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.3" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.7" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.2" />
+  </ItemGroup>
+</Project>

README.md

@@ -17,15 +17,15 @@ C'est une application mettant en oeuvre une prise de contact entre un demandeur
 
 et, pour execution en environement de développement
 
-```
-   ~/workspace/yavsc/Yavsc @ ASPNETCORE_ENV=Development dotnet run
+```bash
+~/workspace/yavsc/Yavsc @ ASPNETCORE_ENV=Development dotnet run
 ```
 
 ## Tests
 
 Utilisez GNU/Makefile (et visitez le code, dans le dossier `test` ):
 
-[TOREDO] Depuis le répertoire racine:
+[TODO] Depuis le répertoire racine:
 
 ```bash
 make test
@@ -33,13 +33,14 @@ make test
 
 ## Installation / Déploiment / Développement 
 
-### les services kestrel et kestrel-pre
-
-[TODO]
+### les services et l'API
 
 ### La Prod
 
-Une fois sûr de vous, et une fois que Git dit propre votre copie de travail, depuis le répertoire `Yavsc`, lancez `make pushInProd`.
+`cd srv/Yavsc` : `make pushInProd CONFIGURATION=Release`.
+
+puis, pour une première installation
+`make install_service`.
 
 ## Fonctionalités (encore en cours de développement)
 

contrib/yavsc.service

@@ -0,0 +1,27 @@
+[Unit]
+Description=Yavsc
+After=syslog.target
+After=network.target
+
+Wants=postgresql.service
+After=postgresql.service
+
+[Service]
+RestartSec=5s
+Type=simple
+User=www-data
+Group=www-data
+WorkingDirectory=/srv/www/yavsc/
+ExecStart=/srv/www/yavsc/Yavsc
+Restart=always
+Environment="HOME=/srv/www/yavsc"
+Environment="ASPNETCORE_ENVIRONMENT=Production"
+Environment="ASPNETCORE_ConnectionStrings__DefaultConnection=YOUR Postgresql CONNECTION STRING"
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=yavsc
+
+[Install]
+WantedBy=multi-user.target

src/Api/Api.csproj

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>1c73094f-959f-4211-b1a1-6a69b236c283</UserSecretsId>
   </PropertyGroup>
-   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.13" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <ProjectReference Include="../Yavsc.Server/Yavsc.Server.csproj" />
- </ItemGroup>
-</Project>
+  </ItemGroup>
+</Project>

src/Api/Controllers/Blogspot/BlogApiController.cs

@@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Blog;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Blogspot/CommentsApiController.cs

@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Blog;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Blogspot/FileSystemApiController.cs

@@ -111,9 +111,9 @@ namespace Yavsc.ApiControllers
             var user = dbContext.Users.Single(
                 u => u.Id == uid
             );
-            var info = user.MoveUserFileToDir(query.id, query.to);
+            var info = user.MoveUserFileToDir(query.Id, query.To);
             if (!info.Done) return new BadRequestObjectResult(info);
-            return Ok(new { moved = query.id });
+            return Ok(new { moved = query.Id });
         }
 
         [HttpPost]
@@ -124,21 +124,21 @@ namespace Yavsc.ApiControllers
             if (!ModelState.IsValid) {
                 var idvr = new ValidRemoteUserFilePathAttribute();
 
-                return this.BadRequest(new { id = idvr.IsValid(query.id), to = idvr.IsValid(query.to), errors = ModelState });
+                return this.BadRequest(new { id = idvr.IsValid(query.Id), to = idvr.IsValid(query.To), errors = ModelState });
             }
-            _logger.LogInformation($"Valid move query: {query.id} => {query.to}");
+            _logger.LogInformation($"Valid move query: {query.Id} => {query.To}");
             var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
             var user = dbContext.Users.Single(
                 u => u.Id == uid
             );
             try {
-                if (Config.UserFilesOptions.FileProvider.GetFileInfo(Path.Combine(user.UserName, query.id)).Exists)
+                if (Config.UserFilesOptions.FileProvider.GetFileInfo(Path.Combine(user.UserName, query.Id)).Exists)
                 {
-                    var result = user.MoveUserFile(query.id, query.to);
+                    var result = user.MoveUserFile(query.Id, query.To);
                     if (!result.Done) return new BadRequestObjectResult(result);
                 }
                 else {
-                    var result = user.MoveUserDir(query.id, query.to);
+                    var result = user.MoveUserDir(query.Id, query.To);
                     if (!result.Done) return new BadRequestObjectResult(result);
                 }
             }

src/Api/Controllers/Blogspot/MoveFileQuery.cs

@@ -1,23 +1,16 @@
 using Yavsc.Attributes.Validation;
 namespace Yavsc.Models.FileSystem
 {
-        public class RenameFileQuery {
-            [ValidRemoteUserFilePath]
-            [YaStringLength(1, 512)]
-            public string id { get; set; } 
 
-            [YaStringLength(0, 512)]
-            [ValidRemoteUserFilePath]
-            public string to { get; set; } 
-        }
-        public class MoveFileQuery {
-            [ValidRemoteUserFilePath]
-            [YaStringLength(1, 512)]
-            public string id { get; set; } 
+    public class MoveFileQuery
+    {
+        [ValidRemoteUserFilePath]
+        [YaStringLength(1, 512)]
+        public required string Id { get; set; }
 
-            [YaStringLength(0, 512)]
-            [ValidRemoteUserFilePath]
-            public string to { get; set; } 
-        }
+        [YaStringLength(0, 512)]
+        [ValidRemoteUserFilePath]
+        public required string To { get; set; }
+    }
 
 }

src/Api/Controllers/Blogspot/PostTagsApiController.cs

@@ -10,6 +10,7 @@ namespace Yavsc.Controllers
     using Models;
     using Yavsc.Helpers;
     using Yavsc.Models.Blog;
+    using Yavsc.Server.Helpers;
 
     [Produces("application/json")]
     [Route("~/api/PostTagsApi")]

src/Api/Controllers/Blogspot/RenameFileQuery.cs

@@ -0,0 +1,15 @@
+using Yavsc.Attributes.Validation;
+namespace Yavsc.Models.FileSystem
+{
+    public class RenameFileQuery
+    {
+        [ValidRemoteUserFilePath]
+        [YaStringLength(1, 512)]
+        public required string Id { get; set; }
+
+        [YaStringLength(0, 512)]
+        [ValidRemoteUserFilePath]
+        public required string To { get; set; }
+    }
+
+}

src/Api/Controllers/Blogspot/TagsApiController.cs

@@ -8,6 +8,7 @@ namespace Yavsc.Controllers
     using Microsoft.EntityFrameworkCore;
     using Models.Relationship;
     using Yavsc.Helpers;
+    using Yavsc.Server.Helpers;
 
     [Produces("application/json")]
     [Route("api/TagsApi")]

src/Api/Controllers/Business/ActivityApiController.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Yavsc.Api.Helpers;
+using Yavsc.Server.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Workflow;
 

src/Api/Controllers/Business/BookQueryApiController.cs

@@ -15,6 +15,7 @@ namespace Yavsc.Controllers
     using Yavsc.Abstract.Identity;
     using Microsoft.EntityFrameworkCore;
     using Yavsc.Helpers;
+    using Yavsc.Server.Helpers;
 
     [Produces("application/json")]
     [Route("api/bookquery"), Authorize(Roles = "Performer,Administrator")]

src/Api/Controllers/Business/EstimateApiController.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Billing;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {
@@ -37,7 +38,7 @@ namespace Yavsc.Controllers
         }
         // GET: api/Estimate{?ownerId=User.GetUserId()}
         [HttpGet]
-        public IActionResult GetEstimates(string ownerId = null)
+        public IActionResult GetEstimates(string? ownerId = null)
         {
             if (ownerId == null) ownerId = User.GetUserId();
             else if (!UserIsAdminOrThis(ownerId)) // throw new Exception("Not authorized") ;

src/Api/Controllers/Business/EstimateTemplatesApiController.cs

@@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Billing;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Business/FrontOfficeApiController.cs

@@ -40,7 +40,7 @@ namespace Yavsc.ApiControllers
             return Ok();
         }
 
-        [HttpPost("query/reject")]
+        [HttpPost("query/accept")]
         public IActionResult AcceptQuery(string billingCode, long queryId)
         {
             if (billingCode == null) return BadRequest("billingCode");
@@ -51,7 +51,6 @@ namespace Yavsc.ApiControllers
             billing.Decided = true;
             dbContext.SaveChanges();
             return Ok();
-
         }
     }
 }

src/Api/Controllers/Business/ProductApiController.cs

@@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Market;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/DimissClicksApiController.cs

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Messaging;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/HairCut/BursherProfilesApiController.cs

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Haircut;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/HairCut/HairCutController.cs

@@ -22,6 +22,7 @@ namespace Yavsc.ApiControllers
     using Microsoft.AspNetCore.Http;
     using Microsoft.EntityFrameworkCore;
     using Microsoft.AspNetCore.Authorization;
+    using Yavsc.Server.Helpers;
 
     [Route("api/haircut")][Authorize]
     public class HairCutController : Controller

src/Api/Controllers/Musical/MusicalPreferencesApiController.cs

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Musical;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Musical/MusicalTendenciesApiController.cs

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Musical;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/NativeConfidentialController.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Identity;
+using Yavsc.Server.Helpers;
 
 [Authorize, Route("~/api/gcm")]
 public class NativeConfidentialController : Controller
@@ -32,7 +33,8 @@ public class NativeConfidentialController : Controller
         [FromBody] DeviceDeclaration declaration)
     {
       var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
-
+      if (uid == null)
+        throw new InvalidOperationException("no name identifier from claims");
       if (!ModelState.IsValid)
       {
         _logger.LogError("Invalid model for GCMD");

src/Api/Controllers/PostRateApiController.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Yavsc.Helpers;
 using Yavsc.Models;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Relationship/BlackListApiController.cs

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Access;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Relationship/BlogAclApiController.cs

@@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Access;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Relationship/ChatRoomApiController.cs

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Chat;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Relationship/CircleApiController.cs

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Relationship;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/Relationship/ContactsApiController.cs

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Abstract.Identity;
 using Yavsc.Helpers;
 using Yavsc.Models;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/ServiceApiController.cs

@@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Market;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/accounting/AccountController.cs

@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
 using Yavsc.Api.Helpers;
 using Yavsc.Server.Helpers;
+using System.Diagnostics;
 
 namespace Yavsc.WebApi.Controllers
 {
@@ -30,9 +31,9 @@ namespace Yavsc.WebApi.Controllers
                 return new BadRequestObjectResult(
                         new { error = "user not found" });
             var uid = User.GetUserId();
-
+            Debug.Assert(uid != null, "uid is null");
             var userData = await GetUserData(uid);
-
+            Debug.Assert(userData != null, "userData is null");
             var user = new Yavsc.Models.Auth.Me(userData.Id, userData.UserName, userData.Email,
             userData.Avatar,
             userData.PostalAddress, userData.DedicatedGoogleCalendar);
@@ -57,7 +58,7 @@ namespace Yavsc.WebApi.Controllers
         [HttpGet("myhost")]
         public IActionResult MyHost ()
         {
-            return Ok(new { host = Request.ForHost() });
+            return Ok(new { host = Request.ForwardedFor() });
         }
 
       

src/Api/Controllers/accounting/ApplicationUserApiController.cs

@@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
 using Yavsc.Abstract.Identity;
 using Yavsc.Helpers;
 using Yavsc.Models;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.Controllers
 {

src/Api/Controllers/accounting/ProfileApiController.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using Yavsc.Models;
 using Yavsc.Abstract.Identity;
 using Yavsc.Helpers;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.ApiControllers.accounting
 {

src/Api/Helpers/RequestHelpers.cs

@@ -13,8 +13,8 @@ namespace Yavsc.Api.Helpers
     public static class RequestHelpers
     {
         // Check for some apache proxy header, if any
-        public static string ForHost(this HttpRequest request) {
-            string host = request.Headers["X-Forwarded-For"];
+        public static string? ForwardedFor(this HttpRequest request) {
+            string? host = request.Headers["X-Forwarded-For"];
             if (string.IsNullOrEmpty(host)) {
                 host = request.Host.Value;
             } else { // Using X-Forwarded-For last address

src/Api/Helpers/UserHelpers.cs

@@ -1,17 +0,0 @@
-using System.Security.Claims;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-using Yavsc.Models;
-using Yavsc.Models.Blog;
-
-namespace Yavsc.Api.Helpers
-{
-    public static class UserHelpers
-    {
-        public static string GetUserId(this ClaimsPrincipal user)
-        {
-            return user.FindFirstValue("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier");
-        }
-    }
-}

src/Api/Program.cs

@@ -11,8 +11,6 @@
 */
 
 using IdentityModel;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Helpers;
@@ -63,7 +61,8 @@ internal class Program
                      options.IncludeErrorDetails = true;
                      options.Authority = "https://localhost:5001";
                      options.TokenValidationParameters =
-                         new() { ValidateAudience = false };
+                         new() { ValidateAudience = false, RoleClaimType = JwtClaimTypes.Role };
+                     options.MapInboundClaims = true;
                  });
 
         services.AddDbContext<ApplicationDbContext>(options =>
@@ -73,12 +72,7 @@ internal class Program
            .AddTransient<IBillingService, BillingService>()
            .AddTransient<ICalendarManager, CalendarManager>();
         services.AddTransient<IFileSystemAuthManager, FileSystemAuthManager>();
-        /*
-          services.AddSingleton<IConnexionManager, HubConnectionManager>();
-          services.AddSingleton<ILiveProcessor, LiveProcessor>();
-          services.AddIdentityApiEndpoints<ApplicationUser>();
-          services.AddSession();
-        */
+        
         WorkflowHelpers.ConfigureBillingService();
         using (var app = builder.Build())
         {
@@ -101,15 +95,10 @@ internal class Program
             app.MapDefaultControllerRoute();
             app.MapGet("/identity", (HttpContext context) =>
                 new JsonResult(context?.User?.Claims.Select(c => new { c.Type, c.Value }))
-        );
+            );
 
             //     app.UseSession(); 
             await app.RunAsync();
         }
-        ;
-
-
-
-
     }
 }

src/Directory.Build.props

@@ -1,5 +1,5 @@
-<Project >
+<Project>
   <PropertyGroup>
     <Version>1.0.8</Version>
   </PropertyGroup>
-</Project>
+</Project>

src/Yavsc.Abstract/Blogspot/IBlog.cs

@@ -1,16 +1,19 @@
 
 
 
+using Yavsc.Abstract.Identity;
+
 namespace Yavsc
 {
     public interface IBlogPostPayLoad
     {      
-        string Content { get; set; }
-        string Photo { get; set; }
+        string? Content { get; set; }
+        string? Photo { get; set; }
 
     }
-    public interface IBlogPost :IBlogPostPayLoad, ITrackedEntity, IIdentified<long>, ITitle
+    public interface IBlogPost : IBlogPostPayLoad, ITrackedEntity, IIdentified<long>, ITitle
     {
         string AuthorId { get; set; }
+        IApplicationUser Author { get; }
     }
 }

src/Yavsc.Abstract/Constants.cs

@@ -5,21 +5,21 @@ namespace Yavsc
 
     public static class Constants
     {
-        public static readonly Scope[] SiteScopes = { 
-            new Scope { Id = "profile", Description = "Your profile informations" },  
-            new Scope { Id = "book" , Description ="Your booking interface"},  
-            new Scope { Id = "blog" , Description ="Your blogging interface"},  
-            new Scope { Id = "estimate" , Description ="Your estimation interface"},  
-            new Scope { Id = "contract" , Description ="Your contract signature access"}, 
-            new Scope { Id = "admin" , Description ="Your administration rights on this site"}, 
-            new Scope { Id = "moderation" , Description ="Your moderator interface"}, 
+        public static readonly Scope[] SiteScopes = {
+            new Scope { Id = "profile", Description = "Your profile informations" },
+            new Scope { Id = "book" , Description ="Your booking interface"},
+            new Scope { Id = "blog" , Description ="Your blogging interface"},
+            new Scope { Id = "estimate" , Description ="Your estimation interface"},
+            new Scope { Id = "contract" , Description ="Your contract signature access"},
+            new Scope { Id = "admin" , Description ="Your administration rights on this site"},
+            new Scope { Id = "moderation" , Description ="Your moderator interface"},
             new Scope { Id = "frontoffice" , Description ="Your front office interface" }
         };
 
         public const string CompanyClaimType = "https://schemas.pschneider.fr/identity/claims/Company";
         public const string UserNameRegExp = @"^[a-zA-Z][a-zA-Z0-9._-]*$";
         public const string UserFileNamePatternRegExp = @"^([a-zA-Z0-9._-]*/)*[a-zA-Z0-9._-]+$";
-      
+
         public const string LoginPath = "/signin";
         public const string LogoutPath = "/signout";
 
@@ -37,7 +37,7 @@ namespace Yavsc
         public const string FrontOfficeGroupName = "FrontOffice";
         public const string DefaultAvatar = "/images/Users/icon_user.png";
         public const string AnonAvatar = "/images/Users/icon_anon_user.png";
-        public const string YavscConnectionStringEnvName = "DEFAULTCONNECTION_CONNECTIONSTRING";
+        public const string YavscConnectionStringEnvName = "YAVSC_CONNECTION_STRING";
 
         // at the end, let 4*4 bytes in peace
         public const int WebSocketsMaxBufLen = 4096;
@@ -52,9 +52,7 @@ namespace Yavsc
         public const int MaxUserNameLength = 26;
 
         public const string LivePath = "/live/cast";
-        
-        public const string StreamingPath = "/api/stream/put";
 
-        public const string RoleClaimName = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role";
+        public const string StreamingPath = "/api/stream/put";
     }
 }

src/Yavsc.Abstract/Google/Messaging/MessageWithPayLoad.cs

@@ -19,6 +19,7 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using Yavsc.Abstract.Models.Messaging;
 using Yavsc.Models.Messaging;
 
 namespace Yavsc.Models.Google.Messaging

src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs

@@ -54,7 +54,7 @@ namespace Yavsc.Models.Google.Messaging
 			/// <summary>
 			/// The error.
 			/// </summary>
-			public string error;
+			public string? error;
 		}
 
 		/// <summary>

src/Yavsc.Abstract/Identity/IApplicationUser.cs

@@ -3,10 +3,10 @@
     public interface IApplicationUser
     {
         string Id { get; set; }
-        string UserName { get; set; }
-        string Avatar { get ; set; }
-        IAccountBalance AccountBalance { get; set; }
-        string DedicatedGoogleCalendar { get; set; }
-        ILocation PostalAddress { get; set; }
+        string? UserName { get; set; }
+        string? Avatar { get ; set; }
+        IAccountBalance? AccountBalance { get; }
+        string? DedicatedGoogleCalendar { get; } 
+        ILocation? PostalAddress { get; }
     }
 }

src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs

@@ -3,7 +3,7 @@ namespace Yavsc.Abstract.Identity.Security
     public interface ICircleAuthorized
     {
         long Id { get; set; }
-        string OwnerId { get; }
+        string AuthorId { get; }
         bool AuthorizeCircle(long circleId);
         ICircleAuthorization [] GetACL();
 

src/Yavsc.Abstract/Interfaces/IBaseTrackedEntity.cs

@@ -5,8 +5,8 @@ namespace Yavsc
     public interface ITrackedEntity
     {
         DateTime DateCreated { get; set; }
-        string UserCreated { get; set; }
+        string? UserCreated { get; set; }
         DateTime DateModified { get; set; }
-        string UserModified { get; set; }
+        string? UserModified { get; set; }
     }
 }

src/Yavsc.Abstract/Messaging/Notification.cs

@@ -2,7 +2,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Yavsc.Models.Messaging
+namespace Yavsc.Abstract.Models.Messaging
 {
     /// <summary>
     /// A Notification, that mocks the one sent to Google,
@@ -29,25 +29,25 @@ namespace Yavsc.Models.Messaging
         /// </summary>
         [StringLength(512)]
         [Display(Name = "Icône")]
-        public string icon { get; set; } 
+        public string? icon { get; set; } 
         /// <summary>
         /// The sound.
         /// </summary>
         [StringLength(512)]
         [Display(Name = "Son")]
-        public string sound { get; set; }
+        public string? sound { get; set; }
         /// <summary>
         /// The tag.
         /// </summary>
         [StringLength(512)]
         [Display(Name = "Tag")]
-        public string tag { get; set; }
+        public string? tag { get; set; }
         /// <summary>
         /// The color.
         /// </summary>
         [StringLength(512)]
         [Display(Name = "Couleur")]
-        public  string color { get; set; }
+        public  string? color { get; set; }
         /// <summary>
         /// The click action.
         /// </summary>
@@ -63,7 +63,7 @@ namespace Yavsc.Models.Messaging
         /// </summary>
         /// <returns></returns>
         [StringLength(512)]
-        public string Target { get; set; }
+        public string? Target { get; set; }
 
         public Notification()
         {

src/Yavsc.Abstract/Yavsc.Abstract.csproj

@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Description> A shared model for a little client/server app, dealing about establishing some contract, between some human client and provider.
     </Description>
-    
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
-
-</Project>
+</Project>

src/Yavsc.Server/.config/dotnet-tools.json

@@ -0,0 +1,5 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {}
+}

src/Yavsc.Server/Config.cs

@@ -31,38 +31,34 @@ public static class Config
 
         /// <summary>
         /// Lists Available user profile classes,
-        /// populated at startup, using reflexion.
+        /// populated at startup, using reflection.
         /// </summary>
         public static List<Type> ProfileTypes = new List<Type>();
 
 
     public static IEnumerable<IdentityResource> IdentityResources =>
-        new IdentityResource[]
-        {
+        [
             new IdentityResources.OpenId(),
             new IdentityResources.Profile(),
             new IdentityResources.Email()
-        };
+        ];
 
-    public static IEnumerable<ApiScope> ApiScopes =>
-        new ApiScope[]
-        {
+    public static IEnumerable<ApiScope> TestingApiScopes =>
+        [
             new ApiScope("scope1",new string[] {"scope1"}),
             new ApiScope("scope2",new string[] {"scope2"}),
-        };
+        ];
 
-    public static IEnumerable<Client> Clients =>
-        new Client[]
-        {
+    public static IEnumerable<Client> TestingClients =>
+        [
             // m2m client credentials flow client
             new Client
             {
                 ClientId = "m2m.client",
                 ClientName = "Client Credentials Client",
-
-                AllowedGrantTypes = GrantTypes.ClientCredentials,
                 ClientSecrets = { new Secret("511536EF-F270-4058-80CA-1C89C192F69A".Sha256()) },
 
+                AllowedGrantTypes = GrantTypes.ClientCredentials,
                 AllowedScopes = { "scope1" }
             },
 
@@ -80,14 +76,14 @@ public static class Config
                 PostLogoutRedirectUris = { "https://localhost:5003/signout-callback-oidc",
                  "http://localhost:5002/signout-callback-oidc" },
 
-                AllowedScopes = { 
+                AllowedScopes = {
                     IdentityServerConstants.StandardScopes.OpenId,
                     IdentityServerConstants.StandardScopes.Profile,
                     IdentityServerConstants.StandardScopes.Email,
                     IdentityServerConstants.StandardScopes.OfflineAccess,
-                    "scope2" }
+                    "scope2" },
             },
-        };
+        ];
 
     public static PayPalSettings? PayPalSettings { get; set; }
 }

src/Yavsc.Server/Exceptions/AuthorizationFailureException.cs

@@ -0,0 +1,17 @@
+namespace Yavsc.Server.Exceptions;
+
+[Serializable]
+public class AuthorizationFailureException : Exception
+{
+    public AuthorizationFailureException(Microsoft.AspNetCore.Authorization.AuthorizationResult auth) : base(auth?.Failure?.ToString()??auth?.ToString()??"AuthorizationResult failure")
+    {
+    }
+
+    public AuthorizationFailureException(string? message) : base(message)
+    {
+    }
+
+    public AuthorizationFailureException(string? message, Exception? innerException) : base(message, innerException)
+    {
+    }
+}

src/Yavsc.Server/Helpers/UserHelpers.cs

@@ -1,11 +1,6 @@
 using System.Security.Claims;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-using Yavsc.Models;
-using Yavsc.Models.Blog;
 
-namespace Yavsc.Helpers
+namespace Yavsc.Server.Helpers
 {
     public static class UserHelpers
     {
@@ -16,7 +11,7 @@ namespace Yavsc.Helpers
 
         public static string GetUserName(this ClaimsPrincipal user)
         {
-            return user.FindFirstValue(ClaimTypes.Name);
+            return user.FindFirstValue("name");
         }
 
         public static bool IsSignedIn(this ClaimsPrincipal user)
@@ -24,29 +19,5 @@ namespace Yavsc.Helpers
             return user.Identity.IsAuthenticated;
         }
 
-        public static IEnumerable<BlogPost> UserPosts(this ApplicationDbContext dbContext, string posterId, string readerId)
-        {
-            if (readerId == null)
-            {
-                var userPosts = dbContext.BlogSpot.Include(
-                b => b.Author
-                ).Where(x => ((x.AuthorId == posterId))).ToArray();
-                return userPosts;
-            }
-            else
-            {
-                long[] readerCirclesMemberships =
-                dbContext.Circle.Include(c => c.Members)
-                .Where(c => c.Members.Any(m => m.MemberId == readerId))
-                .Select(c => c.Id).ToArray();
-                return dbContext.BlogSpot.Include(
-                              b => b.Author
-                              ).Include(p => p.ACL).Where(x => x.Author.Id == posterId &&
-                              (x.ACL.Count == 0 || x.ACL.Any(a => readerCirclesMemberships.Contains(a.CircleId))));
-
-
-            }
-
-        }
     }
 }

src/Yavsc.Server/Helpers/WorkflowHelpers.cs

@@ -16,75 +16,80 @@ namespace Yavsc.Helpers
 
     public static class WorkflowHelpers
     {
-        public static async Task<List<PerformerProfileViewModel>> 
-        ListPerformersAsync(this ApplicationDbContext context, 
+        public static async Task<List<PerformerProfileViewModel>>
+        ListPerformersAsync(this ApplicationDbContext context,
         IBillingService billing,
         string actCode)
         {
-           
+
             var actors = context.Performers
-           .Include(p=>p.Activity)
-           .Include(p=>p.Performer)
-           .Where(p => p.Active && p.Activity.Any(u=>u.DoesCode==actCode)).OrderBy( x => x.Rate )
+           .Include(p => p.Activity)
+           .Include(p => p.Performer)
+           .Where(p => p.Active && p.Activity.Any(u => u.DoesCode == actCode)).OrderBy(x => x.Rate)
            .ToArray();
 
-            List<PerformerProfileViewModel> result = new ();
+            List<PerformerProfileViewModel> result = new();
             foreach (var a in actors)
             {
                 var settings = await billing.GetPerformersSettingsAsync(actCode, a.PerformerId);
-                result.Add(new PerformerProfileViewModel(a, actCode,settings));
+                result.Add(new PerformerProfileViewModel(a, actCode, settings));
             }
 
             return result;
         }
 
-    public static void RegisterBilling<T>(string code, Func<ApplicationDbContext, long, 
-    IDecidableQuery> getter) where T : IBillable
-    {
-        BillingService.Billing.Add(code, getter);
-        BillingService.GlobalBillingMap.Add(typeof(T).Name, code);
-    }
-
-    public static void ConfigureBillingService()
-    {
-        foreach (var a in System.AppDomain.CurrentDomain.GetAssemblies())
+        public static void RegisterBilling<T>(string code, Func<ApplicationDbContext, long,
+        IDecidableQuery> getter) where T : IBillable
         {
-            foreach (var c in a.GetTypes())
+            if (BillingService.Billing.ContainsKey(code)
+                || BillingService.GlobalBillingMap.ContainsKey(code))
             {
-                if (c.IsClass && !c.IsAbstract &&
-                    c.GetInterface("ISpecializationSettings") != null)
-                {
-                    Config.ProfileTypes.Add(c);
-                }
+                throw new InvalidOperationException("Billing setup");
             }
+            BillingService.Billing.Add(code, getter);
+            BillingService.GlobalBillingMap.Add(typeof(T).Name, code);
         }
 
-        foreach (var propertyInfo in typeof(ApplicationDbContext).GetProperties())
+        public static void ConfigureBillingService()
         {
-            foreach (var attr in propertyInfo.CustomAttributes)
+            foreach (var a in System.AppDomain.CurrentDomain.GetAssemblies())
             {
-                // something like a DbSet?
-                if (typeof(Yavsc.Attributes.ActivitySettingsAttribute).IsAssignableFrom(attr.AttributeType))
+                foreach (var c in a.GetTypes())
                 {
-                    BillingService.UserSettings.Add(propertyInfo);
+                    if (c.IsClass && !c.IsAbstract &&
+                        c.GetInterface("ISpecializationSettings") != null)
+                    {
+                        Config.ProfileTypes.Add(c);
+                    }
                 }
             }
+
+            foreach (var propertyInfo in typeof(ApplicationDbContext).GetProperties())
+            {
+                foreach (var attr in propertyInfo.CustomAttributes)
+                {
+                    // something like a DbSet?
+                    if (typeof(Yavsc.Attributes.ActivitySettingsAttribute).IsAssignableFrom(attr.AttributeType))
+                    {
+                        BillingService.UserSettings.Add(propertyInfo);
+                    }
+                }
+            }
+
+            RegisterBilling<HairCutQuery>(BillingCodes.Brush, new Func<ApplicationDbContext, long, IDecidableQuery>
+            ((db, id) =>
+            {
+                var query = db.HairCutQueries.Include(q => q.Prestation).Include(q => q.Regularisation).Single(q => q.Id == id);
+                query.SelectedProfile = db.BrusherProfile.Single(b => b.UserId == query.PerformerId);
+                return query;
+            }));
+
+            RegisterBilling<HairMultiCutQuery>(BillingCodes.MBrush, new Func<ApplicationDbContext, long, IDecidableQuery>
+            ((db, id) => db.HairMultiCutQueries.Include(q => q.Regularisation).Single(q => q.Id == id)));
+
+            RegisterBilling<RdvQuery>(BillingCodes.Rdv, new Func<ApplicationDbContext, long, IDecidableQuery>
+            ((db, id) => db.RdvQueries.Include(q => q.Regularisation).Single(q => q.Id == id)));
         }
 
-        RegisterBilling<HairCutQuery>(BillingCodes.Brush, new Func<ApplicationDbContext, long, IDecidableQuery>
-        ((db, id) =>
-        {
-            var query = db.HairCutQueries.Include(q => q.Prestation).Include(q => q.Regularisation).Single(q => q.Id == id);
-            query.SelectedProfile = db.BrusherProfile.Single(b => b.UserId == query.PerformerId);
-            return query;
-        }));
-
-        RegisterBilling<HairMultiCutQuery>(BillingCodes.MBrush, new Func<ApplicationDbContext, long, IDecidableQuery>
-        ((db, id) => db.HairMultiCutQueries.Include(q => q.Regularisation).Single(q => q.Id == id)));
-
-        RegisterBilling<RdvQuery>(BillingCodes.Rdv, new Func<ApplicationDbContext, long, IDecidableQuery>
-        ((db, id) => db.RdvQueries.Include(q => q.Regularisation).Single(q => q.Id == id)));
-    }
-
     }
 }

src/Yavsc.Server/Hubs/ChatHub.cs

@@ -29,11 +29,14 @@ using Microsoft.Extensions.Localization;
 
 namespace Yavsc
 {
+    using System.Diagnostics;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.EntityFrameworkCore;
     using Models;
     using Models.Chat;
     using Yavsc.Abstract.Chat;
+    using Yavsc.Helpers;
+    using Yavsc.Server.Helpers;
     using Yavsc.Services;
     public partial class ChatHub : Hub, IDisposable
     {
@@ -192,10 +195,11 @@ namespace Yavsc
                 NotifyUserInRoom(NotificationTypes.Error, room, "already registered.");
                 return;
             }
-            string userName = Context.User.Identity.Name;
+            Debug.Assert(Context.User != null);
+            string userName = Context.User.GetUserName();
             var user = _dbContext.Users.FirstOrDefault(u => u.UserName == userName);
 
-            var newroom = new ChatRoom { Name = room, OwnerId = user.Id };
+            var newroom = new ChatRoom { Name = room, OwnerId = Context.User.GetUserId() };
             ChatRoomInfo chanInfo;
             if (_cxManager.TryGetChanInfo(room, out chanInfo))
             {
@@ -319,7 +323,7 @@ namespace Yavsc
 
         async Task NotifyUser(string type, string targetId, string message)
         {
-            _logger.LogInformation("notifying user  {type} {targetId} : {message}");
+            _logger.LogInformation($"notifying user  {type} {targetId} : {message}");
             await Clients.Caller.SendAsync("notifyUser", type, targetId, message);
         }
 
@@ -331,6 +335,8 @@ namespace Yavsc
         [Authorize]
         public async Task SendPV(string userName,  string message)
         {
+            // Authorized code
+            Debug.Assert(Context.User != null);
             _logger.LogInformation($"Sending pv to {userName}");
 
             if (!InputValidator.ValidateUserName(userName)) 
@@ -344,19 +350,21 @@ namespace Yavsc
                 return ;
             }
             _logger.LogInformation($"Message form is validated.");
+                    var identityUserName = Context.User.GetUserName();
 
-            if (userName[0] != '?')
+            if (userName[0] != '?' && Context.User!=null)
                 if (!Context.User.IsInRole(Constants.AdminGroupName))
                 {
+
                     var bl = _dbContext.BlackListed
                         .Include(r => r.User)
                         .Include(r => r.Owner)
-                        .Where(r => r.User.UserName == Context.User.Identity.Name && r.Owner.UserName == userName)
+                        .Where(r => r.User.UserName == identityUserName && r.Owner.UserName == userName)
                         .Select(r => r.OwnerId);
 
                     if (bl.Count() > 0)
                     {
-                        _logger.LogError($"Black listed : {Context.User.Identity.Name}");
+                        _logger.LogError($"Black listed : {identityUserName}");
                         await NotifyUser(NotificationTypes.PrivateMessageDenied, userName, "you are black listed.");
                         return;
                     }
@@ -372,7 +380,7 @@ namespace Yavsc
                 _logger.LogInformation($"cx: {connectionId}");
                 var cli = Clients.Client(connectionId);
                 _logger.LogInformation($"cli: {cli.ToString()}");
-                await cli.SendAsync("addPV", Context.User.Identity.Name, message);
+                await cli.SendAsync("addPV", identityUserName, message);
                 _logger.LogInformation($"Sent pv to cx {connectionId}");
             }
         }
@@ -380,6 +388,9 @@ namespace Yavsc
         [Authorize]
         public async Task SendStream(string connectionId, long streamId,  string message)
         {
+            // Authorized code
+            Debug.Assert(Context.User != null);
+            Debug.Assert(Context.User.Identity != null);
             if (!InputValidator.ValidateMessage(message)) return;
             var sender = Context.User.Identity.Name;
             var cli = Clients.Client(connectionId);

src/Yavsc.Server/Makefile

@@ -1,26 +1,2 @@
-SOURCE_DIR=../..
-MAKEFILE_DIR=$(SOURCE_DIR)/scripts/make
-BASERESX=Resources/Yavsc.Models.Relationship.HyperLink.resx \
-  Resources/Yavsc.Models.Streaming.LiveFlow.resx
-BASERESXGEN=$(BASERESX:.resx=.Designer.cs)
-
-include $(MAKEFILE_DIR)/dnx.mk
-include $(MAKEFILE_DIR)/versioning.mk
-
-default: all
-
-$(BINTARGETPATH): ../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll \
-  ../Yavsc.Abstract/bin/$(CONFIGURATION)/Yavsc.Abstract.dll prepare_code
-
-../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll:
-	make -C ../OAuth.AspNet.AuthServer 
-
-../Yavsc.Abstract/bin/$(CONFIGURATION)/Yavsc.Abstract.dll:
-	make -C ../Yavsc.Abstract
-
-%.Designer.cs: %.resx
-	strongresbuildercli -l -p -t -r "Yavsc.Server.Resources." $^
-
-prepare_code: $(BASERESXGEN)
-
-all: $(BINTARGETPATH) 
+listConnections:
+	dotnet ef migrations list --connection "$(YAVSC_CONNECTION_STRING)"

src/Yavsc.Server/Migrations/20250613122253_notificationTarget.cs

@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class notificationTarget : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Visible",
+                table: "BlogSpot");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Target",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Target",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Visible",
+                table: "BlogSpot",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250613123306_notificationNulls.cs

@@ -0,0 +1,109 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class notificationNulls : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "tag",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "sound",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "icon",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: true,
+                defaultValue: "exclam",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldDefaultValue: "exclam");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "color",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "tag",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "sound",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "icon",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: false,
+                defaultValue: "exclam",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldNullable: true,
+                oldDefaultValue: "exclam");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "color",
+                table: "Notification",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldNullable: true);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250613131533_trackedNulls.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class trackedNulls : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250613131836_blogNulls.cs

@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class blogNulls : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "UserModified",
+                table: "BlogSpot",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "UserCreated",
+                table: "BlogSpot",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "UserModified",
+                table: "BlogSpot",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "UserCreated",
+                table: "BlogSpot",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250613132139_BlogPostInputViewModelNulls.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class BlogPostInputViewModelNulls : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Content",
+                table: "BlogSpot",
+                type: "character varying(56224)",
+                maxLength: 56224,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(56224)",
+                oldMaxLength: 56224);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Content",
+                table: "BlogSpot",
+                type: "character varying(56224)",
+                maxLength: 56224,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(56224)",
+                oldMaxLength: 56224,
+                oldNullable: true);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250613181510_ActivityNulls.cs

@@ -0,0 +1,108 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class ActivityNulls : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "UserModified",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "UserCreated",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SettingsClassName",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Photo",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ModeratorGroupName",
+                table: "Activities",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "UserModified",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "UserCreated",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SettingsClassName",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Photo",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ModeratorGroupName",
+                table: "Activities",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250620185047_BrusherProfileSchedulerId.cs

@@ -0,0 +1,59 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class BrusherProfileSchedulerId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_BrusherProfile_Schedule_ScheduleOwnerId",
+                table: "BrusherProfile");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ScheduleOwnerId",
+                table: "BrusherProfile",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_BrusherProfile_Schedule_ScheduleOwnerId",
+                table: "BrusherProfile",
+                column: "ScheduleOwnerId",
+                principalTable: "Schedule",
+                principalColumn: "OwnerId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_BrusherProfile_Schedule_ScheduleOwnerId",
+                table: "BrusherProfile");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ScheduleOwnerId",
+                table: "BrusherProfile",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_BrusherProfile_Schedule_ScheduleOwnerId",
+                table: "BrusherProfile",
+                column: "ScheduleOwnerId",
+                principalTable: "Schedule",
+                principalColumn: "OwnerId",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250628150549_blogPostPub.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class blogPostPub : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "blogspotPublications",
+                columns: table => new
+                {
+                    BlogpostId = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_blogspotPublications", x => x.BlogpostId);
+                    table.ForeignKey(
+                        name: "FK_blogspotPublications_BlogSpot_BlogpostId",
+                        column: x => x.BlogpostId,
+                        principalTable: "BlogSpot",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "blogspotPublications");
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250629174955_blogPusb2.cs

@@ -0,0 +1,79 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class blogPusb2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_blogspotPublications_BlogSpot_BlogpostId",
+                table: "blogspotPublications");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_blogspotPublications",
+                table: "blogspotPublications");
+
+            migrationBuilder.RenameTable(
+                name: "blogspotPublications",
+                newName: "blogSpotPublications");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Publish",
+                table: "BlogSpot",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_blogSpotPublications",
+                table: "blogSpotPublications",
+                column: "BlogpostId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_blogSpotPublications_BlogSpot_BlogpostId",
+                table: "blogSpotPublications",
+                column: "BlogpostId",
+                principalTable: "BlogSpot",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_blogSpotPublications_BlogSpot_BlogpostId",
+                table: "blogSpotPublications");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_blogSpotPublications",
+                table: "blogSpotPublications");
+
+            migrationBuilder.DropColumn(
+                name: "Publish",
+                table: "BlogSpot");
+
+            migrationBuilder.RenameTable(
+                name: "blogSpotPublications",
+                newName: "blogspotPublications");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_blogspotPublications",
+                table: "blogspotPublications",
+                column: "BlogpostId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_blogspotPublications_BlogSpot_BlogpostId",
+                table: "blogspotPublications",
+                column: "BlogpostId",
+                principalTable: "BlogSpot",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250629175034_blogPub2.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class blogPub2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250705112955_commentAllowed.cs

@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class commentAllowed : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Comment",
+                table: "CircleAuthorizationToBlogPost",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Avatar",
+                table: "AspNetUsers",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: true,
+                defaultValue: "/images/Users/icon_user.png",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldDefaultValue: "/images/Users/icon_user.png");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Comment",
+                table: "CircleAuthorizationToBlogPost");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Avatar",
+                table: "AspNetUsers",
+                type: "character varying(512)",
+                maxLength: 512,
+                nullable: false,
+                defaultValue: "/images/Users/icon_user.png",
+                oldClrType: typeof(string),
+                oldType: "character varying(512)",
+                oldMaxLength: 512,
+                oldNullable: true,
+                oldDefaultValue: "/images/Users/icon_user.png");
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250709123810_noPublishColumn.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class noPublishColumn : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Publish",
+                table: "BlogSpot");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Publish",
+                table: "BlogSpot",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250715143821_nullPaimentIdOnQuery.cs

@@ -0,0 +1,182 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class nullPaimentIdOnQuery : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_HairCutQueries_PayPalPayment_PaymentId",
+                table: "HairCutQueries");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_HairMultiCutQueries_PayPalPayment_PaymentId",
+                table: "HairMultiCutQueries");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Project_PayPalPayment_PaymentId",
+                table: "Project");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_RdvQueries_PayPalPayment_PaymentId",
+                table: "RdvQueries");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PaymentId",
+                table: "RdvQueries",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PaymentId",
+                table: "Project",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PaymentId",
+                table: "HairMultiCutQueries",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PaymentId",
+                table: "HairCutQueries",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQueries_PayPalPayment_PaymentId",
+                table: "HairCutQueries",
+                column: "PaymentId",
+                principalTable: "PayPalPayment",
+                principalColumn: "CreationToken");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQueries_PayPalPayment_PaymentId",
+                table: "HairMultiCutQueries",
+                column: "PaymentId",
+                principalTable: "PayPalPayment",
+                principalColumn: "CreationToken");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_PayPalPayment_PaymentId",
+                table: "Project",
+                column: "PaymentId",
+                principalTable: "PayPalPayment",
+                principalColumn: "CreationToken");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQueries_PayPalPayment_PaymentId",
+                table: "RdvQueries",
+                column: "PaymentId",
+                principalTable: "PayPalPayment",
+                principalColumn: "CreationToken");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_HairCutQueries_PayPalPayment_PaymentId",
+                table: "HairCutQueries");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_HairMultiCutQueries_PayPalPayment_PaymentId",
+                table: "HairMultiCutQueries");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Project_PayPalPayment_PaymentId",
+                table: "Project");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_RdvQueries_PayPalPayment_PaymentId",
+                table: "RdvQueries");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PaymentId",
+                table: "RdvQueries",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PaymentId",
+                table: "Project",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PaymentId",
+                table: "HairMultiCutQueries",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PaymentId",
+                table: "HairCutQueries",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQueries_PayPalPayment_PaymentId",
+                table: "HairCutQueries",
+                column: "PaymentId",
+                principalTable: "PayPalPayment",
+                principalColumn: "CreationToken",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQueries_PayPalPayment_PaymentId",
+                table: "HairMultiCutQueries",
+                column: "PaymentId",
+                principalTable: "PayPalPayment",
+                principalColumn: "CreationToken",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Project_PayPalPayment_PaymentId",
+                table: "Project",
+                column: "PaymentId",
+                principalTable: "PayPalPayment",
+                principalColumn: "CreationToken",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQueries_PayPalPayment_PaymentId",
+                table: "RdvQueries",
+                column: "PaymentId",
+                principalTable: "PayPalPayment",
+                principalColumn: "CreationToken",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

src/Yavsc.Server/Migrations/20250715144838_dbCleanup.cs

@@ -0,0 +1,117 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+    /// <inheritdoc />
+    public partial class dbCleanup : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_BankBook_BankStatus_BalanceId",
+                table: "BankBook");
+
+            migrationBuilder.DropTable(
+                name: "OAuth2Tokens");
+
+            migrationBuilder.DropTable(
+                name: "RefreshTokens");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_BankBook",
+                table: "BankBook");
+
+            migrationBuilder.RenameTable(
+                name: "BankBook",
+                newName: "BalanceImpact");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_BankBook_BalanceId",
+                table: "BalanceImpact",
+                newName: "IX_BalanceImpact_BalanceId");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_BalanceImpact",
+                table: "BalanceImpact",
+                column: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_BalanceImpact_BankStatus_BalanceId",
+                table: "BalanceImpact",
+                column: "BalanceId",
+                principalTable: "BankStatus",
+                principalColumn: "UserId",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_BalanceImpact_BankStatus_BalanceId",
+                table: "BalanceImpact");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_BalanceImpact",
+                table: "BalanceImpact");
+
+            migrationBuilder.RenameTable(
+                name: "BalanceImpact",
+                newName: "BankBook");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_BalanceImpact_BalanceId",
+                table: "BankBook",
+                newName: "IX_BankBook_BalanceId");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_BankBook",
+                table: "BankBook",
+                column: "Id");
+
+            migrationBuilder.CreateTable(
+                name: "OAuth2Tokens",
+                columns: table => new
+                {
+                    UserId = table.Column<string>(type: "text", nullable: false),
+                    AccessToken = table.Column<string>(type: "text", nullable: false),
+                    Expiration = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    ExpiresIn = table.Column<string>(type: "text", nullable: false),
+                    RefreshToken = table.Column<string>(type: "text", nullable: false),
+                    TokenType = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_OAuth2Tokens", x => x.UserId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "RefreshTokens",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    ClientId = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
+                    ExpiresUtc = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    IssuedUtc = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    ProtectedTicket = table.Column<string>(type: "text", nullable: false),
+                    Subject = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RefreshTokens", x => x.Id);
+                });
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_BankBook_BankStatus_BalanceId",
+                table: "BankBook",
+                column: "BalanceId",
+                principalTable: "BankStatus",
+                principalColumn: "UserId",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

src/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace Yavsc.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.2")
+                .HasAnnotation("ProductVersion", "9.0.7")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -183,6 +183,56 @@ namespace Yavsc.Migrations
                     b.ToTable("ClientProviderInfo");
                 });
 
+            modelBuilder.Entity("Yavsc.Abstract.Models.Messaging.Notification", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<string>("Target")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("body")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("click_action")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("color")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("icon")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasDefaultValue("exclam");
+
+                    b.Property<string>("sound")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("tag")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notification");
+                });
+
             modelBuilder.Entity("Yavsc.Models.Access.Ban", b =>
                 {
                     b.Property<long>("Id")
@@ -253,6 +303,9 @@ namespace Yavsc.Migrations
                     b.Property<long>("BlogPostId")
                         .HasColumnType("bigint");
 
+                    b.Property<bool>("Comment")
+                        .HasColumnType("boolean");
+
                     b.HasKey("CircleId", "BlogPostId");
 
                     b.HasIndex("BlogPostId");
@@ -288,7 +341,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("boolean");
 
                     b.Property<string>("Avatar")
-                        .IsRequired()
                         .ValueGeneratedOnAdd()
                         .HasMaxLength(512)
                         .HasColumnType("character varying(512)")
@@ -419,65 +471,6 @@ namespace Yavsc.Migrations
                     b.ToTable("Applications");
                 });
 
-            modelBuilder.Entity("Yavsc.Models.Auth.OAuth2Tokens", b =>
-                {
-                    b.Property<string>("UserId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("AccessToken")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("Expiration")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("ExpiresIn")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("RefreshToken")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("TokenType")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("UserId");
-
-                    b.ToTable("OAuth2Tokens");
-                });
-
-            modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ClientId")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime>("ExpiresUtc")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime>("IssuedUtc")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("ProtectedTicket")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("RefreshTokens");
-                });
-
             modelBuilder.Entity("Yavsc.Models.Auth.Scope", b =>
                 {
                     b.Property<string>("Id")
@@ -519,7 +512,7 @@ namespace Yavsc.Migrations
 
                     b.HasIndex("BalanceId");
 
-                    b.ToTable("BankBook");
+                    b.ToTable("BalanceImpact");
                 });
 
             modelBuilder.Entity("Yavsc.Models.Bank.BankIdentity", b =>
@@ -711,7 +704,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("text");
 
                     b.Property<string>("Content")
-                        .IsRequired()
                         .HasMaxLength(56224)
                         .HasColumnType("character varying(56224)");
 
@@ -731,16 +723,11 @@ namespace Yavsc.Migrations
                         .HasColumnType("character varying(1024)");
 
                     b.Property<string>("UserCreated")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("UserModified")
-                        .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<bool>("Visible")
-                        .HasColumnType("boolean");
-
                     b.HasKey("Id");
 
                     b.HasIndex("AuthorId");
@@ -813,6 +800,16 @@ namespace Yavsc.Migrations
                     b.ToTable("Comment");
                 });
 
+            modelBuilder.Entity("Yavsc.Models.BlogSpotPublication", b =>
+                {
+                    b.Property<long>("BlogpostId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("BlogpostId");
+
+                    b.ToTable("blogSpotPublications");
+                });
+
             modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b =>
                 {
                     b.Property<string>("OwnerId")
@@ -1079,7 +1076,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("numeric");
 
                     b.Property<string>("ScheduleOwnerId")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<decimal>("ShampooPrice")
@@ -1171,7 +1167,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("bigint");
 
                     b.Property<string>("PaymentId")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("PerformerId")
@@ -1262,7 +1257,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("bigint");
 
                     b.Property<string>("PaymentId")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("PerformerId")
@@ -1602,61 +1596,6 @@ namespace Yavsc.Migrations
                     b.ToTable("DismissClicked");
                 });
 
-            modelBuilder.Entity("Yavsc.Models.Messaging.Notification", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
-
-                    b.Property<string>("Target")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("character varying(512)");
-
-                    b.Property<string>("body")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("character varying(512)");
-
-                    b.Property<string>("click_action")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("character varying(512)");
-
-                    b.Property<string>("color")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("character varying(512)");
-
-                    b.Property<string>("icon")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(512)
-                        .HasColumnType("character varying(512)")
-                        .HasDefaultValue("exclam");
-
-                    b.Property<string>("sound")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("character varying(512)");
-
-                    b.Property<string>("tag")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("character varying(512)");
-
-                    b.Property<string>("title")
-                        .IsRequired()
-                        .HasMaxLength(1024)
-                        .HasColumnType("character varying(1024)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Notification");
-                });
-
             modelBuilder.Entity("Yavsc.Models.Musical.Instrument", b =>
                 {
                     b.Property<long>("Id")
@@ -2092,7 +2031,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("boolean");
 
                     b.Property<string>("ModeratorGroupName")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("Name")
@@ -2103,22 +2041,18 @@ namespace Yavsc.Migrations
                         .HasColumnType("text");
 
                     b.Property<string>("Photo")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<int>("Rate")
                         .HasColumnType("integer");
 
                     b.Property<string>("SettingsClassName")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("UserCreated")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("UserModified")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.HasKey("Code");
@@ -2288,7 +2222,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("integer");
 
                     b.Property<string>("PaymentId")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("PerformerId")
@@ -2449,7 +2382,6 @@ namespace Yavsc.Migrations
                         .HasColumnType("text");
 
                     b.Property<string>("PaymentId")
-                        .IsRequired()
                         .HasColumnType("text");
 
                     b.Property<string>("PerformerId")
@@ -2780,6 +2712,17 @@ namespace Yavsc.Migrations
                     b.Navigation("Post");
                 });
 
+            modelBuilder.Entity("Yavsc.Models.BlogSpotPublication", b =>
+                {
+                    b.HasOne("Yavsc.Models.Blog.BlogPost", "BlogPost")
+                        .WithMany()
+                        .HasForeignKey("BlogpostId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("BlogPost");
+                });
+
             modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b =>
                 {
                     b.HasOne("Yavsc.Models.ApplicationUser", "Owner")
@@ -2851,9 +2794,7 @@ namespace Yavsc.Migrations
                 {
                     b.HasOne("Yavsc.Models.Calendar.Schedule", "Schedule")
                         .WithMany()
-                        .HasForeignKey("ScheduleOwnerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("ScheduleOwnerId");
 
                     b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "BaseProfile")
                         .WithMany()
@@ -2886,9 +2827,7 @@ namespace Yavsc.Migrations
 
                     b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularisation")
                         .WithMany()
-                        .HasForeignKey("PaymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("PaymentId");
 
                     b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "PerformerProfile")
                         .WithMany()
@@ -2943,9 +2882,7 @@ namespace Yavsc.Migrations
 
                     b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularisation")
                         .WithMany()
-                        .HasForeignKey("PaymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("PaymentId");
 
                     b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "PerformerProfile")
                         .WithMany()
@@ -3057,7 +2994,7 @@ namespace Yavsc.Migrations
 
             modelBuilder.Entity("Yavsc.Models.Messaging.DismissClicked", b =>
                 {
-                    b.HasOne("Yavsc.Models.Messaging.Notification", "Notified")
+                    b.HasOne("Yavsc.Abstract.Models.Messaging.Notification", "Notified")
                         .WithMany()
                         .HasForeignKey("NotificationId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -3281,9 +3218,7 @@ namespace Yavsc.Migrations
 
                     b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularisation")
                         .WithMany()
-                        .HasForeignKey("PaymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("PaymentId");
 
                     b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "PerformerProfile")
                         .WithMany()
@@ -3343,9 +3278,7 @@ namespace Yavsc.Migrations
 
                     b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularisation")
                         .WithMany()
-                        .HasForeignKey("PaymentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("PaymentId");
 
                     b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "PerformerProfile")
                         .WithMany()
@@ -3388,8 +3321,7 @@ namespace Yavsc.Migrations
 
             modelBuilder.Entity("Yavsc.Models.ApplicationUser", b =>
                 {
-                    b.Navigation("AccountBalance")
-                        .IsRequired();
+                    b.Navigation("AccountBalance");
 
                     b.Navigation("BankInfo");
 

src/Yavsc.Server/Models/Access/CircleAuthorizationToBlogPost.cs

@@ -8,8 +8,8 @@ namespace Yavsc.Models.Access
 
     public class CircleAuthorizationToBlogPost : ICircleAuthorization
     {
-        public long CircleId { get; set; }
-        public long BlogPostId { get; set; }
+        public long CircleId { get; set; }
+        public long BlogPostId { get; set; }
 
         [JsonIgnore]
         [ForeignKey("BlogPostId")]
@@ -17,7 +17,10 @@ namespace Yavsc.Models.Access
 
         [JsonIgnore]
         [ForeignKey("CircleId")]
-        public virtual Circle Allowed { get; set; }
+        public virtual Circle Allowed { get; set; }
+
+        public bool Comment { get; set; }
+        
 
     }
 }

src/Yavsc.Server/Models/ApplicationDbContext.cs

@@ -1,22 +1,22 @@
 
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
-using Yavsc.Models.Haircut;
-using Yavsc.Models.IT.Evolution;
-using Yavsc.Models.IT.Fixing;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Yavsc.Abstract.Models.Messaging;
 using Yavsc.Server.Models.EMailing;
 using Yavsc.Server.Models.IT.SourceCode;
 using Yavsc.Server.Models.IT;
-using Yavsc.Models.Streaming;
-using Yavsc.Models.Musical;
-
+using Yavsc.Abstract.Identity;
+using Yavsc.Server.Models.Calendar;
+    
 namespace Yavsc.Models
 {
+    using Haircut;
+    using IT.Evolution;
+    using IT.Fixing;
+    using Streaming;
     using Relationship;
     using Forms;
-    using Yavsc;
     using Auth;
     using Billing;
     using Musical;
@@ -32,14 +32,7 @@ namespace Yavsc.Models
     using Attributes;
     using Bank;
     using Payment;
-    using Calendar;
     using Blog;
-    using Yavsc.Abstract.Identity;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-    using Yavsc.Server.Models.Calendar;
-
-    using Microsoft.EntityFrameworkCore.ChangeTracking;
 
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
@@ -49,8 +42,8 @@ namespace Yavsc.Models
         }
         public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
         {
+        }
 
-        }  
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
@@ -60,7 +53,7 @@ namespace Yavsc.Models
             builder.Entity<Contact>().HasKey(x => new { x.OwnerId, x.UserId });
             builder.Entity<DeviceDeclaration>().Property(x => x.DeclarationDate).HasDefaultValueSql("LOCALTIMESTAMP");
             builder.Entity<BlogTag>().HasKey(x => new { x.PostId, x.TagId });
-          
+
             builder.Entity<ApplicationUser>().Property(u => u.FullName).IsRequired(false);
             builder.Entity<ApplicationUser>().Property(u => u.DedicatedGoogleCalendar).IsRequired(false);
             builder.Entity<ApplicationUser>().HasMany<ChatConnection>(c => c.Connections);
@@ -77,10 +70,10 @@ namespace Yavsc.Models
             builder.Entity<HairTaintInstance>().HasKey(ti => new { ti.TaintId, ti.PrestationId });
             builder.Entity<HyperLink>().HasKey(l => new { l.HRef, l.Method });
             builder.Entity<Period>().HasKey(l => new { l.Start, l.End });
-            builder.Entity<Models.Cratie.Option>().HasKey(o => new { o.Code, o.CodeScrutin });
+            builder.Entity<Cratie.Option>().HasKey(o => new { o.Code, o.CodeScrutin });
             builder.Entity<Notification>().Property(n => n.icon).HasDefaultValue("exclam");
             builder.Entity<ChatRoomAccess>().HasKey(p => new { room = p.ChannelName, user = p.UserId });
-            builder.Entity<InstrumentRating>().HasAlternateKey(i => new { Instrument= i.InstrumentId, owner = i.OwnerId });
+            builder.Entity<InstrumentRating>().HasAlternateKey(i => new { Instrument = i.InstrumentId, owner = i.OwnerId });
 
             foreach (var et in builder.Model.GetEntityTypes())
             {
@@ -88,30 +81,18 @@ namespace Yavsc.Models
                     et.FindProperty("DateCreated").SetAfterSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
             }
 
-            builder.Entity<Activity>().Property(a=>a.ParentCode).IsRequired(false);
-            //builder.Entity<BlogPost>().HasOne(p => p.Author).WithMany(a => a.Posts);
-            
+            builder.Entity<Activity>().Property(a => a.ParentCode).IsRequired(false);
+            //    builder.Entity<IdentityUserLogin<String>>().HasKey(i=> new { i.LoginProvider, i.UserId, i.ProviderKey });
         }
-
-        // this is not a failback procedure.
-       
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            var appSetup = (string) AppDomain.CurrentDomain.GetData(Constants.YavscConnectionStringEnvName);
-            if (!string.IsNullOrWhiteSpace(appSetup)) 
-            {
-                optionsBuilder.UseNpgsql(appSetup);
-                return;
-            }
-            var envSetup = Environment.GetEnvironmentVariable(Constants.YavscConnectionStringEnvName);
-            if (envSetup!=null) 
-                optionsBuilder.UseNpgsql(envSetup);
-            else optionsBuilder.UseNpgsql();
+            string? envCxStr = Environment.GetEnvironmentVariable(Constants.YavscConnectionStringEnvName);
+            if (envCxStr != null)
+                optionsBuilder.UseNpgsql(envCxStr);
+            base.OnConfiguring(optionsBuilder);
         }
-
         public DbSet<Client> Applications { get; set; }
 
-        public DbSet<RefreshToken> RefreshTokens { get; set; }
 
         /// <summary>
         /// Activities referenced on this site
@@ -124,7 +105,7 @@ namespace Yavsc.Models
         /// Users posts
         /// </summary>
         /// <returns></returns>
-        public DbSet<Blog.BlogPost> BlogSpot { get; set; }
+        public DbSet<BlogPost> BlogSpot { get; set; }
 
         /// <summary>
         /// Skills powered by this site
@@ -152,14 +133,7 @@ namespace Yavsc.Models
 
         public DbSet<Estimate> Estimates { get; set; }
         public DbSet<AccountBalance> BankStatus { get; set; }
-        public DbSet<BalanceImpact> BankBook { get; set; }
-
-        /// <summary>
-        /// Google Calendar offline
-        /// open auth tokens
-        /// </summary>
-        /// <returns>tokens</returns>
-        public DbSet<OAuth2Tokens> OAuth2Tokens { get; set; }
+        public DbSet<BalanceImpact> BalanceImpact { get; set; }
 
         /// <summary>
         /// References all declared external NativeConfidential devices
@@ -225,14 +199,13 @@ namespace Yavsc.Models
                 ((ITrackedEntity)entity.Entity).UserModified = userId;
             }
         }
-        
+
         public int SaveChanges(string userId)
         {
             AddTimestamps(userId);
             return base.SaveChanges();
         }
 
-    
 
         public async Task<int> SaveChangesAsync(string userId, CancellationToken ctoken = default(CancellationToken))
         {
@@ -281,7 +254,7 @@ namespace Yavsc.Models
         public DbSet<Comment> Comment { get; set; }
 
         public DbSet<Announce> Announce { get; set; }
-        
+
         // TODO remove and opt for for memory only storing,
         // as long as it must be set empty each time the service is restarted,
         // and that chatting should be kept as must as possible independent from db context
@@ -294,7 +267,7 @@ namespace Yavsc.Models
         public DbSet<GitRepositoryReference> GitRepositoryReference { get; set; }
 
         public DbSet<Project> Project { get; set; }
-        
+
         [Obsolete("use signaled flows")]
         public DbSet<LiveFlow> LiveFlow { get; set; }
 
@@ -304,5 +277,7 @@ namespace Yavsc.Models
 
         public DbSet<Scope> Scopes { get; set; }
 
+        public DbSet<BlogSpotPublication> blogSpotPublications { get; set; }
+        public DbSet<Client> Client { get; set; }
     }
 }

src/Yavsc.Server/Models/ApplicationUser.cs

@@ -7,10 +7,12 @@ using Yavsc.Models.Identity;
 using Yavsc.Models.Chat;
 using Yavsc.Models.Bank;
 using Yavsc.Models.Access;
+using Yavsc.Abstract.Identity;
+
 namespace Yavsc.Models
 {
     [Table("AspNetUsers")]
-    public class ApplicationUser : IdentityUser
+    public class ApplicationUser : IdentityUser, IApplicationUser
     {
         /// <summary> 
         /// Another me, as a byte array.TG7@Eu%80rufzkhbb
@@ -22,10 +24,10 @@ namespace Yavsc.Models
         /// </summary>
         /// <returns></returns>
         [MaxLength(512)]
-        public string Avatar { get; set; }
+        public string? Avatar { get; set; }
 
         [MaxLength(512)]
-        public string FullName { get; set; }
+        public string? FullName { get; set; }
 
 
         /// <summary>
@@ -33,32 +35,31 @@ namespace Yavsc.Models
         /// </summary>
         /// <returns></returns>
         [Display(Name = "Account balance")]
-        public virtual AccountBalance AccountBalance { get; set; }
+        public virtual AccountBalance? AccountBalance { get; set; }
 
         /// <summary>
         /// User's posts
         /// </summary>
         /// <returns></returns>
         [InverseProperty("Author"), JsonIgnore]
-        public virtual List<Blog.BlogPost> Posts { get; set; }
+        public virtual List<Blog.BlogPost>? Posts { get; set; }
 
         /// <summary>
         /// User's contact list
         /// </summary>
         /// <returns></returns>
         [InverseProperty("Owner"), JsonIgnore]
-        public virtual List<Contact> Book { get; set; }
+        public virtual List<Contact>? Book { get; set; }
 
         /// <summary>
         /// External devices using the API
         /// </summary>
         /// <returns></returns>
         [InverseProperty("DeviceOwner"), JsonIgnore]
-        public virtual List<DeviceDeclaration> DeviceDeclaration { get; set; }
+        public virtual List<DeviceDeclaration>? DeviceDeclaration { get; set; }
 
         [InverseProperty("Owner"), JsonIgnore]
-        public virtual List<ChatConnection> Connections { get; set; }
-
+        public virtual List<ChatConnection>? Connections { get; set; }
 
         /// <summary>
         /// User's circles
@@ -66,7 +67,7 @@ namespace Yavsc.Models
         /// <returns></returns>
         [InverseProperty("Owner"), JsonIgnore]
 
-        public virtual List<Circle> Circles { get; set; }
+        public virtual List<Circle>? Circles { get; set; }
 
         /// <summary>
         /// Billing postal address
@@ -81,14 +82,14 @@ namespace Yavsc.Models
         /// </summary>
         /// <returns></returns>
         [MaxLength(512)]
-        public string DedicatedGoogleCalendar { get; set; }
+        public string? DedicatedGoogleCalendar { get; set; }
 
         public override string ToString()
         {
             return this.Id + " " + this.AccountBalance?.Credits.ToString() + this.Email + " " + this.UserName + " $" + this.AccountBalance?.Credits.ToString();
         }
 
-        public virtual List<BankIdentity> BankInfo { get; set; }
+        public virtual List<BankIdentity>? BankInfo { get; set; }
 
         public long DiskQuota { get; set; } = 512 * 1024 * 1024;
         public long DiskUsage { get; set; } = 0;
@@ -97,21 +98,24 @@ namespace Yavsc.Models
 
         [JsonIgnore]
         [InverseProperty("Owner")]
-        public virtual List<BlackListed> BlackList { get; set; }
+        public virtual List<BlackListed>? BlackList { get; set; }
 
         public bool AllowMonthlyEmail { get; set; } = false;
 
         [JsonIgnore]
         [InverseProperty("Owner")]
-        public virtual List<ChatRoom> Rooms { get; set; }
+        public virtual List<ChatRoom>? Rooms { get; set; }
 
         [JsonIgnore]
         [InverseProperty("User")]
-        public virtual List<ChatRoomAccess> RoomAccess { get; set; }
+        public virtual List<ChatRoomAccess>? RoomAccess { get; set; }
 
         [JsonIgnore]
         [InverseProperty("Member")]
-        public virtual List<CircleMember> Membership { get; set; }
+        public virtual List<CircleMember>? Membership { get; set; }
 
+        IAccountBalance? IApplicationUser.AccountBalance => AccountBalance;
+
+        ILocation? IApplicationUser.PostalAddress { get => PostalAddress; }
     }
 }

src/Yavsc.Server/Models/Billing/NominativeServiceCommand.cs

@@ -98,7 +98,7 @@ namespace Yavsc.Models.Billing
         
         [ForeignKey("Regularisation")]
      
-        public string PaymentId { get; set; }
+        public string? PaymentId { get; set; }
 
         [Display(Name = "Acquittement de la facture")]
         public virtual PayPalPayment Regularisation { get; set; }

src/Yavsc.Server/Models/Blog/BlogPost.cs

@@ -5,6 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
+using Yavsc;
+using Yavsc.Abstract.Identity;
 using Yavsc.Abstract.Identity.Security;
 using Yavsc.Attributes.Validation;
 using Yavsc.Interfaces;
@@ -14,7 +16,8 @@ using Yavsc.ViewModels.Blog;
 
 namespace Yavsc.Models.Blog
 {
-    public class BlogPost : BlogPostInputViewModel, IBlogPost, ICircleAuthorized, ITaggable<long>, IIdentified<long>
+    public class BlogPost : BlogPostBase,
+    IBlogPost, ICircleAuthorized, ITaggable<long>
     {
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         [Display(Name="Identifiant du post")]
@@ -35,7 +38,7 @@ namespace Yavsc.Models.Blog
         }
 
         [Display(Name="Créateur")]
-        public  string UserCreated
+        public string? UserCreated
         {
             get; set;
         }
@@ -47,7 +50,7 @@ namespace Yavsc.Models.Blog
         }
 
         [Display(Name="Utilisateur ayant modifé le dernier")]
-        public  string UserModified
+        public  string? UserModified
         {
             get; set;
         }
@@ -85,7 +88,6 @@ namespace Yavsc.Models.Blog
         [InverseProperty("Post")]
         public  virtual List<Comment> Comments { get; set; }
 
-        [NotMapped]
-        public string OwnerId => AuthorId;
+        IApplicationUser IBlogPost.Author { get => this.Author; }
     }
 }

src/Yavsc.Server/Models/Blog/BlogspotPublication.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Models.Blog;
+
+namespace Yavsc.Models
+{
+    public class BlogSpotPublication
+    {
+        [Key]
+        public long BlogpostId { get; set; }
+        
+        [ForeignKey("BlogpostId")]
+        public virtual BlogPost BlogPost{ get; set; }
+    }
+}

src/Yavsc.Server/Models/HairCut/BrusherProfile.cs

@@ -60,7 +60,7 @@ namespace Yavsc.Models.Haircut
 
         [DisplayFormat(ConvertEmptyStringToNull = true, NullDisplayText = "[Pas d'emploi du temps spécifié]")]
         [Display(Name="Emploi du temps")]
-        public virtual Schedule Schedule { get; set; }
+        public virtual Schedule? Schedule { get; set; }
 
         [Display(Name="Coupe femme cheveux longs"),DisplayFormat(DataFormatString="{0:C}")]
 

src/Yavsc.Server/Models/IdentityUserLogin.cs

@@ -0,0 +1,33 @@
+namespace Yavsc.Models.Auth
+{
+    using Microsoft.AspNetCore.Identity;
+    using System.ComponentModel.DataAnnotations.Schema;
+
+    public class YaIdentityUserLogin
+    {
+
+        /// <summary>
+        /// Gets or sets the login provider for the login (e.g. facebook, google)
+        /// </summary>
+        public virtual string LoginProvider { get; set; } = default!;
+
+        /// <summary>
+        /// Gets or sets the unique provider identifier for this login.
+        /// </summary>
+        public virtual string ProviderKey { get; set; } = default!;
+
+        /// <summary>
+        /// Gets or sets the friendly name used in a UI for this login.
+        /// </summary>
+        public virtual string? ProviderDisplayName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary key of the user associated with this login.
+        /// </summary>
+        public String UserId { get; set; } = default!;
+
+        [ForeignKey("UserId")]
+        public virtual ApplicationUser User { get; set; }
+
+    }
+}

src/Yavsc.Server/Models/Messaging/DimissClicked.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Yavsc.Abstract.Models.Messaging;
 using Yavsc.Attributes.Validation;
 
 namespace Yavsc.Models.Messaging

src/Yavsc.Server/Models/Workflow/Activity.cs

@@ -28,7 +28,7 @@ namespace Yavsc.Models.Workflow
         [YaStringLength(512)]
         [Display(Name = "Code du parent")]
         [ForeignKey("Parent")]
-        public string ParentCode { get; set; }
+        public string? ParentCode { get; set; }
 
         [Display(Name = "Activité parent"), JsonIgnore]
         public virtual Activity Parent { get; set; }
@@ -41,7 +41,7 @@ namespace Yavsc.Models.Workflow
         public string Description { get; set; }
 
         [Display(Name = "Photo")]
-        public string Photo { get; set; }
+        public string? Photo { get; set; }
 
         [InverseProperty("Context")]
         [DisplayAttribute(Name = "Services liés")]
@@ -52,7 +52,7 @@ namespace Yavsc.Models.Workflow
         /// </summary>
         /// <returns></returns>
         [DisplayAttribute(Name = "Groupe de modération")]
-        public string ModeratorGroupName { get; set; }
+        public string? ModeratorGroupName { get; set; }
 
         /// <summary>
         /// indice de recherche de cette activité
@@ -64,7 +64,7 @@ namespace Yavsc.Models.Workflow
         [DisplayFormatAttribute(DataFormatString="{0}%")]
         public int Rate { get; set; }
         [DisplayAttribute(Name = "Classe de paramétrage")]
-        public string SettingsClassName { get; set; }
+        public string? SettingsClassName { get; set; }
 
         [InverseProperty("Context")]
         [Display(Name="Formulaires de commande")]
@@ -77,7 +77,7 @@ namespace Yavsc.Models.Workflow
         }
 
         [Display(Name="Createur")]
-        public string UserCreated
+        public string? UserCreated
         {
             get; set;
         }
@@ -89,7 +89,7 @@ namespace Yavsc.Models.Workflow
         }
 
         [Display(Name="Utilisateur ayant modifié le dernier")]
-        public string UserModified
+        public string? UserModified
         {
             get; set;
         }

src/Yavsc.Server/Models/societe.com/CompanyInfo.cs

@@ -8,10 +8,10 @@ namespace Yavsc.Models.societe.com
     public class CompanyInfoMessage
     {
         public bool success { get; set; }
-        public string errorType { get; set; }
-        public string errorCode { get; set; }
-        public string errorMessage { get; set; }
-        public CompanyInfo result { get; set; }
+        public string? errorType { get; set; }
+        public string? errorCode { get; set; }
+        public string? errorMessage { get; set; }
+        public CompanyInfo? result { get; set; }
 
     }
 

src/Yavsc.Server/Services/BlogPostEdition.cs

@@ -0,0 +1,13 @@
+using Yavsc.Models.Blog;
+
+public class BlogPostEdition
+{
+    public string Content { get; internal set; }
+    public string Title { get; internal set; }
+    public string Photo { get; internal set; }
+
+    internal static BlogPostEdition From(BlogPost blog)
+    {
+        throw new NotImplementedException();
+    }
+}