diff --git a/server/AyaNova/generator/CoreJobNotify.cs b/server/AyaNova/generator/CoreJobNotify.cs index 0f7ce9aa..a8966e1b 100644 --- a/server/AyaNova/generator/CoreJobNotify.cs +++ b/server/AyaNova/generator/CoreJobNotify.cs @@ -153,7 +153,7 @@ namespace AyaNova.Biz private static async Task DeliverInApp(NotifyEvent ne, AyContext ct) { log.LogTrace($"DeliverInApp deliving notify event: {ne}"); - await ct.Notification.AddAsync(new Notification() { UserId = ne.UserId, AyaType = ne.AyaType, ObjectId = ne.ObjectId, EventType = ne.EventType, NotifySubscriptionId = ne.NotifySubscriptionId, Message = ne.Message }); + await ct.Notification.AddAsync(new Notification() { UserId = ne.UserId, AyaType = ne.AyaType, ObjectId = ne.ObjectId, EventType = ne.EventType, NotifySubscriptionId = ne.NotifySubscriptionId, Message = ne.Message, Name = ne.Name }); ct.NotifyEvent.Remove(ne); await ct.SaveChangesAsync(); } diff --git a/server/AyaNova/models/Notification.cs b/server/AyaNova/models/Notification.cs index 6ccdc368..1b7ac55c 100644 --- a/server/AyaNova/models/Notification.cs +++ b/server/AyaNova/models/Notification.cs @@ -21,6 +21,8 @@ namespace AyaNova.Models public AyaType? AyaType { get; set; } public long? ObjectId { get; set; } [Required] + public string Name {get;set;}//object name or closest equivalent for display + [Required] public NotifyEventType EventType { get; set; } [Required] public long NotifySubscriptionId { get; set; } @@ -32,6 +34,7 @@ namespace AyaNova.Models { Created = DateTime.UtcNow; Fetched = false; + Name=string.Empty; } //linked entity diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 9f8fa243..d062b925 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,7 +22,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 12; - internal const long EXPECTED_COLUMN_COUNT = 380; + internal const long EXPECTED_COLUMN_COUNT = 382; internal const long EXPECTED_INDEX_COUNT = 139; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! @@ -694,7 +694,7 @@ $BODY$; await ExecQueryAsync("CREATE TABLE anotification (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, userid bigint not null, " + - "created timestamp not null, ayatype integer not null, objectid bigint not null, eventtype integer not null, " + + "created timestamp not null, ayatype integer not null, objectid bigint not null, name varchar(255) not null, eventtype integer not null, " + "notifysubscriptionid bigint not null references anotifysubscription(id) on delete cascade, message text, fetched bool not null)"); await ExecQueryAsync("CREATE TABLE anotifydeliverylog (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, processed timestamp not null, " +