.
This commit is contained in:
@@ -6,4 +6,6 @@ namespace VizhTalk.BuildingBlocks.Application.Configuration.Query;
|
|||||||
public interface IQueryHandler<in TQuery, TResult>
|
public interface IQueryHandler<in TQuery, TResult>
|
||||||
where TQuery : IQuery<TResult>
|
where TQuery : IQuery<TResult>
|
||||||
{
|
{
|
||||||
|
Task<TResult> Handle(TQuery request, CancellationToken cancellationToken);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace VizhTalk.BuildingBlocks.Application.Data;
|
||||||
|
|
||||||
|
public interface IGenericDapper<T> : IDisposable
|
||||||
|
where T : class
|
||||||
|
{
|
||||||
|
Task<T?> GetAsync(string sql, object? param = null);
|
||||||
|
Task<IEnumerable<T>> GetAllAsync(string sql, object? param = null);
|
||||||
|
}
|
||||||
@@ -1,10 +1,15 @@
|
|||||||
using VizhTalk.Grpc.Learning.Language;
|
using VizhTalk.Grpc.Learning;
|
||||||
|
using VizhTalk.Grpc.Learning.Language;
|
||||||
|
|
||||||
namespace VizhTalk.Gateway.Web.BFF.Mutations;
|
namespace VizhTalk.Gateway.Web.BFF.Mutations;
|
||||||
|
|
||||||
public class LanguageMutation(LanguageGrpc.LanguageGrpcClient client)
|
public class LanguageMutation(LanguageGrpc.LanguageGrpcClient client)
|
||||||
{
|
{
|
||||||
[GraphQLName("CreateLanguage")]
|
[GraphQLName("CreateLanguage")]
|
||||||
public async Task<LanguageDTO> CreateLanguage(CreateLanguageRequest model)
|
public async Task<LanguageDTO> CreateLanguage(CreateLanguageCommand request)
|
||||||
=> await client.CreateAsync(model);
|
=> await client.CreateAsync(request);
|
||||||
|
|
||||||
|
[GraphQLName("UpdateLanguage")]
|
||||||
|
public async Task<LanguageDTO> UpdateLanguage(UpdateLanguageCommand request)
|
||||||
|
=> await client.UpdateAsync(request);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ namespace VizhTalk.Gateway.Web.BFF.Queries
|
|||||||
{
|
{
|
||||||
[GraphQLName("Languages")]
|
[GraphQLName("Languages")]
|
||||||
public async Task<GetAllLanguageDTO> GetAllLanguage()
|
public async Task<GetAllLanguageDTO> GetAllLanguage()
|
||||||
=> await client.GetAllAsync(new GetAllLanguageRequest());
|
=> await client.GetAllAsync(new GetAllLanguageQuery());
|
||||||
|
|
||||||
[GraphQLName("LanguageByTitle")]
|
[GraphQLName("LanguageByTitle")]
|
||||||
public async Task<LanguageDTO> GetLanguageByTitle(GetLanguageByTitleRequest request)
|
public async Task<LanguageDTO> GetLanguageByTitle(GetLanguageByTitleQuery request)
|
||||||
=> await client.GetByTitleAsync(request);
|
=> await client.GetByTitleAsync(request);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
using VizhTalk.BuildingBlocks.Domain.Contract;
|
|
||||||
using VizhTalk.Grpc.Learning.Language;
|
|
||||||
|
|
||||||
namespace VizhTalk.Learning.Application.CommandHandlers.Commands;
|
|
||||||
|
|
||||||
public record CreateLanguageCommand(CreateLanguageRequest Model) : ICommand<LanguageDTO>;
|
|
||||||
public record UpdateLanguageCommand(UpdateLanguageRequest Model) : ICommand;
|
|
||||||
@@ -1,33 +1,50 @@
|
|||||||
using Mapster;
|
using Mapster;
|
||||||
using VizhTalk.BuildingBlocks.Application.Configuration.Commnad;
|
using VizhTalk.BuildingBlocks.Application.Configuration.Commnad;
|
||||||
using VizhTalk.BuildingBlocks.Application.Exceptions;
|
using VizhTalk.BuildingBlocks.Application.Exceptions;
|
||||||
|
using VizhTalk.BuildingBlocks.Domain.Contract;
|
||||||
|
using VizhTalk.Grpc.Learning;
|
||||||
using VizhTalk.Grpc.Learning.Language;
|
using VizhTalk.Grpc.Learning.Language;
|
||||||
using VizhTalk.Learning.Application.CommandHandlers.Commands;
|
using VizhTalk.Learning.Application.Exceptions;
|
||||||
using VizhTalk.Learning.Domain.Entities;
|
using VizhTalk.Learning.Domain.Entities;
|
||||||
|
using VizhTalk.Learning.Domain.TypeIds;
|
||||||
using VizhTalk.Learning.Domain.ValueObjects;
|
using VizhTalk.Learning.Domain.ValueObjects;
|
||||||
|
|
||||||
namespace VizhTalk.Learning.Application.CommandHandlers
|
namespace VizhTalk.Learning.Application.CommandHandlers;
|
||||||
|
|
||||||
|
public class CreateLanguageCommandHandler(IUnitOfWork unitOfWork) : ICommandHandler<CreateLanguageCommand, LanguageDTO>
|
||||||
{
|
{
|
||||||
public class CreateLanguageCommandHandler(IUnitOfWork unitOfWork) : ICommandHandler<CreateLanguageCommand, LanguageDTO>
|
public async Task<LanguageDTO> Handle(CreateLanguageCommand request, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
public async Task<LanguageDTO> Handle(CreateLanguageCommand request, CancellationToken cancellationToken)
|
var title = request.Title.Trim();
|
||||||
{
|
if (await unitOfWork.Language.Exists(x => x.Title.Equals(title)))
|
||||||
var title = request.Model.Title.Trim();
|
throw new LanguageTitleAlreadyExistsException();
|
||||||
if (await unitOfWork.Language.Exists(x => x.Title.Value == title))
|
|
||||||
throw new LanguageTitleAlreadyExistsException();
|
|
||||||
|
|
||||||
var language = Language.CreateNew(new LanguageTitle(title));
|
var language = Language.CreateNew(new LanguageTitle(title));
|
||||||
await unitOfWork.Language.AddAsync(language, cancellationToken);
|
await unitOfWork.Language.AddAsync(language, cancellationToken);
|
||||||
await unitOfWork.SaveChangeAsync(cancellationToken);
|
await unitOfWork.SaveChangeAsync(cancellationToken);
|
||||||
return language.Adapt<LanguageDTO>();
|
return language.Adapt<LanguageDTO>();
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class UpdateLanguageCommandHandler(IUnitOfWork unitOfWork) : ICommandHandler<UpdateLanguageCommand>
|
|
||||||
{
|
|
||||||
public Task Handle(UpdateLanguageCommand request, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class UpdateLanguageCommandHandler(IUnitOfWork unitOfWork) : ICommandHandler<UpdateLanguageCommand, LanguageDTO>
|
||||||
|
{
|
||||||
|
public async Task<LanguageDTO> Handle(UpdateLanguageCommand request, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var language = await unitOfWork.Language.GetById(new LanguageId(request.Id), cancellationToken);
|
||||||
|
if (language == null)
|
||||||
|
throw new LanguageNotFoundException();
|
||||||
|
|
||||||
|
language.SetTitle(new LanguageTitle(request.Title));
|
||||||
|
|
||||||
|
return language.Adapt<LanguageDTO>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TestOnlyHandler : ICommandHandler<TestOnlyCommand>
|
||||||
|
{
|
||||||
|
public Task Handle(TestOnlyCommand request, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public record TestOnlyCommand : ICommand;
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using VizhTalk.BuildingBlocks.Application.Exceptions;
|
||||||
|
|
||||||
|
namespace VizhTalk.Learning.Application.Exceptions
|
||||||
|
{
|
||||||
|
public class LanguageNotFoundException : BaseException
|
||||||
|
{
|
||||||
|
public LanguageNotFoundException() : base("Language not found")
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
using VizhTalk.BuildingBlocks.Application.Configuration.Query;
|
||||||
|
using VizhTalk.BuildingBlocks.Application.Data;
|
||||||
|
using VizhTalk.Grpc.Learning.Language;
|
||||||
|
|
||||||
|
namespace VizhTalk.Learning.Application.QueryHandlers;
|
||||||
|
|
||||||
|
public class GetAllLanguageQueryHandler(IGenericDapper<LanguageDTO> languageDapper) : IQueryHandler<GetAllLanguageQuery, GetAllLanguageDTO>
|
||||||
|
{
|
||||||
|
public async Task<GetAllLanguageDTO> Handle(GetAllLanguageQuery request, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var result = new GetAllLanguageDTO();
|
||||||
|
var sql = $"select * from Learning.Languages";
|
||||||
|
var language = await languageDapper.GetAllAsync(sql);
|
||||||
|
result.Language.AddRange(language);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public class GetLanguageByTitleQueryHandler(IGenericDapper<LanguageDTO> languageDapper) : IQueryHandler<GetLanguageByTitleQuery, LanguageDTO>
|
||||||
|
{
|
||||||
|
public async Task<LanguageDTO> Handle(GetLanguageByTitleQuery request, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var sql = "select * from Learning.Languages where Title = @title";
|
||||||
|
var language = await languageDapper.GetAsync(sql, request.Title);
|
||||||
|
return language;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
using VizhTalk.BuildingBlocks.Domain.Contract;
|
|
||||||
using VizhTalk.Grpc.Learning.Language;
|
|
||||||
|
|
||||||
namespace VizhTalk.Learning.Application.QueryHandlers.Queries;
|
|
||||||
|
|
||||||
public class GetAllLanguageQuery : IQuery<GetAllLanguageDTO>;
|
|
||||||
public class GetLanguageByTitleQuery : IQuery<LanguageDTO>;
|
|
||||||
@@ -12,8 +12,4 @@
|
|||||||
<ProjectReference Include="..\VizhTalk.Services.Grpc.Learning\VizhTalk.Grpc.Learning.csproj" />
|
<ProjectReference Include="..\VizhTalk.Services.Grpc.Learning\VizhTalk.Grpc.Learning.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Folder Include="Exceptions\" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ public class Language : Entity<LanguageId>, IAggregateRoot
|
|||||||
|
|
||||||
public static Language CreateNew(LanguageTitle title)
|
public static Language CreateNew(LanguageTitle title)
|
||||||
=> new(title);
|
=> new(title);
|
||||||
|
|
||||||
|
public void SetTitle(LanguageTitle title)
|
||||||
|
=> Title = title;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ using VizhTalk.BuildingBlocks.Domain;
|
|||||||
|
|
||||||
namespace VizhTalk.Learning.Domain.TypeIds
|
namespace VizhTalk.Learning.Domain.TypeIds
|
||||||
{
|
{
|
||||||
public class LanguageId : TypedIdValueBase<long>
|
public class LanguageId : TypedIdValueBase<int>
|
||||||
{
|
{
|
||||||
public LanguageId(long value) : base(value)
|
public LanguageId(int value) : base(value)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,5 +17,12 @@ namespace VizhTalk.Learning.Domain.ValueObjects
|
|||||||
Value = title;
|
Value = title;
|
||||||
}
|
}
|
||||||
public string Value { get; private set; }
|
public string Value { get; private set; }
|
||||||
|
public override bool Equals(object? obj)
|
||||||
|
{
|
||||||
|
if (obj is string value)
|
||||||
|
return Value == value;
|
||||||
|
|
||||||
|
return base.Equals(obj);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
using VizhTalk.BuildingBlocks.Application.Data;
|
||||||
|
using Dapper;
|
||||||
|
using System.Data;
|
||||||
|
|
||||||
|
namespace VizhTalk.Learning.Infrastructure.Dapper;
|
||||||
|
|
||||||
|
public class GenericDapper<T> : IGenericDapper<T>
|
||||||
|
where T : class
|
||||||
|
{
|
||||||
|
private readonly IDbConnection connection;
|
||||||
|
public GenericDapper(ISqlConnectionFactory sqlConnectionFactory)
|
||||||
|
{
|
||||||
|
connection = sqlConnectionFactory.GetOpenConnection();
|
||||||
|
}
|
||||||
|
public async Task<T?> GetAsync(string sql, object? param = null)
|
||||||
|
{
|
||||||
|
return await connection.QueryFirstOrDefaultAsync<T>(sql, param);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<T>> GetAllAsync(string sql, object? param = null)
|
||||||
|
{
|
||||||
|
return await connection.QueryAsync<T>(sql, param);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
connection.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using VizhTalk.Learning.Domain.Entities;
|
using VizhTalk.Learning.Domain.Entities;
|
||||||
|
using VizhTalk.Learning.Domain.ValueObjects;
|
||||||
|
|
||||||
namespace VizhTalk.Learning.Infrastructure.EF.Configurations
|
namespace VizhTalk.Learning.Infrastructure.EF.Configurations
|
||||||
{
|
{
|
||||||
@@ -20,13 +21,9 @@ namespace VizhTalk.Learning.Infrastructure.EF.Configurations
|
|||||||
.ValueGeneratedOnAdd()
|
.ValueGeneratedOnAdd()
|
||||||
.HasConversion(x => x.Value, x => new Domain.TypeIds.LanguageId(x));
|
.HasConversion(x => x.Value, x => new Domain.TypeIds.LanguageId(x));
|
||||||
|
|
||||||
builder.OwnsOne(x => x.Title, op =>
|
builder.Property(x => x.Title)
|
||||||
{
|
.HasConversion(x => x.Value, x => new LanguageTitle(x))
|
||||||
op.Property(x => x.Value)
|
|
||||||
.HasColumnName("Title")
|
|
||||||
.HasMaxLength(60);
|
.HasMaxLength(60);
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ using VizhTalk.BuildingBlocks.Infrastructure.DomainEventsDispatching;
|
|||||||
using VizhTalk.Learning.Application;
|
using VizhTalk.Learning.Application;
|
||||||
using VizhTalk.Learning.Application.Mappers;
|
using VizhTalk.Learning.Application.Mappers;
|
||||||
using VizhTalk.Learning.Infrastructure.Configuration;
|
using VizhTalk.Learning.Infrastructure.Configuration;
|
||||||
|
using VizhTalk.Learning.Infrastructure.Dapper;
|
||||||
using VizhTalk.Learning.Infrastructure.EF;
|
using VizhTalk.Learning.Infrastructure.EF;
|
||||||
using VizhTalk.Learning.Infrastructure.Outbox;
|
using VizhTalk.Learning.Infrastructure.Outbox;
|
||||||
|
|
||||||
@@ -35,6 +36,7 @@ public static class LearningStartup
|
|||||||
services.AddScoped<IDomainEventsAccessor, DomainEventsAccessor>();
|
services.AddScoped<IDomainEventsAccessor, DomainEventsAccessor>();
|
||||||
services.AddScoped<IDomainEventsDispatcher, DomainEventsDispatcher>();
|
services.AddScoped<IDomainEventsDispatcher, DomainEventsDispatcher>();
|
||||||
services.AddScoped<IDomainNotificationsMapper, DomainNotificationsMapper>();
|
services.AddScoped<IDomainNotificationsMapper, DomainNotificationsMapper>();
|
||||||
|
services.AddScoped(typeof(IGenericDapper<>),typeof(GenericDapper<>));
|
||||||
services.AddScoped(sp => domainNotificationsMap);
|
services.AddScoped(sp => domainNotificationsMap);
|
||||||
services.Scan(scan => scan.
|
services.Scan(scan => scan.
|
||||||
FromAssemblies(Assemblies.Application, Assemblies.Infrastructure)
|
FromAssemblies(Assemblies.Application, Assemblies.Infrastructure)
|
||||||
|
|||||||
+10
-30
@@ -11,8 +11,8 @@ using VizhTalk.Learning.Infrastructure.EF;
|
|||||||
namespace VizhTalk.Learning.Infrastructure.Migrations
|
namespace VizhTalk.Learning.Infrastructure.Migrations
|
||||||
{
|
{
|
||||||
[DbContext(typeof(LearningDbContext))]
|
[DbContext(typeof(LearningDbContext))]
|
||||||
[Migration("20250901180950_Initial")]
|
[Migration("20250902200044_Inital")]
|
||||||
partial class Initial
|
partial class Inital
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
@@ -27,11 +27,11 @@ namespace VizhTalk.Learning.Infrastructure.Migrations
|
|||||||
|
|
||||||
modelBuilder.Entity("VizhTalk.Learning.Domain.Entities.Language", b =>
|
modelBuilder.Entity("VizhTalk.Learning.Domain.Entities.Language", b =>
|
||||||
{
|
{
|
||||||
b.Property<long>("Id")
|
b.Property<int>("Id")
|
||||||
.ValueGeneratedOnAdd()
|
.ValueGeneratedOnAdd()
|
||||||
.HasColumnType("bigint");
|
.HasColumnType("int");
|
||||||
|
|
||||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
|
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||||
|
|
||||||
b.Property<bool>("IsActive")
|
b.Property<bool>("IsActive")
|
||||||
.HasColumnType("bit");
|
.HasColumnType("bit");
|
||||||
@@ -39,35 +39,15 @@ namespace VizhTalk.Learning.Infrastructure.Migrations
|
|||||||
b.Property<bool>("IsDeleted")
|
b.Property<bool>("IsDeleted")
|
||||||
.HasColumnType("bit");
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
b.Property<string>("Title")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(60)
|
||||||
|
.HasColumnType("nvarchar(60)");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
b.ToTable("Languages", "Learning");
|
b.ToTable("Languages", "Learning");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("VizhTalk.Learning.Domain.Entities.Language", b =>
|
|
||||||
{
|
|
||||||
b.OwnsOne("VizhTalk.Learning.Domain.ValueObjects.LanguageTitle", "Title", b1 =>
|
|
||||||
{
|
|
||||||
b1.Property<long>("LanguageId")
|
|
||||||
.HasColumnType("bigint");
|
|
||||||
|
|
||||||
b1.Property<string>("Value")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(60)
|
|
||||||
.HasColumnType("nvarchar(60)")
|
|
||||||
.HasColumnName("Title");
|
|
||||||
|
|
||||||
b1.HasKey("LanguageId");
|
|
||||||
|
|
||||||
b1.ToTable("LanguageTitles", "Learning");
|
|
||||||
|
|
||||||
b1.WithOwner()
|
|
||||||
.HasForeignKey("LanguageId");
|
|
||||||
});
|
|
||||||
|
|
||||||
b.Navigation("Title")
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
#pragma warning restore 612, 618
|
#pragma warning restore 612, 618
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-26
@@ -5,7 +5,7 @@
|
|||||||
namespace VizhTalk.Learning.Infrastructure.Migrations
|
namespace VizhTalk.Learning.Infrastructure.Migrations
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public partial class Initial : Migration
|
public partial class Inital : Migration
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
@@ -18,8 +18,9 @@ namespace VizhTalk.Learning.Infrastructure.Migrations
|
|||||||
schema: "Learning",
|
schema: "Learning",
|
||||||
columns: table => new
|
columns: table => new
|
||||||
{
|
{
|
||||||
Id = table.Column<long>(type: "bigint", nullable: false)
|
Id = table.Column<int>(type: "int", nullable: false)
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
.Annotation("SqlServer:Identity", "1, 1"),
|
||||||
|
Title = table.Column<string>(type: "nvarchar(60)", maxLength: 60, nullable: false),
|
||||||
IsDeleted = table.Column<bool>(type: "bit", nullable: false),
|
IsDeleted = table.Column<bool>(type: "bit", nullable: false),
|
||||||
IsActive = table.Column<bool>(type: "bit", nullable: false)
|
IsActive = table.Column<bool>(type: "bit", nullable: false)
|
||||||
},
|
},
|
||||||
@@ -27,35 +28,11 @@ namespace VizhTalk.Learning.Infrastructure.Migrations
|
|||||||
{
|
{
|
||||||
table.PrimaryKey("PK_Languages", x => x.Id);
|
table.PrimaryKey("PK_Languages", x => x.Id);
|
||||||
});
|
});
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "LanguageTitles",
|
|
||||||
schema: "Learning",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
LanguageId = table.Column<long>(type: "bigint", nullable: false),
|
|
||||||
Title = table.Column<string>(type: "nvarchar(60)", maxLength: 60, nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_LanguageTitles", x => x.LanguageId);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_LanguageTitles_Languages_LanguageId",
|
|
||||||
column: x => x.LanguageId,
|
|
||||||
principalSchema: "Learning",
|
|
||||||
principalTable: "Languages",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
{
|
{
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "LanguageTitles",
|
|
||||||
schema: "Learning");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
migrationBuilder.DropTable(
|
||||||
name: "Languages",
|
name: "Languages",
|
||||||
schema: "Learning");
|
schema: "Learning");
|
||||||
@@ -24,11 +24,11 @@ namespace VizhTalk.Learning.Infrastructure.Migrations
|
|||||||
|
|
||||||
modelBuilder.Entity("VizhTalk.Learning.Domain.Entities.Language", b =>
|
modelBuilder.Entity("VizhTalk.Learning.Domain.Entities.Language", b =>
|
||||||
{
|
{
|
||||||
b.Property<long>("Id")
|
b.Property<int>("Id")
|
||||||
.ValueGeneratedOnAdd()
|
.ValueGeneratedOnAdd()
|
||||||
.HasColumnType("bigint");
|
.HasColumnType("int");
|
||||||
|
|
||||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
|
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||||
|
|
||||||
b.Property<bool>("IsActive")
|
b.Property<bool>("IsActive")
|
||||||
.HasColumnType("bit");
|
.HasColumnType("bit");
|
||||||
@@ -36,35 +36,15 @@ namespace VizhTalk.Learning.Infrastructure.Migrations
|
|||||||
b.Property<bool>("IsDeleted")
|
b.Property<bool>("IsDeleted")
|
||||||
.HasColumnType("bit");
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
b.Property<string>("Title")
|
||||||
|
.IsRequired()
|
||||||
|
.HasMaxLength(60)
|
||||||
|
.HasColumnType("nvarchar(60)");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
b.ToTable("Languages", "Learning");
|
b.ToTable("Languages", "Learning");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("VizhTalk.Learning.Domain.Entities.Language", b =>
|
|
||||||
{
|
|
||||||
b.OwnsOne("VizhTalk.Learning.Domain.ValueObjects.LanguageTitle", "Title", b1 =>
|
|
||||||
{
|
|
||||||
b1.Property<long>("LanguageId")
|
|
||||||
.HasColumnType("bigint");
|
|
||||||
|
|
||||||
b1.Property<string>("Value")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(60)
|
|
||||||
.HasColumnType("nvarchar(60)")
|
|
||||||
.HasColumnName("Title");
|
|
||||||
|
|
||||||
b1.HasKey("LanguageId");
|
|
||||||
|
|
||||||
b1.ToTable("LanguageTitles", "Learning");
|
|
||||||
|
|
||||||
b1.WithOwner()
|
|
||||||
.HasForeignKey("LanguageId");
|
|
||||||
});
|
|
||||||
|
|
||||||
b.Navigation("Title")
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
#pragma warning restore 612, 618
|
#pragma warning restore 612, 618
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Dapper" Version="2.1.66" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
|
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.19">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.19">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
|||||||
@@ -1,14 +1,26 @@
|
|||||||
using Grpc.Core;
|
using Grpc.Core;
|
||||||
|
using VizhTalk.Grpc.Learning;
|
||||||
using VizhTalk.Grpc.Learning.Language;
|
using VizhTalk.Grpc.Learning.Language;
|
||||||
using VizhTalk.Learning.Application.CommandHandlers.Commands;
|
|
||||||
using VizhTalk.Learning.Infrastructure.Configuration;
|
using VizhTalk.Learning.Infrastructure.Configuration;
|
||||||
|
|
||||||
namespace VizhTalk.Learning.Presentation.Services;
|
namespace VizhTalk.Learning.Presentation.Services;
|
||||||
|
|
||||||
public class LanguageService(ILearningModule learningModule) : LanguageGrpc.LanguageGrpcBase
|
public class LanguageService(ILearningModule learningModule) : LanguageGrpc.LanguageGrpcBase
|
||||||
{
|
{
|
||||||
public override async Task<LanguageDTO> Create(CreateLanguageRequest request, ServerCallContext context)
|
public override async Task<LanguageDTO> Create(CreateLanguageCommand request, ServerCallContext context)
|
||||||
{
|
{
|
||||||
return await learningModule.Execute(new CreateLanguageCommand(request), context.CancellationToken);
|
return await learningModule.Execute(request, context.CancellationToken);
|
||||||
|
}
|
||||||
|
public override async Task<LanguageDTO> Update(UpdateLanguageCommand request, ServerCallContext context)
|
||||||
|
{
|
||||||
|
return await learningModule.Execute(request, context.CancellationToken);
|
||||||
|
}
|
||||||
|
public override async Task<LanguageDTO> GetByTitle(GetLanguageByTitleQuery request, ServerCallContext context)
|
||||||
|
{
|
||||||
|
return await learningModule.Execute(request, context.CancellationToken);
|
||||||
|
}
|
||||||
|
public override async Task<GetAllLanguageDTO> GetAll(GetAllLanguageQuery request, ServerCallContext context)
|
||||||
|
{
|
||||||
|
return await learningModule.Execute(request, context.CancellationToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
using VizhTalk.BuildingBlocks.Domain.Contract;
|
||||||
|
using VizhTalk.Grpc.Learning.Language;
|
||||||
|
|
||||||
|
namespace VizhTalk.Grpc.Learning.Language;
|
||||||
|
|
||||||
|
public sealed partial class CreateLanguageCommand : ICommand<LanguageDTO>;
|
||||||
|
public sealed partial class UpdateLanguageCommand : ICommand<LanguageDTO>;
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
syntax="proto3";
|
|
||||||
|
|
||||||
option csharp_namespace="VizhTalk.Grpc.Learning.Language";
|
|
||||||
|
|
||||||
package greet;
|
|
||||||
|
|
||||||
message LanguageDTO {
|
|
||||||
string Id = 1;
|
|
||||||
string title = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message GetAllLanguageDTO{
|
|
||||||
repeated LanguageDTO language =1;
|
|
||||||
}
|
|
||||||
message GetAllLanguageRequest{
|
|
||||||
}
|
|
||||||
message GetLanguageByTitleRequest{
|
|
||||||
LanguageDTO Language = 1;
|
|
||||||
}
|
|
||||||
message CreateLanguageRequest{
|
|
||||||
string title = 2;
|
|
||||||
}
|
|
||||||
message UpdateLanguageRequest{
|
|
||||||
string Id = 1;
|
|
||||||
string title = 2;
|
|
||||||
}
|
|
||||||
message Empty{
|
|
||||||
|
|
||||||
}
|
|
||||||
service LanguageGrpc {
|
|
||||||
rpc GetAll (GetAllLanguageRequest) returns (GetAllLanguageDTO);
|
|
||||||
rpc GetByTitle (GetLanguageByTitleRequest) returns (LanguageDTO);
|
|
||||||
rpc Create (CreateLanguageRequest) returns (LanguageDTO);
|
|
||||||
rpc Update (UpdateLanguageRequest) returns (Empty);
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
syntax="proto3";
|
||||||
|
|
||||||
|
option csharp_namespace="VizhTalk.Grpc.Learning.Language";
|
||||||
|
|
||||||
|
package greet;
|
||||||
|
|
||||||
|
|
||||||
|
message CreateLanguageCommand{
|
||||||
|
string title = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UpdateLanguageCommand{
|
||||||
|
int32 Id = 1;
|
||||||
|
string title = 2;
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
syntax="proto3";
|
||||||
|
|
||||||
|
option csharp_namespace="VizhTalk.Grpc.Learning.Language";
|
||||||
|
|
||||||
|
package greet;
|
||||||
|
|
||||||
|
message LanguageDTO {
|
||||||
|
string Id = 1;
|
||||||
|
string title = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
message GetAllLanguageDTO{
|
||||||
|
repeated LanguageDTO language =1;
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
syntax="proto3";
|
||||||
|
|
||||||
|
option csharp_namespace="VizhTalk.Grpc.Learning.Language";
|
||||||
|
|
||||||
|
package greet;
|
||||||
|
|
||||||
|
|
||||||
|
message GetAllLanguageQuery{
|
||||||
|
}
|
||||||
|
message GetLanguageByTitleQuery{
|
||||||
|
string title = 1;
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
syntax="proto3";
|
||||||
|
|
||||||
|
option csharp_namespace="VizhTalk.Grpc.Learning.Language";
|
||||||
|
|
||||||
|
package greet;
|
||||||
|
|
||||||
|
import "Proto/Languages/DTOs.proto";
|
||||||
|
import "Proto/Languages/Queries.proto";
|
||||||
|
import "Proto/Languages/Commands.proto";
|
||||||
|
import "Proto/Shared.proto";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
service LanguageGrpc {
|
||||||
|
rpc Create (CreateLanguageCommand) returns (LanguageDTO);
|
||||||
|
rpc Update (UpdateLanguageCommand) returns (LanguageDTO);
|
||||||
|
rpc GetAll (GetAllLanguageQuery) returns (GetAllLanguageDTO);
|
||||||
|
rpc GetByTitle (GetLanguageByTitleQuery) returns (LanguageDTO);
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
syntax="proto3";
|
||||||
|
|
||||||
|
option csharp_namespace="VizhTalk.Grpc.Learning";
|
||||||
|
|
||||||
|
package greet;
|
||||||
|
|
||||||
|
message Empty{
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
using VizhTalk.BuildingBlocks.Domain.Contract;
|
||||||
|
using VizhTalk.Grpc.Learning.Language;
|
||||||
|
|
||||||
|
namespace VizhTalk.Grpc.Learning.Language;
|
||||||
|
|
||||||
|
public sealed partial class GetAllLanguageQuery : IQuery<GetAllLanguageDTO>;
|
||||||
|
public sealed partial class GetLanguageByTitleQuery : IQuery<LanguageDTO>;
|
||||||
@@ -11,6 +11,13 @@
|
|||||||
<PackageReference Include="Grpc.Tools" Version="2.58.0" PrivateAssets="All" />
|
<PackageReference Include="Grpc.Tools" Version="2.58.0" PrivateAssets="All" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Protobuf Include="Language.proto" GrpcServices="Both" />
|
<ProjectReference Include="..\VizhTalk.BuildingBlocks.Domain\VizhTalk.BuildingBlocks.Domain.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Protobuf Include="Proto\Languages\Services.proto" GrpcServices="Both" />
|
||||||
|
<Protobuf Include="Proto\Languages\DTOs.proto" GrpcServices="Both" />
|
||||||
|
<Protobuf Include="Proto\Languages\Queries.proto" GrpcServices="Both" />
|
||||||
|
<Protobuf Include="Proto\Languages\Commands.proto" GrpcServices="Both" />
|
||||||
|
<Protobuf Include="Proto\Shared.proto" GrpcServices="Both" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
+3
-4
@@ -41,11 +41,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VizhTalk.BuildingBlocks.Dom
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VizhTalk.BuildingBlocks.Infrastructure", "VizhTalk.BuildingBlocks.Infrastructure\VizhTalk.BuildingBlocks.Infrastructure.csproj", "{B2014B29-FE4E-4B59-829E-2AAC38B039AA}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VizhTalk.BuildingBlocks.Infrastructure", "VizhTalk.BuildingBlocks.Infrastructure\VizhTalk.BuildingBlocks.Infrastructure.csproj", "{B2014B29-FE4E-4B59-829E-2AAC38B039AA}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VizhTalk.Grpc.Learning", "VizhTalk.Services.Grpc.Learning\VizhTalk.Grpc.Learning.csproj", "{A3F0C4E9-3957-4B25-8AB5-6751ECB01F39}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VizhTalk.Grpc.Learning", "VizhTalk.Services.Grpc.Learning\VizhTalk.Grpc.Learning.csproj", "{A3F0C4E9-3957-4B25-8AB5-6751ECB01F39}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VizhTalk.Learning.Presentation", "VizhTalk.Learning.Presentation\VizhTalk.Learning.Presentation.csproj", "{8327C994-F1D5-493B-8EF7-B60EB888E92A}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VizhTalk.Learning.Presentation", "VizhTalk.Learning.Presentation\VizhTalk.Learning.Presentation.csproj", "{8327C994-F1D5-493B-8EF7-B60EB888E92A}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VizhTalk.Gateway.Web.BFF", "VizhTalk.Gateway.BFF\VizhTalk.Gateway.Web.BFF.csproj", "{21DDD623-E75A-4D16-894B-2DEA0CA5C073}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VizhTalk.Gateway.Web.BFF", "VizhTalk.Gateway.BFF\VizhTalk.Gateway.Web.BFF.csproj", "{21DDD623-E75A-4D16-894B-2DEA0CA5C073}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -106,7 +106,6 @@ Global
|
|||||||
{B294A620-DADE-4D31-9BF5-C1CC5D7E29EB} = {1305E6AB-69E5-47BD-B03C-694832C4D46A}
|
{B294A620-DADE-4D31-9BF5-C1CC5D7E29EB} = {1305E6AB-69E5-47BD-B03C-694832C4D46A}
|
||||||
{B5065F1D-F391-4511-8697-966806841816} = {1305E6AB-69E5-47BD-B03C-694832C4D46A}
|
{B5065F1D-F391-4511-8697-966806841816} = {1305E6AB-69E5-47BD-B03C-694832C4D46A}
|
||||||
{1495DF56-D227-4D68-86CA-0249D886C07C} = {1305E6AB-69E5-47BD-B03C-694832C4D46A}
|
{1495DF56-D227-4D68-86CA-0249D886C07C} = {1305E6AB-69E5-47BD-B03C-694832C4D46A}
|
||||||
{45B6CABB-4197-4C70-BF3F-F3AE7C8CB380} = {5B01E22E-8A79-4C40-A0B7-97D4EC2D120E}
|
|
||||||
{EBFE2D6C-BA5B-460E-B57C-A8295BBCD727} = {45B6CABB-4197-4C70-BF3F-F3AE7C8CB380}
|
{EBFE2D6C-BA5B-460E-B57C-A8295BBCD727} = {45B6CABB-4197-4C70-BF3F-F3AE7C8CB380}
|
||||||
{22CD7011-A8DB-4DB6-8597-1601E7EF8725} = {45B6CABB-4197-4C70-BF3F-F3AE7C8CB380}
|
{22CD7011-A8DB-4DB6-8597-1601E7EF8725} = {45B6CABB-4197-4C70-BF3F-F3AE7C8CB380}
|
||||||
{B2014B29-FE4E-4B59-829E-2AAC38B039AA} = {45B6CABB-4197-4C70-BF3F-F3AE7C8CB380}
|
{B2014B29-FE4E-4B59-829E-2AAC38B039AA} = {45B6CABB-4197-4C70-BF3F-F3AE7C8CB380}
|
||||||
|
|||||||
Reference in New Issue
Block a user