rust/nashel-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Правка регистрации, расписание, смена ролей

Browse Source
This commit is contained in:
Халимов Рустам
2026-02-16 12:10:44 +03:00
parent 3524e0d0af
commit 628fce5b50
13 changed files with 530 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Modules/Identity/Infrastructure/Persistence/Configurations/UserProfileConfiguration.cs
+6
View File
@@ -37,6 +37,12 @@ public class UserProfileConfiguration : IEntityTypeConfiguration<UserProfile>
builder.Property(x => x.AvatarUrl)
.HasMaxLength(500);
// Optional 1:1 relationship with WorkSchedule
builder.HasOne(x => x.WorkSchedule)
.WithOne()
.HasForeignKey<WorkSchedule>(x => x.Id)
.OnDelete(DeleteBehavior.Cascade);
// Many-to-Many relationship with Competencies
builder.HasMany(x => x.Competencies)
.WithMany()
src/Modules/Identity/Infrastructure/Persistence/Configurations/WorkScheduleConfiguration.cs
+27
View File
@@ -0,0 +1,27 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Nashel.Modules.Identity.Domain.Entities;
namespace Nashel.Modules.Identity.Infrastructure.Persistence.Configurations;
public class WorkScheduleConfiguration : IEntityTypeConfiguration<WorkSchedule>
{
public void Configure(EntityTypeBuilder<WorkSchedule> builder)
{
builder.ToTable("WorkSchedules", "identity");
builder.HasKey(x => x.Id);
builder.Property(x => x.Is24_7)
.IsRequired();
builder.Property(x => x.IsAlwaysReady)
.IsRequired();
builder.Property(x => x.WorkingDays)
.HasMaxLength(100); // JSON-массив дней недели
builder.Property(x => x.WorkingHours)
.HasMaxLength(100); // JSON с часами работы
}
}
src/Modules/Identity/Infrastructure/Persistence/IdentityDbContext.cs
+2
View File
@@ -14,12 +14,14 @@ public class IdentityDbContext : DbContext
public DbSet<Account> Accounts { get; set; }
public DbSet<UserProfile> UserProfiles { get; set; }
public DbSet<Competency> Competencies { get; set; }
public DbSet<WorkSchedule> WorkSchedules { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.ApplyConfiguration(new AccountConfiguration());
modelBuilder.ApplyConfiguration(new UserProfileConfiguration());
modelBuilder.ApplyConfiguration(new CompetencyConfiguration());
modelBuilder.ApplyConfiguration(new WorkScheduleConfiguration());
base.OnModelCreating(modelBuilder);
}
}
src/Modules/Identity/Infrastructure/Persistence/Migrations/20260216085438_AddWorkScheduleToUserProfile.Designer.cs
Generated
+200
View File
@@ -0,0 +1,200 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Nashel.Modules.Identity.Infrastructure.Persistence;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Nashel.Modules.Identity.Infrastructure.Persistence.Migrations
{
[DbContext(typeof(IdentityDbContext))]
[Migration("20260216085438_AddWorkScheduleToUserProfile")]
partial class AddWorkScheduleToUserProfile
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "10.0.2")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Aggregates.Account", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("PasswordHash")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Phone")
.IsRequired()
.HasMaxLength(20)
.HasColumnType("character varying(20)");
b.Property<string>("Roles")
.IsRequired()
.HasColumnType("jsonb");
b.HasKey("Id");
b.HasIndex("Phone")
.IsUnique();
b.ToTable("Accounts", "identity");
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Aggregates.UserProfile", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("AvatarUrl")
.HasMaxLength(500)
.HasColumnType("character varying(500)");
b.Property<string>("CompanyName")
.HasMaxLength(200)
.HasColumnType("character varying(200)");
b.Property<string>("Description")
.HasMaxLength(2048)
.HasColumnType("character varying(2048)");
b.Property<string>("FirstName")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.Property<string>("Inn")
.HasMaxLength(10)
.HasColumnType("character varying(10)");
b.Property<string>("LastName")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.Property<string>("Patronymic")
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.HasKey("Id");
b.ToTable("UserProfiles", "identity");
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Entities.Competency", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.HasKey("Id");
b.HasIndex("Name")
.IsUnique()
.HasDatabaseName("IX_Competencies_Name");
b.ToTable("Competencies", "identity");
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Entities.WorkSchedule", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<bool>("Is24_7")
.HasColumnType("boolean");
b.Property<bool>("IsAlwaysReady")
.HasColumnType("boolean");
b.Property<string>("WorkingDays")
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.Property<string>("WorkingHours")
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.HasKey("Id");
b.ToTable("WorkSchedules", "identity");
});
modelBuilder.Entity("UserProfileCompetencies", b =>
{
b.Property<Guid>("UserProfileId")
.HasColumnType("uuid");
b.Property<Guid>("CompetencyId")
.HasColumnType("uuid");
b.HasKey("UserProfileId", "CompetencyId");
b.HasIndex("CompetencyId");
b.ToTable("UserProfileCompetencies", "identity");
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Aggregates.UserProfile", b =>
{
b.HasOne("Nashel.Modules.Identity.Domain.Aggregates.Account", null)
.WithOne("Profile")
.HasForeignKey("Nashel.Modules.Identity.Domain.Aggregates.UserProfile", "Id")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Entities.WorkSchedule", b =>
{
b.HasOne("Nashel.Modules.Identity.Domain.Aggregates.UserProfile", null)
.WithOne("WorkSchedule")
.HasForeignKey("Nashel.Modules.Identity.Domain.Entities.WorkSchedule", "Id")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("UserProfileCompetencies", b =>
{
b.HasOne("Nashel.Modules.Identity.Domain.Entities.Competency", null)
.WithMany()
.HasForeignKey("CompetencyId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Nashel.Modules.Identity.Domain.Aggregates.UserProfile", null)
.WithMany()
.HasForeignKey("UserProfileId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Aggregates.Account", b =>
{
b.Navigation("Profile")
.IsRequired();
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Aggregates.UserProfile", b =>
{
b.Navigation("WorkSchedule");
});
#pragma warning restore 612, 618
}
}
}
src/Modules/Identity/Infrastructure/Persistence/Migrations/20260216085438_AddWorkScheduleToUserProfile.cs
+46
View File
@@ -0,0 +1,46 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Nashel.Modules.Identity.Infrastructure.Persistence.Migrations
{
/// <inheritdoc />
public partial class AddWorkScheduleToUserProfile : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "WorkSchedules",
schema: "identity",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
Is24_7 = table.Column<bool>(type: "boolean", nullable: false),
IsAlwaysReady = table.Column<bool>(type: "boolean", nullable: false),
WorkingDays = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: true),
WorkingHours = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_WorkSchedules", x => x.Id);
table.ForeignKey(
name: "FK_WorkSchedules_UserProfiles_Id",
column: x => x.Id,
principalSchema: "identity",
principalTable: "UserProfiles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "WorkSchedules",
schema: "identity");
}
}
}
src/Modules/Identity/Infrastructure/Persistence/Migrations/IdentityDbContextModelSnapshot.cs
+38
View File
@@ -109,6 +109,30 @@ namespace Nashel.Modules.Identity.Infrastructure.Persistence.Migrations
b.ToTable("Competencies", "identity");
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Entities.WorkSchedule", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<bool>("Is24_7")
.HasColumnType("boolean");
b.Property<bool>("IsAlwaysReady")
.HasColumnType("boolean");
b.Property<string>("WorkingDays")
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.Property<string>("WorkingHours")
.HasMaxLength(100)
.HasColumnType("character varying(100)");
b.HasKey("Id");
b.ToTable("WorkSchedules", "identity");
});
modelBuilder.Entity("UserProfileCompetencies", b =>
{
b.Property<Guid>("UserProfileId")
@@ -133,6 +157,15 @@ namespace Nashel.Modules.Identity.Infrastructure.Persistence.Migrations
.IsRequired();
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Entities.WorkSchedule", b =>
{
b.HasOne("Nashel.Modules.Identity.Domain.Aggregates.UserProfile", null)
.WithOne("WorkSchedule")
.HasForeignKey("Nashel.Modules.Identity.Domain.Entities.WorkSchedule", "Id")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("UserProfileCompetencies", b =>
{
b.HasOne("Nashel.Modules.Identity.Domain.Entities.Competency", null)
@@ -153,6 +186,11 @@ namespace Nashel.Modules.Identity.Infrastructure.Persistence.Migrations
b.Navigation("Profile")
.IsRequired();
});
modelBuilder.Entity("Nashel.Modules.Identity.Domain.Aggregates.UserProfile", b =>
{
b.Navigation("WorkSchedule");
});
#pragma warning restore 612, 618
}
}