Move all event integration code to Dirt (#6757)

* Move all event integration code to Dirt

* Format to fix lint

src/Api/Dirt/Controllers/OrganizationIntegrationConfigurationController.cs

@@ -1,12 +1,12 @@
-using Bit.Api.AdminConsole.Models.Request.Organizations;
+using Bit.Api.Dirt.Models.Request;
-using Bit.Api.AdminConsole.Models.Response.Organizations;
+using Bit.Api.Dirt.Models.Response;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
 using Bit.Core.Context;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
 using Bit.Core.Exceptions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.AdminConsole.Controllers;
+namespace Bit.Api.Dirt.Controllers;
 
 [Route("organizations/{organizationId:guid}/integrations/{integrationId:guid}/configurations")]
 [Authorize("Application")]

src/Api/Dirt/Controllers/OrganizationIntegrationController.cs

@@ -1,12 +1,12 @@
-using Bit.Api.AdminConsole.Models.Request.Organizations;
+using Bit.Api.Dirt.Models.Request;
-using Bit.Api.AdminConsole.Models.Response.Organizations;
+using Bit.Api.Dirt.Models.Response;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
 using Bit.Core.Context;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
 using Bit.Core.Exceptions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.AdminConsole.Controllers;
+namespace Bit.Api.Dirt.Controllers;
 
 [Route("organizations/{organizationId:guid}/integrations")]
 [Authorize("Application")]

src/Api/Dirt/Controllers/SlackIntegrationController.cs

@@ -1,16 +1,16 @@
 using System.Text.Json;
-using Bit.Api.AdminConsole.Models.Response.Organizations;
+using Bit.Api.Dirt.Models.Response;
-using Bit.Core.AdminConsole.Entities;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
 using Bit.Core.Context;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Dirt.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Repositories;
+using Bit.Core.Dirt.Services;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.AdminConsole.Controllers;
+namespace Bit.Api.Dirt.Controllers;
 
 [Route("organizations")]
 [Authorize("Application")]

src/Api/Dirt/Controllers/TeamsIntegrationController.cs

@@ -1,18 +1,18 @@
 using System.Text.Json;
-using Bit.Api.AdminConsole.Models.Response.Organizations;
+using Bit.Api.Dirt.Models.Response;
-using Bit.Core.AdminConsole.Entities;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
 using Bit.Core.Context;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Dirt.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Repositories;
+using Bit.Core.Dirt.Services;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 
-namespace Bit.Api.AdminConsole.Controllers;
+namespace Bit.Api.Dirt.Controllers;
 
 [Route("organizations")]
 [Authorize("Application")]

src/Api/Dirt/Models/Request/OrganizationIntegrationConfigurationRequestModel.cs

@@ -1,8 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 using Bit.Core.Enums;
 
-
+namespace Bit.Api.Dirt.Models.Request;
-namespace Bit.Api.AdminConsole.Models.Request.Organizations;
 
 public class OrganizationIntegrationConfigurationRequestModel
 {

src/Api/Dirt/Models/Request/OrganizationIntegrationRequestModel.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Enums;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 
-namespace Bit.Api.AdminConsole.Models.Request.Organizations;
+namespace Bit.Api.Dirt.Models.Request;
 
 public class OrganizationIntegrationRequestModel : IValidatableObject
 {

src/Api/Dirt/Models/Response/OrganizationIntegrationConfigurationResponseModel.cs

@@ -1,8 +1,8 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.AdminConsole.Models.Response.Organizations;
+namespace Bit.Api.Dirt.Models.Response;
 
 public class OrganizationIntegrationConfigurationResponseModel : ResponseModel
 {

src/Api/Dirt/Models/Response/OrganizationIntegrationResponseModel.cs

@@ -1,10 +1,10 @@
 using System.Text.Json;
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Enums;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.AdminConsole.Models.Response.Organizations;
+namespace Bit.Api.Dirt.Models.Response;
 
 public class OrganizationIntegrationResponseModel : ResponseModel
 {

src/Core/AdminConsole/Models/Data/EventIntegrations/DatadogIntegration.cs

@@ -1,3 +0,0 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
-
-public record DatadogIntegration(string ApiKey, Uri Uri);

src/Core/AdminConsole/Models/Data/EventIntegrations/SlackIntegration.cs

@@ -1,3 +0,0 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
-
-public record SlackIntegration(string Token);

src/Core/AdminConsole/Models/Data/EventIntegrations/SlackIntegrationConfiguration.cs

@@ -1,3 +0,0 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
-
-public record SlackIntegrationConfiguration(string ChannelId);

src/Core/AdminConsole/Services/IIntegrationConfigurationDetailsCache.cs

@@ -1,14 +0,0 @@
-#nullable enable
-
-using Bit.Core.Enums;
-using Bit.Core.Models.Data.Organizations;
-
-namespace Bit.Core.Services;
-
-public interface IIntegrationConfigurationDetailsCache
-{
-    List<OrganizationIntegrationConfigurationDetails> GetConfigurationDetails(
-        Guid organizationId,
-        IntegrationType integrationType,
-        EventType eventType);
-}

src/Core/Dirt/Entities/OrganizationIntegration.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Entities;
+using Bit.Core.Dirt.Enums;
-using Bit.Core.Enums;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.AdminConsole.Entities;
+namespace Bit.Core.Dirt.Entities;
 
 public class OrganizationIntegration : ITableObject<Guid>
 {

src/Core/Dirt/Entities/OrganizationIntegrationConfiguration.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.AdminConsole.Entities;
+namespace Bit.Core.Dirt.Entities;
 
 public class OrganizationIntegrationConfiguration : ITableObject<Guid>
 {

src/Core/Dirt/Enums/IntegrationType.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums;
+namespace Bit.Core.Dirt.Enums;
 
 public enum IntegrationType : int
 {

src/Core/Dirt/Enums/OrganizationIntegrationStatus.cs

@@ -1,4 +1,4 @@
-namespace Bit.Api.AdminConsole.Models.Response.Organizations;
+namespace Bit.Core.Dirt.Enums;
 
 public enum OrganizationIntegrationStatus : int
 {

src/Core/Dirt/EventIntegrations/EventIntegrationsServiceCollectionExtensions.cs

@@ -1,13 +1,15 @@
 using Azure.Messaging.ServiceBus;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
-using Bit.Core.AdminConsole.Models.Teams;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.AdminConsole.Services;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations;
-using Bit.Core.AdminConsole.Services.NoopImplementations;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.Teams;
+using Bit.Core.Dirt.Repositories;
+using Bit.Core.Dirt.Services;
+using Bit.Core.Dirt.Services.Implementations;
+using Bit.Core.Dirt.Services.NoopImplementations;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Core/Dirt/EventIntegrations/OrganizationIntegrationConfigurations/CreateOrganizationIntegrationConfigurationCommand.cs

@@ -1,13 +1,13 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
-using Bit.Core.AdminConsole.Services;
+using Bit.Core.Dirt.Repositories;
+using Bit.Core.Dirt.Services;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations;
 
 /// <summary>
 /// Command implementation for creating organization integration configurations with validation and cache invalidation support.

src/Core/Dirt/EventIntegrations/OrganizationIntegrationConfigurations/DeleteOrganizationIntegrationConfigurationCommand.cs

@@ -1,11 +1,11 @@
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations;
 
 /// <summary>
 /// Command implementation for deleting organization integration configurations with cache invalidation support.

src/Core/Dirt/EventIntegrations/OrganizationIntegrationConfigurations/GetOrganizationIntegrationConfigurationsQuery.cs

@@ -1,9 +1,9 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations;
 
 /// <summary>
 /// Query implementation for retrieving organization integration configurations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrationConfigurations/Interfaces/ICreateOrganizationIntegrationConfigurationCommand.cs

@@ -1,6 +1,6 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
 
 /// <summary>
 /// Command interface for creating organization integration configurations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrationConfigurations/Interfaces/IDeleteOrganizationIntegrationConfigurationCommand.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
 
 /// <summary>
 /// Command interface for deleting organization integration configurations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrationConfigurations/Interfaces/IGetOrganizationIntegrationConfigurationsQuery.cs

@@ -1,6 +1,6 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
 
 /// <summary>
 /// Query interface for retrieving organization integration configurations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrationConfigurations/Interfaces/IUpdateOrganizationIntegrationConfigurationCommand.cs

@@ -1,6 +1,6 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
 
 /// <summary>
 /// Command interface for updating organization integration configurations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrationConfigurations/UpdateOrganizationIntegrationConfigurationCommand.cs

@@ -1,13 +1,13 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations.Interfaces;
-using Bit.Core.AdminConsole.Services;
+using Bit.Core.Dirt.Repositories;
+using Bit.Core.Dirt.Services;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrationConfigurations;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrationConfigurations;
 
 /// <summary>
 /// Command implementation for updating organization integration configurations with validation and cache invalidation support.

src/Core/Dirt/EventIntegrations/OrganizationIntegrations/CreateOrganizationIntegrationCommand.cs

@@ -1,12 +1,12 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations;
 
 /// <summary>
 /// Command implementation for creating organization integrations with cache invalidation support.

src/Core/Dirt/EventIntegrations/OrganizationIntegrations/DeleteOrganizationIntegrationCommand.cs

@@ -1,11 +1,11 @@
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations;
 
 /// <summary>
 /// Command implementation for deleting organization integrations with cache invalidation support.

src/Core/Dirt/EventIntegrations/OrganizationIntegrations/GetOrganizationIntegrationsQuery.cs

@@ -1,8 +1,8 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
-using Bit.Core.Repositories;
+using Bit.Core.Dirt.Repositories;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations;
 
 /// <summary>
 /// Query implementation for retrieving organization integrations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrations/Interfaces/ICreateOrganizationIntegrationCommand.cs

@@ -1,6 +1,6 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
 
 /// <summary>
 /// Command interface for creating an OrganizationIntegration.

src/Core/Dirt/EventIntegrations/OrganizationIntegrations/Interfaces/IDeleteOrganizationIntegrationCommand.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
 
 /// <summary>
 /// Command interface for deleting organization integrations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrations/Interfaces/IGetOrganizationIntegrationsQuery.cs

@@ -1,6 +1,6 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
 
 /// <summary>
 /// Query interface for retrieving organization integrations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrations/Interfaces/IUpdateOrganizationIntegrationCommand.cs

@@ -1,6 +1,6 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
 
 /// <summary>
 /// Command interface for updating organization integrations.

src/Core/Dirt/EventIntegrations/OrganizationIntegrations/UpdateOrganizationIntegrationCommand.cs

@@ -1,12 +1,12 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations.Interfaces;
+using Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations.Interfaces;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Exceptions;
-using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace Bit.Core.AdminConsole.EventIntegrations.OrganizationIntegrations;
+namespace Bit.Core.Dirt.EventIntegrations.OrganizationIntegrations;
 
 /// <summary>
 /// Command implementation for updating organization integrations with cache invalidation support.

src/Core/Dirt/Models/Data/EventIntegrations/DatadogIntegration.cs

@@ -0,0 +1,3 @@
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
+
+public record DatadogIntegration(string ApiKey, Uri Uri);

src/Core/Dirt/Models/Data/EventIntegrations/DatadogIntegrationConfigurationDetails.cs

@@ -1,3 +1,3 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public record DatadogIntegrationConfigurationDetails(string ApiKey, Uri Uri);

src/Core/Dirt/Models/Data/EventIntegrations/DatadogListenerConfiguration.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 using Bit.Core.Settings;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class DatadogListenerConfiguration(GlobalSettings globalSettings)
     : ListenerConfiguration(globalSettings), IIntegrationListenerConfiguration

src/Core/Dirt/Models/Data/EventIntegrations/HecIntegration.cs

@@ -1,3 +1,3 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public record HecIntegration(Uri Uri, string Scheme, string Token, string? Service = null);

src/Core/Dirt/Models/Data/EventIntegrations/HecListenerConfiguration.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 using Bit.Core.Settings;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class HecListenerConfiguration(GlobalSettings globalSettings)
     : ListenerConfiguration(globalSettings), IIntegrationListenerConfiguration

src/Core/Dirt/Models/Data/EventIntegrations/IEventListenerConfiguration.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public interface IEventListenerConfiguration
 {

src/Core/Dirt/Models/Data/EventIntegrations/IIntegrationListenerConfiguration.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public interface IIntegrationListenerConfiguration : IEventListenerConfiguration
 {

src/Core/Dirt/Models/Data/EventIntegrations/IIntegrationMessage.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public interface IIntegrationMessage
 {

src/Core/Dirt/Models/Data/EventIntegrations/IntegrationFailureCategory.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 /// <summary>
 /// Categories of event integration failures used for classification and retry logic.

src/Core/Dirt/Models/Data/EventIntegrations/IntegrationFilterGroup.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class IntegrationFilterGroup
 {

src/Core/Dirt/Models/Data/EventIntegrations/IntegrationFilterOperation.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public enum IntegrationFilterOperation
 {

src/Core/Dirt/Models/Data/EventIntegrations/IntegrationFilterRule.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class IntegrationFilterRule
 {

src/Core/Dirt/Models/Data/EventIntegrations/IntegrationHandlerResult.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 /// <summary>
 /// Represents the result of an integration handler operation, including success status,

src/Core/Dirt/Models/Data/EventIntegrations/IntegrationMessage.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class IntegrationMessage : IIntegrationMessage
 {

src/Core/Dirt/Models/Data/EventIntegrations/IntegrationOAuthState.cs

@@ -1,8 +1,8 @@
 using System.Security.Cryptography;
 using System.Text;
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class IntegrationOAuthState
 {

src/Core/Dirt/Models/Data/EventIntegrations/IntegrationTemplateContext.cs

@@ -4,7 +4,7 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class IntegrationTemplateContext(EventMessage eventMessage)
 {

src/Core/Dirt/Models/Data/EventIntegrations/ListenerConfiguration.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Settings;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public abstract class ListenerConfiguration
 {

src/Core/Dirt/Models/Data/EventIntegrations/OrganizationIntegrationConfigurationDetails.cs

@@ -1,9 +1,8 @@
 using System.Text.Json.Nodes;
+using Bit.Core.Dirt.Enums;
 using Bit.Core.Enums;
 
-#nullable enable
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
-
-namespace Bit.Core.Models.Data.Organizations;
 
 public class OrganizationIntegrationConfigurationDetails
 {

src/Core/Dirt/Models/Data/EventIntegrations/RepositoryListenerConfiguration.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Settings;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class RepositoryListenerConfiguration(GlobalSettings globalSettings)
     : ListenerConfiguration(globalSettings), IEventListenerConfiguration

src/Core/Dirt/Models/Data/EventIntegrations/SlackIntegration.cs

@@ -0,0 +1,3 @@
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
+
+public record SlackIntegration(string Token);

src/Core/Dirt/Models/Data/EventIntegrations/SlackIntegrationConfiguration.cs

@@ -0,0 +1,3 @@
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
+
+public record SlackIntegrationConfiguration(string ChannelId);

src/Core/Dirt/Models/Data/EventIntegrations/SlackIntegrationConfigurationDetails.cs

@@ -1,3 +1,3 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public record SlackIntegrationConfigurationDetails(string ChannelId, string Token);

src/Core/Dirt/Models/Data/EventIntegrations/SlackListenerConfiguration.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 using Bit.Core.Settings;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class SlackListenerConfiguration(GlobalSettings globalSettings) :
     ListenerConfiguration(globalSettings), IIntegrationListenerConfiguration

src/Core/Dirt/Models/Data/EventIntegrations/TeamsIntegration.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Models.Teams;
+using Bit.Core.Dirt.Models.Data.Teams;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public record TeamsIntegration(
     string TenantId,

src/Core/Dirt/Models/Data/EventIntegrations/TeamsIntegrationConfigurationDetails.cs

@@ -1,3 +1,3 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public record TeamsIntegrationConfigurationDetails(string ChannelId, Uri ServiceUrl);

src/Core/Dirt/Models/Data/EventIntegrations/TeamsListenerConfiguration.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 using Bit.Core.Settings;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class TeamsListenerConfiguration(GlobalSettings globalSettings) :
     ListenerConfiguration(globalSettings), IIntegrationListenerConfiguration

src/Core/Dirt/Models/Data/EventIntegrations/WebhookIntegration.cs

@@ -1,3 +1,3 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public record WebhookIntegration(Uri Uri, string? Scheme = null, string? Token = null);

src/Core/Dirt/Models/Data/EventIntegrations/WebhookIntegrationConfiguration.cs

@@ -1,3 +1,3 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public record WebhookIntegrationConfiguration(Uri Uri, string? Scheme = null, string? Token = null);

src/Core/Dirt/Models/Data/EventIntegrations/WebhookIntegrationConfigurationDetails.cs

@@ -1,3 +1,3 @@
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public record WebhookIntegrationConfigurationDetails(Uri Uri, string? Scheme = null, string? Token = null);

src/Core/Dirt/Models/Data/EventIntegrations/WebhookListenerConfiguration.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 using Bit.Core.Settings;
 
-namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+namespace Bit.Core.Dirt.Models.Data.EventIntegrations;
 
 public class WebhookListenerConfiguration(GlobalSettings globalSettings)
     : ListenerConfiguration(globalSettings), IIntegrationListenerConfiguration

src/Core/Dirt/Models/Data/Slack/SlackApiResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Bit.Core.Models.Slack;
+namespace Bit.Core.Dirt.Models.Data.Slack;
 
 public abstract class SlackApiResponse
 {

src/Core/Dirt/Models/Data/Teams/TeamsApiResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Bit.Core.Models.Teams;
+namespace Bit.Core.Dirt.Models.Data.Teams;
 
 /// <summary>Represents the response returned by the Microsoft OAuth 2.0 token endpoint.
 /// See <see href="https://learn.microsoft.com/graph/auth-v2-user">Microsoft identity platform and OAuth 2.0

src/Core/Dirt/Models/Data/Teams/TeamsBotCredentialProvider.cs

@@ -1,6 +1,6 @@
 using Microsoft.Bot.Connector.Authentication;
 
-namespace Bit.Core.AdminConsole.Models.Teams;
+namespace Bit.Core.Dirt.Models.Data.Teams;
 
 public class TeamsBotCredentialProvider(string clientId, string clientSecret) : ICredentialProvider
 {

src/Core/Dirt/Repositories/IOrganizationIntegrationConfigurationRepository.cs

@@ -1,8 +1,10 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Dirt.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Bit.Core.Enums;
-using Bit.Core.Models.Data.Organizations;
+using Bit.Core.Repositories;
 
-namespace Bit.Core.Repositories;
+namespace Bit.Core.Dirt.Repositories;
 
 public interface IOrganizationIntegrationConfigurationRepository : IRepository<OrganizationIntegrationConfiguration, Guid>
 {

src/Core/Dirt/Repositories/IOrganizationIntegrationRepository.cs

@@ -1,6 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Repositories;
 
-namespace Bit.Core.Repositories;
+namespace Bit.Core.Dirt.Repositories;
 
 public interface IOrganizationIntegrationRepository : IRepository<OrganizationIntegration, Guid>
 {

src/Core/Dirt/Services/IAzureServiceBusService.cs

@@ -1,7 +1,7 @@
 using Azure.Messaging.ServiceBus;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services;
 
 public interface IAzureServiceBusService : IEventIntegrationPublisher, IAsyncDisposable
 {

src/Core/Dirt/Services/IEventIntegrationPublisher.cs

@@ -1,6 +1,6 @@
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services;
 
 public interface IEventIntegrationPublisher : IAsyncDisposable
 {

src/Core/Dirt/Services/IEventMessageHandler.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services;
 
 public interface IEventMessageHandler
 {

src/Core/Dirt/Services/IIntegrationFilterService.cs

@@ -1,9 +1,9 @@
 #nullable enable
 
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services;
 
 public interface IIntegrationFilterService
 {

src/Core/Dirt/Services/IIntegrationHandler.cs

@@ -1,8 +1,8 @@
 using System.Globalization;
 using System.Net;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services;
 
 public interface IIntegrationHandler
 {

src/Core/Dirt/Services/IOrganizationIntegrationConfigurationValidator.cs

@@ -1,7 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
 
-namespace Bit.Core.AdminConsole.Services;
+namespace Bit.Core.Dirt.Services;
 
 public interface IOrganizationIntegrationConfigurationValidator
 {

src/Core/Dirt/Services/IRabbitMqService.cs

@@ -1,8 +1,8 @@
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services;
 
 public interface IRabbitMqService : IEventIntegrationPublisher
 {

src/Core/Dirt/Services/ISlackService.cs

@@ -1,6 +1,7 @@
-using Bit.Core.Models.Slack;
+using Bit.Core.Dirt.Models.Data.Slack;
+using Bit.Core.Dirt.Services.Implementations;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services;
 
 /// <summary>Defines operations for interacting with Slack, including OAuth authentication, channel discovery,
 /// and sending messages.</summary>

src/Core/Dirt/Services/ITeamsService.cs

@@ -1,6 +1,7 @@
-using Bit.Core.Models.Teams;
+using Bit.Core.Dirt.Models.Data.Teams;
+using Bit.Core.Dirt.Services.Implementations;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services;
 
 /// <summary>
 /// Service that provides functionality relating to the Microsoft Teams integration including OAuth,

src/Core/Dirt/Services/Implementations/AzureServiceBusEventListenerService.cs

@@ -1,9 +1,9 @@
 using System.Text;
 using Azure.Messaging.ServiceBus;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class AzureServiceBusEventListenerService<TConfiguration> : EventLoggingListenerService
     where TConfiguration : IEventListenerConfiguration
@@ -42,7 +42,7 @@ public class AzureServiceBusEventListenerService<TConfiguration> : EventLoggingL
     private static ILogger CreateLogger(ILoggerFactory loggerFactory, TConfiguration configuration)
     {
         return loggerFactory.CreateLogger(
-            categoryName: $"Bit.Core.Services.AzureServiceBusEventListenerService.{configuration.EventSubscriptionName}");
+            categoryName: $"Bit.Core.Dirt.Services.Implementations.AzureServiceBusEventListenerService.{configuration.EventSubscriptionName}");
     }
 
     internal Task ProcessErrorAsync(ProcessErrorEventArgs args)

src/Core/Dirt/Services/Implementations/AzureServiceBusIntegrationListenerService.cs

@@ -1,9 +1,9 @@
 using Azure.Messaging.ServiceBus;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class AzureServiceBusIntegrationListenerService<TConfiguration> : BackgroundService
     where TConfiguration : IIntegrationListenerConfiguration
@@ -23,7 +23,7 @@ public class AzureServiceBusIntegrationListenerService<TConfiguration> : Backgro
     {
         _handler = handler;
         _logger = loggerFactory.CreateLogger(
-            categoryName: $"Bit.Core.Services.AzureServiceBusIntegrationListenerService.{configuration.IntegrationSubscriptionName}");
+            categoryName: $"Bit.Core.Dirt.Services.Implementations.AzureServiceBusIntegrationListenerService.{configuration.IntegrationSubscriptionName}");
         _maxRetries = configuration.MaxRetries;
         _serviceBusService = serviceBusService;
 

src/Core/Dirt/Services/Implementations/AzureServiceBusService.cs

@@ -1,9 +1,9 @@
 using Azure.Messaging.ServiceBus;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Enums;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Bit.Core.Settings;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class AzureServiceBusService : IAzureServiceBusService
 {

src/Core/Dirt/Services/Implementations/AzureTableStorageEventHandler.cs

@@ -1,9 +1,8 @@
-#nullable enable
+using Bit.Core.Models.Data;
-
+using Bit.Core.Services;
-using Bit.Core.Models.Data;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class AzureTableStorageEventHandler(
     [FromKeyedServices("persistent")] IEventWriteService eventWriteService)

src/Core/Dirt/Services/Implementations/DatadogIntegrationHandler.cs

@@ -1,7 +1,7 @@
 using System.Text;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class DatadogIntegrationHandler(
     IHttpClientFactory httpClientFactory,

src/Core/Dirt/Services/Implementations/EventIntegrationEventWriteService.cs

@@ -1,7 +1,8 @@
 using System.Text.Json;
 using Bit.Core.Models.Data;
+using Bit.Core.Services;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 public class EventIntegrationEventWriteService : IEventWriteService, IAsyncDisposable
 {
     private readonly IEventIntegrationPublisher _eventIntegrationPublisher;

src/Core/Dirt/Services/Implementations/EventIntegrationHandler.cs

@@ -1,18 +1,18 @@
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Utilities;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Repositories;
 using Bit.Core.Utilities;
 using Microsoft.Extensions.Logging;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class EventIntegrationHandler<T>(
     IntegrationType integrationType,

src/Core/Dirt/Services/Implementations/EventLoggingListenerService.cs

@@ -1,11 +1,9 @@
-#nullable enable
+using System.Text.Json;
-
-using System.Text.Json;
 using Bit.Core.Models.Data;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public abstract class EventLoggingListenerService : BackgroundService
 {

src/Core/Dirt/Services/Implementations/EventRepositoryHandler.cs

@@ -1,7 +1,8 @@
 using Bit.Core.Models.Data;
+using Bit.Core.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class EventRepositoryHandler(
     [FromKeyedServices("persistent")] IEventWriteService eventWriteService)

src/Core/Dirt/Services/Implementations/IntegrationFilterFactory.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public delegate bool IntegrationFilter(EventMessage message, object? value);
 

src/Core/Dirt/Services/Implementations/IntegrationFilterService.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class IntegrationFilterService : IIntegrationFilterService
 {

src/Core/Dirt/Services/Implementations/OrganizationIntegrationConfigurationValidator.cs

@@ -1,9 +1,9 @@
 using System.Text.Json;
-using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Dirt.Entities;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Enums;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 
-namespace Bit.Core.AdminConsole.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class OrganizationIntegrationConfigurationValidator : IOrganizationIntegrationConfigurationValidator
 {

src/Core/Dirt/Services/Implementations/RabbitMqEventListenerService.cs

@@ -1,10 +1,10 @@
 using System.Text;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Microsoft.Extensions.Logging;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class RabbitMqEventListenerService<TConfiguration> : EventLoggingListenerService
     where TConfiguration : IEventListenerConfiguration
@@ -69,6 +69,6 @@ public class RabbitMqEventListenerService<TConfiguration> : EventLoggingListener
     private static ILogger CreateLogger(ILoggerFactory loggerFactory, TConfiguration configuration)
     {
         return loggerFactory.CreateLogger(
-            categoryName: $"Bit.Core.Services.RabbitMqEventListenerService.{configuration.EventQueueName}");
+            categoryName: $"Bit.Core.Dirt.Services.Implementations.RabbitMqEventListenerService.{configuration.EventQueueName}");
     }
 }

src/Core/Dirt/Services/Implementations/RabbitMqIntegrationListenerService.cs

@@ -1,12 +1,12 @@
 using System.Text;
 using System.Text.Json;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class RabbitMqIntegrationListenerService<TConfiguration> : BackgroundService
     where TConfiguration : IIntegrationListenerConfiguration
@@ -37,7 +37,7 @@ public class RabbitMqIntegrationListenerService<TConfiguration> : BackgroundServ
         _timeProvider = timeProvider;
         _lazyChannel = new Lazy<Task<IChannel>>(() => _rabbitMqService.CreateChannelAsync());
         _logger = loggerFactory.CreateLogger(
-            categoryName: $"Bit.Core.Services.RabbitMqIntegrationListenerService.{configuration.IntegrationQueueName}"); ;
+            categoryName: $"Bit.Core.Dirt.Services.Implementations.RabbitMqIntegrationListenerService.{configuration.IntegrationQueueName}"); ;
     }
 
     public override async Task StartAsync(CancellationToken cancellationToken)

src/Core/Dirt/Services/Implementations/RabbitMqService.cs

@@ -1,11 +1,11 @@
 using System.Text;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Enums;
-using Bit.Core.Enums;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Bit.Core.Settings;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class RabbitMqService : IRabbitMqService
 {

src/Core/Dirt/Services/Implementations/SlackIntegrationHandler.cs

@@ -1,6 +1,6 @@
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class SlackIntegrationHandler(
     ISlackService slackService)

src/Core/Dirt/Services/Implementations/SlackService.cs

@@ -2,11 +2,11 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Web;
-using Bit.Core.Models.Slack;
+using Bit.Core.Dirt.Models.Data.Slack;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class SlackService(
     IHttpClientFactory httpClientFactory,

src/Core/Dirt/Services/Implementations/TeamsIntegrationHandler.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 using Microsoft.Rest;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class TeamsIntegrationHandler(
     ITeamsService teamsService)

src/Core/Dirt/Services/Implementations/TeamsService.cs

@@ -2,9 +2,9 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Web;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
-using Bit.Core.Models.Teams;
+using Bit.Core.Dirt.Models.Data.Teams;
-using Bit.Core.Repositories;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Settings;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Teams;
@@ -12,9 +12,9 @@ using Microsoft.Bot.Connector;
 using Microsoft.Bot.Connector.Authentication;
 using Microsoft.Bot.Schema;
 using Microsoft.Extensions.Logging;
-using TeamInfo = Bit.Core.Models.Teams.TeamInfo;
+using TeamInfo = Bit.Core.Dirt.Models.Data.Teams.TeamInfo;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class TeamsService(
     IHttpClientFactory httpClientFactory,

src/Core/Dirt/Services/Implementations/WebhookIntegrationHandler.cs

@@ -1,8 +1,8 @@
 using System.Net.Http.Headers;
 using System.Text;
-using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
+using Bit.Core.Dirt.Models.Data.EventIntegrations;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Dirt.Services.Implementations;
 
 public class WebhookIntegrationHandler(
     IHttpClientFactory httpClientFactory,

src/Core/Dirt/Services/NoopImplementations/NoopSlackService.cs

@@ -1,7 +1,6 @@
-using Bit.Core.Models.Slack;
+using Bit.Core.Dirt.Models.Data.Slack;
-using Bit.Core.Services;
 
-namespace Bit.Core.AdminConsole.Services.NoopImplementations;
+namespace Bit.Core.Dirt.Services.NoopImplementations;
 
 public class NoopSlackService : ISlackService
 {

src/Core/Dirt/Services/NoopImplementations/NoopTeamsService.cs

@@ -1,7 +1,6 @@
-using Bit.Core.Models.Teams;
+using Bit.Core.Dirt.Models.Data.Teams;
-using Bit.Core.Services;
 
-namespace Bit.Core.AdminConsole.Services.NoopImplementations;
+namespace Bit.Core.Dirt.Services.NoopImplementations;
 
 public class NoopTeamsService : ITeamsService
 {