on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Переименован метод получения контакта по ключу контакта и ключу скважины: GetContact, убраны ConfigureAwait(false)

Browse Source
This commit is contained in:
Olga Nemt 2023-10-16 10:56:10 +05:00
parent 43b7d77628
commit cf298690a4
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Services/IWellContactService.cs
View File

@ -24,7 +24,7 @@ namespace AsbCloudApp.Services
/// Получение контакта по ключу /// Получение контакта по ключу
/// </summary> /// </summary>
/// <param name="idWell">ключ скважины</param> /// <param name="idWell">ключ скважины</param>
/// <param name="id">тип пользователя</param> /// <param name="id">ключ пользователя</param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<ContactDto?> GetAsync(int idWell, int id, CancellationToken token); Task<ContactDto?> GetAsync(int idWell, int id, CancellationToken token);

19
AsbCloudInfrastructure/Services/WellContactService.cs
View File

@ -29,15 +29,14 @@ namespace AsbCloudInfrastructure.Services
.Select(c => c.Adapt<ContactDto>()); .Select(c => c.Adapt<ContactDto>());
var entities = await query.AsNoTracking() var entities = await query.AsNoTracking()
.ToArrayAsync(token) .ToArrayAsync(token);
.ConfigureAwait(false);
return entities; return entities;
} }
public async Task<ContactDto?> GetAsync(int idWell, int id, CancellationToken token) public async Task<ContactDto?> GetAsync(int idWell, int id, CancellationToken token)
{ {
var dbContact = await CheckMembershipContactToWell(idWell, id, token); var dbContact = await GetContact(idWell, id, token);
var result = dbContact?.Adapt<ContactDto>(); var result = dbContact?.Adapt<ContactDto>();
@ -51,8 +50,7 @@ namespace AsbCloudInfrastructure.Services
.OrderBy(t => t.Order); .OrderBy(t => t.Order);
var entities = await query.AsNoTracking() var entities = await query.AsNoTracking()
.ToArrayAsync(token) .ToArrayAsync(token);
.ConfigureAwait(false);
var dtos = entities.Adapt<IEnumerable<CompanyTypeDto>>(); var dtos = entities.Adapt<IEnumerable<CompanyTypeDto>>();
@ -75,16 +73,14 @@ namespace AsbCloudInfrastructure.Services
var entity = contactDto.Adapt<Contact>(); var entity = contactDto.Adapt<Contact>();
db.Contacts.Update(entity); db.Contacts.Update(entity);
return await db.SaveChangesAsync(token) return await db.SaveChangesAsync(token);
.ConfigureAwait(false);
} }
public async Task<int> DeleteAsync(int id, CancellationToken token) public async Task<int> DeleteAsync(int id, CancellationToken token)
{ {
var contact = await db.Contacts var contact = await db.Contacts
.Where(c => c.Id == id) .Where(c => c.Id == id)
.FirstOrDefaultAsync(token) .FirstOrDefaultAsync(token);
.ConfigureAwait(false);
if (contact is null) if (contact is null)
throw new ForbidException("Contact doesn't exist"); throw new ForbidException("Contact doesn't exist");
@ -93,13 +89,12 @@ namespace AsbCloudInfrastructure.Services
return await db.SaveChangesAsync(token); return await db.SaveChangesAsync(token);
} }
private async Task<Contact?> CheckMembershipContactToWell(int idWell, int idContact, CancellationToken token) private async Task<Contact?> GetContact(int idWell, int idContact, CancellationToken token)
{ {
var contact = await db.Contacts var contact = await db.Contacts
.Where(c => c.IdWell == idWell) .Where(c => c.IdWell == idWell)
.Where(c => c.Id == idContact) .Where(c => c.Id == idContact)
.FirstOrDefaultAsync(token) .FirstOrDefaultAsync(token);
.ConfigureAwait(false);
return contact; return contact;
} }