From 21664d1e16b02cf0dfff2132aa70771224736e56 Mon Sep 17 00:00:00 2001
From: Roman Efremov <rs.efremov@digitaldrilling.ru>
Date: Mon, 20 Jan 2025 09:05:01 +0500
Subject: [PATCH] =?UTF-8?q?=20=D0=A4=D0=B8=D0=BA=D1=81=20Setpoint=20Timest?=
 =?UTF-8?q?amp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SetpointControllerTest.cs     | 31 +++++++++----------
 DD.Persistence.Models/SetpointLogDto.cs       |  2 +-
 .../Repositories/SetpointRepository.cs        |  2 +-
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/DD.Persistence.IntegrationTests/Controllers/SetpointControllerTest.cs b/DD.Persistence.IntegrationTests/Controllers/SetpointControllerTest.cs
index 27432f3..5b36d6a 100644
--- a/DD.Persistence.IntegrationTests/Controllers/SetpointControllerTest.cs
+++ b/DD.Persistence.IntegrationTests/Controllers/SetpointControllerTest.cs
@@ -1,23 +1,17 @@
-using Microsoft.Extensions.DependencyInjection;
 using DD.Persistence.Client;
-using DD.Persistence.Client.Clients.Interfaces;
-using DD.Persistence.Database.Model;
-using System.Net;
-using Xunit;
-using DD.Persistence.Client.Clients.Interfaces.Refit;
 using DD.Persistence.Client.Clients;
+using DD.Persistence.Client.Clients.Interfaces;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Database.Model;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Xunit;
 
 namespace DD.Persistence.IntegrationTests.Controllers
 {
     public class SetpointControllerTest : BaseIntegrationTest
     {
         private readonly ISetpointClient setpointClient;
-        private class TestObject
-        {
-            public string? Value1 { get; set; }
-            public int? Value2 { get; set; }
-        }
         public SetpointControllerTest(WebAppFactoryFixture factory) : base(factory)
         {
             var refitClientFactory = scope.ServiceProvider
@@ -153,7 +147,7 @@ namespace DD.Persistence.IntegrationTests.Controllers
 
             await Add();
 
-            var dateBegin = DateTimeOffset.MinValue;
+            var dateBegin = DateTimeOffset.UtcNow.AddDays(-1);
             var take = 1;
             var part = await setpointClient.GetPart(dateBegin, take, CancellationToken.None);
 
@@ -164,14 +158,17 @@ namespace DD.Persistence.IntegrationTests.Controllers
             Assert.NotNull(response);
 
             var expectedValue = part!
-                .FirstOrDefault()!.Created
-                .ToString("dd.MM.yyyy-HH:mm:ss");
+                .FirstOrDefault()!.Timestamp
+                .ToUniversalTime()
+                .ToString();
             var actualValueFrom = response.From
-                .ToString("dd.MM.yyyy-HH:mm:ss");
+                .ToUniversalTime()
+                .ToString();
             Assert.Equal(expectedValue, actualValueFrom);
 
             var actualValueTo = response.To
-                .ToString("dd.MM.yyyy-HH:mm:ss");
+                .ToUniversalTime()
+                .ToString();
             Assert.Equal(expectedValue, actualValueTo);
         }
 
@@ -216,7 +213,7 @@ namespace DD.Persistence.IntegrationTests.Controllers
         {
             //arrange
             var setpointKey = Guid.NewGuid();
-            var setpointValue = new TestObject()
+            var setpointValue = new
             {
                 Value1 = "1",
                 Value2 = 2
diff --git a/DD.Persistence.Models/SetpointLogDto.cs b/DD.Persistence.Models/SetpointLogDto.cs
index 9a46a99..78cc66c 100644
--- a/DD.Persistence.Models/SetpointLogDto.cs
+++ b/DD.Persistence.Models/SetpointLogDto.cs
@@ -8,7 +8,7 @@ public class SetpointLogDto : SetpointValueDto
     /// <summary>
     /// Дата сохранения уставки
     /// </summary>
-    public DateTimeOffset Created { get; set; }
+    public DateTimeOffset Timestamp { get; set; }
 
     /// <summary>
     /// Ключ пользователя
diff --git a/DD.Persistence.Repository/Repositories/SetpointRepository.cs b/DD.Persistence.Repository/Repositories/SetpointRepository.cs
index 8068b79..8fb703c 100644
--- a/DD.Persistence.Repository/Repositories/SetpointRepository.cs
+++ b/DD.Persistence.Repository/Repositories/SetpointRepository.cs
@@ -96,7 +96,7 @@ namespace DD.Persistence.Repository.Repositories
                 Key = setpointKey,
                 Value = newValue,
                 IdUser = idUser,
-                Timestamp = DateTimeOffset.UtcNow
+                Timestamp = DateTimeOffset.UtcNow.ToUniversalTime()
             };
 
             await db.Set<Setpoint>().AddAsync(entity, token);