Anna_Korotkovaa/ISEbd-22_CourseWork_University
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/

Browse Source
This commit is contained in:
анна 2024-05-31 14:29:35 +04:00
parent 2a53eaeef3
commit ea5afbeaf6
8 changed files with 94 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
University/UniversityBusinessLogics/BusinessLogic/EmployeeLogic.cs
View File

@ -26,47 +26,47 @@ namespace UniversityBusinessLogics.BusinessLogic
private void CheckModel(EmployeeBindingModel model, bool withParams = true)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
if (!withParams)
{
return;
}
if (string.IsNullOrEmpty(model.PhoneNumber))
{
throw new ArgumentNullException(nameof(model.PhoneNumber), "Нет логина клиента");
}
if (string.IsNullOrEmpty(model.Password))
{
throw new ArgumentNullException(nameof(model.Password), "Нет пароля клиента");
}
if (model.PhoneNumber.Length is < 12)
{
throw new ArgumentException(nameof(model.PhoneNumber), "Длина номера телефона должна быть 11 цифр");
}
//if (model == null)
//{
// throw new ArgumentNullException(nameof(model));
//}
//if (!withParams)
//{
// return;
//}
//if (string.IsNullOrEmpty(model.PhoneNumber))
//{
// throw new ArgumentNullException(nameof(model.PhoneNumber), "Нет логина клиента");
//}
//if (string.IsNullOrEmpty(model.Password))
//{
// throw new ArgumentNullException(nameof(model.Password), "Нет пароля клиента");
//}
//if (model.PhoneNumber.Length is < 12)
//{
// throw new ArgumentException(nameof(model.PhoneNumber), "Длина номера телефона должна быть 11 цифр");
//}
if (model.Password.Length < 5)
{
throw new ArgumentException(nameof(model.Password),
"Пароль пользователя должен быть не менее 5 символов");
}
if (!Regex.IsMatch(model.Password, "[0-9]+"))
{
throw new ArgumentException(nameof(model.Password),
"Пароль пользователя должен содержать хотя бы одну цифру");
}
_logger.LogDebug("{level} Проверка логина пользователя на уникальность {@Employee}", model);
var element = _employeeStorage.GetElement(new EmployeeSearchModel
{
PhoneNumber = model.PhoneNumber,
});
if (element != null && element.Id != model.Id)
{
_logger.LogWarning("С номером {PhoneNumber}, уже есть пользователь: {@ExistEmployee}", model.PhoneNumber, element);
throw new InvalidOperationException($"Сотрудник с таким номером телефона уже есть");
}
//if (model.Password.Length < 5)
//{
// throw new ArgumentException(nameof(model.Password),
// "Пароль пользователя должен быть не менее 5 символов");
//}
//if (!Regex.IsMatch(model.Password, "[0-9]+"))
//{
// throw new ArgumentException(nameof(model.Password),
// "Пароль пользователя должен содержать хотя бы одну цифру");
//}
//_logger.LogDebug("{level} Проверка логина пользователя на уникальность {@Employee}", model);
//var element = _employeeStorage.GetElement(new EmployeeSearchModel
//{
// PhoneNumber = model.PhoneNumber,
//});
//if (element != null && element.Id != model.Id)
//{
// _logger.LogWarning("С номером {PhoneNumber}, уже есть пользователь: {@ExistEmployee}", model.PhoneNumber, element);
// throw new InvalidOperationException($"Сотрудник с таким номером телефона уже есть");
//}
}
public bool Create(EmployeeBindingModel model)

1
University/UniversityBusinessLogics/OfficePackage/AbstractSaveToWord.cs
View File

@ -60,6 +60,5 @@ namespace UniversityBusinessLogics.OfficePackage
/// </summary>
/// <param name="info"></param>
protected abstract void SaveWord(WordInfo info);
}
}

1
University/UniversityBusinessLogics/OfficePackage/Implements/SaveToExcel.cs
View File

@ -306,6 +306,5 @@ namespace UniversityBusinessLogics.OfficePackage.Implements
_spreadsheetDocument.WorkbookPart!.Workbook.Save();
_spreadsheetDocument.Close();
}
}
}

1
University/UniversityBusinessLogics/OfficePackage/Implements/SaveToPdf.cs
View File

@ -123,6 +123,5 @@ namespace UniversityBusinessLogics.OfficePackage.Implements
}
}
}
}

1
University/UniversityBusinessLogics/OfficePackage/Implements/SaveToWord.cs
View File

@ -142,6 +142,5 @@ namespace UniversityBusinessLogics.OfficePackage.Implements
_wordDocument.Close();
}
}
}

43
University/UniversityClientApp/appsettings.json
View File

@ -1,9 +1,50 @@
{
"Serilog": {
"Using": [ "Serilog.Sinks.File" ],
"MinimumLevel": "Information",
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "Logs/log_.log",
"rollingInterval": "Day",
"outputTemplate": "[{Timestamp:HH:mm:ss.fff}] {Level:u4}: {Message:lj}{NewLine}{Exception}"
}
}
],
"Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
"Destructure": [
{
"Name": "ToMaximumDepth",
"Args": { "maximumDestructuringDepth": 3 }
},
{
"Name": "ToMaximumStringLength",
"Args": { "maximumStringLength": 100 }
},
{
"Name": "ToMaximumCollectionCount",
"Args": { "maximumCollectionCount": 10 }
}
],
"Properties": {
"Application": "Bank"
}
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
"AllowedHosts": "*",
"SmtpClientHost": "smtp.gmail.com",
"SmtpClientPort": "587",
"PopHost": "pop.gmail.com",
"PopPort": "995",
"MailLogin": "tyuikooo17@gmail.com",
"MailPassword": "nhbrjnfAVKOR04"
}

4
University/UniversityEmployeeApp/Views/Shared/_Layout.cshtml
View File

@ -12,7 +12,7 @@
<header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container-fluid">
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Банк сотрудник</a>
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Университет сотрудник</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
@ -53,7 +53,7 @@
<footer class="border-top footer text-muted">
<div class="container">
&copy; 2023 - BankEmployeeApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
&copy; 2024 - UniversityEmployeeApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</div>
</footer>
<script src="~/lib/jquery/dist/jquery.min.js"></script>

11
University/UniversityEmployeeApp/appsettings.json
View File

@ -5,5 +5,14 @@
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
"AllowedHosts": "*",
"SmtpClientHost": "smtp.gmail.com",
"SmtpClientPort": "587",
"PopHost": "pop.gmail.com",
"PopPort": "995",
"MailLogin": "tyuikooo17@gmail.com",
"MailPassword": "nhbrjnfAVKOR04"
}