hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-04-21 17:20:17 +07:00
commit cd54079a47
31 changed files with 27955 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BMA.EHR.Application/Repositories/UserProfileRepository.cs
View file

@ -756,7 +756,7 @@ namespace BMA.EHR.Application.Repositories
}
}
public GetUserOCIdDto? GetUserOC(Guid keycloakId, string? accessToken)
public async Task<GetUserOCIdDto?> GetUserOC(Guid keycloakId, string? accessToken)
{
try
{
@ -767,15 +767,11 @@ namespace BMA.EHR.Application.Repositories
var apiResult = GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
if (apiResult.Result != null)
{
var raw = JsonConvert.DeserializeObject<GetUserOCIdDto>(apiResult.Result);
var raw = JsonConvert.DeserializeObject<GetUserOCIdResultDto>(apiResult.Result);
return raw;
//if (raw == null || raw.RootId == null)
// return Guid.Empty;
//return raw.RootId;
if (raw != null)
return raw.Result;
}
return null;
}
catch

21
BMA.EHR.Application/Responses/Profiles/GetUserOCIdDto.cs
View file

@ -4,26 +4,27 @@
{
public Guid ProfileId { get; set; }
public string Prefix { get; set; } = string.Empty;
public string? Prefix { get; set; } = string.Empty;
public string Rank { get; set; } = string.Empty;
public string? Rank { get; set; } = string.Empty;
public string Avatar { get; set; } = string.Empty;
public string? Avatar { get; set; } = string.Empty;
public string FirstName { get; set; } = string.Empty;
public string? FirstName { get; set; } = string.Empty;
public string LastName { get; set; } = string.Empty;
public string? LastName { get; set; } = string.Empty;
public string CitizenId { get; set; } = string.Empty;
public string? CitizenId { get; set; } = string.Empty;
public DateTime BirthDate { get; set; } = DateTime.MinValue;
public DateTime? BirthDate { get; set; } = DateTime.MinValue;
public string Position { get; set; } = string.Empty;
public string? Position { get; set; } = string.Empty;
public Guid RootId { get; set; }
public Guid? RootDnaId { get; set; }
public string Root { get; set; } = string.Empty;
public string? Root { get; set; } = string.Empty;
public string RootShortName { get; set; } = string.Empty;
public string? RootShortName { get; set; } = string.Empty;
}
}