Skip to content

Commit

Permalink
Updated libs
Browse files Browse the repository at this point in the history
  • Loading branch information
joaofx committed Apr 11, 2023
1 parent 4154411 commit 7912502
Show file tree
Hide file tree
Showing 43 changed files with 313 additions and 127 deletions.
2 changes: 1 addition & 1 deletion global.json
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.101"
"version": "7.0.202"
}
}
Expand Up @@ -9,10 +9,10 @@
<ProjectReference Include="..\..\..\..\src\Miru.PageTesting\Miru.PageTesting.csproj" />
<ProjectReference Include="..\..\..\..\src\Miru.PageTesting.Chrome\Miru.PageTesting.Chrome.csproj" />

<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />

<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="108.0.5359.7100" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="112.0.5615.4900" />
</ItemGroup>

<ItemGroup>
Expand Down
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />

<ProjectReference Include="..\..\..\..\src\Miru.Testing\Miru.Testing.csproj" />
<ProjectReference Include="..\..\..\..\src\Miru.Fabrication\Miru.Fabrication.csproj" />
Expand Down
Expand Up @@ -6,15 +6,13 @@

namespace MiruNext.Database;

public class MiruNextDbContext : UserfyDbContext<User>
public class AppDbContext : UserfyDbContext<User>
{
public MiruNextDbContext(
public AppDbContext(
DbContextOptions options,
IEnumerable<IInterceptor> interceptors) : base(options, interceptors)
{
}

// Your entities
// public DbSet<> { get; set; }

public DbSet<Todo> Todos { get; set; }
}
Expand Up @@ -3,9 +3,9 @@

namespace MiruNext.Database;

public class MiruNextFabricator : Fabricator
public class AppFabricator : Fabricator
{
public MiruNextFabricator(FabSupport context) : base(context)
public AppFabricator(FabSupport context) : base(context)
{
Fixture.AddConvention(cfg =>
{
Expand Down
@@ -0,0 +1,18 @@
using FluentMigrator;
using Miru.Behaviors.TimeStamp;
using Miru.Databases.Migrations.FluentMigrator;

namespace Corpo.Skeleton.Database.Migrations;

[Migration(202303312001)]
public class CreateTodos : AutoReversingMigration
{
public override void Up()
{
Create.Table("Todos")
.WithColumn("Id").AsId()
.WithColumn("Name").AsString(64)
.WithColumn("UserId").AsForeignKeyReference("Users")
.WithTimeStamps();
}
}
8 changes: 8 additions & 0 deletions samples/MiruNext/src/MiruNext/Domain/Todo.cs
@@ -0,0 +1,8 @@
using Miru.Domain;

namespace MiruNext.Domain;

public class Todo : Entity
{
public string Name { get; set; }
}
25 changes: 25 additions & 0 deletions samples/MiruNext/src/MiruNext/Features/Todos/List.cshtml
@@ -0,0 +1,25 @@
@model MiruNext.Features.Todos.TodoList.Result

<h3>Todos</h3>

<div class="my-3">
@* <a for="@(new TodoEdit)">Add</a> *@
</div>

<miru-table x="For(x => x.Todos)">
<thead>
<tr>
<miru-th x="For(x => x.Todos[0].Id)" />
<miru-th x="For(x => x.Todos[0].Name)" />
</tr>
</thead>
<tbody>
@foreach (var (_, i) in Model.Todos.Indexed())
{
<tr>
<miru-td x="For(x => x.Todos[i].Id)" />
<miru-td x="For(x => x.Todos[i].Name)" />
</tr>
}
</tbody>
</miru-table>
3 changes: 3 additions & 0 deletions samples/MiruNext/src/MiruNext/Features/Todos/New.cshtml
@@ -0,0 +1,3 @@
@model MiruNext.Features.Todos.TodoEdit.Command

<partial name="Edit" model="@Model" />
82 changes: 82 additions & 0 deletions samples/MiruNext/src/MiruNext/Features/Todos/TodoEdit.cs
@@ -0,0 +1,82 @@
using System.Linq;
using Microsoft.EntityFrameworkCore;
using MiruNext.Database;

namespace MiruNext.Features.Todos;

public class TodoEdit
{
public class Query
{
}

public class Command
{
public long TodoId { get; set; }
public string Name { get; set; }
}

public class Result
{
public TodoView[] Todos { get; set; } = Array.Empty<TodoView>();
}

public class TodoView
{
public long Id { get; set; }
public string Name { get; set; }
}

[HttpGet("/todos/{TodoId}")]
public class Edit : Endpoint2<Query>
{
private readonly AppDbContext _db;

public Edit(AppDbContext db) => _db = db;

public override async Task HandleAsync(Query request, CancellationToken ct)
{
var result = new Result
{
Todos = await _db.Todos
.Select(x => new TodoView
{
Id = x.Id,
Name = x.Name
})
.ToArrayAsync(ct)
};

await RespondAsync(result);
}

// public override async Task HandleAsync(Command request, CancellationToken ct)
// {
// var result = new Result
// {
// Todos = await _db.Todos
// .Select(x => new TodoView
// {
// Id = x.Id,
// Name = x.Name
// })
// .ToArrayAsync(ct)
// };
//
// await RespondAsync(result);
// }
}

[HttpGet("/todos/new")]
public class New : Endpoint2<Query>
{
// private readonly AppDbContext _db;
//
// public New(AppDbContext db) => _db = db;

public override async Task HandleAsync(Query request, CancellationToken ct)
{
await RespondAsync(new Command());
}
}
}
50 changes: 50 additions & 0 deletions samples/MiruNext/src/MiruNext/Features/Todos/TodoList.cs
@@ -0,0 +1,50 @@
using System.Linq;
using Microsoft.EntityFrameworkCore;
using MiruNext.Database;

namespace MiruNext.Features.Todos;

public class TodoList
{
public class Query
{
}

public class Result
{
public TodoView[] Todos { get; set; } = Array.Empty<TodoView>();
}

public class TodoView
{
public long Id { get; set; }
public string Name { get; set; }
}

[HttpGet("/Todos")]
public class List : Endpoint2<Query>
{
private readonly AppDbContext _db;

public List(AppDbContext db)
{
_db = db;
}

public override async Task HandleAsync(Query request, CancellationToken ct)
{
var result = new Result
{
Todos = await _db.Todos
.Select(x => new TodoView
{
Id = x.Id,
Name = x.Name
})
.ToArrayAsync(ct)
};

await RespondAsync(result);
}
}
}
2 changes: 1 addition & 1 deletion samples/MiruNext/src/MiruNext/MiruNext.csproj
Expand Up @@ -9,7 +9,7 @@
<PackageReference Include="StackExchange.Exceptional.AspNetCore" Version="2.2.32" />
<PackageReference Include="Hangfire.Console" Version="1.4.2" />
<PackageReference Include="Hangfire.Console.Extensions.Serilog" Version="1.0.2" />
<PackageReference Include="FastEndpoints" Version="5.5.0" />
<PackageReference Include="FastEndpoints" Version="5.8.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions samples/MiruNext/tests/MiruNext.Tests/Extensions.cs
Expand Up @@ -6,9 +6,9 @@ namespace MiruNext.Tests;

public static class Extensions
{
public static TReturn Db<TReturn>(this ITestFixture fixture, Func<MiruNextDbContext, TReturn> func) =>
public static TReturn Db<TReturn>(this ITestFixture fixture, Func<AppDbContext, TReturn> func) =>
fixture.WithDb(func);

public static MiruNextFabricator Fab(this ITestFixture fixture) =>
fixture.Get<MiruNextFabricator>();
public static AppFabricator Fab(this ITestFixture fixture) =>
fixture.Get<AppFabricator>();
}
6 changes: 4 additions & 2 deletions samples/Playground/src/Playground/Features/Jobs/JobNew.cs
Expand Up @@ -62,7 +62,7 @@ public class NameNewJob : IRequest
public string Name { get; set; }
}

public class JobHandler : RequestHandler<NameNewJob>
public class JobHandler : IRequestHandler<NameNewJob>
{
private readonly ILogger<JobHandler> _logger;
private readonly PlaygroundDbContext _db;
Expand All @@ -73,13 +73,15 @@ public JobHandler(ILogger<JobHandler> logger, PlaygroundDbContext db)
_db = db;
}

protected override void Handle(NameNewJob request)
public async Task<Unit> Handle(NameNewJob request, CancellationToken cancellationToken)
{
_db.Users.ToList();

_logger.LogInformation("From ILogger {Name}", request.Name);

App.Log.Information("Name is {Name}", request.Name);

return await Unit.Task;
}
}
}
10 changes: 5 additions & 5 deletions samples/Playground/src/Playground/Features/Results/ResultEdit.cs
Expand Up @@ -25,21 +25,21 @@ public class Command : IRequest<FeatureResult>
}

public class Handler :
RequestHandler<Command, FeatureResult>,
IRequestHandler<Command, FeatureResult>,
IRequestHandler<Query, Command>
{
public Task<Command> Handle(Query request, CancellationToken cancellationToken)
public Task<Command> Handle(Query request, CancellationToken ct)
{
return Task.FromResult(new Command());
}

protected override FeatureResult Handle(Command request)
public async Task<FeatureResult> Handle(Command request, CancellationToken ct)
{
return new FeatureResult<ResultList>()
return await Task.FromResult(new FeatureResult<ResultList>()
.Success("Success message")
.Alert("Alert message")
.Info("Info message")
.Danger("danger message");
.Danger("danger message"));
}
}

Expand Down
@@ -1,3 +1,4 @@
using System.Threading;
using System.Threading.Tasks;
using MediatR;
using Microsoft.AspNetCore.Mvc;
Expand All @@ -16,11 +17,11 @@ public class Result
}

public class Handler :
RequestHandler<Query, Result>
IRequestHandler<Query, Result>
{
protected override Result Handle(Query request)
public async Task<Result> Handle(Query request, CancellationToken ct)
{
return new Result();
return await Task.FromResult(new Result());
}
}

Expand Down
Expand Up @@ -9,10 +9,10 @@
<ProjectReference Include="..\..\..\..\src\Miru.PageTesting.Firefox\Miru.PageTesting.Firefox.csproj" />
<ProjectReference Include="..\..\..\..\src\Miru.PageTesting\Miru.PageTesting.csproj" />

<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />

<PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.32.0" />
<PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.33.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />

<ProjectReference Include="..\..\..\..\src\Miru.Testing\Miru.Testing.csproj" />
<ProjectReference Include="..\..\..\..\src\Miru.Fabrication\Miru.Fabrication.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/Miru.Core/Miru.Core.csproj
Expand Up @@ -7,10 +7,10 @@
<ItemGroup>
<PackageReference Include="Baseline" Version="4.1.0" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="Scriban" Version="5.5.0" />
<PackageReference Include="Scriban" Version="5.7.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
<PackageReference Include="YamlDotNet" Version="12.3.1" />
<PackageReference Include="YamlDotNet" Version="13.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 7912502

Please sign in to comment.