From a74468e78064e19286dd2414dc1c13282872169d Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Tue, 7 Jul 2026 21:36:11 +0200
Subject: [PATCH] When Response.Create() is called without a pre-built
 ResponseMessage, use the DateTime.UtcNow (#1487)

---
 .../Owin/WireMockMiddlewareLogger.cs          | 35 ++++++++++---------
 .../ResponseBuilders/Response.cs              |  7 ++--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/WireMock.Net.Minimal/Owin/WireMockMiddlewareLogger.cs b/src/WireMock.Net.Minimal/Owin/WireMockMiddlewareLogger.cs
index 3a0d0a39..0ce9d441 100644
--- a/src/WireMock.Net.Minimal/Owin/WireMockMiddlewareLogger.cs
+++ b/src/WireMock.Net.Minimal/Owin/WireMockMiddlewareLogger.cs
@@ -9,16 +9,17 @@ using WireMock.Util;
 namespace WireMock.Owin;
 
 internal class WireMockMiddlewareLogger(
-    IWireMockMiddlewareOptions _options,
-    LogEntryMapper _logEntryMapper,
-    IGuidUtils _guidUtils
+    IWireMockMiddlewareOptions options,
+    LogEntryMapper logEntryMapper,
+    IGuidUtils guidUtils,
+    IDateTimeUtils dateTimeUtils
 ) : IWireMockMiddlewareLogger
 {
     public void LogRequestAndResponse(bool logRequest, RequestMessage request, IResponseMessage? response, MappingMatcherResult? match, MappingMatcherResult? partialMatch, Activity? activity)
     {
         var logEntry = new LogEntry
         {
-            Guid = _guidUtils.NewGuid(),
+            Guid = guidUtils.NewGuid(),
             RequestMessage = request,
             ResponseMessage = response,
 
@@ -31,17 +32,17 @@ internal class WireMockMiddlewareLogger(
             PartialMatchResult = partialMatch?.RequestMatchResult
         };
 
-        WireMockActivitySource.EnrichWithLogEntry(activity, logEntry, _options.ActivityTracingOptions);
+        WireMockActivitySource.EnrichWithLogEntry(activity, logEntry, options.ActivityTracingOptions);
         activity?.Dispose();
 
         LogLogEntry(logEntry, logRequest);
 
         try
         {
-            if (_options.SaveUnmatchedRequests == true && match?.RequestMatchResult is not { IsPerfectMatch: true })
+            if (options.SaveUnmatchedRequests == true && match?.RequestMatchResult is not { IsPerfectMatch: true })
             {
                 var filename = $"{logEntry.Guid}.LogEntry.json";
-                _options.FileSystemHandler?.WriteUnmatchedRequest(filename, _options.DefaultJsonSerializer.Serialize(logEntry));
+                options.FileSystemHandler?.WriteUnmatchedRequest(filename, options.DefaultJsonSerializer.Serialize(logEntry));
             }
         }
         catch
@@ -52,34 +53,34 @@ internal class WireMockMiddlewareLogger(
 
     public void LogLogEntry(LogEntry entry, bool addRequest)
     {
-        _options.Logger.DebugRequestResponse(_logEntryMapper.Map(entry), entry.RequestMessage?.Path.StartsWith("/__admin/") == true);
+        options.Logger.DebugRequestResponse(logEntryMapper.Map(entry), entry.RequestMessage?.Path.StartsWith("/__admin/") == true);
 
         // If addRequest is set to true and MaxRequestLogCount is null or does have a value greater than 0, try to add a new request log.
-        if (addRequest && _options.MaxRequestLogCount is null or > 0)
+        if (addRequest && options.MaxRequestLogCount is null or > 0)
         {
             TryAddLogEntry(entry);
         }
 
 
         // In case MaxRequestLogCount has a value greater than 0, try to delete existing request logs based on the count.
-        if (_options.MaxRequestLogCount is > 0)
+        if (options.MaxRequestLogCount is > 0)
         {
-            var logEntries = _options.LogEntries.ToList();
+            var logEntries = options.LogEntries.ToList();
 
             foreach (var logEntry in logEntries
                 .OrderBy(le => le.RequestMessage?.DateTime ?? le.ResponseMessage?.DateTime)
-                .Take(logEntries.Count - _options.MaxRequestLogCount.Value))
+                .Take(logEntries.Count - options.MaxRequestLogCount.Value))
             {
                 TryRemoveLogEntry(logEntry);
             }
         }
 
         // In case RequestLogExpirationDuration has a value greater than 0, try to delete existing request logs based on the date.
-        if (_options.RequestLogExpirationDuration is > 0)
+        if (options.RequestLogExpirationDuration is > 0)
         {
-            var logEntries = _options.LogEntries.ToList();
+            var logEntries = options.LogEntries.ToList();
 
-            var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);
+            var checkTime = dateTimeUtils.UtcNow.AddHours(-options.RequestLogExpirationDuration.Value);
             foreach (var logEntry in logEntries.Where(le => le.RequestMessage?.DateTime < checkTime || le.ResponseMessage?.DateTime < checkTime))
             {
                 TryRemoveLogEntry(logEntry);
@@ -91,7 +92,7 @@ internal class WireMockMiddlewareLogger(
     {
         try
         {
-            _options.LogEntries.Add(logEntry);
+            options.LogEntries.Add(logEntry);
         }
         catch
         {
@@ -103,7 +104,7 @@ internal class WireMockMiddlewareLogger(
     {
         try
         {
-            _options.LogEntries.Remove(logEntry);
+            options.LogEntries.Remove(logEntry);
         }
         catch
         {
diff --git a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
index fdd9b575..60151c0e 100644
--- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
@@ -11,7 +11,6 @@ using WireMock.RequestBuilders;
 using WireMock.Settings;
 using WireMock.Transformers;
 using WireMock.Types;
-using WireMock.Util;
 
 namespace WireMock.ResponseBuilders;
 
@@ -86,7 +85,11 @@ public partial class Response : IResponseBuilder
     [PublicAPI]
     public static IResponseBuilder Create(ResponseMessage? responseMessage = null)
     {
-        var message = responseMessage ?? new ResponseMessage();
+        var message = responseMessage ?? new ResponseMessage
+        {
+            DateTime = DateTime.UtcNow // We set it here to the current time.
+        };
+
         return new Response(message);
     }