ker73rus/PIbd-21_Pyatakov_KM_Markov_DP_University
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

role теперь enum + по мелочи

Browse Source
This commit is contained in:
Danil Markov 2023-05-16 22:01:03 +04:00
parent 8388b39941
commit 752868c67f
25 changed files with 111 additions and 472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
UniversityBusinessLogic/BusinessLogics/RoleLogic.cs
View File

@ -1,100 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityContracts.BindingModels;
using UniversityContracts.BusinessLogicContracts;
using UniversityContracts.SearchModels;
using UniversityContracts.StoragesContracts;
using UniversityContracts.ViewModels;
namespace UniversityBusinessLogic.BusinessLogics
{
public class RoleLogic : IRoleLogic
{
private readonly IRoleStorage _roleStorage;
public RoleLogic(IRoleStorage roleStorage)
{
_roleStorage = roleStorage;
}
public bool Create(RoleBindingModel model)
{
CheckModel(model);
if (_roleStorage.Insert(model) == null)
{
return false;
}
return true;
}
public bool Delete(RoleBindingModel model)
{
CheckModel(model, false);
if (_roleStorage.Delete(model) == null)
{
return false;
}
return true;
}
public RoleViewModel? ReadElement(RoleSearchModel model)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
var element = _roleStorage.GetElement(model);
if (element == null)
{
return null;
}
return element;
}
public List<RoleViewModel>? ReadList(RoleSearchModel? model)
{
var list = model == null ? _roleStorage.GetFullList() : _roleStorage.GetFilteredList(model);
if (list == null)
{
return null;
}
return list;
}
public bool Update(RoleBindingModel model)
{
CheckModel(model);
if (_roleStorage.Update(model) == null)
{
return false;
}
return true;
}
private void CheckModel(RoleBindingModel model, bool withParams = true)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
if (!withParams)
{
return;
}
if (string.IsNullOrEmpty(model.Name))
{
throw new ArgumentNullException("Нет названия роли", nameof(model.Name));
}
var element = _roleStorage.GetElement(new RoleSearchModel
{
Name = model.Name
});
if (element != null && element.Id != model.Id)
{
throw new InvalidOperationException("Роль с таким названием уже есть");
}
}
}
}

15
UniversityContracts/BindingModels/RoleBindingModel.cs
View File

@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityModels.Models;
namespace UniversityContracts.BindingModels
{
public class RoleBindingModel : IRoleModel
{
public int Id { get; set; }
public string Name { get; set; } = string.Empty;
}
}

5
UniversityContracts/BindingModels/UserBindingModel.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityModels.Enums;
using UniversityModels.Models;
namespace UniversityContracts.BindingModels
@ -12,6 +13,6 @@ namespace UniversityContracts.BindingModels
public int Id { get; set; }
public string Login { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
public int RoleId { get; set; }
}
public Role Role { get; set; }
}
}

20
UniversityContracts/BusinessLogicContracts/IRoleLogic.cs
View File

@ -1,20 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityContracts.BindingModels;
using UniversityContracts.SearchModels;
using UniversityContracts.ViewModels;
namespace UniversityContracts.BusinessLogicContracts
{
public interface IRoleLogic
{
List<RoleViewModel>? ReadList(RoleSearchModel? model);
RoleViewModel? ReadElement(RoleSearchModel model);
bool Create(RoleBindingModel model);
bool Update(RoleBindingModel model);
bool Delete(RoleBindingModel model);
}
}

14
UniversityContracts/SearchModels/RoleSearchModel.cs
View File

@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace UniversityContracts.SearchModels
{
public class RoleSearchModel
{
public string? Name { get; set; }
public int? Id { get; set; }
}
}

10
UniversityContracts/SearchModels/UserSearchModel.cs
View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityModels.Enums;
namespace UniversityContracts.SearchModels
{
@ -10,7 +6,7 @@ namespace UniversityContracts.SearchModels
{
public int? Id { get; set; }
public string? Login { get; set; }
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
public string? Password { get; set; }
public Role? Role { get; set; }
}
}

21
UniversityContracts/StoragesContracts/IRoleStorage.cs
View File

@ -1,21 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityContracts.BindingModels;
using UniversityContracts.SearchModels;
using UniversityContracts.ViewModels;
namespace UniversityContracts.StoragesContracts
{
public interface IRoleStorage
{
List<RoleViewModel> GetFullList();
List<RoleViewModel> GetFilteredList(RoleSearchModel model);
RoleViewModel? GetElement(RoleSearchModel model);
RoleViewModel? Insert(RoleBindingModel model);
RoleViewModel? Update(RoleBindingModel model);
RoleViewModel? Delete(RoleBindingModel model);
}
}

18
UniversityContracts/ViewModels/RoleViewModel.cs
View File

@ -1,18 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityModels.Models;
namespace UniversityContracts.ViewModels
{
public class RoleViewModel : IRoleModel
{
[DisplayName("Название")]
public string Name { get; set; } = string.Empty;
public int Id { get; set; }
}
}

4
UniversityContracts/ViewModels/UserViewModel.cs
View File

@ -4,13 +4,15 @@ using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityModels.Enums;
namespace UniversityContracts.ViewModels
{
public class UserViewModel
{
public int Id { get; set; }
public int RoleId { get; set; }
[DisplayName("Роль")]
public Role Role { get; set; }
[DisplayName("Логин")]
public string Login { get; set; } = string.Empty;
[DisplayName("Пароль")]

3
UniversityDataBaseImplemet/Database.cs
View File

@ -10,7 +10,7 @@ namespace UniversityDataBaseImplemet
{
if (optionsBuilder.IsConfigured == false)
{
optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=University;Username=postgres;Password=123");
optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=UniversityCourseWork;Username=postgres;Password=123");
}
base.OnConfiguring(optionsBuilder);
}
@ -25,6 +25,5 @@ namespace UniversityDataBaseImplemet
public virtual DbSet<Student> Students { get; set; }
public virtual DbSet<StudentDocument> StudentDocuments { get; set; }
public virtual DbSet<StudentStream> StudentStreams { get; set; }
public virtual DbSet<Role> Roles { get; set; }
}
}

89
UniversityDataBaseImplemet/Implements/RoleStorage.cs
View File

@ -1,89 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityContracts.BindingModels;
using UniversityContracts.SearchModels;
using UniversityContracts.StoragesContracts;
using UniversityContracts.ViewModels;
using UniversityDataBaseImplemet.Models;
namespace UniversityDataBaseImplemet.Implements
{
public class RoleStorage : IRoleStorage
{
public RoleViewModel? Delete(RoleBindingModel model)
{
using var context = new Database();
var element = context.Roles
.FirstOrDefault(rec => rec.Id == model.Id);
if (element != null)
{
context.Roles.Remove(element);
context.SaveChanges();
return element.GetViewModel;
}
return null;
}
public RoleViewModel? GetElement(RoleSearchModel model)
{
using var context = new Database();
if (model.Id.HasValue)
return context.Roles
.FirstOrDefault(record => record.Id == model.Id)
?.GetViewModel;
if (!string.IsNullOrEmpty(model.Name))
return context.Roles
.FirstOrDefault(record => record.Name.Equals(model.Name))
?.GetViewModel;
return null;
}
public List<RoleViewModel> GetFilteredList(RoleSearchModel model)
{
if (string.IsNullOrEmpty(model.Name))
{
return new();
}
using var context = new Database();
return context.Roles
.Where(record => record.Name.Contains(model.Name))
.Select(record => record.GetViewModel)
.ToList();
}
public List<RoleViewModel> GetFullList()
{
using var context = new Database();
return context.Roles.Select(record => record.GetViewModel).ToList();
}
public RoleViewModel? Insert(RoleBindingModel model)
{
var newRole = Role.Create(model);
if (newRole == null)
{
return null;
}
using var context = new Database();
context.Roles.Add(newRole);
context.SaveChanges();
return newRole.GetViewModel;
}
public RoleViewModel? Update(RoleBindingModel model)
{
using var context = new Database();
var client = context.Roles.FirstOrDefault(record => record.Id == model.Id);
if (client == null)
{
return null;
}
client.Update(model);
context.SaveChanges();
return client.GetViewModel;
}
}
}

41
UniversityDataBaseImplemet/Migrations/20230515162605_lastStageStart.Designer.cs → UniversityDataBaseImplemet/Migrations/20230516175336_fixRole.Designer.cs generated
View File

@ -12,8 +12,8 @@ using UniversityDataBaseImplemet;
namespace UniversityDataBaseImplemet.Migrations
{
[DbContext(typeof(Database))]
[Migration("20230515162605_lastStageStart")]
partial class lastStageStart
[Migration("20230516175336_fixRole")]
partial class fixRole
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -176,23 +176,6 @@ namespace UniversityDataBaseImplemet.Migrations
b.ToTable("EducationStatuses");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Role", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("Roles");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Stream", b =>
{
b.Property<int>("Id")
@ -317,13 +300,11 @@ namespace UniversityDataBaseImplemet.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<int>("RoleId")
b.Property<int>("Role")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("User");
});
@ -485,17 +466,6 @@ namespace UniversityDataBaseImplemet.Migrations
b.Navigation("Student");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.User", b =>
{
b.HasOne("UniversityDataBaseImplemet.Models.Role", "Role")
.WithMany("Users")
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Role");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Document", b =>
{
b.Navigation("EducationGroupDocument");
@ -515,11 +485,6 @@ namespace UniversityDataBaseImplemet.Migrations
b.Navigation("Students");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Role", b =>
{
b.Navigation("Users");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Stream", b =>
{
b.Navigation("EducationGroupStream");

31
UniversityDataBaseImplemet/Migrations/20230515162605_lastStageStart.cs → UniversityDataBaseImplemet/Migrations/20230516175336_fixRole.cs
View File

@ -7,24 +7,11 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace UniversityDataBaseImplemet.Migrations
{
/// <inheritdoc />
public partial class lastStageStart : Migration
public partial class fixRole : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "Roles",
columns: table => new
{
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
Name = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Roles", x => x.Id);
});
migrationBuilder.CreateTable(
name: "User",
columns: table => new
@ -33,17 +20,11 @@ namespace UniversityDataBaseImplemet.Migrations
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
Login = table.Column<string>(type: "text", nullable: false),
Password = table.Column<string>(type: "text", nullable: false),
RoleId = table.Column<int>(type: "integer", nullable: false)
Role = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_User", x => x.Id);
table.ForeignKey(
name: "FK_User_Roles_RoleId",
column: x => x.RoleId,
principalTable: "Roles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
@ -371,11 +352,6 @@ namespace UniversityDataBaseImplemet.Migrations
name: "IX_StudentStreams_StudentId",
table: "StudentStreams",
column: "StudentId");
migrationBuilder.CreateIndex(
name: "IX_User_RoleId",
table: "User",
column: "RoleId");
}
/// <inheritdoc />
@ -413,9 +389,6 @@ namespace UniversityDataBaseImplemet.Migrations
migrationBuilder.DropTable(
name: "User");
migrationBuilder.DropTable(
name: "Roles");
}
}
}

37
UniversityDataBaseImplemet/Migrations/DatabaseModelSnapshot.cs
View File

@ -173,23 +173,6 @@ namespace UniversityDataBaseImplemet.Migrations
b.ToTable("EducationStatuses");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Role", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("Roles");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Stream", b =>
{
b.Property<int>("Id")
@ -314,13 +297,11 @@ namespace UniversityDataBaseImplemet.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<int>("RoleId")
b.Property<int>("Role")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("User");
});
@ -482,17 +463,6 @@ namespace UniversityDataBaseImplemet.Migrations
b.Navigation("Student");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.User", b =>
{
b.HasOne("UniversityDataBaseImplemet.Models.Role", "Role")
.WithMany("Users")
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Role");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Document", b =>
{
b.Navigation("EducationGroupDocument");
@ -512,11 +482,6 @@ namespace UniversityDataBaseImplemet.Migrations
b.Navigation("Students");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Role", b =>
{
b.Navigation("Users");
});
modelBuilder.Entity("UniversityDataBaseImplemet.Models.Stream", b =>
{
b.Navigation("EducationGroupStream");

58
UniversityDataBaseImplemet/Models/Role.cs
View File

@ -1,58 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityContracts.BindingModels;
using UniversityContracts.ViewModels;
using UniversityModels.Models;
namespace UniversityDataBaseImplemet.Models
{
public class Role : IRoleModel
{
[Required]
public string Name { get; set; } = string.Empty;
public int Id { get; set; }
[ForeignKey("RoleId")]
public virtual List<User> Users { get; set; } = new();
public static Role? Create(RoleBindingModel model)
{
if (model == null)
{
return null;
}
return new Role()
{
Id = model.Id,
Name = model.Name
};
}
public static Role Create(RoleViewModel model)
{
return new Role
{
Id = model.Id,
Name = model.Name
};
}
public void Update(RoleBindingModel model)
{
if (model == null)
{
return;
}
Name = model.Name;
}
public RoleViewModel GetViewModel => new()
{
Id = Id,
Name = Name
};
}
}

12
UniversityDataBaseImplemet/Models/User.cs
View File

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using UniversityContracts.BindingModels;
using UniversityContracts.ViewModels;
using UniversityModels.Models;
using UniversityModels.Enums;
namespace UniversityDataBaseImplemet.Models
{
@ -18,9 +19,8 @@ namespace UniversityDataBaseImplemet.Models
public string Login { get; set; } = string.Empty;
[Required]
public string Password { get; set; } = string.Empty;
[Required]
public int RoleId { get; set; }
public virtual Role Role { get; set; } = new();
[Required]
public Role Role { get; set; }
public static User Create(UserBindingModel model)
{
return new User()
@ -28,20 +28,20 @@ namespace UniversityDataBaseImplemet.Models
Id = model.Id,
Login = model.Login,
Password = model.Password,
RoleId = model.RoleId
Role = model.Role
};
}
public void Update(UserBindingModel model)
{
Password = model.Password;
RoleId = model.RoleId;
Role = model.Role;
}
public UserViewModel GetViewModel => new()
{
Id = Id,
Login = Login,
Password = Password,
RoleId = RoleId
Role = Role
};
}
}

5
UniversityDataBaseImplemet/UniversityDataBaseImplemet.csproj
View File

@ -13,8 +13,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
</ItemGroup>
<ItemGroup>

11
UniversityModels/Models/IRoleModel.cs → UniversityModels/Enums/Role.cs
View File

@ -4,10 +4,11 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace UniversityModels.Models
namespace UniversityModels.Enums
{
public interface IRoleModel : IId
{
string Name { get; }
}
public enum Role
{
Provider = 0,
Customer = 1
}
}

3
UniversityModels/Models/IUserModel.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UniversityModels.Enums;
namespace UniversityModels.Models
{
@ -10,7 +11,7 @@ namespace UniversityModels.Models
{
string Login { get; }
string Password { get; }
int RoleId { get; }
Role Role { get; }
}
}

4
UniversityProvider/Program.cs
View File

@ -1,3 +1,5 @@
using System.IO.Pipes;
var builder = WebApplication.CreateBuilder(args);
// Add services to the container.
@ -5,6 +7,8 @@ builder.Services.AddControllersWithViews();
var app = builder.Build();
// Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment())
{

1
UniversityProvider/UniversityProvider.csproj
View File

@ -11,6 +11,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>

3
UniversityProvider/appsettings.json
View File

@ -5,5 +5,6 @@
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
"AllowedHosts": "*",
"IPAddress": "http://localhost:5067"
}

67
UniversityRestAPI/Controllers/UserController.cs Normal file
View File

@ -0,0 +1,67 @@
using Microsoft.AspNetCore.Mvc;
using UniversityContracts.BindingModels;
using UniversityContracts.BusinessLogicContracts;
using UniversityContracts.SearchModels;
using UniversityContracts.ViewModels;
using UniversityDataBaseImplemet.Models;
using UniversityModels.Enums;
namespace UniversityRestAPI.Controllers
{
[Route("api/[controller]/[action]")]
[ApiController]
public class UserController : Controller
{
private readonly IUserLogic _logic;
public UserController(IUserLogic logic, ILogger<UserController> logger)
{
_logic = logic;
}
[HttpGet]
public UserViewModel? Login(string login, string password, Role role)
{
try
{
return _logic.ReadElement(new UserSearchModel
{
Login = login,
Password = password,
Role = role
});
}
catch (Exception ex)
{
throw;
}
}
[HttpPost]
public void Register(UserBindingModel model)
{
try
{
_logic.Create(model);
}
catch (Exception ex)
{
throw;
}
}
[HttpPost]
public void UpdateData(UserBindingModel model)
{
try
{
_logic.Update(model);
}
catch (Exception ex)
{
throw;
}
}
}
}

1
UniversityRestAPI/Program.cs
View File

@ -6,7 +6,6 @@ using UniversityDataBaseImplemet.Implements;
var builder = WebApplication.CreateBuilder(args);
// Add services to the container.
builder.Services.AddTransient<IUserStorage, UserStorage>();

6
UniversityRestAPI/UniversityRestAPI.csproj
View File

@ -7,11 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
</ItemGroup>
<ItemGroup>
<Folder Include="Controllers\" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup>