Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf3bb20f

Browse files
committed
CU-868ftfbxx Minor bug fixes for messaging api and messages list.
1 parent34ff56b commitf3bb20f

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

‎Core/Resgrid.Services/MessageService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task<Message> GetMessageByIdAsync(int messageId)
5050
publicasyncTask<List<Message>>GetInboxMessagesByUserIdAsync(stringuserId)
5151
{
5252
varlist=await_messageRepository.GetInboxMessagesByUserIdAsync(userId);
53-
returnlist.ToList();
53+
returnlist.OrderByDescending(x=>x.SentOn).ToList();
5454
}
5555

5656
publicasyncTask<List<Message>>GetUnreadInboxMessagesByUserIdAsync(stringuserId)
@@ -65,7 +65,7 @@ public async Task<List<Message>> GetSentMessagesByUserIdAsync(string userId)
6565
varitems=await_messageRepository.GetSentMessagesByUserIdAsync(userId);
6666

6767
if(items!=null&&items.Any())
68-
returnitems.ToList();
68+
returnitems.OrderByDescending(x=>x.SentOn).ToList();
6969

7070
returnnewList<Message>();
7171
}

‎Web/Resgrid.Web.Services/Controllers/v4/MessagesController.cs‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,19 @@ public async Task<ActionResult<SendMessageResult>> SendMessage([FromBody] NewMes
312312
// Add all the explict people
313313
foreach(varpersoninnewMessageInput.Recipients.Where(x=>x.Type==1))
314314
{
315-
if(usersToSendTo.All(x=>x!=person.Id)&&person.Id!=UserId)
315+
if(!String.IsNullOrWhiteSpace(person.Id))
316316
{
317-
// Ensure the user is in the same department
318-
if(departmentUsers.Any(x=>x.UserId==person.Id))
317+
// New RN Apps add a prefix to ID's from the Recipients list, guard against the prefix here.
318+
varuserIdToSendTo=person.Id.Replace("P:","").Trim();
319+
320+
if(usersToSendTo.All(x=>x!=userIdToSendTo)&&userIdToSendTo!=UserId)
319321
{
320-
usersToSendTo.Add(person.Id);
321-
message.AddRecipient(person.Id);
322+
// Ensure the user is in the same department
323+
if(departmentUsers.Any(x=>x.UserId==userIdToSendTo))
324+
{
325+
usersToSendTo.Add(userIdToSendTo);
326+
message.AddRecipient(userIdToSendTo);
327+
}
322328
}
323329
}
324330
}
@@ -328,8 +334,11 @@ public async Task<ActionResult<SendMessageResult>> SendMessage([FromBody] NewMes
328334
{
329335
if(!String.IsNullOrWhiteSpace(group.Id))
330336
{
337+
// New RN Apps add a prefix to ID's from the Recipients list, guard against the prefix here.
338+
vargroupIdToSendTo=group.Id.Replace("G:","").Trim();
339+
331340
intgroupId=0;
332-
if(int.TryParse(group.Id.Trim(),outgroupId))
341+
if(int.TryParse(groupIdToSendTo,outgroupId))
333342
{
334343
if(departmentGroups.Any(x=>x.DepartmentGroupId==groupId))
335344
{
@@ -356,8 +365,11 @@ public async Task<ActionResult<SendMessageResult>> SendMessage([FromBody] NewMes
356365
{
357366
if(!String.IsNullOrWhiteSpace(role.Id))
358367
{
368+
// New RN Apps add a prefix to ID's from the Recipients list, guard against the prefix here.
369+
varroleIdToSendTo=role.Id.Replace("R:","").Trim();
370+
359371
introleId=0;
360-
if(int.TryParse(role.Id.Trim(),outroleId))
372+
if(int.TryParse(roleIdToSendTo,outroleId))
361373
{
362374
if(departmentRoles.Any(x=>x.PersonnelRoleId==roleId))
363375
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp