Правка конфликтов по результатам мерджа из мастера

DD.Persistence.Database.Postgres/Migrations/20250218060716_Init.Designer.cs

@@ -13,11 +13,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace DD.Persistence.Database.Postgres.Migrations
 {
     [DbContext(typeof(PersistencePostgresContext))]
-<<<<<<<< HEAD:DD.Persistence.Database.Postgres/Migrations/20250218052129_Init.Designer.cs
+    [Migration("20250218060716_Init")]
-    [Migration("20250218052129_Init")]
-========
-    [Migration("20250210055116_Init")]
->>>>>>>> master:DD.Persistence.Database.Postgres/Migrations/20250210055116_Init.Designer.cs
     partial class Init
     {
         /// <inheritdoc />
@@ -49,20 +45,10 @@ namespace DD.Persistence.Database.Postgres.Migrations
                         .HasColumnType("uuid")
                         .HasComment("Автор изменения");
 
-<<<<<<<< HEAD:DD.Persistence.Database.Postgres/Migrations/20250218052129_Init.Designer.cs
                     b.Property<Guid>("IdCommit")
                         .HasColumnType("uuid")
                         .HasComment("Id коммита");
 
-                    b.Property<Guid>("IdDiscriminator")
-                        .HasColumnType("uuid")
-                        .HasComment("Дискриминатор таблицы");
-========
-                    b.Property<Guid?>("IdEditor")
-                        .HasColumnType("uuid")
-                        .HasComment("Редактор");
->>>>>>>> master:DD.Persistence.Database.Postgres/Migrations/20250210055116_Init.Designer.cs
-
                     b.Property<Guid?>("IdNext")
                         .HasColumnType("uuid")
                         .HasComment("Id заменяющей записи");

DD.Persistence.Database.Postgres/Migrations/20250218060716_Init.cs

@@ -16,21 +16,10 @@ namespace DD.Persistence.Database.Postgres.Migrations
                 name: "change_log_commit",
                 columns: table => new
                 {
-<<<<<<<< HEAD:DD.Persistence.Database.Postgres/Migrations/20250218052129_Init.cs
                     Id = table.Column<Guid>(type: "uuid", nullable: false, comment: "Id коммита"),
                     IdAuthor = table.Column<Guid>(type: "uuid", nullable: false, comment: "Пользователь, создавший коммит"),
                     Creation = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, comment: "Дата создания коммита"),
                     Comment = table.Column<string>(type: "text", nullable: false, comment: "Комментарий к коммиту")
-========
-                    Id = table.Column<Guid>(type: "uuid", nullable: false, comment: "Ключ записи"),
-                    DiscriminatorId = table.Column<Guid>(type: "uuid", nullable: false, comment: "Дискриминатор таблицы"),
-                    IdAuthor = table.Column<Guid>(type: "uuid", nullable: false, comment: "Автор изменения"),
-                    IdEditor = table.Column<Guid>(type: "uuid", nullable: true, comment: "Редактор"),
-                    Creation = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, comment: "Дата создания записи"),
-                    Obsolete = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true, comment: "Дата устаревания (например при удалении)"),
-                    IdNext = table.Column<Guid>(type: "uuid", nullable: true, comment: "Id заменяющей записи"),
-                    Value = table.Column<string>(type: "jsonb", nullable: false, comment: "Значение")
->>>>>>>> master:DD.Persistence.Database.Postgres/Migrations/20250210055116_Init.cs
                 },
                 constraints: table =>
                 {
@@ -110,7 +99,7 @@ namespace DD.Persistence.Database.Postgres.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "uuid", nullable: false, comment: "Ключ записи"),
-                    IdDiscriminator = table.Column<Guid>(type: "uuid", nullable: false, comment: "Дискриминатор таблицы"),
+                    DiscriminatorId = table.Column<Guid>(type: "uuid", nullable: false, comment: "Дискриминатор таблицы"),
                     IdAuthor = table.Column<Guid>(type: "uuid", nullable: false, comment: "Автор изменения"),
                     Creation = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, comment: "Дата создания записи"),
                     Obsolete = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true, comment: "Дата устаревания (например при удалении)"),

DD.Persistence.Database.Postgres/Migrations/PersistencePostgresContextModelSnapshot.cs

@@ -34,6 +34,10 @@ namespace DD.Persistence.Database.Postgres.Migrations
                         .HasColumnType("timestamp with time zone")
                         .HasComment("Дата создания записи");
 
+                    b.Property<Guid>("DiscriminatorId")
+                        .HasColumnType("uuid")
+                        .HasComment("Дискриминатор таблицы");
+
                     b.Property<Guid>("IdAuthor")
                         .HasColumnType("uuid")
                         .HasComment("Автор изменения");
@@ -42,10 +46,6 @@ namespace DD.Persistence.Database.Postgres.Migrations
                         .HasColumnType("uuid")
                         .HasComment("Id коммита");
 
-                    b.Property<Guid>("IdDiscriminator")
-                        .HasColumnType("uuid")
-                        .HasComment("Дискриминатор таблицы");
-
                     b.Property<Guid?>("IdNext")
                         .HasColumnType("uuid")
                         .HasComment("Id заменяющей записи");

DD.Persistence.Database/Repositories/ChangeLogRepository.cs

@@ -29,7 +29,7 @@ public class ChangeLogRepository : IChangeLogRepository
                 Id = Uuid7.Guid(),
                 Creation = commitDto.Creation,
                 IdAuthor = commitDto.IdAuthor,
-                IdDiscriminator = idDiscriminator,
+                DiscriminatorId = idDiscriminator,
                 Value = values.Value,
                 IdCommit = commitDto.Id,
             };
@@ -59,7 +59,7 @@ public class ChangeLogRepository : IChangeLogRepository
         foreach (var entity in entities)
         {
             entity.Obsolete = updateTime;
-            entity.IdDiscriminator = idCommit;
+            entity.IdCommit = idCommit;
         }
 
         return await db.SaveChangesAsync(token);
@@ -68,7 +68,7 @@ public class ChangeLogRepository : IChangeLogRepository
     public async Task<int> MarkAsDeleted(Guid idDiscriminator, Guid idCommit, DateTimeOffset updateTime, CancellationToken token)
     {
         var query = db.Set<ChangeLog>()
-            .Where(s => s.IdDiscriminator == idDiscriminator)
+            .Where(s => s.DiscriminatorId == idDiscriminator)
             .Where(e => e.Obsolete == null);
 
         var entities = await query.ToArrayAsync(token);
@@ -76,7 +76,7 @@ public class ChangeLogRepository : IChangeLogRepository
         foreach (var entity in entities)
         {
             entity.Obsolete = updateTime;
-            entity.IdDiscriminator = idCommit;
+            entity.DiscriminatorId = idCommit;
         }
 
         return await db.SaveChangesAsync(token);
@@ -124,7 +124,7 @@ public class ChangeLogRepository : IChangeLogRepository
                 Id = Uuid7.Guid(),
                 Creation = commitDto.Creation,
                 IdAuthor = commitDto.IdAuthor,
-                IdDiscriminator = updatedEntity.IdDiscriminator,
+                DiscriminatorId = updatedEntity.DiscriminatorId,
                 Value = dto.Value,
                 IdCommit = commitDto.Id,
             };
@@ -156,14 +156,14 @@ public class ChangeLogRepository : IChangeLogRepository
 
     private IQueryable<ChangeLog> CreateQuery(Guid idDiscriminator)
     {
-        var query = db.Set<ChangeLog>().Where(e => e.IdDiscriminator == idDiscriminator);
+        var query = db.Set<ChangeLog>().Where(e => e.DiscriminatorId == idDiscriminator);
 
         return query;
     }
 
     public async Task<IEnumerable<ChangeLogDto>> GetChangeLogForInterval(Guid idDiscriminator, DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token)
     {
-        var query = db.Set<ChangeLog>().Where(s => s.IdDiscriminator == idDiscriminator);
+        var query = db.Set<ChangeLog>().Where(s => s.DiscriminatorId == idDiscriminator);
 
         var min = new DateTimeOffset(dateBegin.ToUniversalTime().Date, TimeSpan.Zero);
         var max = new DateTimeOffset(dateEnd.ToUniversalTime().Date, TimeSpan.Zero);
@@ -183,7 +183,7 @@ public class ChangeLogRepository : IChangeLogRepository
 
     public async Task<IEnumerable<DateOnly>> GetDatesChange(Guid idDiscriminator, CancellationToken token)
     {
-        var query = db.Set<ChangeLog>().Where(e => e.IdDiscriminator == idDiscriminator);
+        var query = db.Set<ChangeLog>().Where(e => e.DiscriminatorId == idDiscriminator);
 
         var datesCreateQuery = query
             .Select(e => e.Creation)
@@ -211,7 +211,7 @@ public class ChangeLogRepository : IChangeLogRepository
     {
         var date = dateBegin.ToUniversalTime();
         var query = db.Set<ChangeLog>()
-            .Where(e => e.IdDiscriminator == idDiscriminator)
+            .Where(e => e.DiscriminatorId == idDiscriminator)
             .Where(e => e.Creation >= date || e.Obsolete >= date);
 
         var entities = await query.ToArrayAsync(token);
@@ -224,7 +224,7 @@ public class ChangeLogRepository : IChangeLogRepository
     public async Task<DatesRangeDto?> GetDatesRange(Guid idDiscriminator, CancellationToken token)
     {
         var query = db.Set<ChangeLog>()
-            .Where(e => e.IdDiscriminator == idDiscriminator)
+            .Where(e => e.DiscriminatorId == idDiscriminator)
             .GroupBy(e => 1)
             .Select(group => new
             {

DD.Persistence.IntegrationTests/Controllers/ChangeLogControllerTest.cs

@@ -333,7 +333,7 @@ public class ChangeLogControllerTest : BaseIntegrationTest
         var entities = dtos.Select(d =>
         {
             var entity = d.Adapt<ChangeLog>();
-            entity.IdDiscriminator = idDiscriminator;
+            entity.DiscriminatorId = idDiscriminator;
             entity.Creation = DateTimeOffset.UtcNow.AddDays(generatorRandomDigits.Next(minDayCount, maxDayCount));
             entity.IdCommit = commit.Id;