Перенести содержимое проекта DD.Persistence.Repository в DD.Persistence.Database.Postgres

DD.Persistence.API/DD.Persistence.API.csproj

@@ -25,7 +25,6 @@
   <ItemGroup>
     <ProjectReference Include="..\DD.Persistence.Database.Postgres\DD.Persistence.Database.Postgres.csproj" />
     <ProjectReference Include="..\DD.Persistence.Database\DD.Persistence.Database.csproj" />
-    <ProjectReference Include="..\DD.Persistence.Repository\DD.Persistence.Repository.csproj" />
     <ProjectReference Include="..\DD.Persistence\DD.Persistence.csproj" />
   </ItemGroup>
 

DD.Persistence.API/Startup.cs

@@ -1,6 +1,5 @@
 using DD.Persistence.Database.Model;
 using DD.Persistence.Database.Postgres.Extensions;
-using DD.Persistence.Repository;
 
 namespace DD.Persistence.API;
 

DD.Persistence.Database.Postgres/DD.Persistence.Database.Postgres.csproj

@@ -7,11 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Mapster" Version="7.4.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
+    <PackageReference Include="UuidExtensions" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>

DD.Persistence.Database.Postgres/DependencyInjection.cs

@@ -1,6 +1,13 @@
-using Microsoft.EntityFrameworkCore;
+using DD.Persistence.Database.Entity;
+using DD.Persistence.Database.Postgres.Repositories;
+using DD.Persistence.Database.Postgres.RepositoriesCached;
+using DD.Persistence.Models;
+using DD.Persistence.Repositories;
+using Mapster;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using System.Reflection;
 
 namespace DD.Persistence.Database.Model;
 
@@ -17,4 +24,37 @@ public static class DependencyInjection
 
         return services;
     }
+
+    public static void MapsterSetup()
+    {
+        TypeAdapterConfig.GlobalSettings.Default.Config
+            .ForType<TechMessageDto, TechMessage>()
+            .Ignore(dest => dest.System, dest => dest.SystemId);
+
+        TypeAdapterConfig<ChangeLog, ChangeLogDto>.NewConfig()
+           .Map(dest => dest.Value, src => new ChangeLogValuesDto()
+           {
+               Value = src.Value,
+               Id = src.Id
+           });
+    }
+
+    public static IServiceCollection AddInfrastructure(this IServiceCollection services)
+    {
+        var typeAdapterConfig = TypeAdapterConfig.GlobalSettings;
+        typeAdapterConfig.RuleMap.Clear();
+        typeAdapterConfig.Scan(Assembly.GetExecutingAssembly());
+
+        MapsterSetup();
+
+        services.AddTransient<ISetpointRepository, SetpointRepository>();
+        services.AddTransient<IChangeLogRepository, ChangeLogRepository>();
+        services.AddTransient<ITimestampedValuesRepository, TimestampedValuesRepository>();
+        services.AddTransient<ITechMessagesRepository, TechMessagesRepository>();
+        services.AddTransient<IParameterRepository, ParameterRepository>();
+        services.AddTransient<IDataSourceSystemRepository, DataSourceSystemCachedRepository>();
+        services.AddTransient<IDataSchemeRepository, DataSchemeCachedRepository>();
+
+        return services;
+    }
 }

DD.Persistence.Database.Postgres/Extensions/EFExtensionsSortBy.cs

@@ -2,7 +2,7 @@ using System.Collections.Concurrent;
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace DD.Persistence.Repository.Extensions;
+namespace DD.Persistence.Database.Postgres.Extensions;
 
 public static class EFExtensionsSortBy
 {

DD.Persistence.Database.Postgres/Helpers/CyclicArray.cs

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace DD.Persistence.Repository;
+namespace DD.Persistence.Database.Postgres.Helpers;
 /// <summary>
 /// Цикличный массив
 /// </summary>

DD.Persistence.Database.Postgres/Helpers/QueryBuilders.cs

@@ -1,11 +1,10 @@
-using Microsoft.EntityFrameworkCore;
+using DD.Persistence.Database.EntityAbstractions;
-using DD.Persistence.Models.Requests;
-using DD.Persistence.Models.Common;
-using DD.Persistence.ModelsAbstractions;
-using DD.Persistence.Database.EntityAbstractions;
 using DD.Persistence.Extensions;
+using DD.Persistence.Models.Common;
+using DD.Persistence.Models.Requests;
+using Microsoft.EntityFrameworkCore;
 
-namespace DD.Persistence.Repository;
+namespace DD.Persistence.Database.Postgres.Helpers;
 
 /// <summary>
 /// класс с набором методов, необходимых для фильтрации записей

DD.Persistence.Database.Postgres/Repositories/ChangeLogRepository.cs

@@ -1,4 +1,5 @@
 using DD.Persistence.Database.Entity;
+using DD.Persistence.Database.Postgres.Helpers;
 using DD.Persistence.Models;
 using DD.Persistence.Models.Common;
 using DD.Persistence.Models.Requests;
@@ -7,7 +8,7 @@ using Mapster;
 using Microsoft.EntityFrameworkCore;
 using UuidExtensions;
 
-namespace DD.Persistence.Repository.Repositories;
+namespace DD.Persistence.Database.Postgres.Repositories;
 public class ChangeLogRepository : IChangeLogRepository
 {
     private readonly DbContext db;

DD.Persistence.Database.Postgres/Repositories/DataSchemeRepository.cs

@@ -4,7 +4,7 @@ using DD.Persistence.Repositories;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
 
-namespace DD.Persistence.Repository.Repositories;
+namespace DD.Persistence.Database.Postgres.Repositories;
 public class DataSchemeRepository : IDataSchemeRepository
 {
     protected DbContext db;

DD.Persistence.Database.Postgres/Repositories/DataSourceSystemRepository.cs

@@ -4,7 +4,7 @@ using DD.Persistence.Repositories;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
 
-namespace DD.Persistence.Repository.Repositories;
+namespace DD.Persistence.Database.Postgres.Repositories;
 public class DataSourceSystemRepository : IDataSourceSystemRepository
 {
     protected DbContext db;

DD.Persistence.Database.Postgres/Repositories/ParameterRepository.cs

@@ -5,7 +5,7 @@ using DD.Persistence.Models;
 using DD.Persistence.Repositories;
 using DD.Persistence.Models.Common;
 
-namespace DD.Persistence.Repository.Repositories;
+namespace DD.Persistence.Database.Postgres.Repositories;
 public class ParameterRepository : IParameterRepository
 {
     private DbContext db;

DD.Persistence.Database.Postgres/Repositories/SetpointRepository.cs

@@ -6,7 +6,7 @@ using Mapster;
 using Microsoft.EntityFrameworkCore;
 using System.Text.Json;
 
-namespace DD.Persistence.Repository.Repositories
+namespace DD.Persistence.Database.Postgres.Repositories
 {
     public class SetpointRepository : ISetpointRepository
     {

DD.Persistence.Database.Postgres/Repositories/TechMessagesRepository.cs

@@ -7,7 +7,7 @@ using DD.Persistence.Repositories;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
 
-namespace DD.Persistence.Repository.Repositories
+namespace DD.Persistence.Database.Postgres.Repositories
 {
     public class TechMessagesRepository : ITechMessagesRepository
 	{

DD.Persistence.Database.Postgres/Repositories/TimestampedValuesRepository.cs

@@ -4,7 +4,7 @@ using DD.Persistence.Models.Common;
 using DD.Persistence.Repositories;
 using Microsoft.EntityFrameworkCore;
 
-namespace DD.Persistence.Repository.Repositories;
+namespace DD.Persistence.Database.Postgres.Repositories;
 public class TimestampedValuesRepository : ITimestampedValuesRepository
 {
     private readonly DbContext db;
@@ -14,7 +14,8 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
         this.db = db;
     }
 
-    protected virtual IQueryable<TimestampedValues> GetQueryReadOnly() => this.db.Set<TimestampedValues>();
+    protected virtual IQueryable<TimestampedValues> GetQueryReadOnly() => this.db.Set<TimestampedValues>()
+        .Include(e => e.DataScheme);
 
     public async virtual Task<int> AddRange(Guid discriminatorId, IEnumerable<TimestampedValuesDto> dtos, CancellationToken token)
     {
@@ -54,6 +55,15 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
             .Select(g => KeyValuePair.Create(g.Key, g.OrderBy(i => i.Timestamp).Skip(skip).Take(take)));
         var entities = await groupQuery.ToArrayAsync(token);
 
+        //var root = new TVertex(
+        //    OperationEnum.And,
+        //    new TLeaf(OperationEnum.Equal, "A", 1),
+        //    new TLeaf(OperationEnum.Equal, "B", 1)
+        //);
+        //var dataScheme = entities.First().Value.First().DataScheme;
+        //var specification = dataScheme.BuildFilter<TimestampedValues>(root);
+        //var que = ApplySpecification(specification);
+
         var result = entities.ToDictionary(k => k.Key, v => v.Value.Select(e => (
             e.Timestamp,
             e.Values

DD.Persistence.Database.Postgres/RepositoriesCached/DataSchemeCachedRepository.cs

@@ -1,9 +1,9 @@
 using DD.Persistence.Models;
-using DD.Persistence.Repository.Repositories;
+using DD.Persistence.Database.Postgres.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 
-namespace DD.Persistence.Repository.RepositoriesCached;
+namespace DD.Persistence.Database.Postgres.RepositoriesCached;
 public class DataSchemeCachedRepository : DataSchemeRepository
 {
     private readonly IMemoryCache memoryCache;

DD.Persistence.Database.Postgres/RepositoriesCached/DataSourceSystemCachedRepository.cs

@@ -1,10 +1,10 @@
 using DD.Persistence.Database.Entity;
 using DD.Persistence.Models;
-using DD.Persistence.Repository.Repositories;
+using DD.Persistence.Database.Postgres.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 
-namespace DD.Persistence.Repository.RepositoriesCached;
+namespace DD.Persistence.Database.Postgres.RepositoriesCached;
 public class DataSourceSystemCachedRepository : DataSourceSystemRepository
 {
     private static readonly string SystemCacheKey = $"{typeof(DataSourceSystem).FullName}CacheKey";

DD.Persistence.Database.Postgres/RepositoriesCached/TimestampedValuesCachedRepository.cs

@@ -3,7 +3,7 @@
 //using DD.Persistence.Repositories;
 //using Microsoft.EntityFrameworkCore;
 
-//namespace DD.Persistence.Repository.Repositories;
+//namespace DD.Persistence.Database.Postgres.Repositories;
 
 //public class TimestampedValuesCachedRepository : TimestampedValuesRepository
 //{

DD.Persistence.Repository.Test/DD.Persistence.Repository.Test.csproj

@@ -20,7 +20,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DD.Persistence.Database.Postgres\DD.Persistence.Database.Postgres.csproj" />
-    <ProjectReference Include="..\DD.Persistence.Repository\DD.Persistence.Repository.csproj" />
   </ItemGroup>
 
   <ItemGroup>

DD.Persistence.Repository.Test/SetpointRepositoryShould.cs

@@ -1,12 +1,7 @@
 using DD.Persistence.Database.Model;
-using DD.Persistence.Repository.Repositories;
+using DD.Persistence.Database.Postgres.Repositories;
 using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 
 namespace DD.Persistence.Repository.Test;
 public class SetpointRepositoryShould : IClassFixture<RepositoryTestFixture>

DD.Persistence.Repository/DD.Persistence.Repository.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Mapster" Version="7.4.0" />
-    <PackageReference Include="UuidExtensions" Version="1.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DD.Persistence.Database\DD.Persistence.Database.csproj" />
-    <ProjectReference Include="..\DD.Persistence\DD.Persistence.csproj" />
-  </ItemGroup>
-
-</Project>

DD.Persistence.Repository/DependencyInjection.cs

@@ -1,45 +0,0 @@
-using DD.Persistence.Database.Entity;
-using DD.Persistence.Models;
-using DD.Persistence.Repositories;
-using DD.Persistence.Repository.Repositories;
-using DD.Persistence.Repository.RepositoriesCached;
-using Mapster;
-using Microsoft.Extensions.DependencyInjection;
-using System.Reflection;
-
-namespace DD.Persistence.Repository;
-public static class DependencyInjection
-{
-    public static void MapsterSetup()
-    {
-        TypeAdapterConfig.GlobalSettings.Default.Config
-            .ForType<TechMessageDto, TechMessage>()
-            .Ignore(dest => dest.System, dest => dest.SystemId);
-
-        TypeAdapterConfig<ChangeLog, ChangeLogDto>.NewConfig()
-           .Map(dest => dest.Value, src => new ChangeLogValuesDto()
-           {
-               Value = src.Value,
-               Id = src.Id
-           });
-    }
-
-    public static IServiceCollection AddInfrastructure(this IServiceCollection services)
-    {
-        var typeAdapterConfig = TypeAdapterConfig.GlobalSettings;
-        typeAdapterConfig.RuleMap.Clear();
-        typeAdapterConfig.Scan(Assembly.GetExecutingAssembly());
-
-        MapsterSetup();
-
-        services.AddTransient<ISetpointRepository, SetpointRepository>();
-        services.AddTransient<IChangeLogRepository, ChangeLogRepository>();
-        services.AddTransient<ITimestampedValuesRepository, TimestampedValuesRepository>();
-        services.AddTransient<ITechMessagesRepository, TechMessagesRepository>();
-        services.AddTransient<IParameterRepository, ParameterRepository>();
-		services.AddTransient<IDataSourceSystemRepository, DataSourceSystemCachedRepository>();
-        services.AddTransient<IDataSchemeRepository, DataSchemeCachedRepository>();
-
-        return services;
-    }
-}

DD.Persistence.sln

@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DD.Persistence", "DD.Persis
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DD.Persistence.API", "DD.Persistence.API\DD.Persistence.API.csproj", "{8650A227-929E-45F0-AEF7-2C91F45FE884}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DD.Persistence.Repository", "DD.Persistence.Repository\DD.Persistence.Repository.csproj", "{493D6D92-231B-4CB6-831B-BE13884B0DE4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DD.Persistence.Database", "DD.Persistence.Database\DD.Persistence.Database.csproj", "{F77475D1-D074-407A-9D69-2FADDDAE2056}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DD.Persistence.IntegrationTests", "DD.Persistence.IntegrationTests\DD.Persistence.IntegrationTests.csproj", "{10752C25-3773-4081-A1F2-215A1D950126}"
@@ -51,10 +49,6 @@ Global
 		{8650A227-929E-45F0-AEF7-2C91F45FE884}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8650A227-929E-45F0-AEF7-2C91F45FE884}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8650A227-929E-45F0-AEF7-2C91F45FE884}.Release|Any CPU.Build.0 = Release|Any CPU
-		{493D6D92-231B-4CB6-831B-BE13884B0DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{493D6D92-231B-4CB6-831B-BE13884B0DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{493D6D92-231B-4CB6-831B-BE13884B0DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{493D6D92-231B-4CB6-831B-BE13884B0DE4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F77475D1-D074-407A-9D69-2FADDDAE2056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F77475D1-D074-407A-9D69-2FADDDAE2056}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F77475D1-D074-407A-9D69-2FADDDAE2056}.Release|Any CPU.ActiveCfg = Release|Any CPU