notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

.

Browse source
This commit is contained in:
Paul Schneider 2016-12-15 01:27:40 +01:00
commit 5e5f6a3d25
6 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Yavsc/ApiControllers/ChatApiController.cs
View file

@ -23,13 +23,13 @@ namespace Yavsc.Controllers
}
[HttpGet("users")]
public async Task<List<ChatUserInfo>> GetUserList()
public IEnumerable<ChatUserInfo> GetUserList()
{
var cxsQuery = dbContext.Connections.Include(c=>c.Owner).GroupBy( c => c.ApplicationUserId );
List<ChatUserInfo> result = new List<ChatUserInfo>();
var cxsQuery = dbContext.Connections?.Include(c=>c.Owner).GroupBy( c => c.ApplicationUserId );
// List<ChatUserInfo> result = new List<ChatUserInfo>();
if (cxsQuery!=null)
foreach (var g in cxsQuery) {
var uid = g.Key;
@ -38,12 +38,12 @@ namespace Yavsc.Controllers
if (cxs.Count>0) {
var user = cxs.First().Owner;
result.Add(new ChatUserInfo { UserName = user.UserName,
yield return new ChatUserInfo { UserName = user.UserName,
UserId = user.Id, Avatar = user.Avatar, Connections = cxs,
Roles = ( await userManager.GetRolesAsync(user) ).ToArray() } );
Roles = ( userManager.GetRolesAsync(user) ).Result.ToArray() };
}
}
return result;
}
}
}