Правки

Persistence.API/Controllers/SetpointController.cs

@@ -16,31 +16,33 @@ namespace Persistence.API.Controllers
 		}
 
 		[HttpPost("current")]
-		public Task<ActionResult<IEnumerable<SetpointValueDto>>> GetCurrentAsync(IEnumerable<Guid> setpointKeys, CancellationToken token)
+		public async Task<ActionResult<IEnumerable<SetpointValueDto>>> GetCurrent(IEnumerable<Guid> setpointKeys, CancellationToken token)
 		{
-			throw new NotImplementedException();
+			var result = await setpointRepository.GetCurrent(setpointKeys, token);
+
+			return Ok(result);
 		}
 
 		[HttpPost("history")]
-		public async Task<ActionResult<IEnumerable<SetpointValueDto>>> GetHistoryAsync(IEnumerable<Guid> setpointKeys, DateTimeOffset historyMoment, CancellationToken token)
+		public async Task<ActionResult<IEnumerable<SetpointValueDto>>> GetHistory(IEnumerable<Guid> setpointKeys, DateTimeOffset historyMoment, CancellationToken token)
 		{
-			var result = await setpointRepository.GetHistoryAsync(setpointKeys, historyMoment, token);
+			var result = await setpointRepository.GetHistory(setpointKeys, historyMoment, token);
 
 			return Ok(result);
 		}
 
 		[HttpPost("log")]
-		public async Task<ActionResult<Dictionary<Guid, IEnumerable<SetpointLogDto>>>> GetLogAsync([FromBody] IEnumerable<Guid> setpointKeys, CancellationToken token)
+		public async Task<ActionResult<Dictionary<Guid, IEnumerable<SetpointLogDto>>>> GetLog([FromBody] IEnumerable<Guid> setpointKeys, CancellationToken token)
 		{
-			var result = await setpointRepository.GetLogAsync(setpointKeys, token);
+			var result = await setpointRepository.GetLog(setpointKeys, token);
 
 			return Ok(result);
 		}
 
 		[HttpPost("save")]
-		public async Task<ActionResult<int>> SaveAsync(Guid setpointKey, object newValue, CancellationToken token)
+		public async Task<ActionResult<int>> Save(Guid setpointKey, object newValue, CancellationToken token)
 		{
-			var result = await setpointRepository.SaveAsync(setpointKey, newValue, token);
+			var result = await setpointRepository.Save(setpointKey, newValue, 0, token);
 
 			return Ok(result);
 		}

Persistence.Database/Entity/ISetpointData.cs

@@ -1,10 +0,0 @@
-namespace Persistence.Database.Model
-{
-	public interface ISetpointData
-	{
-		public Guid Key { get; set; }
-		public object Value { get; set; }
-		public DateTimeOffset Created { get; set; }
-		public int IdUser { get; set; }
-	}
-}

Persistence.Database/Entity/Setpoint.cs

@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Internal;
 namespace Persistence.Database.Model
 {
 	[PrimaryKey(nameof(Key), nameof(Created))]
-	public class Setpoint : ISetpointData
+	public class Setpoint
 	{
 		[Comment("Ключ")]
 		public Guid Key { get; set; }

Persistence.IntegrationTests/Clients/ISetpointClient.cs

@@ -5,13 +5,16 @@ namespace Persistence.IntegrationTests.Clients
 {
 	public interface ISetpointClient
 	{
-		[Post("/api/Setpoint/history")]
+		[Post("/current")]
-		Task<IApiResponse<IEnumerable<SetpointValueDto>>> GetHistoryAsync(IEnumerable<Guid> setpointKeys, DateTimeOffset historyMoment);
+		Task<IApiResponse<IEnumerable<SetpointValueDto>>> GetCurrent(IEnumerable<Guid> setpointKeys);
 		
-		[Post("/api/Setpoint/log")]
+		[Post("/history")]
-		Task<IApiResponse<Dictionary<Guid, IEnumerable<SetpointLogDto>>>> GetLogAsync(IEnumerable<Guid> setpoitKeys);
+		Task<IApiResponse<IEnumerable<SetpointValueDto>>> GetHistory(IEnumerable<Guid> setpointKeys, DateTimeOffset historyMoment);
 
-		[Post("/api/Setpoint/save")]
+		[Post("/log")]
-		Task<IApiResponse<int>> SaveAsync(Guid setpointKey, object newValue);
+		Task<IApiResponse<Dictionary<Guid, IEnumerable<SetpointLogDto>>>> GetLog(IEnumerable<Guid> setpoitKeys);
+
+		[Post("/save")]
+		Task<IApiResponse<int>> Save(Guid setpointKey, object newValue);
 	}
 }

Persistence.IntegrationTests/Controllers/SetpointControllerTest.cs

@@ -1,4 +1,6 @@
 using System.Net;
+using System.Text.Json;
+using Mapster;
 using Persistence.IntegrationTests.Clients;
 using Xunit;
 
@@ -10,16 +12,36 @@ namespace Persistence.IntegrationTests.Controllers
 		private class TestObject
 		{
 			public string? value1 { get; set; }
-			public int value2 { get; set; }
+			public int? value2 { get; set; }
-			public double value3 { get; set; }
 		}
 		public SetpointControllerTest(WebAppFactoryFixture factory) : base(factory) 
 		{
+			factory.ClientOptions.BaseAddress = new Uri($"http://localhost/api/Setpoint");
+
 			client = factory.GetHttpClient<ISetpointClient>(string.Empty);
 		}
 
 		[Fact]
-		public async Task GetHistoryAsync_returns_success()
+		public async Task GetCurrent_returns_success()
+		{
+			//arrange
+			var setpointKeys = new List<Guid>()
+			{
+				Guid.NewGuid(),
+				Guid.NewGuid()
+			};
+
+			//act
+			var response = await client.GetCurrent(setpointKeys);
+
+			//assert
+			Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+			Assert.NotNull(response.Content);
+			Assert.Empty(response.Content);
+		}
+
+		[Fact]
+		public async Task GetHistory_returns_success()
 		{
 			//arrange
 			var setpointKeys = new List<Guid>()
@@ -30,14 +52,16 @@ namespace Persistence.IntegrationTests.Controllers
 			var historyMoment = DateTimeOffset.Now.ToUniversalTime();
 
 			//act
-			var response = await client.GetHistoryAsync(setpointKeys, historyMoment);
+			var response = await client.GetHistory(setpointKeys, historyMoment);
 
 			//assert
 			Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+			Assert.NotNull(response.Content);
+			Assert.Empty(response.Content);
 		}
 
 		[Fact]
-		public async Task GetLogAsync_returns_success()
+		public async Task GetLog_returns_success()
 		{
 			//arrange
 			var setpointKeys = new List<Guid>()
@@ -47,30 +71,77 @@ namespace Persistence.IntegrationTests.Controllers
 			};
 
 			//act
-			var response = await client.GetLogAsync(setpointKeys);
+			var response = await client.GetLog(setpointKeys);
 
 			//assert
 			Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+			Assert.NotNull(response.Content);
+			Assert.Empty(response.Content);
 		}
 
 		[Fact]
-		public async Task SaveAsync_returns_success()
+		public async Task Save_returns_success()
 		{
 			//arrange
 			var setpointKey = Guid.NewGuid();
 			var setpointValue = new TestObject()
 			{
 				value1 = "1",
-				value2 = 2,
+				value2 = 2
-				value3 = 3.3
 			};
 
 			//act
-			var response = await client.SaveAsync(setpointKey, setpointValue);
+			var response = await client.Save(setpointKey, setpointValue);
 
 			//assert
 			Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 			Assert.Equal(1, response.Content);
 		}
+
+		[Fact]
+		public async Task General_test_success()
+		{
+			//save
+			var setpointKey = Guid.NewGuid();
+			var setpointValue = new TestObject()
+			{
+				value1 = "1",
+				value2 = 2
+			};
+
+			var saveResponse = await client.Save(setpointKey, setpointValue);
+			Assert.Equal(HttpStatusCode.OK, saveResponse.StatusCode);
+			Assert.Equal(1, saveResponse.Content);
+
+			//current
+			var currentResponse = await client.GetCurrent([setpointKey]);
+			Assert.Equal(HttpStatusCode.OK, currentResponse.StatusCode);
+
+			var currentContent = currentResponse.Content;
+			Assert.NotNull(currentContent);
+			Assert.NotEmpty(currentContent);
+
+			var currentContentValue = currentContent.FirstOrDefault()?.Value?.ToString();
+			Assert.NotNull(currentContentValue);
+			Assert.NotEmpty(currentContentValue);
+
+			var testObjectValue = JsonSerializer.Deserialize<TestObject>(currentContentValue);
+			Assert.NotNull(testObjectValue);
+			Assert.Equal(setpointValue.value1, testObjectValue.value1);
+			Assert.Equal(setpointValue.value2, testObjectValue.value2);
+
+			//history
+			var historyMoment = DateTimeOffset.Now.ToUniversalTime();
+			var historyResponse = await client.GetHistory([setpointKey], historyMoment);
+			Assert.Equal(HttpStatusCode.OK, historyResponse.StatusCode);
+			Assert.NotNull(historyResponse.Content);
+			Assert.NotEmpty(historyResponse.Content);
+
+			//log
+			var logResponse = await client.GetLog([setpointKey]);
+			Assert.Equal(HttpStatusCode.OK, logResponse.StatusCode);
+			Assert.NotNull(logResponse.Content);
+			Assert.NotEmpty(logResponse.Content);
+		}
 	}
 }

Persistence.Repository/Repositories/SetpointRepository.cs

@@ -16,7 +16,18 @@ namespace Persistence.Repository.Repositories
 
 		protected virtual IQueryable<Setpoint> GetQueryReadOnly() => db.Set<Setpoint>();
 
-		public async Task<IEnumerable<SetpointValueDto>> GetHistoryAsync(IEnumerable<Guid> setpointKeys, DateTimeOffset historyMoment, CancellationToken token)
+		public async Task<IEnumerable<SetpointValueDto>> GetCurrent(IEnumerable<Guid> setpointKeys, CancellationToken token)
+		{
+			var query = GetQueryReadOnly();
+			var entities = await query
+				.Where(e => setpointKeys.Contains(e.Key))
+				.ToArrayAsync(token);
+			var dtos = entities.Select(e => e.Adapt<SetpointValueDto>());
+
+			return dtos;
+		}
+
+		public async Task<IEnumerable<SetpointValueDto>> GetHistory(IEnumerable<Guid> setpointKeys, DateTimeOffset historyMoment, CancellationToken token)
 		{
 			var query = GetQueryReadOnly();
 			var entities = await query
@@ -27,7 +38,7 @@ namespace Persistence.Repository.Repositories
 			return dtos;
 		}
 
-		public async Task<Dictionary<Guid, IEnumerable<SetpointLogDto>>> GetLogAsync(IEnumerable<Guid> setpointKeys, CancellationToken token)
+		public async Task<Dictionary<Guid, IEnumerable<SetpointLogDto>>> GetLog(IEnumerable<Guid> setpointKeys, CancellationToken token)
 		{
 			var query = GetQueryReadOnly();
 			var entities = await query
@@ -43,7 +54,7 @@ namespace Persistence.Repository.Repositories
 			return dtos;
 		}
 
-		public async Task<int> SaveAsync(Guid setpointKey, object newValue, CancellationToken token)
+		public async Task<int> Save(Guid setpointKey, object newValue, int idUser, CancellationToken token)
 		{
 			try
 			{
@@ -51,7 +62,7 @@ namespace Persistence.Repository.Repositories
 				{
 					Key = setpointKey,
 					Value = newValue,
-					IdUser = 0, // ToDo: откуда тянуть?
+					IdUser = idUser,
 					Created = DateTimeOffset.Now.ToUniversalTime()
 				};
 

Persistence/API/ISetpointApi.cs

@@ -14,7 +14,7 @@ public interface ISetpointApi
     /// <param name="setpoitKeys">ключи уставок</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<IEnumerable<SetpointValueDto>>> GetCurrentAsync(IEnumerable<Guid> setpoitKeys, CancellationToken token);
+    Task<ActionResult<IEnumerable<SetpointValueDto>>> GetCurrent(IEnumerable<Guid> setpoitKeys, CancellationToken token);
 
     /// <summary>
     /// Получить значения уставок за определенный момент времени
@@ -23,7 +23,7 @@ public interface ISetpointApi
     /// <param name="historyMoment">дата, на которую получаем данные</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<IEnumerable<SetpointValueDto>>> GetHistoryAsync(IEnumerable<Guid> setpoitKeys, DateTimeOffset historyMoment, CancellationToken token);
+    Task<ActionResult<IEnumerable<SetpointValueDto>>> GetHistory(IEnumerable<Guid> setpoitKeys, DateTimeOffset historyMoment, CancellationToken token);
 
     /// <summary>
     /// Получить историю изменений значений уставок
@@ -31,7 +31,7 @@ public interface ISetpointApi
     /// <param name="setpoitKeys">ключи уставок</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<Dictionary<Guid, IEnumerable<SetpointLogDto>>>> GetLogAsync(IEnumerable<Guid> setpoitKeys, CancellationToken token);
+    Task<ActionResult<Dictionary<Guid, IEnumerable<SetpointLogDto>>>> GetLog(IEnumerable<Guid> setpoitKeys, CancellationToken token);
 
     /// <summary>
     /// Метод сохранения уставки
@@ -40,5 +40,5 @@ public interface ISetpointApi
     /// <param name="newValue">значение</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> SaveAsync(Guid setpointKey, object newValue, CancellationToken token);
+    Task<ActionResult<int>> Save(Guid setpointKey, object newValue, CancellationToken token);
 }

Persistence/Repositories/ISetpointRepository.cs

@@ -7,15 +7,22 @@ namespace Persistence.Repositories;
 /// </summary>
 public interface ISetpointRepository
 {
+	/// <summary>
+	/// Получить значения уставок по набору ключей
+	/// </summary>
+	/// <param name="setpointKeys"></param>
+	/// <param name="token"></param>
+	/// <returns></returns>
+	Task<IEnumerable<SetpointValueDto>> GetCurrent(IEnumerable<Guid> setpointKeys, CancellationToken token);
 
-    /// <summary>
+	/// <summary>
-    /// Получить значения уставок за определенный момент времени
+	/// Получить значения уставок за определенный момент времени
-    /// </summary>
+	/// </summary>
-    /// <param name="setpointKeys"></param>
+	/// <param name="setpointKeys"></param>
-    /// <param name="historyMoment">дата, на которую получаем данные</param>
+	/// <param name="historyMoment">дата, на которую получаем данные</param>
-    /// <param name="token"></param>
+	/// <param name="token"></param>
-    /// <returns></returns>
+	/// <returns></returns>
-    Task<IEnumerable<SetpointValueDto>> GetHistoryAsync(IEnumerable<Guid> setpointKeys, DateTimeOffset historyMoment, CancellationToken token);
+	Task<IEnumerable<SetpointValueDto>> GetHistory(IEnumerable<Guid> setpointKeys, DateTimeOffset historyMoment, CancellationToken token);
 
     /// <summary>
     /// Получить историю изменений значений уставок
@@ -23,7 +30,7 @@ public interface ISetpointRepository
     /// <param name="setpointKeys"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<Dictionary<Guid, IEnumerable<SetpointLogDto>>> GetLogAsync(IEnumerable<Guid> setpointKeys, CancellationToken token);
+    Task<Dictionary<Guid, IEnumerable<SetpointLogDto>>> GetLog(IEnumerable<Guid> setpointKeys, CancellationToken token);
 
     /// <summary>
     /// Метод сохранения уставки
@@ -35,5 +42,5 @@ public interface ISetpointRepository
     /// <returns></returns>
     /// to do
     /// id User учесть в соответствующем методе репозитория
-    Task<int> SaveAsync(Guid setpointKey, object newValue, CancellationToken token);
+    Task<int> Save(Guid setpointKey, object newValue, int idUser, CancellationToken token);
 }