From 24a196785d307d0002bdd8bb5a02f45b29949d0d Mon Sep 17 00:00:00 2001 From: Hinton Date: Tue, 16 Dec 2025 17:31:15 +0100 Subject: [PATCH] Resolve some comments --- src/Core/Entities/PlayData.cs | 3 +-- .../Repositories/UserRepository.cs | 12 +++--------- .../Repositories/OrganizationRepository.cs | 2 -- .../Repositories/UserRepository.cs | 16 ++++------------ util/SeederApi/Services/SceneService.cs | 5 +++-- 5 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/Core/Entities/PlayData.cs b/src/Core/Entities/PlayData.cs index 623922516b..131cc1c676 100644 --- a/src/Core/Entities/PlayData.cs +++ b/src/Core/Entities/PlayData.cs @@ -13,11 +13,10 @@ public class PlayData : ITableObject { public Guid Id { get; set; } [MaxLength(256)] - public string PlayId { get; init; } = null!; + public required string PlayId { get; init; } public Guid? UserId { get; init; } public Guid? OrganizationId { get; init; } public DateTime CreationDate { get; init; } - protected PlayData() { } /// /// Generates and sets a new COMB GUID for the Id property. diff --git a/src/Infrastructure.Dapper/Repositories/UserRepository.cs b/src/Infrastructure.Dapper/Repositories/UserRepository.cs index 73e7cd401b..0a373dee6f 100644 --- a/src/Infrastructure.Dapper/Repositories/UserRepository.cs +++ b/src/Infrastructure.Dapper/Repositories/UserRepository.cs @@ -13,23 +13,19 @@ using Bit.Core.Utilities; using Dapper; using Microsoft.AspNetCore.DataProtection; using Microsoft.Data.SqlClient; -using Microsoft.Extensions.Logging; namespace Bit.Infrastructure.Dapper.Repositories; public class UserRepository : Repository, IUserRepository { private readonly IDataProtector _dataProtector; - protected readonly ILogger _logger; public UserRepository( IDataProtectionProvider dataProtectionProvider, - GlobalSettings globalSettings, - ILogger logger) + GlobalSettings globalSettings) : base(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString) { _dataProtector = dataProtectionProvider.CreateProtector(Constants.DatabaseFieldProtectorPurpose); - _logger = logger; } public override async Task GetByIdAsync(Guid id) @@ -159,7 +155,6 @@ public class UserRepository : Repository, IUserRepository public override async Task CreateAsync(User user) { await ProtectDataAndSaveAsync(user, async () => await base.CreateAsync(user)); - return user; } @@ -486,9 +481,8 @@ public class TestUserTrackingUserRepository : UserRepository public TestUserTrackingUserRepository( IPlayDataService playDataService, GlobalSettings globalSettings, - IDataProtectionProvider dataProtectionProvider, - ILogger logger) - : base(dataProtectionProvider, globalSettings, logger) + IDataProtectionProvider dataProtectionProvider) + : base(dataProtectionProvider, globalSettings) { _playDataService = playDataService; } diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs index 5c85cd0d2b..f0e0d33f21 100644 --- a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs @@ -32,8 +32,6 @@ public class OrganizationRepository : Repository GetByIdentifierAsync(string identifier) { using (var scope = ServiceScopeFactory.CreateScope()) diff --git a/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs b/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs index f31bbb4bca..eab66985c2 100644 --- a/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs +++ b/src/Infrastructure.EntityFramework/Repositories/UserRepository.cs @@ -16,16 +16,9 @@ namespace Bit.Infrastructure.EntityFramework.Repositories; public class UserRepository : Repository, IUserRepository { - protected readonly ILogger _logger; - - public UserRepository( - IServiceScopeFactory serviceScopeFactory, - IMapper mapper, - ILogger logger) + public UserRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.Users) - { - _logger = logger; - } + {} public async Task GetByEmailAsync(string email) { @@ -515,9 +508,8 @@ public class TestUserTrackingUserRepository : UserRepository public TestUserTrackingUserRepository( IPlayDataService playDataService, IServiceScopeFactory serviceScopeFactory, - IMapper mapper, - ILogger logger) - : base(serviceScopeFactory, mapper, logger) + IMapper mapper) + : base(serviceScopeFactory, mapper) { _playDataService = playDataService; } diff --git a/util/SeederApi/Services/SceneService.cs b/util/SeederApi/Services/SceneService.cs index 24d3feb3d9..3bdf4bbe42 100644 --- a/util/SeederApi/Services/SceneService.cs +++ b/util/SeederApi/Services/SceneService.cs @@ -23,9 +23,10 @@ public class SceneService( public List GetAllPlayIds() { - return [.. databaseContext.PlayData + return databaseContext.PlayData .Select(pd => pd.PlayId) - .Distinct()]; + .Distinct() + .ToList(); } public async Task ExecuteScene(string templateName, JsonElement? arguments)