Andrey_Abazov/CourseWork_Bank
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Фиксы для создания сделки

Browse Source
This commit is contained in:
abazov73 2023-04-07 18:20:50 +04:00
parent 9201113e0d
commit c3e2a54710
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Bank/BankDatabaseImplement/Implements/OperatorStorage.cs
View File

@ -45,14 +45,24 @@ namespace BankDatabaseImplement.Implements
} }
public OperatorViewModel? GetElement(OperatorSearchModel model) public OperatorViewModel? GetElement(OperatorSearchModel model)
{ {
if (!model.Id.HasValue) if (!model.Id.HasValue && string.IsNullOrEmpty(model.Login) && string.IsNullOrEmpty(model.Password))
{ {
return null; return null;
} }
using var context = new BankDatabase(); if (!string.IsNullOrEmpty(model.Login) && !string.IsNullOrEmpty(model.Password))
return context.Operators {
.FirstOrDefault(x => x.Id == model.Id) using var context = new BankDatabase();
?.GetViewModel; return context.Operators
.FirstOrDefault(x => x.Login == model.Login && x.Password == model.Password)
?.GetViewModel;
}
else
{
using var context = new BankDatabase();
return context.Operators
.FirstOrDefault(x => x.Id == model.Id)
?.GetViewModel;
}
} }
public OperatorViewModel? Insert(OperatorBindingModel model) public OperatorViewModel? Insert(OperatorBindingModel model)
{ {

2
Bank/BankDatabaseImplement/Models/Deal.cs
View File

@ -22,7 +22,7 @@ namespace BankDatabaseImplement.Models
public int OperatorId { get; set; } public int OperatorId { get; set; }
public virtual Operator Operator { get; set; } = new(); public virtual Operator Operator { get; set; } = new();
public int? CreditProgramId {get; set; } public int? CreditProgramId {get; set; }
public virtual CreditProgram CreditProgram { get; set; } = new(); public virtual CreditProgram? CreditProgram { get; set; }
[ForeignKey("DealId")] [ForeignKey("DealId")]
public virtual List<DealPayment> DealPayments { get; set; } = new(); public virtual List<DealPayment> DealPayments { get; set; } = new();
public static Deal? Create(BankDatabase context, DealBindingModel model) public static Deal? Create(BankDatabase context, DealBindingModel model)

2
Bank/OperatorApp/Controllers/HomeController.cs
View File

@ -127,7 +127,7 @@ namespace OperatorApp.Controllers
{ {
throw new Exception("Вы как суда попали? Суда вход только авторизованным"); throw new Exception("Вы как суда попали? Суда вход только авторизованным");
} }
APIClient.PostRequest("api/main/createorder", new DealBindingModel APIClient.PostRequest("api/deal/createdeal", new DealBindingModel
{ {
ClientId = clientid, ClientId = clientid,
OperatorId = APIClient.Operator.Id, OperatorId = APIClient.Operator.Id,