Change model of eventsrececiver endpoint to CloudEventEnvelope

src/Altinn.App.Api/Controllers/EventsReceiverController.cs

@@ -43,12 +43,14 @@ public EventsReceiverController(
         [ProducesResponseType(425)]
         [ProducesResponseType(500)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-        public async Task<ActionResult> Post([FromQuery] string code, [FromBody] CloudEvent cloudEvent)
+        public async Task<ActionResult> Post([FromQuery] string code, [FromBody] CloudEventEnvelope cloudEventEnvelope)
         {
             if (await _secretCodeProvider.GetSecretCode() != code)
             {
                 return Unauthorized();
             }
+
+            CloudEvent cloudEvent = cloudEventEnvelope.CloudEvent;
 
             IEventHandler eventHandler = _eventHandlerResolver.ResolveEventHandler(cloudEvent.Type);
             try
@@ -62,7 +64,7 @@ public async Task<ActionResult> Post([FromQuery] string code, [FromBody] CloudEv
             }
             catch (NotImplementedException)
             {
-                return BadRequest();
+                return BadRequest($"No eventhandler found that supports {cloudEvent.Type}");
             }
             catch (Exception ex)
             {

src/Altinn.App.Core/Models/CloudEventEnvelope.cs

@@ -0,0 +1,33 @@
+namespace Altinn.App.Core.Models
+{
+    /// <summary>
+    /// Cloud event envelope to push
+    /// </summary>
+    public class CloudEventEnvelope
+    {
+        /// <summary>
+        /// The Event to push
+        /// </summary>
+        public CloudEvent? CloudEvent { get; set; }
+
+        /// <summary>
+        /// The time the event was pushed to queue
+        /// </summary>
+        public DateTime Pushed { get; set; }
+
+        /// <summary>
+        /// Target URI to push event
+        /// </summary>
+        public Uri? Endpoint { get; set; }
+
+        /// <summary>
+        /// The consumer of the events
+        /// </summary>
+        public string? Consumer { get; set; }
+
+        /// <summary>
+        /// The subscription id that matched.
+        /// </summary>
+        public int SubscriptionId { get; set; }
+    }
+}

test/Altinn.App.Api.Tests/Controllers/EventsReceiverControllerTests.cs

@@ -23,6 +23,7 @@ public EventsReceiverControllerTests(WebApplicationFactory<Program> factory)
             _factory = factory;
             _secretCodeProvider = _factory.Services.GetRequiredService<IEventSecretCodeProvider>();
         }
+
         [Fact]
         public async Task Post_ValidEventType_ShouldReturnOk()
         {
@@ -39,13 +40,14 @@ public async Task Post_ValidEventType_ShouldReturnOk()
                 Time = DateTime.Parse("2022-10-13T09:33:46.6330634Z"),
                 AlternativeSubject = "/person/17858296439"
             };
+            CloudEventEnvelope envelope = new() { CloudEvent = cloudEvent };
 
             var org = "ttd";
             var app = "non-existing-app";
             string requestUrl = $"{org}/{app}/api/v1/eventsreceiver?code={await _secretCodeProvider.GetSecretCode()}";
             HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, requestUrl)
             {
-                Content = new StringContent(System.Text.Json.JsonSerializer.Serialize(cloudEvent), Encoding.UTF8, "application/json")
+                Content = new StringContent(System.Text.Json.JsonSerializer.Serialize(envelope), Encoding.UTF8, "application/json")
             };
 
             HttpResponseMessage response = await client.SendAsync(request);
@@ -69,13 +71,14 @@ public async Task Post_NonValidEventType_ShouldReturnBadRequest()
                 Time = DateTime.Parse("2022-10-13T09:33:46.6330634Z"),
                 AlternativeSubject = "/person/17858296439"
             };
+            CloudEventEnvelope envelope = new() { CloudEvent = cloudEvent };
 
             var org = "ttd";
             var app = "non-existing-app";
             string requestUrl = $"{org}/{app}/api/v1/eventsreceiver?code={await _secretCodeProvider.GetSecretCode()}";
             HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, requestUrl)
             {
-                Content = new StringContent(System.Text.Json.JsonSerializer.Serialize(cloudEvent), Encoding.UTF8, "application/json")
+                Content = new StringContent(System.Text.Json.JsonSerializer.Serialize(envelope), Encoding.UTF8, "application/json")
             };
 
             HttpResponseMessage response = await client.SendAsync(request);