Moving group details query to core

src/Api/AdminConsole/Controllers/GroupsController.cs

@@ -1,5 +1,4 @@
-using Api.AdminConsole.Queries;
-using Bit.Api.AdminConsole.Models.Request;
+using Bit.Api.AdminConsole.Models.Request;
 using Bit.Api.AdminConsole.Models.Response;
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
@@ -7,6 +6,7 @@ using Bit.Api.Vault.AuthorizationHandlers.Collections;
 using Bit.Api.Vault.AuthorizationHandlers.Groups;
 using Bit.Core;
 using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Requests;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;

src/Api/AdminConsole/Queries/IGroupDetailsQuery.cs

@@ -1,6 +0,0 @@
-namespace Api.AdminConsole.Queries;
-
-public interface IGroupDetailsQuery
-{
-    Task<IEnumerable<GroupDetailsQueryResponse>> GetGroupDetails(GroupDetailsQueryRequest request);
-}

src/Api/Startup.cs

@@ -32,7 +32,6 @@ using Bit.Core.Tools.Entities;
 using Bit.Core.Vault.Entities;
 using Bit.Api.Auth.Models.Request.WebAuthn;
 using Bit.Core.Auth.Models.Data;
-using Api.AdminConsole.Queries;
 
 
 #if !OSS
@@ -178,9 +177,6 @@ public class Startup
         services.AddCoreLocalizationServices();
         services.AddBillingOperations();
 
-        // Queries
-        services.AddScoped<IGroupDetailsQuery, GroupDetailsQuery>();
-
         // Authorization Handlers
         services.AddAuthorizationHandlers();
 

src/Core/AdminConsole/OrganizationFeatures/Groups/GroupDetailsQuery.cs

@@ -1,22 +1,11 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Requests;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Responses;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Data;
 
-namespace Api.AdminConsole.Queries;
-
-public class GroupDetailsQueryRequest
-{
-    public Guid OrganizationId { get; set; }
-    public Guid? GroupId { get; set; }
-}
-
-public class GroupDetailsQueryResponse
-{
-    public Group Group { get; set; }
-    public IEnumerable<CollectionAccessSelection> CollectionAccessSelection { get; set; }
-}
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups;
 
 public class GroupDetailsQuery : IGroupDetailsQuery
 {

src/Core/AdminConsole/OrganizationFeatures/Groups/Interfaces/IGroupDetailsQuery.cs

@@ -0,0 +1,9 @@
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Requests;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Responses;
+
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+
+public interface IGroupDetailsQuery
+{
+    Task<IEnumerable<GroupDetailsQueryResponse>> GetGroupDetails(GroupDetailsQueryRequest request);
+}

src/Core/AdminConsole/OrganizationFeatures/Groups/Requests/GroupDetailsQueryRequest.cs

@@ -0,0 +1,7 @@
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups.Requests;
+
+public class GroupDetailsQueryRequest
+{
+    public Guid OrganizationId { get; set; }
+    public Guid? GroupId { get; set; }
+}

src/Core/AdminConsole/OrganizationFeatures/Groups/Responses/GroupDetailsQueryResponse.cs

@@ -0,0 +1,10 @@
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Models.Data;
+
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Groups.Responses;
+
+public class GroupDetailsQueryResponse
+{
+    public Group Group { get; set; }
+    public IEnumerable<CollectionAccessSelection> CollectionAccessSelection { get; set; }
+}

src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs

@@ -109,6 +109,7 @@ public static class OrganizationServiceCollectionExtensions
         services.AddScoped<ICreateGroupCommand, CreateGroupCommand>();
         services.AddScoped<IDeleteGroupCommand, DeleteGroupCommand>();
         services.AddScoped<IUpdateGroupCommand, UpdateGroupCommand>();
+        services.AddScoped<IGroupDetailsQuery, GroupDetailsQuery>();
     }
 
     private static void AddOrganizationLicenseCommandsQueries(this IServiceCollection services)