Adjust ids for event messaging

Author: whamm86

src/AasxServerDB/EntityFrameworkPersistenceService.cs

@@ -1516,14 +1516,15 @@ private Contracts.Events.EventPayload ReadEventMessages(Dictionary<string, strin
             smOnly = eventData.SubmodelsOnly.Value.ToLower() == "true";
         }
 
+
+
         var diff = "";
 
         if (time.IsNullOrEmpty())
         {
             diff = "init";
         }
 
-
         switch (requestType)
         {
             case DbEventRequestType.Status:
@@ -1550,6 +1551,41 @@ private Contracts.Events.EventPayload ReadEventMessages(Dictionary<string, strin
         {
             eventPayload.time = eventData.LastUpdate.Value;
         }
+
+ 
+        bool pbee = false;
+
+        if (eventData.PublishBasicEventElement != null
+                && eventData.PublishBasicEventElement.Value != null)
+        {
+            pbee = eventData.PublishBasicEventElement.Value.ToLower() == "true";
+        }
+
+        if (pbee)
+        {
+            var parentSubmodel = op.GetParentSubmodel();
+            if (parentSubmodel != null)
+            {
+                //if (eventData.IdShort != null)
+                //{
+                //    sourceString = $"{Program.externalBlazor}/submodels/{Base64UrlEncoder.Encode(submodelId)}/events/{idShortPath}.{eventData.IdShort}";
+                //}
+                //var basicEventElementSourceString =  
+            }
+            eventPayload.id = $"SOURCE_STRING_TO_BE_ADDED-{eventPayload.time}";
+        }
+        else
+        {
+            if (eventPayload.elements != null && eventPayload.elements.Count > 0)
+            {
+                foreach (var element in eventPayload.elements)
+                {
+                    element.id = null;
+                }
+            }
+
+        }
+
         if (diff != "status")
         {
             var timeStamp = DateTime.UtcNow;

src/AasxServerStandardBib/EventService.cs

@@ -789,6 +789,7 @@ public EventPayload CollectPayload(Dictionary<string, string> securityCondition,
                 {
                     statusEntry.dataschema = "https://api.swaggerhub.com/domains/Plattform_i40/Part1-MetaModel-Schemas/V3.1.0#/components/schemas/BasicEventElement";
                     statusEntry.id = $"{basicEventElementSourceString}-{eventPayload.time}";
+                    eventPayload.id = statusEntry.id;
 
                     statusEntry.SetType(EventPayloadEntryType.Updated);
                     statusEntry.source = basicEventElementSourceString;
@@ -820,19 +821,24 @@ public EventPayload CollectPayload(Dictionary<string, string> securityCondition,
                         {
                             statusEntry.dataschema = "https://api.swaggerhub.com/domains/Plattform_i40/Part1-MetaModel-Schemas/V3.1.0#/components/schemas/BasicEventElement";
                             statusEntry.id = $"{basicEventElementSourceString}-{eventPayload.time}";
+                            eventPayload.id = statusEntry.id;
 
                             statusEntry.SetType(EventPayloadEntryType.Updated);
                             statusEntry.source = basicEventElementSourceString;
                             eventPayload.basiceventelementsemanticId = basicEventElementSemanticId;
                             statusEntry.subject = null;
 
-                        };
-                        eventPayload.elements =
+                            eventPayload.elements =
                         [
                             statusEntry,
                         ];
 
-                        return eventPayload;
+                            return eventPayload;
+                        }
+                        else
+                        {
+                            //ToDo: Add element for non-basiceventelement keep alive message
+                        }
                     }
                     else
                     {
@@ -852,6 +858,7 @@ public EventPayload CollectPayload(Dictionary<string, string> securityCondition,
                 {
                     statusEntry.dataschema = "https://api.swaggerhub.com/domains/Plattform_i40/Part1-MetaModel-Schemas/V3.1.0#/components/schemas/BasicEventElement";
                     statusEntry.id = $"{basicEventElementSourceString}-{eventPayload.time}";
+                    eventPayload.id = statusEntry.id;
 
                     statusEntry.SetType(EventPayloadEntryType.Updated);
                     statusEntry.source = basicEventElementSourceString;

src/Contracts/Events/EventPayload.cs

@@ -50,7 +50,7 @@ public EventPayload(bool isREST)
     {
         specversion = SPEC_VERSION;
         datacontenttype = DATA_CONTENT_TYPE;
-        id = $"{Guid.NewGuid()}";
+        id = null;
 
         time = "";
         transmitted = "";