testing

2025-07-14 18:58:04 +01:00
parent 0a270c9218
commit 62e863e343
20 changed files with 233 additions and 266 deletions
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
  <PropertyGroup>
    <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="9.0.6" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
    <ProjectReference Include="../Yavsc.Server/Yavsc.Server.csproj" />
- </ItemGroup>
-</Project>
+  </ItemGroup>
+</Project>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -1,5 +1,5 @@
-<Project >
+<Project>
  <PropertyGroup>
    <Version>1.0.8</Version>
  </PropertyGroup>
-</Project>
+</Project>
--- a/src/Yavsc.Abstract/Constants.cs
+++ b/src/Yavsc.Abstract/Constants.cs
@ -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;
--- a/src/Yavsc.Abstract/Yavsc.Abstract.csproj
+++ b/src/Yavsc.Abstract/Yavsc.Abstract.csproj
@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <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>
--- a/src/Yavsc.Server/Helpers/WorkflowHelpers.cs
+++ b/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)));
-    }
-
    }
 }
--- a/src/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/src/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs
@ -17,7 +17,7 @@ namespace Yavsc.Migrations
        {
 #pragma warning disable 612, 618
            modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.6")
+                .HasAnnotation("ProductVersion", "9.0.7")
                .HasAnnotation("Relational:MaxIdentifierLength", 63);

            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
--- a/src/Yavsc.Server/Models/ApplicationDbContext.cs
+++ b/src/Yavsc.Server/Models/ApplicationDbContext.cs
@ -35,17 +35,18 @@ namespace Yavsc.Models

    using Microsoft.EntityFrameworkCore.ChangeTracking;
    using Yavsc.Abstract.Models.Messaging;
+    using Microsoft.Extensions.Logging;
+    using System.Configuration;

    public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
    {
-        public ApplicationDbContext()
-        {
+        private readonly ILogger<ApplicationDbContext> logger;

-        }
        
-        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
+        public ApplicationDbContext(ILoggerFactory loggerFactory,
+        DbContextOptions<ApplicationDbContext> options) : base(options)
        {
-
+            logger = loggerFactory.CreateLogger<ApplicationDbContext>();
        }
        
        protected override void OnModelCreating(ModelBuilder builder)
@ -89,22 +90,6 @@ namespace Yavsc.Models
            //    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();
-        }
-
        public DbSet<Client> Applications { get; set; }

        public DbSet<RefreshToken> RefreshTokens { get; set; }
--- a/src/Yavsc.Server/Yavsc.Server.csproj
+++ b/src/Yavsc.Server/Yavsc.Server.csproj
@ -1,33 +1,32 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <UserSecretsId>53bd70e8-ff81-497a-847f-a15fd8ea7a09</UserSecretsId>
-    
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="HigginsSoft.IdentityServer8" Version="8.0.5-preview-net9" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.6">
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+    <PackageReference Include="HigginsSoft.IdentityServer8" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
-    <PackageReference Include="Google.Apis.Calendar.v3" Version="1.69.0.3746" />
-    <PackageReference Include="PayPalMerchantSDK" Version="2.16.250" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
-    <PackageReference Include="RazorEngine.NetCore" Version="3.1.0" />
-    <PackageReference Include="MailKit" Version="4.13.0" />
-    <PackageReference Include="MimeKit" Version="4.13.0" />
-    <PackageReference Include="pazof.rules" Version="1.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
+    <PackageReference Include="Google.Apis.Calendar.v3" />
+    <PackageReference Include="PayPalMerchantSDK" />
+    <PackageReference Include="SixLabors.ImageSharp" />
+    <PackageReference Include="RazorEngine.NetCore" />
+    <PackageReference Include="MailKit" />
+    <PackageReference Include="MimeKit" />
+    <PackageReference Include="pazof.rules" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
  </ItemGroup>
-</Project>
+</Project>
--- a/src/Yavsc/Extensions/HostingExtensions.cs
+++ b/src/Yavsc/Extensions/HostingExtensions.cs
@ -44,7 +44,7 @@ namespace Yavsc.Extensions;
 public static class HostingExtensions
 {
  
-    internal static WebApplication ConfigureWebAppServices(this WebApplicationBuilder builder)
+    public static WebApplication ConfigureWebAppServices(this WebApplicationBuilder builder)
    {
        IServiceCollection services = LoadConfiguration(builder);

@ -300,7 +300,7 @@ public static class HostingExtensions
    }


-    internal async static Task<WebApplication> ConfigurePipeline(this WebApplication app)
+    public async static Task<WebApplication> ConfigurePipeline(this WebApplication app)
    {

        if (app.Environment.IsDevelopment())
--- a/src/Yavsc/Yavsc.csproj
+++ b/src/Yavsc/Yavsc.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
    <Nullable>enable</Nullable>
@ -7,44 +7,42 @@
    <UserSecretsId>76e56fc2-1619-40d8-8393-365258b7a21d</UserSecretsId>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="popper.js" Version="1.16.1">
-     <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="popper.js">
+      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="bootstrap" Version="5.3.7">
-     <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="bootstrap">
+      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="HigginsSoft.IdentityServer8" Version="8.0.5-preview-net9" />
-    <PackageReference Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="8.0.5-preview-net9" />
-  
-    <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.7">
+    <PackageReference Include="HigginsSoft.IdentityServer8" />
+    <PackageReference Include="HigginsSoft.IdentityServer8.AspNetIdentity" />
+    <PackageReference Include="Serilog.AspNetCore" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.7" />
-    <PackageReference Include="Google.Apis.Compute.v1" Version="1.70.0.3829" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.3.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
-    <PackageReference Include="AsciiDocNet" Version="1.0.0-alpha6" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.7" />
-  
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
+    <PackageReference Include="Google.Apis.Compute.v1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" />
+    <PackageReference Include="Microsoft.AspNetCore.Antiforgery" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
+    <PackageReference Include="AsciiDocNet" />
+    <PackageReference Include="SixLabors.ImageSharp" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="../Yavsc.Server/Yavsc.Server.csproj" />
    <ProjectReference Include="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
  </ItemGroup>
-</Project>
+</Project>
--- a/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj
+++ b/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj
@ -4,18 +4,15 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>
-
  <ItemGroup>
    <ProjectReference Include="..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
-    <PackageReference Include="IdentityModel.AspNetCore" Version="4.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
+    <PackageReference Include="IdentityModel.AspNetCore" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
  </ItemGroup>
-
  <ItemGroup>
    <Content Update="Views\Shared\Json.cshtml">
      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
    </Content>
  </ItemGroup>
-  
-</Project>
+</Project>