Revert filescoped (#2227)

* Revert "Add git blame entry (#2226)"

This reverts commit 239286737d.

* Revert "Turn on file scoped namespaces (#2225)"

This reverts commit 34fb4cca2a.

src/Infrastructure.Dapper/Repositories/GroupRepository.cs

@@ -7,134 +7,135 @@ using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Dapper;
 
-namespace Bit.Infrastructure.Dapper.Repositories;
-
-public class GroupRepository : Repository<Group, Guid>, IGroupRepository
+namespace Bit.Infrastructure.Dapper.Repositories
 {
-    public GroupRepository(GlobalSettings globalSettings)
-        : this(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
-    { }
-
-    public GroupRepository(string connectionString, string readOnlyConnectionString)
-        : base(connectionString, readOnlyConnectionString)
-    { }
-
-    public async Task<Tuple<Group, ICollection<SelectionReadOnly>>> GetByIdWithCollectionsAsync(Guid id)
+    public class GroupRepository : Repository<Group, Guid>, IGroupRepository
     {
-        using (var connection = new SqlConnection(ConnectionString))
+        public GroupRepository(GlobalSettings globalSettings)
+            : this(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
+        { }
+
+        public GroupRepository(string connectionString, string readOnlyConnectionString)
+            : base(connectionString, readOnlyConnectionString)
+        { }
+
+        public async Task<Tuple<Group, ICollection<SelectionReadOnly>>> GetByIdWithCollectionsAsync(Guid id)
         {
-            var results = await connection.QueryMultipleAsync(
-                $"[{Schema}].[Group_ReadWithCollectionsById]",
-                new { Id = id },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryMultipleAsync(
+                    $"[{Schema}].[Group_ReadWithCollectionsById]",
+                    new { Id = id },
+                    commandType: CommandType.StoredProcedure);
 
-            var group = await results.ReadFirstOrDefaultAsync<Group>();
-            var colletions = (await results.ReadAsync<SelectionReadOnly>()).ToList();
+                var group = await results.ReadFirstOrDefaultAsync<Group>();
+                var colletions = (await results.ReadAsync<SelectionReadOnly>()).ToList();
 
-            return new Tuple<Group, ICollection<SelectionReadOnly>>(group, colletions);
+                return new Tuple<Group, ICollection<SelectionReadOnly>>(group, colletions);
+            }
         }
-    }
 
-    public async Task<ICollection<Group>> GetManyByOrganizationIdAsync(Guid organizationId)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<ICollection<Group>> GetManyByOrganizationIdAsync(Guid organizationId)
         {
-            var results = await connection.QueryAsync<Group>(
-                $"[{Schema}].[Group_ReadByOrganizationId]",
-                new { OrganizationId = organizationId },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<Group>(
+                    $"[{Schema}].[Group_ReadByOrganizationId]",
+                    new { OrganizationId = organizationId },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.ToList();
+                return results.ToList();
+            }
         }
-    }
 
-    public async Task<ICollection<Guid>> GetManyIdsByUserIdAsync(Guid organizationUserId)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<ICollection<Guid>> GetManyIdsByUserIdAsync(Guid organizationUserId)
         {
-            var results = await connection.QueryAsync<Guid>(
-                $"[{Schema}].[GroupUser_ReadGroupIdsByOrganizationUserId]",
-                new { OrganizationUserId = organizationUserId },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<Guid>(
+                    $"[{Schema}].[GroupUser_ReadGroupIdsByOrganizationUserId]",
+                    new { OrganizationUserId = organizationUserId },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.ToList();
+                return results.ToList();
+            }
         }
-    }
 
-    public async Task<ICollection<Guid>> GetManyUserIdsByIdAsync(Guid id)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<ICollection<Guid>> GetManyUserIdsByIdAsync(Guid id)
         {
-            var results = await connection.QueryAsync<Guid>(
-                $"[{Schema}].[GroupUser_ReadOrganizationUserIdsByGroupId]",
-                new { GroupId = id },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<Guid>(
+                    $"[{Schema}].[GroupUser_ReadOrganizationUserIdsByGroupId]",
+                    new { GroupId = id },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.ToList();
+                return results.ToList();
+            }
         }
-    }
 
-    public async Task<ICollection<GroupUser>> GetManyGroupUsersByOrganizationIdAsync(Guid organizationId)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<ICollection<GroupUser>> GetManyGroupUsersByOrganizationIdAsync(Guid organizationId)
         {
-            var results = await connection.QueryAsync<GroupUser>(
-                $"[{Schema}].[GroupUser_ReadByOrganizationId]",
-                new { OrganizationId = organizationId },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<GroupUser>(
+                    $"[{Schema}].[GroupUser_ReadByOrganizationId]",
+                    new { OrganizationId = organizationId },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.ToList();
+                return results.ToList();
+            }
         }
-    }
 
-    public async Task CreateAsync(Group obj, IEnumerable<SelectionReadOnly> collections)
-    {
-        obj.SetNewId();
-        var objWithCollections = JsonSerializer.Deserialize<GroupWithCollections>(JsonSerializer.Serialize(obj));
-        objWithCollections.Collections = collections.ToArrayTVP();
-
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task CreateAsync(Group obj, IEnumerable<SelectionReadOnly> collections)
         {
-            var results = await connection.ExecuteAsync(
-                $"[{Schema}].[Group_CreateWithCollections]",
-                objWithCollections,
-                commandType: CommandType.StoredProcedure);
+            obj.SetNewId();
+            var objWithCollections = JsonSerializer.Deserialize<GroupWithCollections>(JsonSerializer.Serialize(obj));
+            objWithCollections.Collections = collections.ToArrayTVP();
+
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.ExecuteAsync(
+                    $"[{Schema}].[Group_CreateWithCollections]",
+                    objWithCollections,
+                    commandType: CommandType.StoredProcedure);
+            }
         }
-    }
 
-    public async Task ReplaceAsync(Group obj, IEnumerable<SelectionReadOnly> collections)
-    {
-        var objWithCollections = JsonSerializer.Deserialize<GroupWithCollections>(JsonSerializer.Serialize(obj));
-        objWithCollections.Collections = collections.ToArrayTVP();
-
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task ReplaceAsync(Group obj, IEnumerable<SelectionReadOnly> collections)
         {
-            var results = await connection.ExecuteAsync(
-                $"[{Schema}].[Group_UpdateWithCollections]",
-                objWithCollections,
-                commandType: CommandType.StoredProcedure);
+            var objWithCollections = JsonSerializer.Deserialize<GroupWithCollections>(JsonSerializer.Serialize(obj));
+            objWithCollections.Collections = collections.ToArrayTVP();
+
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.ExecuteAsync(
+                    $"[{Schema}].[Group_UpdateWithCollections]",
+                    objWithCollections,
+                    commandType: CommandType.StoredProcedure);
+            }
         }
-    }
 
-    public async Task DeleteUserAsync(Guid groupId, Guid organizationUserId)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task DeleteUserAsync(Guid groupId, Guid organizationUserId)
         {
-            var results = await connection.ExecuteAsync(
-                $"[{Schema}].[GroupUser_Delete]",
-                new { GroupId = groupId, OrganizationUserId = organizationUserId },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.ExecuteAsync(
+                    $"[{Schema}].[GroupUser_Delete]",
+                    new { GroupId = groupId, OrganizationUserId = organizationUserId },
+                    commandType: CommandType.StoredProcedure);
+            }
         }
-    }
 
-    public async Task UpdateUsersAsync(Guid groupId, IEnumerable<Guid> organizationUserIds)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task UpdateUsersAsync(Guid groupId, IEnumerable<Guid> organizationUserIds)
         {
-            var results = await connection.ExecuteAsync(
-                "[dbo].[GroupUser_UpdateUsers]",
-                new { GroupId = groupId, OrganizationUserIds = organizationUserIds.ToGuidIdArrayTVP() },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.ExecuteAsync(
+                    "[dbo].[GroupUser_UpdateUsers]",
+                    new { GroupId = groupId, OrganizationUserIds = organizationUserIds.ToGuidIdArrayTVP() },
+                    commandType: CommandType.StoredProcedure);
+            }
         }
     }
 }