This commit is contained in:
mmrbnjd
2025-07-12 16:59:25 +03:30
parent ff342a53c0
commit d397f70b9a
9 changed files with 82 additions and 87 deletions

View File

@@ -1,4 +1,5 @@
using Hushian.Application.Dtos;
using Common.Dtos.Conversation;
using Common.Enums;
using System.Net.Http.Json;
namespace HushianWebApp.Service
@@ -13,27 +14,27 @@ namespace HushianWebApp.Service
_baseController = baseController;
}
public async Task <List<ConversationDto>> MyConversationIsFinished()
public async Task <List<Read_ConversationDto>> MyConversationIsFinished()
{
var response = await _baseController.Get($"{BaseRoute}MyConversationIsFinished");
var response = await _baseController.Post($"{BaseRoute}MyConversation", ConversationStatus.Finished);
if (response.IsSuccessStatusCode)
return await response.Content.ReadFromJsonAsync<List<ConversationDto>>();
return await response.Content.ReadFromJsonAsync<List<Read_ConversationDto>>();
return new() ;
}
public async Task<List<ConversationDto>> MyConversationIsInProgress()
public async Task<List<Read_ConversationDto>> MyConversationIsInProgress()
{
var response = await _baseController.Get($"{BaseRoute}MyConversationIsInProgress");
var response = await _baseController.Post($"{BaseRoute}MyConversation", ConversationStatus.InProgress);
if (response.IsSuccessStatusCode)
return await response.Content.ReadFromJsonAsync<List<ConversationDto>>();
return await response.Content.ReadFromJsonAsync<List<Read_ConversationDto>>();
return new();
}
public async Task<List<ConversationDto>> ConversationAwaitingOurResponse()
public async Task<List<Read_ConversationDto>> ConversationAwaitingOurResponse()
{
var response = await _baseController.Get($"{BaseRoute}ConversationAwaitingOurResponse");
if (response.IsSuccessStatusCode)
return await response.Content.ReadFromJsonAsync<List<ConversationDto>>();
return await response.Content.ReadFromJsonAsync<List<Read_ConversationDto>>();
return new();
}
@@ -43,36 +44,28 @@ namespace HushianWebApp.Service
return response.IsSuccessStatusCode;
}
public async Task<List<ConversationItemDto>> GetConversationItems(int ConversationID)
public async Task<List<Read_ConversationResponseDto>> GetConversationItems(int ConversationID)
{
var response = await _baseController.Get($"{BaseRoute}ConversationItems/{ConversationID}");
if (response.IsSuccessStatusCode)
return await response.Content.ReadFromJsonAsync<List<ConversationItemDto>>();
return await response.Content.ReadFromJsonAsync<List<Read_ConversationResponseDto>>();
return new();
}
public async Task ADDConversationItemFromCompanySide(int ConversationID,string text)
public async Task ADDConversationItemFromCompanySide(int ConversationID,string text, ConversationType type)
{
var response = await _baseController.Post($"{BaseRoute}ADDConversationItemFromCompanySide/{ConversationID}",new ADDConversationItemDto()
var response = await _baseController.Post($"{BaseRoute}ADDConversationResponse",new ADD_ConversationResponseDto()
{
ConversationID = ConversationID,
text=text
Text=text,
Type=type
});
/* if (response.IsSuccessStatusCode)
return await response.Content.ReadFromJsonAsync<List<ConversationItemDto>>();
// return new();*/
}
public async Task<bool> ConversationIsFinish(int ConversationID)
{
var response = await _baseController.Put($"{BaseRoute}ConversationIsFinish/{ConversationID}");
return response.IsSuccessStatusCode;
}
public async Task<bool> ConversationIsStart(int ConversationID)
{
var response = await _baseController.Put($"{BaseRoute}ConversationIsStart/{ConversationID}");
return response.IsSuccessStatusCode;
}
public async Task<int> GetCountQueueCompany(int CompanyID,int GroupID=0)
{
var response = await _baseController.Get($"{BaseRoute}CountQueueCompany/{CompanyID}?GroupID={GroupID}");
@@ -81,11 +74,11 @@ namespace HushianWebApp.Service
return -1;
}
public async Task<List<ConversationDto>> MyConversationUserSide(int CompanyID)
public async Task<List<Read_ConversationDto>> MyConversationUserSide(int CompanyID)
{
var response = await _baseController.Get($"{BaseRoute}ConversationFromUserSide/{CompanyID}");
if (response.IsSuccessStatusCode)
return await response.Content.ReadFromJsonAsync<List<ConversationDto>>();
return await response.Content.ReadFromJsonAsync<List<Read_ConversationDto>>();
return new();
}