Compare commits
5 Commits
90f28175a3
...
116e501d63
Author | SHA1 | Date | |
---|---|---|---|
116e501d63 | |||
5dad216404 | |||
bbe1fba99e | |||
536a8bfe91 | |||
d615a86f33 |
@ -6,10 +6,11 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace BusinessLogic.Tools.Mail
|
namespace BusinessLogic.Tools.Mail
|
||||||
{
|
{
|
||||||
public class Mail
|
public class Mail
|
||||||
{
|
{
|
||||||
public IEnumerable<string> To { get; set; } = null!;
|
public IEnumerable<string> To { get; set; } = null!;
|
||||||
public string Title { get; set; } = null!;
|
public string Title { get; set; } = null!;
|
||||||
public string Body { get; set; } = null!;
|
public string Body { get; set; } = null!;
|
||||||
}
|
public bool IsSendable { get; set; } = true;
|
||||||
|
}
|
||||||
}
|
}
|
@ -8,39 +8,41 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace BusinessLogic.Tools.Mail
|
namespace BusinessLogic.Tools.Mail
|
||||||
{
|
{
|
||||||
public class MailSender
|
public class MailSender
|
||||||
{
|
{
|
||||||
private static string _email;
|
private static string _email;
|
||||||
private static string _password;
|
private static string _password;
|
||||||
private static string _smtpClientHost;
|
private static string _smtpClientHost;
|
||||||
private static short _smtpClientPort;
|
private static short _smtpClientPort;
|
||||||
|
|
||||||
public void SetupMailOptions(MailOptions options)
|
public void SetupMailOptions(MailOptions options)
|
||||||
{
|
{
|
||||||
_email = options.Email;
|
_email = options.Email;
|
||||||
_password = options.Password;
|
_password = options.Password;
|
||||||
_smtpClientHost = options.SmtpClientHost;
|
_smtpClientHost = options.SmtpClientHost;
|
||||||
_smtpClientPort = options.SmtpClientPort;
|
_smtpClientPort = options.SmtpClientPort;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Send(Mail mail)
|
public static void Send(Mail mail)
|
||||||
{
|
{
|
||||||
using SmtpClient client = new SmtpClient(_smtpClientHost, _smtpClientPort);
|
if (!mail.IsSendable) return;
|
||||||
client.Credentials = new NetworkCredential(_email, _password);
|
|
||||||
client.EnableSsl = true;
|
|
||||||
|
|
||||||
using MailMessage message = new MailMessage();
|
using SmtpClient client = new SmtpClient(_smtpClientHost, _smtpClientPort);
|
||||||
|
client.Credentials = new NetworkCredential(_email, _password);
|
||||||
|
client.EnableSsl = true;
|
||||||
|
|
||||||
message.From = new MailAddress(_email);
|
using MailMessage message = new MailMessage();
|
||||||
foreach (string to in mail.To)
|
|
||||||
{
|
|
||||||
message.To.Add(to);
|
|
||||||
}
|
|
||||||
|
|
||||||
message.Subject = mail.Title;
|
message.From = new MailAddress(_email);
|
||||||
message.Body = mail.Body;
|
foreach (string to in mail.To)
|
||||||
|
{
|
||||||
|
message.To.Add(to);
|
||||||
|
}
|
||||||
|
|
||||||
client.Send(message);
|
message.Subject = mail.Title;
|
||||||
}
|
message.Body = mail.Body;
|
||||||
}
|
|
||||||
|
client.Send(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@ -8,14 +8,18 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace BusinessLogic.Tools.Mail.MailTemplates
|
namespace BusinessLogic.Tools.Mail.MailTemplates
|
||||||
{
|
{
|
||||||
public class MailRegistration : Mail
|
public class MailRegistration : Mail
|
||||||
{
|
{
|
||||||
public MailRegistration(UserBindingModel user)
|
public MailRegistration(UserBindingModel user)
|
||||||
{
|
{
|
||||||
To = [user.Email];
|
if (user.OnlyImportantMails)
|
||||||
Title = "Приветствуем Вас на нашем сайте!";
|
{
|
||||||
Body = $"Спасибо, {user.SecondName} {user.FirstName}, что выбрали НАС.\n" +
|
IsSendable = false;
|
||||||
$"Надеемся, что Вам что-то уже приглянулось!";
|
}
|
||||||
}
|
To = [user.Email];
|
||||||
}
|
Title = "Приветствуем Вас на нашем сайте!";
|
||||||
|
Body = $"Спасибо, {user.SecondName} {user.FirstName}, что выбрали НАС.\n" +
|
||||||
|
$"Надеемся, что Вам что-то уже приглянулось!";
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@ -6,15 +6,16 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace Contracts.BindingModels
|
namespace Contracts.BindingModels
|
||||||
{
|
{
|
||||||
public class UserBindingModel
|
public class UserBindingModel
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
public string FirstName { get; set; } = string.Empty;
|
public string FirstName { get; set; } = string.Empty;
|
||||||
public string SecondName { get; set; } = string.Empty;
|
public string SecondName { get; set; } = string.Empty;
|
||||||
public string Email { get; set; } = string.Empty;
|
public string Email { get; set; } = string.Empty;
|
||||||
public string PasswordHash { get; set; } = string.Empty;
|
public string PasswordHash { get; set; } = string.Empty;
|
||||||
public string? Password { get; set; }
|
public string? Password { get; set; }
|
||||||
public DateTime Birthday { get; set; }
|
public DateTime Birthday { get; set; }
|
||||||
public RoleBindingModel Role { get; set; } = null!;
|
public bool OnlyImportantMails { get; set; }
|
||||||
}
|
public RoleBindingModel Role { get; set; } = null!;
|
||||||
|
}
|
||||||
}
|
}
|
@ -8,26 +8,28 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace Contracts.Converters
|
namespace Contracts.Converters
|
||||||
{
|
{
|
||||||
public static class UserConverter
|
public static class UserConverter
|
||||||
{
|
{
|
||||||
public static UserViewModel ToView(UserBindingModel model) => new()
|
public static UserViewModel ToView(UserBindingModel model) => new()
|
||||||
{
|
{
|
||||||
Id = model.Id,
|
Id = model.Id,
|
||||||
FirstName = model.FirstName,
|
FirstName = model.FirstName,
|
||||||
SecondName = model.SecondName,
|
SecondName = model.SecondName,
|
||||||
Email = model.Email,
|
Email = model.Email,
|
||||||
Birthday = model.Birthday,
|
Birthday = model.Birthday,
|
||||||
Role = RoleConverter.ToView(model.Role),
|
OnlyImportantMails = model.OnlyImportantMails,
|
||||||
};
|
Role = RoleConverter.ToView(model.Role),
|
||||||
|
};
|
||||||
|
|
||||||
public static UserBindingModel ToBinding(UserViewModel model) => new()
|
public static UserBindingModel ToBinding(UserViewModel model) => new()
|
||||||
{
|
{
|
||||||
Id = model.Id,
|
Id = model.Id,
|
||||||
FirstName = model.FirstName,
|
FirstName = model.FirstName,
|
||||||
SecondName = model.SecondName,
|
SecondName = model.SecondName,
|
||||||
Email = model.Email,
|
Email = model.Email,
|
||||||
Birthday = model.Birthday,
|
Birthday = model.Birthday,
|
||||||
Role = RoleConverter.ToBinding(model.Role),
|
OnlyImportantMails = model.OnlyImportantMails,
|
||||||
};
|
Role = RoleConverter.ToBinding(model.Role),
|
||||||
}
|
};
|
||||||
|
}
|
||||||
}
|
}
|
@ -6,9 +6,10 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace Contracts.SearchModels
|
namespace Contracts.SearchModels
|
||||||
{
|
{
|
||||||
public class UserSearchModel
|
public class UserSearchModel
|
||||||
{
|
{
|
||||||
public Guid? Id { get; set; }
|
public Guid? Id { get; set; }
|
||||||
public string? Email { get; set; }
|
public string? Email { get; set; }
|
||||||
}
|
public bool? OnlyImportantMails { get; set; }
|
||||||
|
}
|
||||||
}
|
}
|
@ -6,13 +6,14 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace Contracts.ViewModels
|
namespace Contracts.ViewModels
|
||||||
{
|
{
|
||||||
public class UserViewModel
|
public class UserViewModel
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
public string FirstName { get; set; } = string.Empty;
|
public string FirstName { get; set; } = string.Empty;
|
||||||
public string SecondName { get; set; } = string.Empty;
|
public string SecondName { get; set; } = string.Empty;
|
||||||
public string Email { get; set; } = string.Empty;
|
public string Email { get; set; } = string.Empty;
|
||||||
public DateTime Birthday { get; set; }
|
public DateTime Birthday { get; set; }
|
||||||
public RoleViewModel Role { get; set; } = null!;
|
public bool OnlyImportantMails { get; set; }
|
||||||
}
|
public RoleViewModel Role { get; set; } = null!;
|
||||||
|
}
|
||||||
}
|
}
|
@ -6,12 +6,13 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace DataModels.Models
|
namespace DataModels.Models
|
||||||
{
|
{
|
||||||
public interface IUser : IId
|
public interface IUser : IId
|
||||||
{
|
{
|
||||||
string FirstName { get; }
|
string FirstName { get; }
|
||||||
string SecondName { get; }
|
string SecondName { get; }
|
||||||
string PasswordHash { get; }
|
string PasswordHash { get; }
|
||||||
string Email { get; }
|
string Email { get; }
|
||||||
DateTime Birthday { get; }
|
DateTime Birthday { get; }
|
||||||
}
|
bool OnlyImportantMails { get; }
|
||||||
|
}
|
||||||
}
|
}
|
@ -12,98 +12,99 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace DatabaseImplement.Implements
|
namespace DatabaseImplement.Implements
|
||||||
{
|
{
|
||||||
public class UserStorage : IUserStorage
|
public class UserStorage : IUserStorage
|
||||||
{
|
{
|
||||||
public UserBindingModel? Delete(UserSearchModel model)
|
public UserBindingModel? Delete(UserSearchModel model)
|
||||||
{
|
{
|
||||||
if (model.Id is null && model.Email is null)
|
if (model.Id is null && model.Email is null)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
var context = new Database();
|
var context = new Database();
|
||||||
var user = context.Users.FirstOrDefault(u =>
|
var user = context.Users.FirstOrDefault(u =>
|
||||||
(model.Id.HasValue && u.Id == model.Id)
|
(model.Id.HasValue && u.Id == model.Id)
|
||||||
|| (!string.IsNullOrEmpty(u.Email) && u.Email.Contains(model.Email)));
|
|| (!string.IsNullOrEmpty(u.Email) && u.Email.Contains(model.Email)));
|
||||||
|
|
||||||
if (user is null)
|
if (user is null)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
context.Remove(user);
|
context.Remove(user);
|
||||||
context.SaveChanges();
|
context.SaveChanges();
|
||||||
|
|
||||||
return user.GetBindingModel();
|
return user.GetBindingModel();
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserBindingModel? GetElement(UserSearchModel model)
|
public UserBindingModel? GetElement(UserSearchModel model)
|
||||||
{
|
{
|
||||||
if (model.Id is null && model.Email is null)
|
if (model.Id is null && model.Email is null)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
var context = new Database();
|
var context = new Database();
|
||||||
return context.Users
|
return context.Users
|
||||||
.Include(u => u.Role)
|
.Include(u => u.Role)
|
||||||
.FirstOrDefault(u =>
|
.FirstOrDefault(u =>
|
||||||
(model.Id.HasValue && u.Id == model.Id)
|
(model.Id.HasValue && u.Id == model.Id)
|
||||||
|| (!string.IsNullOrEmpty(u.Email) && u.Email.Contains(model.Email)))
|
|| (!string.IsNullOrEmpty(u.Email) && u.Email.Contains(model.Email)))
|
||||||
?.GetBindingModel();
|
?.GetBindingModel();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerable<UserBindingModel> GetList(UserSearchModel? model)
|
public IEnumerable<UserBindingModel> GetList(UserSearchModel? model)
|
||||||
{
|
{
|
||||||
var context = new Database();
|
var context = new Database();
|
||||||
if (model is null)
|
if (model is null)
|
||||||
{
|
{
|
||||||
return context.Users
|
return context.Users
|
||||||
.Include(u => u.Role)
|
.Include(u => u.Role)
|
||||||
.Select(r => r.GetBindingModel());
|
.Select(r => r.GetBindingModel());
|
||||||
}
|
}
|
||||||
if (model.Id is null && model.Email is null)
|
if (model.Id is null && model.Email is null && !model.OnlyImportantMails is null)
|
||||||
{
|
{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
return context.Users
|
return context.Users
|
||||||
.Where(u =>
|
.Where(u =>
|
||||||
(model.Id.HasValue && u.Id == model.Id)
|
(model.Id.HasValue && u.Id == model.Id)
|
||||||
|| (!string.IsNullOrEmpty(u.Email) && u.Email.Contains(model.Email)))
|
|| (!string.IsNullOrEmpty(u.Email) && u.Email.Contains(model.Email))
|
||||||
.Include(u => u.Role)
|
|| (model.OnlyImportantMails.HasValue && u.OnlyImportantMails == model.OnlyImportantMails))
|
||||||
.Select(r => r.GetBindingModel());
|
.Include(u => u.Role)
|
||||||
}
|
.Select(r => r.GetBindingModel());
|
||||||
|
}
|
||||||
|
|
||||||
public UserBindingModel? Insert(UserBindingModel model)
|
public UserBindingModel? Insert(UserBindingModel model)
|
||||||
{
|
{
|
||||||
var context = new Database();
|
var context = new Database();
|
||||||
var role = context.Roles.FirstOrDefault(r => r.Id == model.Role.Id);
|
var role = context.Roles.FirstOrDefault(r => r.Id == model.Role.Id);
|
||||||
if (role is null)
|
if (role is null)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
var newUser = Models.User.ToUserFromBinding(model, role);
|
var newUser = Models.User.ToUserFromBinding(model, role);
|
||||||
|
|
||||||
context.Users.Add(newUser);
|
context.Users.Add(newUser);
|
||||||
context.SaveChanges();
|
context.SaveChanges();
|
||||||
|
|
||||||
return newUser.GetBindingModel();
|
return newUser.GetBindingModel();
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserBindingModel? Update(UserBindingModel model)
|
public UserBindingModel? Update(UserBindingModel model)
|
||||||
{
|
{
|
||||||
var context = new Database();
|
var context = new Database();
|
||||||
var user = context.Users
|
var user = context.Users
|
||||||
.FirstOrDefault(u => u.Id == model.Id);
|
.FirstOrDefault(u => u.Id == model.Id);
|
||||||
var role = context.Roles.FirstOrDefault(r => r.Id == model.Role.Id);
|
var role = context.Roles.FirstOrDefault(r => r.Id == model.Role.Id);
|
||||||
|
|
||||||
if (user is null || role is null)
|
if (user is null || role is null)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
user.Update(model, role);
|
user.Update(model, role);
|
||||||
|
|
||||||
context.SaveChanges();
|
context.SaveChanges();
|
||||||
return user.GetBindingModel();
|
return user.GetBindingModel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
326
DatabaseImplement/Migrations/20240622162300_second.Designer.cs
generated
Normal file
326
DatabaseImplement/Migrations/20240622162300_second.Designer.cs
generated
Normal file
@ -0,0 +1,326 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using DatabaseImplement;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace DatabaseImplement.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(Database))]
|
||||||
|
[Migration("20240622162300_second")]
|
||||||
|
partial class second
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder
|
||||||
|
.HasAnnotation("ProductVersion", "8.0.6")
|
||||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.MediaFile", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("Location")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<Guid>("ProductId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("MediaFiles");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Product", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<int>("Amount")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<bool>("IsBeingSold")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<double>("Price")
|
||||||
|
.HasColumnType("double precision");
|
||||||
|
|
||||||
|
b.Property<double>("Rate")
|
||||||
|
.HasColumnType("double precision");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Products");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Purchase", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DatePurchase")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<int>("Status")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Purchases");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Role", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Roles");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Sell", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateSell")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Sells");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supplier", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<int>("Deals")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Suppliers");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.SupplierProduct", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<int>("Count")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<Guid>("ProductId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<Guid>("SupplierId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ProductId");
|
||||||
|
|
||||||
|
b.HasIndex("SupplierId");
|
||||||
|
|
||||||
|
b.ToTable("SupplierProducts");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supply", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<DateTime>("Date")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<double>("Price")
|
||||||
|
.HasColumnType("double precision");
|
||||||
|
|
||||||
|
b.Property<int>("Status")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<Guid>("SupplierId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("SupplierId");
|
||||||
|
|
||||||
|
b.ToTable("Supplies");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.SupplyProduct", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<int>("Count")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<Guid>("ProductId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<Guid>("SupplyId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ProductId");
|
||||||
|
|
||||||
|
b.HasIndex("SupplyId");
|
||||||
|
|
||||||
|
b.ToTable("SupplyProducts");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.User", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<DateTime>("Birthday")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("Email")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("FirstName")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<bool>("OnlyImportantMails")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<string>("PasswordHash")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<Guid?>("RoleId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("SecondName")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("RoleId");
|
||||||
|
|
||||||
|
b.ToTable("Users");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.SupplierProduct", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("DatabaseImplement.Models.Product", "Product")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ProductId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("DatabaseImplement.Models.Supplier", "Supplier")
|
||||||
|
.WithMany("Products")
|
||||||
|
.HasForeignKey("SupplierId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Product");
|
||||||
|
|
||||||
|
b.Navigation("Supplier");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supply", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("DatabaseImplement.Models.Supplier", "Supplier")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("SupplierId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Supplier");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.SupplyProduct", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("DatabaseImplement.Models.Product", "Product")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ProductId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("DatabaseImplement.Models.Supply", "Supply")
|
||||||
|
.WithMany("Products")
|
||||||
|
.HasForeignKey("SupplyId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Product");
|
||||||
|
|
||||||
|
b.Navigation("Supply");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.User", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("DatabaseImplement.Models.Role", "Role")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("RoleId");
|
||||||
|
|
||||||
|
b.Navigation("Role");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supplier", b =>
|
||||||
|
{
|
||||||
|
b.Navigation("Products");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supply", b =>
|
||||||
|
{
|
||||||
|
b.Navigation("Products");
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
221
DatabaseImplement/Migrations/20240622162300_second.cs
Normal file
221
DatabaseImplement/Migrations/20240622162300_second.cs
Normal file
@ -0,0 +1,221 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace DatabaseImplement.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class second : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "OnlyImportantMails",
|
||||||
|
table: "Users",
|
||||||
|
type: "boolean",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: false);
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "MediaFiles",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
Name = table.Column<string>(type: "text", nullable: false),
|
||||||
|
Location = table.Column<string>(type: "text", nullable: false),
|
||||||
|
ProductId = table.Column<Guid>(type: "uuid", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_MediaFiles", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Products",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
Name = table.Column<string>(type: "text", nullable: false),
|
||||||
|
Price = table.Column<double>(type: "double precision", nullable: false),
|
||||||
|
Rate = table.Column<double>(type: "double precision", nullable: false),
|
||||||
|
IsBeingSold = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
Amount = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Products", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Purchases",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
DatePurchase = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
||||||
|
Status = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Purchases", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Sells",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
DateSell = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Sells", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Suppliers",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
Name = table.Column<string>(type: "text", nullable: false),
|
||||||
|
Deals = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Suppliers", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "SupplierProducts",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
SupplierId = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
ProductId = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
Count = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_SupplierProducts", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SupplierProducts_Products_ProductId",
|
||||||
|
column: x => x.ProductId,
|
||||||
|
principalTable: "Products",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SupplierProducts_Suppliers_SupplierId",
|
||||||
|
column: x => x.SupplierId,
|
||||||
|
principalTable: "Suppliers",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Supplies",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
Name = table.Column<string>(type: "text", nullable: false),
|
||||||
|
Price = table.Column<double>(type: "double precision", nullable: false),
|
||||||
|
SupplierId = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
Date = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
||||||
|
Status = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Supplies", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Supplies_Suppliers_SupplierId",
|
||||||
|
column: x => x.SupplierId,
|
||||||
|
principalTable: "Suppliers",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "SupplyProducts",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
SupplyId = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
ProductId = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
Count = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_SupplyProducts", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SupplyProducts_Products_ProductId",
|
||||||
|
column: x => x.ProductId,
|
||||||
|
principalTable: "Products",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SupplyProducts_Supplies_SupplyId",
|
||||||
|
column: x => x.SupplyId,
|
||||||
|
principalTable: "Supplies",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SupplierProducts_ProductId",
|
||||||
|
table: "SupplierProducts",
|
||||||
|
column: "ProductId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SupplierProducts_SupplierId",
|
||||||
|
table: "SupplierProducts",
|
||||||
|
column: "SupplierId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Supplies_SupplierId",
|
||||||
|
table: "Supplies",
|
||||||
|
column: "SupplierId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SupplyProducts_ProductId",
|
||||||
|
table: "SupplyProducts",
|
||||||
|
column: "ProductId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SupplyProducts_SupplyId",
|
||||||
|
table: "SupplyProducts",
|
||||||
|
column: "SupplyId");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "MediaFiles");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Purchases");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Sells");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "SupplierProducts");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "SupplyProducts");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Products");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Supplies");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Suppliers");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "OnlyImportantMails",
|
||||||
|
table: "Users");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -22,6 +22,72 @@ namespace DatabaseImplement.Migrations
|
|||||||
|
|
||||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.MediaFile", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<string>("Location")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<Guid>("ProductId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("MediaFiles");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Product", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<int>("Amount")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<bool>("IsBeingSold")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<double>("Price")
|
||||||
|
.HasColumnType("double precision");
|
||||||
|
|
||||||
|
b.Property<double>("Rate")
|
||||||
|
.HasColumnType("double precision");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Products");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Purchase", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DatePurchase")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<int>("Status")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Purchases");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("DatabaseImplement.Models.Role", b =>
|
modelBuilder.Entity("DatabaseImplement.Models.Role", b =>
|
||||||
{
|
{
|
||||||
b.Property<Guid>("Id")
|
b.Property<Guid>("Id")
|
||||||
@ -37,6 +103,115 @@ namespace DatabaseImplement.Migrations
|
|||||||
b.ToTable("Roles");
|
b.ToTable("Roles");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Sell", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<DateTime>("DateSell")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Sells");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supplier", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<int>("Deals")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Suppliers");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.SupplierProduct", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<int>("Count")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<Guid>("ProductId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<Guid>("SupplierId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ProductId");
|
||||||
|
|
||||||
|
b.HasIndex("SupplierId");
|
||||||
|
|
||||||
|
b.ToTable("SupplierProducts");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supply", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<DateTime>("Date")
|
||||||
|
.HasColumnType("timestamp with time zone");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<double>("Price")
|
||||||
|
.HasColumnType("double precision");
|
||||||
|
|
||||||
|
b.Property<int>("Status")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<Guid>("SupplierId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("SupplierId");
|
||||||
|
|
||||||
|
b.ToTable("Supplies");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.SupplyProduct", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<int>("Count")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<Guid>("ProductId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.Property<Guid>("SupplyId")
|
||||||
|
.HasColumnType("uuid");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ProductId");
|
||||||
|
|
||||||
|
b.HasIndex("SupplyId");
|
||||||
|
|
||||||
|
b.ToTable("SupplyProducts");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("DatabaseImplement.Models.User", b =>
|
modelBuilder.Entity("DatabaseImplement.Models.User", b =>
|
||||||
{
|
{
|
||||||
b.Property<Guid>("Id")
|
b.Property<Guid>("Id")
|
||||||
@ -54,6 +229,9 @@ namespace DatabaseImplement.Migrations
|
|||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<bool>("OnlyImportantMails")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
b.Property<string>("PasswordHash")
|
b.Property<string>("PasswordHash")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
@ -72,6 +250,55 @@ namespace DatabaseImplement.Migrations
|
|||||||
b.ToTable("Users");
|
b.ToTable("Users");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.SupplierProduct", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("DatabaseImplement.Models.Product", "Product")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ProductId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("DatabaseImplement.Models.Supplier", "Supplier")
|
||||||
|
.WithMany("Products")
|
||||||
|
.HasForeignKey("SupplierId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Product");
|
||||||
|
|
||||||
|
b.Navigation("Supplier");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supply", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("DatabaseImplement.Models.Supplier", "Supplier")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("SupplierId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Supplier");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.SupplyProduct", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("DatabaseImplement.Models.Product", "Product")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ProductId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.HasOne("DatabaseImplement.Models.Supply", "Supply")
|
||||||
|
.WithMany("Products")
|
||||||
|
.HasForeignKey("SupplyId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("Product");
|
||||||
|
|
||||||
|
b.Navigation("Supply");
|
||||||
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("DatabaseImplement.Models.User", b =>
|
modelBuilder.Entity("DatabaseImplement.Models.User", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("DatabaseImplement.Models.Role", "Role")
|
b.HasOne("DatabaseImplement.Models.Role", "Role")
|
||||||
@ -80,6 +307,16 @@ namespace DatabaseImplement.Migrations
|
|||||||
|
|
||||||
b.Navigation("Role");
|
b.Navigation("Role");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supplier", b =>
|
||||||
|
{
|
||||||
|
b.Navigation("Products");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("DatabaseImplement.Models.Supply", b =>
|
||||||
|
{
|
||||||
|
b.Navigation("Products");
|
||||||
|
});
|
||||||
#pragma warning restore 612, 618
|
#pragma warning restore 612, 618
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ using Contracts.ViewModels;
|
|||||||
using DataModels.Models;
|
using DataModels.Models;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@ -11,72 +12,77 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace DatabaseImplement.Models
|
namespace DatabaseImplement.Models
|
||||||
{
|
{
|
||||||
public class User : IUser
|
public class User : IUser
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string FirstName { get; set; } = string.Empty;
|
public string FirstName { get; set; } = string.Empty;
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string SecondName { get; set; } = string.Empty;
|
public string SecondName { get; set; } = string.Empty;
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string PasswordHash { get; set; } = string.Empty;
|
public string PasswordHash { get; set; } = string.Empty;
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string Email { get; set; } = string.Empty;
|
public string Email { get; set; } = string.Empty;
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public DateTime Birthday { get; set; }
|
public DateTime Birthday { get; set; }
|
||||||
|
|
||||||
public Role? Role { get; set; }
|
public Role? Role { get; set; }
|
||||||
|
|
||||||
public UserBindingModel GetBindingModel() => new()
|
public bool OnlyImportantMails { get; set; } = false;
|
||||||
{
|
|
||||||
Id = Id,
|
|
||||||
FirstName = FirstName,
|
|
||||||
SecondName = SecondName,
|
|
||||||
Email = Email,
|
|
||||||
PasswordHash = PasswordHash,
|
|
||||||
Birthday = Birthday,
|
|
||||||
Role = Role?.GetBindingModel() ?? new()
|
|
||||||
};
|
|
||||||
|
|
||||||
public static User ToUserFromView(UserViewModel model, Role role) => new()
|
public UserBindingModel GetBindingModel() => new()
|
||||||
{
|
{
|
||||||
Id = model.Id,
|
Id = Id,
|
||||||
FirstName = model.FirstName,
|
FirstName = FirstName,
|
||||||
SecondName = model.SecondName,
|
SecondName = SecondName,
|
||||||
Email = model.Email,
|
Email = Email,
|
||||||
Birthday = model.Birthday,
|
PasswordHash = PasswordHash,
|
||||||
Role = role
|
Birthday = Birthday,
|
||||||
};
|
OnlyImportantMails = OnlyImportantMails,
|
||||||
|
Role = Role?.GetBindingModel() ?? new()
|
||||||
|
};
|
||||||
|
|
||||||
public static User ToUserFromBinding(UserBindingModel model, Role role) => new()
|
public static User ToUserFromView(UserViewModel model, Role role) => new()
|
||||||
{
|
{
|
||||||
Id = model.Id,
|
Id = model.Id,
|
||||||
FirstName = model.FirstName,
|
FirstName = model.FirstName,
|
||||||
SecondName = model.SecondName,
|
SecondName = model.SecondName,
|
||||||
Email = model.Email,
|
Email = model.Email,
|
||||||
PasswordHash = model.PasswordHash,
|
Birthday = model.Birthday,
|
||||||
Birthday = model.Birthday,
|
Role = role
|
||||||
Role = role
|
};
|
||||||
};
|
|
||||||
|
|
||||||
public void Update(UserBindingModel model, Role role)
|
public static User ToUserFromBinding(UserBindingModel model, Role role) => new()
|
||||||
{
|
{
|
||||||
if (model is null)
|
Id = model.Id,
|
||||||
{
|
FirstName = model.FirstName,
|
||||||
throw new ArgumentNullException("Update user: binding model is null");
|
SecondName = model.SecondName,
|
||||||
}
|
Email = model.Email,
|
||||||
|
PasswordHash = model.PasswordHash,
|
||||||
|
Birthday = model.Birthday,
|
||||||
|
OnlyImportantMails = model.OnlyImportantMails,
|
||||||
|
Role = role
|
||||||
|
};
|
||||||
|
|
||||||
Email = model.Email;
|
public void Update(UserBindingModel model, Role role)
|
||||||
FirstName = model.FirstName;
|
{
|
||||||
SecondName = model.SecondName;
|
if (model is null)
|
||||||
PasswordHash = model.PasswordHash;
|
{
|
||||||
Birthday = model.Birthday;
|
throw new ArgumentNullException("Update user: binding model is null");
|
||||||
Role = role;
|
}
|
||||||
}
|
|
||||||
}
|
Email = model.Email ?? Email;
|
||||||
|
FirstName = model.FirstName ?? FirstName;
|
||||||
|
SecondName = model.SecondName ?? SecondName;
|
||||||
|
PasswordHash = model.PasswordHash ?? PasswordHash;
|
||||||
|
Birthday = model.Birthday;
|
||||||
|
OnlyImportantMails = model.OnlyImportantMails;
|
||||||
|
Role = role ?? Role;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@ -74,6 +74,13 @@
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-check d-flex justify-content-center mb-4">
|
||||||
|
<input asp-for="UserModel.OnlyImportantMails" class="form-check-input me-2" type="checkbox" id="policy" />
|
||||||
|
<label class="form-check-label" for="policy">
|
||||||
|
Send only important mails
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Submit button -->
|
<!-- Submit button -->
|
||||||
<button type="submit" data-mdb-button-init data-mdb-ripple-init class="btn btn-primary btn-block mb-4">
|
<button type="submit" data-mdb-button-init data-mdb-ripple-init class="btn btn-primary btn-block mb-4">
|
||||||
Sign up
|
Sign up
|
||||||
|
@ -37,6 +37,12 @@
|
|||||||
<input asp-for="UserModel.Birthday" type="date" id="birthday" class="form-control" />
|
<input asp-for="UserModel.Birthday" type="date" id="birthday" class="form-control" />
|
||||||
<label class="form-label" for="birthday">Birthday</label>
|
<label class="form-label" for="birthday">Birthday</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Sending Policy input -->
|
||||||
|
<div class="form-outline mb-4">
|
||||||
|
<input asp-for="UserModel.OnlyImportantMails" type="checkbox" id="policy" />
|
||||||
|
<label class="form-label" for="policy">Send only important mails</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Hidden inputs -->
|
<!-- Hidden inputs -->
|
||||||
<input type="hidden" asp-for="UserModel.Id" />
|
<input type="hidden" asp-for="UserModel.Id" />
|
||||||
|
Loading…
Reference in New Issue
Block a user