This commit is contained in:
@@ -133,13 +133,14 @@ namespace AyaNova.Api.Controllers
|
||||
return BadRequest(new ApiErrorResponse(ModelState));
|
||||
}
|
||||
|
||||
var ret = await ct.NotifyEvent.AsNoTracking().Include(z => z.NotifySubscription).Select(z => new
|
||||
var ret = await ct.NotifyEvent.AsNoTracking().Include(z => z.NotifySubscription).Include(z=>z.User).Select(z => new
|
||||
{
|
||||
z.Id,
|
||||
z.Created,
|
||||
z.EventDate,
|
||||
DeliverAfter = (z.EventDate + z.NotifySubscription.AgeValue - z.NotifySubscription.AdvanceNotice),
|
||||
z.UserId,
|
||||
user=z.User.Name,
|
||||
z.EventType,
|
||||
z.AyaType,
|
||||
z.Name
|
||||
|
||||
@@ -58,6 +58,7 @@ namespace AyaNova.Models
|
||||
|
||||
//linked entity
|
||||
public NotifySubscription NotifySubscription { get; set; }
|
||||
public User User { get; set; }
|
||||
|
||||
}//eoc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user