Refactored current attributes

MiruFx · Mar 6, 2024 · 0ed2857 · 0ed2857
1 parent 9f7c42a
commit 0ed2857
Show file tree

Hide file tree

Showing 113 changed files with 529 additions and 953 deletions.
diff --git a/samples/Corpo.Skeleton/src/Corpo.Skeleton/Features/CurrentAttributes.cs b/samples/Corpo.Skeleton/src/Corpo.Skeleton/Features/CurrentAttributes.cs
diff --git a/samples/Corpo.Skeleton/src/Corpo.Skeleton/Features/CurrentHandler.cs b/samples/Corpo.Skeleton/src/Corpo.Skeleton/Features/CurrentHandler.cs
@@ -0,0 +1,30 @@
+using Microsoft.Extensions.Options;
+using Miru.Currentable;
+using Miru.Userfy;
+
+namespace Corpo.Skeleton.Features;
+
+public class CurrentHandler(
+    Current current,
+    AppDbContext db,
+    ICurrentUser currentUser,
+    IOptions<AppOptions> appOptions)
+    : ICurrentHandler
+{
+    private readonly AppOptions _appOptions = appOptions.Value;
+
+    public async Task Handle<TRequest>(TRequest request, CancellationToken ct)
+    {
+        if (current.Loaded == false)
+        {
+            current.IsAuthenticated = currentUser.IsAuthenticated;
+
+            if (currentUser.IsAuthenticated)
+            {
+                current.User = await db.Users.ByIdAsync(currentUser.Id, ct);
+            }
+
+            current.AppOptions = _appOptions;   
+        }
+    }
+}
diff --git a/samples/Corpo.Skeleton/src/Corpo.Skeleton/Features/Examples/_Form.turbo.cshtml b/samples/Corpo.Skeleton/src/Corpo.Skeleton/Features/Examples/_Form.turbo.cshtml
@@ -2,6 +2,6 @@
 
 <turbo-stream action="update" target="result">
     <template>
-        <pre>@Model.Inspect()</pre>
+        @* <pre>@Model.Inspect()</pre> *@
     </template>
 </turbo-stream>
diff --git a/samples/Corpo.Skeleton/src/Corpo.Skeleton/Startup.cs b/samples/Corpo.Skeleton/src/Corpo.Skeleton/Startup.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Hosting;
 using Miru.Behaviors.BelongsToUser;
 using Miru.Behaviors.TimeStamp;
+using Miru.Currentable;
 using Miru.Hosting;
 using Miru.Queuing;
 using Miru.Sqlite;
@@ -22,7 +23,7 @@ public void ConfigureServices(IServiceCollection services)
 
             .AddDefaultPipeline<Startup>()
 
-            .AddCurrentAttributes<Current, CurrentAttributes>()
+            .AddCurrent<Current, CurrentHandler>()
 
             .AddEfCoreSqlite<AppDbContext>()
 

diff --git a/...es/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Categories/CategoryEditPageTest.cs b/...es/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Categories/CategoryEditPageTest.cs
@@ -7,8 +7,9 @@ public class CategoryEditPageTest : PageTest
     [Test]
     public void Can_edit_category()
     {
-        var category = _.MakeSaving<Category>();
-
+        var category = _.Make<Category>();
+        _.Save(category);
+
         _.Visit(new CategoryEdit.Query { Id = category.Id });
 
         _.Form<CategoryEdit.Command>((f, command) =>

diff --git a/...es/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Categories/CategoryListPageTest.cs b/...es/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Categories/CategoryListPageTest.cs
@@ -7,8 +7,9 @@ public class CategoryListPageTest : PageTest
     [Test]
     public void Can_list_categories()
     {
-        var categories = _.MakeManySaving<Category>();
-
+        var categories = _.MakeMany<Category>();
+        _.Save(categories);
+
         _.Visit<CategoryList>();
 
         _.ShouldHaveText("Category");

diff --git a/...es/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Categories/CategoryShowPageTest.cs b/...es/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Categories/CategoryShowPageTest.cs
@@ -7,8 +7,9 @@ public class CategoryShowPageTest : PageTest
     [Test]
     public void Can_show_category()
     {
-        var category = _.MakeSaving<Category>();
-
+        var category = _.Make<Category>();
+        _.Save(category);
+
         _.Visit(new CategoryShow.Query { Id = category.Id });
 
         _.ShouldHaveText(category.Name);

diff --git a/samples/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Teams/TeamEditPageTest.cs b/samples/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Teams/TeamEditPageTest.cs
@@ -7,8 +7,9 @@ public class TeamEditPageTest : PageTest
     [Test]
     public void Can_edit_team()
     {
-        var team = _.MakeSaving<Team>();
-
+        var team = _.Make<Team>();
+        _.Save(team);
+
         _.Visit(new TeamEdit.Query { Id = team.Id });
 
         _.Form<TeamEdit.Command>((f, command) =>

diff --git a/samples/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Teams/TeamListPageTest.cs b/samples/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Teams/TeamListPageTest.cs
@@ -1,27 +1,22 @@
-using Corpo.Skeleton.Domain;
 using Corpo.Skeleton.Features.Teams;
-using Miru;
-using Miru.PageTesting;
-using Miru.Testing;
-using NUnit.Framework;
 
-namespace Corpo.Skeleton.PageTests.Pages.Teams
+namespace Corpo.Skeleton.PageTests.Pages.Teams;
+
+public class TeamListPageTest : PageTest
 {
-    public class TeamListPageTest : PageTest
+    [Test]
+    public void Can_list_teams()
     {
-        [Test]
-        public void Can_list_teams()
-        {
-            var teams = _.MakeManySaving<Team>();
+        var teams = _.MakeMany<Team>();
+        _.Save(teams);
 
-            _.Visit<TeamList>();
+        _.Visit<TeamList>();
 
-            _.ShouldHaveText("Teams");
+        _.ShouldHaveText("Teams");
 
-            _.Display<TeamList.Result>(x =>
-            {
-                x.ShouldHave(m => m.Teams[0].Name, teams.At(0).Name);
-            });
-        }
+        _.Display<TeamList.Result>(x =>
+        {
+            x.ShouldHave(m => m.Teams[0].Name, teams.At(0).Name);
+        });
     }
 }
diff --git a/samples/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Tickets/TicketEditPageTest.cs b/samples/Corpo.Skeleton/tests/Corpo.Skeleton.PageTests/Pages/Tickets/TicketEditPageTest.cs
@@ -12,8 +12,9 @@ public class TicketEditPageTest : PageTest
     public void Can_edit_ticket()
     {
         // arrange
-        var ticket = _.MakeSaving<Ticket>();
-
+        var ticket = _.Make<Ticket>();
+        _.Save(ticket);
+
         _.Visit(new TicketEdit.Query { Id = ticket.Id });
 
         // act

diff --git a/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Categories/CategoryEditTest.cs b/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Categories/CategoryEditTest.cs
@@ -8,7 +8,9 @@ public class CategoryEditTest : FeatureTest
     public async Task Can_edit_category()
     {
         // arrange
-        var category = _.MakeSaving<Category>();
+        var category = _.Make<Category>();
+        await _.SaveAsync(category);
+
         var command = _.Make<CategoryEdit.Command>(m => m.Id = category.Id);
 
         // act

diff --git a/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Categories/CategoryListTest.cs b/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Categories/CategoryListTest.cs
@@ -8,7 +8,8 @@ public class CategoryListTest : FeatureTest
     public async Task Can_list_categories()
     {
         // arrange
-        var categories = _.MakeManySaving<Category>();
+        var categories = _.MakeMany<Category>(2);
+        await _.SaveAsync(categories);
 
         // act
         var result = await _.SendAsync(new CategoryList.Query());

diff --git a/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Categories/CategoryShowTest.cs b/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Categories/CategoryShowTest.cs
@@ -8,7 +8,8 @@ public class CategoryShowTest : FeatureTest
     public async Task Can_show_categories()
     {
         // arrange
-        var category = _.MakeSaving<Category>();
+        var category = _.Make<Category>();
+        await _.SaveAsync(category);
 
         // act
         var response = await _.SendAsync(new CategoryShow.Query { Id = category.Id });

diff --git a/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Teams/TeamEditTest.cs b/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Teams/TeamEditTest.cs
@@ -8,7 +8,9 @@ public class TeamEditTest : FeatureTest
     public async Task Can_edit_team()
     {
         // arrange
-        var team = _.MakeSaving<Team>();
+        var team = _.Make<Team>();
+        await _.SaveAsync(team);
+
         var command = _.Make<TeamEdit.Command>(m => m.Id = team.Id);
 
         // act

diff --git a/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Teams/TeamListTest.cs b/samples/Corpo.Skeleton/tests/Corpo.Skeleton.Tests/Features/Teams/TeamListTest.cs
@@ -8,8 +8,9 @@ public class TeamListTest : FeatureTest
     public async Task Can_list_teams()
     {
         // arrange
-        var teams = _.MakeManySaving<Team>();
-
+        var teams = _.MakeMany<Team>();
+        await _.SaveAsync(teams);
+
         // act
         var result = await _.SendAsync(new TeamList.Query());
 

diff --git a/samples/Playground/src/Playground/Features/Cultures/Edit.cshtml b/samples/Playground/src/Playground/Features/Cultures/Edit.cshtml
@@ -106,7 +106,7 @@
 
         <div class="row justify-content-center mt-4">
             <div class="col-md-8 alert alert-info" id="result">
-                <pre>@Model.Inspect()</pre>
+                @* <pre>@Model.Inspect()</pre> *@
             </div>
         </div>
 

diff --git a/samples/Playground/src/Playground/Features/Cultures/_Edit.turbo.cshtml b/samples/Playground/src/Playground/Features/Cultures/_Edit.turbo.cshtml
@@ -4,7 +4,7 @@
     <template>
         <div class="col-md-8 alert alert-warning" id="result">
             <pre>Response at: @DateTime.Now</pre>
-            <pre>@Model.Inspect()</pre>
+            @* <pre>@Model.Inspect()</pre> *@
         </div>
     </template>
 </turbo-stream>
diff --git a/samples/Playground/src/Playground/Features/Examples/Form.cshtml b/samples/Playground/src/Playground/Features/Examples/Form.cshtml
@@ -141,7 +141,7 @@
 
         <div class="row justify-content-center mt-4">
             <div class="col-md-8 alert alert-info" id="result">
-                <pre>@Model.Inspect()</pre>
+                @* <pre>@Model.Inspect()</pre> *@
             </div>
         </div>
     </div>

diff --git a/samples/Playground/src/Playground/Features/Examples/_Form.turbo.cshtml b/samples/Playground/src/Playground/Features/Examples/_Form.turbo.cshtml
@@ -4,7 +4,7 @@
     <template>
         <div class="col-md-8 alert alert-warning" id="result">
             <pre>Response at: @DateTime.Now</pre>
-            <pre>@Model.Inspect()</pre>
+            @* <pre>@Model.Inspect()</pre> *@
         </div>
     </template>
 </turbo-stream>
diff --git a/samples/Playground/src/Playground/Features/Forms/_Model.turbo.cshtml b/samples/Playground/src/Playground/Features/Forms/_Model.turbo.cshtml
@@ -4,7 +4,7 @@
     <template>
         <div class="col-md-8 alert alert-warning" id="result">
             <pre>Response at: @DateTime.Now</pre>
-            <pre>@Model.Inspect()</pre>
+            @* <pre>@Model.Inspect()</pre> *@
         </div>
     </template>
 </turbo-stream>
diff --git a/scripts/StubsExport/SolutionStubExport.cs b/scripts/StubsExport/SolutionStubExport.cs
@@ -59,7 +59,7 @@ public override void Export()
 
     private void SaveMapForNewSolution()
     {
-        File.WriteAllText(Params.StubDir / "_New.yml", NewSolutionFiles.ToYml());
+        File.WriteAllText(Params.StubDir / "_New.yml", Yml.ToYml(NewSolutionFiles));
 
         NewSolutionFiles.Clear();
 

diff --git a/src/Miru.Core/Console2.cs b/src/Miru.Core/Console2.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Diagnostics;
+using Baseline;
 
 namespace Miru.Core;
 
@@ -81,4 +83,27 @@ public static void BreakLine()
     {
         Console.WriteLine();
     }
+
+    public static void Measure(Action action, string taskName = "Task")
+    {
+        Console.WriteLine($"{taskName} started");
+
+        var timer = new Stopwatch();
+        timer.Start();
+
+        action();
+
+        timer.Stop();
+        Console.WriteLine($"{taskName} executed in {timer.ElapsedMilliseconds} ms");
+    }
+
+    public static T Dump<T>(T value, string prefix = null)
+    {
+        if (prefix.IsNotEmpty()) 
+            Console.Write(prefix);
+
+        Console.WriteLine($"{value.GetType().GetName()}: {Environment.NewLine}{Yml.Dump(value)}");
+
+        return value;
+    }
 }
diff --git a/src/Miru.Core/Makers/NewMaker.cs b/src/Miru.Core/Makers/NewMaker.cs
@@ -19,7 +19,7 @@ public static void New(this Maker m, string name)
             m.Directory();
             Console.WriteLine();
 
-            var map = Maker.ReadEmbedded("_New.yml").FromYml<Dictionary<string, string>>();
+            var map = Yml.FromYml<Dictionary<string, string>>(Maker.ReadEmbedded("_New.yml"));
 
             foreach (var (key, stub) in map)
             {

diff --git a/src/Miru.Core/Templates/CommandPageTest.stub b/src/Miru.Core/Templates/CommandPageTest.stub
@@ -12,8 +12,9 @@ public class {{ input.Name }}{{ input.Action }}PageTest : PageTest
     public void Can_{{ string.downcase input.Action }}_{{ string.downcase input.Name }}()
     {
         // arrange
-        var {{ string.downcase input.Name }} = _.MakeSaving<{{ input.Name }}>();
-
+        var {{ string.downcase input.Name }} = _.Make<{{ input.Name }}>();
+        _.Save({{ string.downcase input.Name }});
+
         _.Visit(new {{ input.Name }}{{ input.Action }}.Query { Id = {{ string.downcase input.Name }}.Id });
 
         // act

diff --git a/src/Miru.Core/Templates/Crud-Edit-FeaturePageTest.stub b/src/Miru.Core/Templates/Crud-Edit-FeaturePageTest.stub
@@ -7,8 +7,9 @@ public class {{ input.Name }}{{ input.Action }}PageTest : PageTest
     [Test]
     public void Can_{{ string.downcase input.Action }}_{{ string.downcase input.Name }}()
     {
-        var {{ string.downcase input.Name }} = _.MakeSaving<{{ input.Name }}>();
-
+        var {{ string.downcase input.Name }} = _.Make<{{ input.Name }}>();
+        _.Save({{ string.downcase input.Name }});
+
         _.Visit(new {{ input.Name }}{{ input.Action }}.Query { Id = {{ string.downcase input.Name }}.Id });
 
         _.Form<{{ input.Name }}{{ input.Action }}.Command>((f, command) =>

diff --git a/src/Miru.Core/Templates/Crud-Edit-FeatureTest.stub b/src/Miru.Core/Templates/Crud-Edit-FeatureTest.stub
@@ -8,7 +8,9 @@ public class {{ input.Name }}{{ input.Action }}Test : FeatureTest
     public async Task Can_{{ string.downcase input.Action }}_{{ string.downcase input.Name }}()
     {
         // arrange
-        var {{ string.downcase input.Name }} = _.MakeSaving<{{ input.Name }}>();
+        var {{ string.downcase input.Name }} = _.Make<{{ input.Name }}>();
+        await _.SaveAsync({{ string.downcase input.Name }});
+
         var command = _.Make<{{ input.Name }}{{ input.Action }}.Command>(m => m.Id = {{ string.downcase input.Name }}.Id);
 
         // act