From 8dde35de49275ba732ba820305e8588c8e2b0b51 Mon Sep 17 00:00:00 2001 From: stepan Date: Sun, 13 Sep 2026 20:32:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=20AuditFields=20=D0=B2=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Tenants/AuditRecordDtoExtensionsTests.cs | 8 ++++---- .../Modules/Tenants/AuditServiceTests.cs | 2 +- .../Modules/Tenants/SuspiciousActivityServiceTests.cs | 8 ++++---- .../Deal.Tests.Unit/Support/JoinEndpointHttpTests.cs | 4 ++-- .../Support/OperatorAnalyticsEndpointsHttpTests.cs | 2 +- .../Support/OperatorAuditEndpointsHttpTests.cs | 2 +- .../Support/OperatorInvitesEndpointsHttpTests.cs | 4 ++-- .../Support/OperatorSettingsEndpointsHttpTests.cs | 4 ++-- .../Support/OperatorTenantsEndpointsHttpTests.cs | 10 +++++----- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/core/tests/Deal.Tests.Unit/Modules/Tenants/AuditRecordDtoExtensionsTests.cs b/src/core/tests/Deal.Tests.Unit/Modules/Tenants/AuditRecordDtoExtensionsTests.cs index 60790d4..eba20e8 100644 --- a/src/core/tests/Deal.Tests.Unit/Modules/Tenants/AuditRecordDtoExtensionsTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Modules/Tenants/AuditRecordDtoExtensionsTests.cs @@ -76,11 +76,11 @@ public sealed class AuditRecordDtoExtensionsTests [Fact] public void DetailValue_ReturnsToThenFrom() { - var setRecord = Record(AuditService.ToDetailJson([AuditDetails.Set("login", "admin")])); - var changeRecord = Record(AuditService.ToDetailJson([AuditDetails.Change("login", "old", "new")])); + var setRecord = Record(AuditService.ToDetailJson([AuditDetails.Set(AuditFields.Login, "admin")])); + var changeRecord = Record(AuditService.ToDetailJson([AuditDetails.Change(AuditFields.Login, "old", "new")])); - Assert.Equal("admin", setRecord.DetailValue("login")); - Assert.Equal("new", changeRecord.DetailValue("login")); + Assert.Equal("admin", setRecord.DetailValue(AuditFields.Login)); + Assert.Equal("new", changeRecord.DetailValue(AuditFields.Login)); Assert.Null(setRecord.DetailValue("missing")); } diff --git a/src/core/tests/Deal.Tests.Unit/Modules/Tenants/AuditServiceTests.cs b/src/core/tests/Deal.Tests.Unit/Modules/Tenants/AuditServiceTests.cs index e76bec2..5869570 100644 --- a/src/core/tests/Deal.Tests.Unit/Modules/Tenants/AuditServiceTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Modules/Tenants/AuditServiceTests.cs @@ -111,7 +111,7 @@ public sealed class AuditServiceTests [Fact] public void ToDetailJson_SerializesChangeFields() { - string json = AuditService.ToDetailJson([AuditDetails.Set("login", "Admin")]); + string json = AuditService.ToDetailJson([AuditDetails.Set(AuditFields.Login, "Admin")]); Assert.Contains("\"field\":\"login\"", json); Assert.Contains("\"to\":\"Admin\"", json); diff --git a/src/core/tests/Deal.Tests.Unit/Modules/Tenants/SuspiciousActivityServiceTests.cs b/src/core/tests/Deal.Tests.Unit/Modules/Tenants/SuspiciousActivityServiceTests.cs index 5c8cfc5..582e8eb 100644 --- a/src/core/tests/Deal.Tests.Unit/Modules/Tenants/SuspiciousActivityServiceTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Modules/Tenants/SuspiciousActivityServiceTests.cs @@ -96,7 +96,7 @@ public sealed class SuspiciousActivityServiceTests ActorId: actor, TenantId: Tenant, Ip: $"10.1.0.{i + 1}", - DetailJson: AuditService.ToDetailJson([AuditDetails.Set("login", "user")]), + DetailJson: AuditService.ToDetailJson([AuditDetails.Set(AuditFields.Login, "user")]), At: Now.AddMinutes(-i)), CancellationToken.None); } @@ -124,7 +124,7 @@ public sealed class SuspiciousActivityServiceTests ActorId: null, TenantId: Tenant, Ip: $"10.2.0.{i + 1}", - DetailJson: AuditService.ToDetailJson([AuditDetails.Set("login", $"user{i}")]), + DetailJson: AuditService.ToDetailJson([AuditDetails.Set(AuditFields.Login, $"user{i}")]), At: Now.AddMinutes(-i)), CancellationToken.None); } @@ -252,7 +252,7 @@ public sealed class SuspiciousActivityServiceTests ActorId: null, TenantId: null, Ip: ip, - DetailJson: AuditService.ToDetailJson([AuditDetails.Set("login", login)]), + DetailJson: AuditService.ToDetailJson([AuditDetails.Set(AuditFields.Login, login)]), At: Now.AddMinutes(-minutesAgo)), CancellationToken.None); } @@ -271,7 +271,7 @@ public sealed class SuspiciousActivityServiceTests ActorId: null, TenantId: null, Ip: ip, - DetailJson: AuditService.ToDetailJson([AuditDetails.Set("login", login)]), + DetailJson: AuditService.ToDetailJson([AuditDetails.Set(AuditFields.Login, login)]), At: Now.AddMinutes(-minutesAgo)), CancellationToken.None); } diff --git a/src/core/tests/Deal.Tests.Unit/Support/JoinEndpointHttpTests.cs b/src/core/tests/Deal.Tests.Unit/Support/JoinEndpointHttpTests.cs index 34073ac..13adf02 100644 --- a/src/core/tests/Deal.Tests.Unit/Support/JoinEndpointHttpTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Support/JoinEndpointHttpTests.cs @@ -307,8 +307,8 @@ public sealed class JoinEndpointHttpTests string code) { Assert.NotNull(record.DetailJson); - Assert.Equal(email, record.DetailValue("email")); - Assert.Equal(SessionTokens.HashToken(code), record.DetailValue("codeHash")); + Assert.Equal(email, record.DetailValue(AuditFields.Email)); + Assert.Equal(SessionTokens.HashToken(code), record.DetailValue(AuditFields.CodeHash)); } diff --git a/src/core/tests/Deal.Tests.Unit/Support/OperatorAnalyticsEndpointsHttpTests.cs b/src/core/tests/Deal.Tests.Unit/Support/OperatorAnalyticsEndpointsHttpTests.cs index 909fac6..612991e 100644 --- a/src/core/tests/Deal.Tests.Unit/Support/OperatorAnalyticsEndpointsHttpTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Support/OperatorAnalyticsEndpointsHttpTests.cs @@ -93,7 +93,7 @@ public sealed class OperatorAnalyticsEndpointsHttpTests ActorId: null, TenantId: ActiveTenant, Ip: "10.9.0.1", - DetailJson: AuditService.ToDetailJson([AuditDetails.Set("login", "brute")]), + DetailJson: AuditService.ToDetailJson([AuditDetails.Set(AuditFields.Login, "brute")]), At: DateTimeOffset.UtcNow.AddMinutes(-i)), CancellationToken.None); } diff --git a/src/core/tests/Deal.Tests.Unit/Support/OperatorAuditEndpointsHttpTests.cs b/src/core/tests/Deal.Tests.Unit/Support/OperatorAuditEndpointsHttpTests.cs index 557d9d9..1fad933 100644 --- a/src/core/tests/Deal.Tests.Unit/Support/OperatorAuditEndpointsHttpTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Support/OperatorAuditEndpointsHttpTests.cs @@ -290,7 +290,7 @@ public sealed class OperatorAuditEndpointsHttpTests ActorId: Guid.NewGuid(), TenantId: tenantId, Ip: null, - DetailJson: AuditService.ToDetailJson([AuditDetails.Change("status", "active", "suspended")]), + DetailJson: AuditService.ToDetailJson([AuditDetails.Change(AuditFields.Status, "active", "suspended")]), At: DateTimeOffset.UtcNow), CancellationToken.None); diff --git a/src/core/tests/Deal.Tests.Unit/Support/OperatorInvitesEndpointsHttpTests.cs b/src/core/tests/Deal.Tests.Unit/Support/OperatorInvitesEndpointsHttpTests.cs index fb01b52..6dc301c 100644 --- a/src/core/tests/Deal.Tests.Unit/Support/OperatorInvitesEndpointsHttpTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Support/OperatorInvitesEndpointsHttpTests.cs @@ -247,8 +247,8 @@ public sealed class OperatorInvitesEndpointsHttpTests string code) { Assert.NotNull(record.DetailJson); - Assert.Equal(email, record.DetailValue("email")); - Assert.Equal(SessionTokens.HashToken(code), record.DetailValue("codeHash")); + Assert.Equal(email, record.DetailValue(AuditFields.Email)); + Assert.Equal(SessionTokens.HashToken(code), record.DetailValue(AuditFields.CodeHash)); } // Логинит оператора (ожидается 200). diff --git a/src/core/tests/Deal.Tests.Unit/Support/OperatorSettingsEndpointsHttpTests.cs b/src/core/tests/Deal.Tests.Unit/Support/OperatorSettingsEndpointsHttpTests.cs index c099a53..343ed35 100644 --- a/src/core/tests/Deal.Tests.Unit/Support/OperatorSettingsEndpointsHttpTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Support/OperatorSettingsEndpointsHttpTests.cs @@ -89,8 +89,8 @@ public sealed class OperatorSettingsEndpointsHttpTests Assert.Null(record.TenantId); Assert.NotNull(record.DetailJson); Assert.DoesNotContain("abcdefghijklmnop", record.DetailJson); - Assert.Equal("1234567", record.DetailValue("apiId")); - Assert.Equal("true", record.DetailValue("apiHashSet")); + Assert.Equal("1234567", record.DetailValue(AuditFields.ApiId)); + Assert.Equal("true", record.DetailValue(AuditFields.ApiHashSet)); }, auditStore); } diff --git a/src/core/tests/Deal.Tests.Unit/Support/OperatorTenantsEndpointsHttpTests.cs b/src/core/tests/Deal.Tests.Unit/Support/OperatorTenantsEndpointsHttpTests.cs index 08741a4..b8faf63 100644 --- a/src/core/tests/Deal.Tests.Unit/Support/OperatorTenantsEndpointsHttpTests.cs +++ b/src/core/tests/Deal.Tests.Unit/Support/OperatorTenantsEndpointsHttpTests.cs @@ -126,7 +126,7 @@ public sealed class OperatorTenantsEndpointsHttpTests Assert.Equal(operatorStore.Operators.Single().Id, createdAudit.ActorId); Assert.Equal(createdId, createdAudit.TenantId); Assert.NotNull(createdAudit.DetailJson); - Assert.Equal(NewTenantName, createdAudit.DetailValue("name")); + Assert.Equal(NewTenantName, createdAudit.DetailValue(AuditFields.Name)); }, auditStore); } @@ -363,7 +363,7 @@ public sealed class OperatorTenantsEndpointsHttpTests Assert.Equal(operatorStore.Operators.Single().Id, started.ActorId); Assert.Equal(TenantId, started.TenantId); Assert.NotNull(started.DetailJson); - Assert.Equal(TenantUserLogin, started.DetailValue("targetLogin")); + Assert.Equal(TenantUserLogin, started.DetailValue(AuditFields.TargetLogin)); HttpClient userClient = CreateClient(baseAddress); using (HttpResponseMessage me = await GetWithTenantCookieAsync(userClient, baseAddress, sessionToken, "/api/auth/me")) @@ -506,17 +506,17 @@ public sealed class OperatorTenantsEndpointsHttpTests Assert.Equal(AuditActorTypes.Operator, record.ActorType); Assert.Equal(operatorStore.Operators.Single().Id, record.ActorId); Assert.Equal(TenantId, record.TenantId); - Assert.Equal(status, record.DetailValue("status")); + Assert.Equal(status, record.DetailValue(AuditFields.Status)); } // Статус из деталей записи tenant_status_changed. - private static string? StatusOf(AuditRecordDto record) => record.DetailValue("status"); + private static string? StatusOf(AuditRecordDto record) => record.DetailValue(AuditFields.Status); // Проверяет детали записи аудита: параметр login. private static void AssertDetailLogin(AuditRecordDto record, string login) { Assert.NotNull(record.DetailJson); - Assert.Equal(login, record.DetailValue("login")); + Assert.Equal(login, record.DetailValue(AuditFields.Login)); } // GET с tenant-кукой deal_session=rawToken (impersonation-токен как значение куки).