no message

This commit is contained in:
Kittapath 2024-05-21 14:31:29 +07:00
parent 2a17eff17d
commit fb6a83b36a
11 changed files with 17862 additions and 70 deletions

View file

@ -393,7 +393,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
IsSendNotification = true,
// OrganizationName = retirementDeceased.OrganizationName,
PositionName = retirementDeceased.position,
// ReceiveUser = profile,
profileId = req.ProfileId,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
@ -502,7 +502,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsSendNotification,
p.OrganizationName,
p.PositionName,
// ProfileId = p.ReceiveUser.Id,
p.profileId,
})
.ToListAsync();
@ -529,32 +529,53 @@ namespace BMA.EHR.Retirement.Service.Controllers
foreach (var item in req.Persons)
{
var profile = await _context.Profiles.AsQueryable()
.Include(x => x.Prefix)
.Include(x => x.Position)
.FirstOrDefaultAsync(x => x.Id == item.ProfileId);
if (profile == null)
continue;
retirementDeceased.RetirementDeceasedNotis.Add(new RetirementDeceasedNoti
// var profile = await _context.Profiles.AsQueryable()
// .Include(x => x.Prefix)
// .Include(x => x.Position)
// .FirstOrDefaultAsync(x => x.Id == item.ProfileId);
// if (profile == null)
// continue;
var retirementDeceasedNoti = new RetirementDeceasedNoti
{
CitizenId = profile.CitizenId == null ? "" : profile.CitizenId,
Prefix = profile.Prefix == null ? "" : profile.Prefix.Name,
FirstName = profile.FirstName == null ? "" : profile.FirstName,
LastName = profile.LastName == null ? "" : profile.LastName,
profileId = item.ProfileId,
IsSendMail = item.IsSendMail,
IsSendInbox = item.IsSendInbox,
IsSendNotification = item.IsSendNotification,
OrganizationName = profile.OrganizationOrganization == null ? "" : profile.OrganizationOrganization,
PositionName = profile.Position == null ? null : profile.Position.Name,
// ReceiveUser = profile,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
};
var apiUrl = $"{_configuration["API"]}org/profile/profileid/position/{item.ProfileId}";
using (var client = new HttpClient())
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
if (org == null || org.result == null)
continue;
retirementDeceasedNoti.Prefix = org.result.prefix == null ? "" : org.result.prefix;
retirementDeceasedNoti.FirstName = org.result.firstName == null ? "" : org.result.firstName;
retirementDeceasedNoti.LastName = org.result.lastName == null ? "" : org.result.lastName;
retirementDeceasedNoti.CitizenId = org.result.citizenId == null ? "" : org.result.citizenId;
retirementDeceasedNoti.PositionName = org.result.position == null ? "" : org.result.position;
retirementDeceasedNoti.OrganizationName = (org.result.child4 == null ? "" : org.result.child4 + "/") +
(org.result.child3 == null ? "" : org.result.child3 + "/") +
(org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root + "/");
}
retirementDeceased.RetirementDeceasedNotis.Add(retirementDeceasedNoti);
await _context.SaveChangesAsync();
}
@ -625,36 +646,37 @@ namespace BMA.EHR.Retirement.Service.Controllers
};
var payload_str = JsonConvert.SerializeObject(payload);
// foreach (var item in items)
// {
// var prefix = item.RetirementDeceased.prefix;
// var profile = req.Persons.FirstOrDefault(x => x.ProfileId == item.ReceiveUser.Id);
// if (profile != null)
// {
// await _repositoryNoti.PushNotificationAsync(
// item.ReceiveUser.Id,
// $"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// $"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// payload_str,
// profile.IsSendInbox,
// profile.IsSendMail
// );
// item.IsSendMail = profile.IsSendMail;
// item.IsSendInbox = profile.IsSendInbox;
// item.IsSendNotification = profile.IsSendNotification;
// }
// else
// {
// await _repositoryNoti.PushNotificationAsync(
// item.ReceiveUser.Id,
// $"หนังสือเวียนถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// $"แจ้งข่าวการถึงแก่กรรมของ {prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
// payload_str,
// item.IsSendInbox,
// item.IsSendMail
// );
// }
// }
foreach (var item in items)
{
// var profile = item.profileId;
// var prefix = item.profileId;
var profile = req.Persons.FirstOrDefault(x => x.ProfileId == item.profileId);
if (profile != null)
{
await _repositoryNoti.PushNotificationAsyncV2(
item.profileId,
$"หนังสือเวียนถึงแก่กรรมของ {item.RetirementDeceased.prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
$"แจ้งข่าวการถึงแก่กรรมของ {item.RetirementDeceased.prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
payload_str,
profile.IsSendInbox,
profile.IsSendMail
);
item.IsSendMail = profile.IsSendMail;
item.IsSendInbox = profile.IsSendInbox;
item.IsSendNotification = profile.IsSendNotification;
}
else
{
await _repositoryNoti.PushNotificationAsyncV2(
item.profileId,
$"หนังสือเวียนถึงแก่กรรมของ {item.RetirementDeceased.prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
$"แจ้งข่าวการถึงแก่กรรมของ {item.RetirementDeceased.prefix}{item.RetirementDeceased.firstName} {item.RetirementDeceased.lastName}",
payload_str,
item.IsSendInbox,
item.IsSendMail
);
}
}
await _context.SaveChangesAsync();
return Success();