This commit is contained in:
@@ -140,7 +140,7 @@ namespace AyaNova.Api.Controllers
|
||||
{
|
||||
//DateTime, ObjectType, ObjectId, Event, Textra
|
||||
public DateTime Date { get; set; }
|
||||
public AyaType Type { get; set; }
|
||||
public AyaType ObjectType { get; set; }
|
||||
public long ObjectId { get; set; }
|
||||
public AyaEvent Event { get; set; }
|
||||
public string Textra { get; set; }
|
||||
|
||||
@@ -54,7 +54,6 @@ namespace AyaNova.Biz
|
||||
//Set up the query
|
||||
var q = ct.Event.Select(m => m);
|
||||
|
||||
|
||||
q = q.Where(m => m.AyId == opt.AyId);
|
||||
|
||||
if (opt.StartDate != null)
|
||||
@@ -84,9 +83,36 @@ namespace AyaNova.Biz
|
||||
|
||||
|
||||
|
||||
internal static Task<string> GetLogForUser(AyaNova.Api.Controllers.EventLogController.EventLogOptions opt, AyContext ct)
|
||||
internal static async Task<AyaNova.Api.Controllers.EventLogController.UserEventLogItem[]> GetLogForUser(AyaNova.Api.Controllers.EventLogController.EventLogOptions opt, AyContext ct)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
//Set up the query
|
||||
var q = ct.Event.Select(m => m);
|
||||
|
||||
q = q.Where(m => m.OwnerId == opt.AyId);
|
||||
|
||||
if (opt.StartDate != null)
|
||||
q = q.Where(m => m.Created > opt.StartDate);
|
||||
|
||||
if (opt.EndDate != null)
|
||||
q = q.Where(m => m.Created < opt.EndDate);
|
||||
|
||||
q = q.OrderBy(m => m.Created);
|
||||
|
||||
//Execute the query
|
||||
var EventItems = await q.ToArrayAsync();
|
||||
|
||||
//convert the Event array to the correct return type array
|
||||
//DateTime, ObjectType, ObjectId, Event, Textra
|
||||
var ret = EventItems.Select(m => new AyaNova.Api.Controllers.EventLogController.UserEventLogItem()
|
||||
{
|
||||
Date = m.Created,
|
||||
ObjectType=m.AyType,
|
||||
ObjectId= m.AyId,
|
||||
Event = m.AyEvent,
|
||||
Textra = m.Textra
|
||||
}).ToArray();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user