diff --git a/src/1-BuildingBlocks/Application/Behaviors/BehaviorsExtensions.cs b/src/1-BuildingBlocks/Application/Behaviors/BehaviorsExtensions.cs index 7ec9cad46..0129b7c7e 100644 --- a/src/1-BuildingBlocks/Application/Behaviors/BehaviorsExtensions.cs +++ b/src/1-BuildingBlocks/Application/Behaviors/BehaviorsExtensions.cs @@ -2,7 +2,7 @@ using MediatR; using Microsoft.Extensions.DependencyInjection; using System; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; namespace TaskoMask.BuildingBlocks.Application.Behaviors { @@ -27,7 +27,7 @@ public static void AddApplicationBehaviors(this IServiceCollection services, Typ /// public static void AddValidationBehaviour(this IServiceCollection services, Type validatorAssemblyMarkerType) { - //Load all fluent validation to use in ValidationBehaviour + //Load all fluent validation classes to be used in ValidationBehaviour services.AddValidatorsFromAssembly(validatorAssemblyMarkerType.Assembly); services.AddScoped(typeof(IPipelineBehavior<,>), typeof(ValidationBehaviour<,>)); diff --git a/src/1-BuildingBlocks/Application/Behaviors/CachingBehavior.cs b/src/1-BuildingBlocks/Application/Behaviors/CachingBehavior.cs index e003aafef..23d98126a 100644 --- a/src/1-BuildingBlocks/Application/Behaviors/CachingBehavior.cs +++ b/src/1-BuildingBlocks/Application/Behaviors/CachingBehavior.cs @@ -12,7 +12,7 @@ namespace TaskoMask.BuildingBlocks.Application.Behaviors { /// - /// Caching response of queries mareked with ICacheableQuery + /// Caching response for queries that are mareked by ICacheableQuery /// public class CachingBehavior : IPipelineBehavior where TRequest : BaseQuery { @@ -42,14 +42,17 @@ public CachingBehavior(IEasyCachingProvider cachingProvider, IConfiguration conf /// public async Task Handle(TRequest request, CancellationToken cancellationToken, RequestHandlerDelegate next) { + // ignore command requests if (request is not ICacheableQuery cacheableQuery) return await next(); - var configurationCacheEnabled = bool.Parse(_configuration["Caching:Enabled"]); - if (!configurationCacheEnabled) + //ignore caching if it is not enabled globaly from configurations + var configurationCachingEnabled = bool.Parse(_configuration["Caching:Enabled"]); + if (!configurationCachingEnabled) return await next(); - if (!cacheableQuery.EnableCache) + //ignore caching for this request if caching is not enabled + if (!cacheableQuery.CachingIsEnabled()) return await next(); diff --git a/src/1-BuildingBlocks/Application/Behaviors/EventStoringBehavior.cs b/src/1-BuildingBlocks/Application/Behaviors/EventStoringBehavior.cs index 0a765e048..18c86dc8a 100644 --- a/src/1-BuildingBlocks/Application/Behaviors/EventStoringBehavior.cs +++ b/src/1-BuildingBlocks/Application/Behaviors/EventStoringBehavior.cs @@ -7,16 +7,15 @@ using System.Threading; using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Application.Commands; -using TaskoMask.BuildingBlocks.Domain.Models; -using TaskoMask.BuildingBlocks.Domain.Services; +using TaskoMask.BuildingBlocks.Domain.Events; namespace TaskoMask.BuildingBlocks.Application.Behaviors { /// - /// Each command must have at least one event to save changes in event store + /// Each command must have at least one event to save its changes in event store /// So this notification handler act as a behavior and makes it easy to store events without repeating the creation of event handler - /// However events can have another handlers to do another things like sending an email or update some other entities + /// However events can have other handlers to do other things like sending an email or update some other entities, etc. /// public class EventStoringBehavior : INotificationHandler { diff --git a/src/1-BuildingBlocks/Application/Behaviors/ValidationBehaviour.cs b/src/1-BuildingBlocks/Application/Behaviors/ValidationBehaviour.cs index 3d83ed02e..5ae3ef7b9 100644 --- a/src/1-BuildingBlocks/Application/Behaviors/ValidationBehaviour.cs +++ b/src/1-BuildingBlocks/Application/Behaviors/ValidationBehaviour.cs @@ -13,7 +13,7 @@ namespace TaskoMask.BuildingBlocks.Application.Behaviors { /// - /// automatic command validation by check annotation and fluent validation (if exist) + /// Automatic validation by checking data annotation and fluent validations (if any) /// public class ValidationBehaviour : IPipelineBehavior where TRequest : BaseCommand { diff --git a/src/1-BuildingBlocks/Application/Bus/IInMemoryBus.cs b/src/1-BuildingBlocks/Application/Bus/IInMemoryBus.cs index a1b0d946b..59811eb84 100644 --- a/src/1-BuildingBlocks/Application/Bus/IInMemoryBus.cs +++ b/src/1-BuildingBlocks/Application/Bus/IInMemoryBus.cs @@ -2,16 +2,17 @@ using TaskoMask.BuildingBlocks.Application.Commands; using TaskoMask.BuildingBlocks.Application.Queries; using TaskoMask.BuildingBlocks.Contracts.Helpers; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; namespace TaskoMask.BuildingBlocks.Application.Bus { /// - /// It is used as a mediator to send and handle requests inside a single service + /// It is used as a mediator to send and handle requests inside a service (in-process) /// public interface IInMemoryBus { - Task> SendCommand(TCommand cmd) where TCommand : BaseCommand; + Task> SendCommand(TCommand cmd) + where TCommand : BaseCommand; Task> SendQuery(BaseQuery query); Task PublishEvent(DomainEvent @event); } diff --git a/src/1-BuildingBlocks/Application/Bus/IMessageBus.cs b/src/1-BuildingBlocks/Application/Bus/IMessageBus.cs index 45f1c63bf..609b338ff 100644 --- a/src/1-BuildingBlocks/Application/Bus/IMessageBus.cs +++ b/src/1-BuildingBlocks/Application/Bus/IMessageBus.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; -using TaskoMask.BuildingBlocks.Contracts.Models; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Contracts.Events; + namespace TaskoMask.BuildingBlocks.Application.Bus { /// - /// It is used as a message broker to enable microservices communicating each other + /// It is used as a message broker to enable microservices communicating each other (out-process) /// public interface IMessageBus { diff --git a/src/1-BuildingBlocks/Application/Commands/BaseCommand.cs b/src/1-BuildingBlocks/Application/Commands/BaseCommand.cs index 12ffd62e9..4b534324a 100644 --- a/src/1-BuildingBlocks/Application/Commands/BaseCommand.cs +++ b/src/1-BuildingBlocks/Application/Commands/BaseCommand.cs @@ -3,7 +3,5 @@ namespace TaskoMask.BuildingBlocks.Application.Commands { - public abstract class BaseCommand : InternalCommand - { - } -} \ No newline at end of file + public abstract class BaseCommand : IRequest { } +} diff --git a/src/1-BuildingBlocks/Application/Commands/BaseCommandHandler.cs b/src/1-BuildingBlocks/Application/Commands/BaseCommandHandler.cs index d178b3fd9..1d8c585c6 100644 --- a/src/1-BuildingBlocks/Application/Commands/BaseCommandHandler.cs +++ b/src/1-BuildingBlocks/Application/Commands/BaseCommandHandler.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Application.Bus; -using TaskoMask.BuildingBlocks.Domain.Models; -using TaskoMask.BuildingBlocks.Contracts.Models; +using TaskoMask.BuildingBlocks.Contracts.Events; +using TaskoMask.BuildingBlocks.Domain.Events; namespace TaskoMask.BuildingBlocks.Application.Commands { diff --git a/src/1-BuildingBlocks/Application/Commands/InternalCommand.cs b/src/1-BuildingBlocks/Application/Commands/InternalCommand.cs deleted file mode 100644 index 604b4e643..000000000 --- a/src/1-BuildingBlocks/Application/Commands/InternalCommand.cs +++ /dev/null @@ -1,8 +0,0 @@ -using MediatR; - -namespace TaskoMask.BuildingBlocks.Application.Commands -{ - public abstract class InternalCommand : IRequest - { - } -} \ No newline at end of file diff --git a/src/1-BuildingBlocks/Application/Queries/BaseQuery.cs b/src/1-BuildingBlocks/Application/Queries/BaseQuery.cs index e8a212fe4..d1f926a80 100644 --- a/src/1-BuildingBlocks/Application/Queries/BaseQuery.cs +++ b/src/1-BuildingBlocks/Application/Queries/BaseQuery.cs @@ -4,18 +4,27 @@ namespace TaskoMask.BuildingBlocks.Application.Queries { /// - /// Mark BaseQuery with ICacheableQuery to catche the queries by CachingBehavior. - /// If you need to cache a query just set the EnableCache to true beafore sending the query to bus + /// Mark BaseQuery with ICacheableQuery to enable catching for queries by CachingBehavior. /// public abstract class BaseQuery : ICacheableQuery, IRequest { protected BaseQuery() { - //By default cache is disabled + //Ching is disabled by default EnableCache = false; } - public bool EnableCache { get; set; } + public bool EnableCache { get; private set; } + + public bool CachingIsEnabled() + { + return EnableCache ; + } + + public void EnableCaching() + { + EnableCache = true; + } } } \ No newline at end of file diff --git a/src/1-BuildingBlocks/Application/Queries/ICacheableQuery.cs b/src/1-BuildingBlocks/Application/Queries/ICacheableQuery.cs index 0cc84925b..03a12e7a8 100644 --- a/src/1-BuildingBlocks/Application/Queries/ICacheableQuery.cs +++ b/src/1-BuildingBlocks/Application/Queries/ICacheableQuery.cs @@ -12,11 +12,12 @@ namespace TaskoMask.BuildingBlocks.Application.Queries public interface ICacheableQuery { /// - /// for enable caching set it to true beafor sending the query to bus like below: + /// To enable caching for a query, call EnableCaching() beafor sending the query: /// var query=new GetSomeQuery() - /// query.EnableCache = false; + /// query.EnableCaching(); /// _inMemoryBus.SendQuery(query) /// - bool EnableCache { get; set; } + void EnableCaching(); + bool CachingIsEnabled(); } } diff --git a/src/1-BuildingBlocks/Contracts/Enums/ContractsEnums.cs b/src/1-BuildingBlocks/Contracts/Enums/ContractsEnums.cs index bda139009..620bce787 100644 --- a/src/1-BuildingBlocks/Contracts/Enums/ContractsEnums.cs +++ b/src/1-BuildingBlocks/Contracts/Enums/ContractsEnums.cs @@ -4,20 +4,6 @@ namespace TaskoMask.BuildingBlocks.Contracts.Enums { - - /// - /// - /// - public enum BoardMemberAccessLevel - { - [Display(Name = nameof(ContractsMetadata.BoardMemberAccessLevel_Reader), ResourceType = typeof(ContractsMetadata))] - Reader = 0, - [Display(Name = nameof(ContractsMetadata.BoardMemberAccessLevel_Writer), ResourceType = typeof(ContractsMetadata))] - Writer = 1, - } - - - /// /// /// @@ -35,13 +21,4 @@ public enum BoardCardType } - /// - /// - /// - public enum UserType - { - Owner = 0, - Operator = 1 - } - } diff --git a/src/1-BuildingBlocks/Contracts/Events/BoardIntegrationEvents.cs b/src/1-BuildingBlocks/Contracts/Events/BoardIntegrationEvents.cs index 83ad714ba..05da0095f 100644 --- a/src/1-BuildingBlocks/Contracts/Events/BoardIntegrationEvents.cs +++ b/src/1-BuildingBlocks/Contracts/Events/BoardIntegrationEvents.cs @@ -1,6 +1,5 @@  using TaskoMask.BuildingBlocks.Contracts.Enums; -using TaskoMask.BuildingBlocks.Contracts.Models; namespace TaskoMask.BuildingBlocks.Contracts.Events { diff --git a/src/1-BuildingBlocks/Contracts/Events/IIntegrationEvent.cs b/src/1-BuildingBlocks/Contracts/Events/IIntegrationEvent.cs new file mode 100644 index 000000000..ec2b312ce --- /dev/null +++ b/src/1-BuildingBlocks/Contracts/Events/IIntegrationEvent.cs @@ -0,0 +1,6 @@ +namespace TaskoMask.BuildingBlocks.Contracts.Events +{ + public interface IntegrationEvent + { + } +} diff --git a/src/1-BuildingBlocks/Contracts/Events/IdentityIntegrationEvents.cs b/src/1-BuildingBlocks/Contracts/Events/IdentityIntegrationEvents.cs index 4b417665c..8c1f24cf8 100644 --- a/src/1-BuildingBlocks/Contracts/Events/IdentityIntegrationEvents.cs +++ b/src/1-BuildingBlocks/Contracts/Events/IdentityIntegrationEvents.cs @@ -1,7 +1,4 @@ - -using TaskoMask.BuildingBlocks.Contracts.Models; - -namespace TaskoMask.BuildingBlocks.Contracts.Events +namespace TaskoMask.BuildingBlocks.Contracts.Events { public record UserRegistered(string Email) : IntegrationEvent; public record UserUpdated(string Email) : IntegrationEvent; diff --git a/src/1-BuildingBlocks/Contracts/Events/OwnerIntegrationEvents.cs b/src/1-BuildingBlocks/Contracts/Events/OwnerIntegrationEvents.cs index 5b66b0476..7b04c9d13 100644 --- a/src/1-BuildingBlocks/Contracts/Events/OwnerIntegrationEvents.cs +++ b/src/1-BuildingBlocks/Contracts/Events/OwnerIntegrationEvents.cs @@ -1,6 +1,4 @@ -using TaskoMask.BuildingBlocks.Contracts.Models; - -namespace TaskoMask.BuildingBlocks.Contracts.Events +namespace TaskoMask.BuildingBlocks.Contracts.Events { public record OwnerRegistered(string Id, string Email, string Password) : IntegrationEvent; public record OwnerRegisterationCompleted(string Id, string Email, string DisplayName) : IntegrationEvent; diff --git a/src/1-BuildingBlocks/Contracts/Events/TaskIntegrationEvents.cs b/src/1-BuildingBlocks/Contracts/Events/TaskIntegrationEvents.cs index 1ed35c935..b1c9938e7 100644 --- a/src/1-BuildingBlocks/Contracts/Events/TaskIntegrationEvents.cs +++ b/src/1-BuildingBlocks/Contracts/Events/TaskIntegrationEvents.cs @@ -1,6 +1,4 @@ -using TaskoMask.BuildingBlocks.Contracts.Models; - -namespace TaskoMask.BuildingBlocks.Contracts.Events +namespace TaskoMask.BuildingBlocks.Contracts.Events { public record TaskAdded(string Id, string Title, string Description, string CardId, string BoardId) : IntegrationEvent; public record TaskDeleted(string Id) : IntegrationEvent; diff --git a/src/1-BuildingBlocks/Contracts/Extensions/DataAnnotationExtension.cs b/src/1-BuildingBlocks/Contracts/Extensions/DataAnnotationExtension.cs index 6cc5e733f..252f96f42 100644 --- a/src/1-BuildingBlocks/Contracts/Extensions/DataAnnotationExtension.cs +++ b/src/1-BuildingBlocks/Contracts/Extensions/DataAnnotationExtension.cs @@ -22,18 +22,5 @@ public static bool Validate(this TObject obj, out ICollection - /// - /// - public static object GetDisplayName(this TObject obj) where TObject : class - { - return typeof(TObject).CustomAttributes.Any() ? - typeof(TObject).CustomAttributes.First().ConstructorArguments.First().Value : - nameof(TObject); - } - - } } \ No newline at end of file diff --git a/src/1-BuildingBlocks/Contracts/Extensions/UtilityExtensions.cs b/src/1-BuildingBlocks/Contracts/Extensions/UtilityExtensions.cs deleted file mode 100644 index 9a3c84bc4..000000000 --- a/src/1-BuildingBlocks/Contracts/Extensions/UtilityExtensions.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Reflection; - -namespace TaskoMask.BuildingBlocks.Contracts.Extensions -{ - - /// - /// - /// - public static class UtilityExtensions - { - /// - /// - /// - public static string ToLowerFirst(this string str) - { - return str.Substring(0, 1).ToLower() + str.Substring(1); - } - - - - /// - /// - /// - public static string GetEnumDisplayName(this Enum enumValue) - { - return enumValue.GetType() - .GetMember(enumValue.ToString()) - .First() - .GetCustomAttribute() - .GetName(); - } - - - } -} diff --git a/src/1-BuildingBlocks/Contracts/Helpers/EncryptionHelper.cs b/src/1-BuildingBlocks/Contracts/Helpers/EncryptionHelper.cs deleted file mode 100644 index 8a2b318b3..000000000 --- a/src/1-BuildingBlocks/Contracts/Helpers/EncryptionHelper.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.IO; -using System.Security.Cryptography; -using System.Text; - -namespace TaskoMask.BuildingBlocks.Contracts.Helpers -{ - public static class EncryptionHelper - { - #region Public Methods - - /// - /// Create a password hash by SHA256 - /// - public static string CreateSaltKey(int size) - { - var rng = RandomNumberGenerator.Create(); - var buff = new byte[size]; - rng.GetBytes(buff); - return Convert.ToBase64String(buff); - } - - - - /// - /// - /// - public static string CreatePasswordHash(string password, string saltkey) - { - var saltAndPassword = string.Concat(password, saltkey); - HashAlgorithm algorithm = SHA256.Create(); - - var hashByteArray = algorithm.ComputeHash(Encoding.UTF8.GetBytes(saltAndPassword)); - return BitConverter.ToString(hashByteArray).Replace("-", ""); - } - - - - /// - /// - /// - public static string EncryptText(string plainText, string privateKey) - { - if (string.IsNullOrEmpty(plainText)) - return plainText; - - if (string.IsNullOrEmpty(privateKey) || privateKey.Length != 24) - throw new Exception("Wrong private key"); - - var tDES = TripleDES.Create(); - - tDES.Key = new ASCIIEncoding().GetBytes(privateKey.Substring(0, 24)); - tDES.IV = new ASCIIEncoding().GetBytes(privateKey.Substring(16, 8)); - - byte[] encryptedBinary = EncryptTextToMemory(plainText, tDES.Key, tDES.IV); - return Convert.ToBase64String(encryptedBinary); - } - - - - /// - /// - /// - public static string DecryptText(string cipherText, string encryptionPrivateKey) - { - if (string.IsNullOrEmpty(cipherText)) - return cipherText; - - if (string.IsNullOrEmpty(encryptionPrivateKey) || encryptionPrivateKey.Length != 24) - throw new Exception("Wrong encryp private key"); - - var tDES = TripleDES.Create(); - tDES.Key = new ASCIIEncoding().GetBytes(encryptionPrivateKey.Substring(0, 24)); - tDES.IV = new ASCIIEncoding().GetBytes(encryptionPrivateKey.Substring(16, 8)); - - byte[] buffer = Convert.FromBase64String(cipherText); - return DecryptTextFromMemory(buffer, tDES.Key, tDES.IV); - } - - #endregion - - #region Private Methods - - - - /// - /// - /// - private static byte[] EncryptTextToMemory(string data, byte[] key, byte[] iv) - { - using (var ms = new MemoryStream()) - { - using (var cs = new CryptoStream(ms, TripleDES.Create().CreateEncryptor(key, iv), CryptoStreamMode.Write)) - { - byte[] toEncrypt = new UnicodeEncoding().GetBytes(data); - cs.Write(toEncrypt, 0, toEncrypt.Length); - cs.FlushFinalBlock(); - } - - return ms.ToArray(); - } - } - - - - /// - /// - /// - private static string DecryptTextFromMemory(byte[] data, byte[] key, byte[] iv) - { - using (var ms = new MemoryStream(data)) - { - using (var cs = new CryptoStream(ms, TripleDES.Create().CreateDecryptor(key, iv), CryptoStreamMode.Read)) - { - var sr = new StreamReader(cs, new UnicodeEncoding()); - return sr.ReadLine(); - } - } - } - - - #endregion - } -} diff --git a/src/1-BuildingBlocks/Contracts/Models/IIntegrationEvent.cs b/src/1-BuildingBlocks/Contracts/Models/IIntegrationEvent.cs deleted file mode 100644 index b350ae01c..000000000 --- a/src/1-BuildingBlocks/Contracts/Models/IIntegrationEvent.cs +++ /dev/null @@ -1,7 +0,0 @@ - -namespace TaskoMask.BuildingBlocks.Contracts.Models -{ - public interface IntegrationEvent - { - } -} diff --git a/src/1-BuildingBlocks/Contracts/Models/PaginatedList.cs b/src/1-BuildingBlocks/Contracts/Models/PaginatedList.cs deleted file mode 100644 index 4df35306c..000000000 --- a/src/1-BuildingBlocks/Contracts/Models/PaginatedList.cs +++ /dev/null @@ -1,17 +0,0 @@ - -using System.Collections.Generic; - -namespace TaskoMask.BuildingBlocks.Contracts.Models -{ - public class PaginatedList - { - public PaginatedList() - { - - } - - public int PageNumber { get; set; } - public int TotalCount { get; set; } - public IEnumerable Items { get; set; } - } -} diff --git a/src/1-BuildingBlocks/Domain/Data/IBaseAggregateRepository.cs b/src/1-BuildingBlocks/Domain/Data/IBaseAggregateRepository.cs index c9473a2e0..014689750 100644 --- a/src/1-BuildingBlocks/Domain/Data/IBaseAggregateRepository.cs +++ b/src/1-BuildingBlocks/Domain/Data/IBaseAggregateRepository.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.BuildingBlocks.Domain.Data { diff --git a/src/1-BuildingBlocks/Domain/Data/IBaseRepository.cs b/src/1-BuildingBlocks/Domain/Data/IBaseRepository.cs index 6c6b1c8a1..27fa49e14 100644 --- a/src/1-BuildingBlocks/Domain/Data/IBaseRepository.cs +++ b/src/1-BuildingBlocks/Domain/Data/IBaseRepository.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.BuildingBlocks.Domain.Data { diff --git a/src/1-BuildingBlocks/Domain/Models/AggregateRoot.cs b/src/1-BuildingBlocks/Domain/Entities/AggregateRoot.cs similarity index 93% rename from src/1-BuildingBlocks/Domain/Models/AggregateRoot.cs rename to src/1-BuildingBlocks/Domain/Entities/AggregateRoot.cs index 2ed450f73..c9e227e47 100644 --- a/src/1-BuildingBlocks/Domain/Models/AggregateRoot.cs +++ b/src/1-BuildingBlocks/Domain/Entities/AggregateRoot.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; +using TaskoMask.BuildingBlocks.Domain.Events; -namespace TaskoMask.BuildingBlocks.Domain.Models +namespace TaskoMask.BuildingBlocks.Domain.Entities { /// @@ -68,7 +69,7 @@ protected void AddDomainEvent(DomainEvent domainEvent) UpdateAggregate(); domainEvents ??= new List(); - this.domainEvents.Add(domainEvent); + domainEvents.Add(domainEvent); } diff --git a/src/1-BuildingBlocks/Domain/Models/BaseEntity.cs b/src/1-BuildingBlocks/Domain/Entities/BaseEntity.cs similarity index 79% rename from src/1-BuildingBlocks/Domain/Models/BaseEntity.cs rename to src/1-BuildingBlocks/Domain/Entities/BaseEntity.cs index c7f3b91fc..13eb3989b 100644 --- a/src/1-BuildingBlocks/Domain/Models/BaseEntity.cs +++ b/src/1-BuildingBlocks/Domain/Entities/BaseEntity.cs @@ -1,19 +1,17 @@ using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.BuildingBlocks.Domain.Models +namespace TaskoMask.BuildingBlocks.Domain.Entities { - //To be updated - /// /// /// - public abstract class BaseEntity: Entity + public abstract class BaseEntity : Entity { #region Ctors public BaseEntity() { - CreationTime = CreationTime.Create(); + CreationTime = CreationTime.CreateNowDateTime(); } diff --git a/src/1-BuildingBlocks/Domain/Models/Entity.cs b/src/1-BuildingBlocks/Domain/Entities/Entity.cs similarity index 85% rename from src/1-BuildingBlocks/Domain/Models/Entity.cs rename to src/1-BuildingBlocks/Domain/Entities/Entity.cs index e09c93ed2..8623dd471 100644 --- a/src/1-BuildingBlocks/Domain/Models/Entity.cs +++ b/src/1-BuildingBlocks/Domain/Entities/Entity.cs @@ -1,4 +1,4 @@ -namespace TaskoMask.BuildingBlocks.Domain.Models +namespace TaskoMask.BuildingBlocks.Domain.Entities { /// /// diff --git a/src/1-BuildingBlocks/Domain/Models/DomainEvent.cs b/src/1-BuildingBlocks/Domain/Events/DomainEvent.cs similarity index 63% rename from src/1-BuildingBlocks/Domain/Models/DomainEvent.cs rename to src/1-BuildingBlocks/Domain/Events/DomainEvent.cs index 33f6181ff..3dc97c7a6 100644 --- a/src/1-BuildingBlocks/Domain/Models/DomainEvent.cs +++ b/src/1-BuildingBlocks/Domain/Events/DomainEvent.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using System; -namespace TaskoMask.BuildingBlocks.Domain.Models +namespace TaskoMask.BuildingBlocks.Domain.Events { /// @@ -19,19 +19,19 @@ public DomainEvent(string entityId, string entityType) } /// - /// Use JsonIgnore to prevent adding it to Data prop in StoredEvent because it will map to EntityId prop in StoredEvent + /// Use JsonIgnore to prevent adding it to Data in StoredEvent. As it will be mapped to StoredEvent.EntityId and no need to have it in StoredEvent.Data /// [JsonIgnore] public string EntityId { get; } /// - /// Use JsonIgnore to prevent adding it to Data prop in StoredEvent because it will map to EntityType prop in StoredEvent + /// Use JsonIgnore to prevent adding it to Data in StoredEvent. /// [JsonIgnore] public string EntityType { get; } /// - /// Use JsonIgnore to prevent adding it to Data prop in StoredEvent because it will map to EventType prop in StoredEvent + /// Use JsonIgnore to prevent adding it to Data in StoredEvent. /// [JsonIgnore] public string EventType { get; } diff --git a/src/1-BuildingBlocks/Domain/Services/IEventStoreService.cs b/src/1-BuildingBlocks/Domain/Events/IEventStoreService.cs similarity index 87% rename from src/1-BuildingBlocks/Domain/Services/IEventStoreService.cs rename to src/1-BuildingBlocks/Domain/Events/IEventStoreService.cs index 68b822878..ba6af0def 100644 --- a/src/1-BuildingBlocks/Domain/Services/IEventStoreService.cs +++ b/src/1-BuildingBlocks/Domain/Events/IEventStoreService.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -using TaskoMask.BuildingBlocks.Domain.Models; -namespace TaskoMask.BuildingBlocks.Domain.Services +namespace TaskoMask.BuildingBlocks.Domain.Events { /// /// diff --git a/src/1-BuildingBlocks/Domain/Models/StoredEvent.cs b/src/1-BuildingBlocks/Domain/Events/StoredEvent.cs similarity index 93% rename from src/1-BuildingBlocks/Domain/Models/StoredEvent.cs rename to src/1-BuildingBlocks/Domain/Events/StoredEvent.cs index c0433cb99..c829b8066 100644 --- a/src/1-BuildingBlocks/Domain/Models/StoredEvent.cs +++ b/src/1-BuildingBlocks/Domain/Events/StoredEvent.cs @@ -1,6 +1,6 @@ using System; -namespace TaskoMask.BuildingBlocks.Domain.Models +namespace TaskoMask.BuildingBlocks.Domain.Events { /// /// diff --git a/src/1-BuildingBlocks/Domain/Models/BaseValueObject.cs b/src/1-BuildingBlocks/Domain/ValueObjects/BaseValueObject.cs similarity index 96% rename from src/1-BuildingBlocks/Domain/Models/BaseValueObject.cs rename to src/1-BuildingBlocks/Domain/ValueObjects/BaseValueObject.cs index c7c9ffe5c..3b3ea8afe 100644 --- a/src/1-BuildingBlocks/Domain/Models/BaseValueObject.cs +++ b/src/1-BuildingBlocks/Domain/ValueObjects/BaseValueObject.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace TaskoMask.BuildingBlocks.Domain.Models +namespace TaskoMask.BuildingBlocks.Domain.ValueObjects { /// diff --git a/src/1-BuildingBlocks/Domain/ValueObjects/CreationTime.cs b/src/1-BuildingBlocks/Domain/ValueObjects/CreationTime.cs index af8f82a4a..df36950ba 100644 --- a/src/1-BuildingBlocks/Domain/ValueObjects/CreationTime.cs +++ b/src/1-BuildingBlocks/Domain/ValueObjects/CreationTime.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using TaskoMask.BuildingBlocks.Domain.Models; namespace TaskoMask.BuildingBlocks.Domain.ValueObjects { @@ -21,9 +20,9 @@ public class CreationTime : BaseValueObject #region Ctors - private CreationTime() + private CreationTime(DateTime dateTime) { - CreateDateTime = DateTime.Now; + CreateDateTime = dateTime; ModifiedDateTime = CreateDateTime; CreateDay = CreateDateTime.Day; CreateMonth = CreateDateTime.Month; @@ -39,29 +38,21 @@ private CreationTime() /// - /// Factory method for creating new object + /// /// - public static CreationTime Create() + public static CreationTime CreateNowDateTime() { - return new CreationTime(); + return new CreationTime(DateTime.Now); } /// - /// Value objects are immutable. - /// Changing it creates a new object + /// /// public CreationTime UpdateModifiedDateTime() { - return new CreationTime - { - ModifiedDateTime = DateTime.Now, - CreateDateTime = this.CreateDateTime, - CreateDay = this.CreateDateTime.Day, - CreateMonth = this.CreateDateTime.Month, - CreateYear = this.CreateDateTime.Year, - }; + return new CreationTime(DateTime.Now); } diff --git a/src/1-BuildingBlocks/Infrastructure/Bus/BusExtensions.cs b/src/1-BuildingBlocks/Infrastructure/Bus/BusExtensions.cs index ba55dcf8c..da19ef5a8 100644 --- a/src/1-BuildingBlocks/Infrastructure/Bus/BusExtensions.cs +++ b/src/1-BuildingBlocks/Infrastructure/Bus/BusExtensions.cs @@ -16,7 +16,7 @@ public static class BusExtensions /// public static void AddInMemoryBus(this IServiceCollection services, Type handlerAssemblyMarkerType) { - //Load all handlers in given assemblies + //Load all handlers from given assemblies services.AddMediatR(handlerAssemblyMarkerType); services.AddScoped(); diff --git a/src/1-BuildingBlocks/Infrastructure/Bus/InMemoryBus.cs b/src/1-BuildingBlocks/Infrastructure/Bus/InMemoryBus.cs index 627c73ce0..fa008b848 100644 --- a/src/1-BuildingBlocks/Infrastructure/Bus/InMemoryBus.cs +++ b/src/1-BuildingBlocks/Infrastructure/Bus/InMemoryBus.cs @@ -5,7 +5,7 @@ using TaskoMask.BuildingBlocks.Application.Notifications; using TaskoMask.BuildingBlocks.Application.Queries; using TaskoMask.BuildingBlocks.Contracts.Helpers; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; namespace TaskoMask.BuildingBlocks.Infrastructure.Bus { diff --git a/src/1-BuildingBlocks/Infrastructure/Bus/MessageBus.cs b/src/1-BuildingBlocks/Infrastructure/Bus/MessageBus.cs index 679110939..6531dcaa5 100644 --- a/src/1-BuildingBlocks/Infrastructure/Bus/MessageBus.cs +++ b/src/1-BuildingBlocks/Infrastructure/Bus/MessageBus.cs @@ -1,7 +1,7 @@ using MassTransit; using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Application.Bus; -using TaskoMask.BuildingBlocks.Contracts.Models; +using TaskoMask.BuildingBlocks.Contracts.Events; namespace TaskoMask.BuildingBlocks.Infrastructure.Bus { diff --git a/src/1-BuildingBlocks/Infrastructure/EventSourcing/EventStoreExtensions.cs b/src/1-BuildingBlocks/Infrastructure/EventSourcing/EventStoreExtensions.cs index 84323ae65..7a671efd1 100644 --- a/src/1-BuildingBlocks/Infrastructure/EventSourcing/EventStoreExtensions.cs +++ b/src/1-BuildingBlocks/Infrastructure/EventSourcing/EventStoreExtensions.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.DependencyInjection; -using TaskoMask.BuildingBlocks.Domain.Services; +using TaskoMask.BuildingBlocks.Domain.Events; namespace TaskoMask.BuildingBlocks.Infrastructure.EventSourcing { diff --git a/src/1-BuildingBlocks/Infrastructure/EventSourcing/RedisEventStoreService.cs b/src/1-BuildingBlocks/Infrastructure/EventSourcing/RedisEventStoreService.cs index bea73c791..99f3fb879 100644 --- a/src/1-BuildingBlocks/Infrastructure/EventSourcing/RedisEventStoreService.cs +++ b/src/1-BuildingBlocks/Infrastructure/EventSourcing/RedisEventStoreService.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Contracts.Services; -using TaskoMask.BuildingBlocks.Domain.Models; -using TaskoMask.BuildingBlocks.Domain.Services; +using TaskoMask.BuildingBlocks.Domain.Events; namespace TaskoMask.BuildingBlocks.Infrastructure.EventSourcing { diff --git a/src/1-BuildingBlocks/Infrastructure/MongoDB/MongoDbBaseAggregateRepository.cs b/src/1-BuildingBlocks/Infrastructure/MongoDB/MongoDbBaseAggregateRepository.cs index b5fa740fe..a42139e35 100644 --- a/src/1-BuildingBlocks/Infrastructure/MongoDB/MongoDbBaseAggregateRepository.cs +++ b/src/1-BuildingBlocks/Infrastructure/MongoDB/MongoDbBaseAggregateRepository.cs @@ -2,8 +2,8 @@ using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Domain.Data; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.BuildingBlocks.Infrastructure.MongoDB { diff --git a/src/1-BuildingBlocks/Infrastructure/MongoDB/MongoDbBaseRepository.cs b/src/1-BuildingBlocks/Infrastructure/MongoDB/MongoDbBaseRepository.cs index d0634a2c7..a96d91e56 100644 --- a/src/1-BuildingBlocks/Infrastructure/MongoDB/MongoDbBaseRepository.cs +++ b/src/1-BuildingBlocks/Infrastructure/MongoDB/MongoDbBaseRepository.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Domain.Data; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.BuildingBlocks.Infrastructure.MongoDB { diff --git a/src/1-BuildingBlocks/Web.MVC/Configuration/MVC/MvcConfiguration.cs b/src/1-BuildingBlocks/Web.MVC/Configuration/MVC/MvcConfiguration.cs index 2faa2065e..2cc302cf7 100644 --- a/src/1-BuildingBlocks/Web.MVC/Configuration/MVC/MvcConfiguration.cs +++ b/src/1-BuildingBlocks/Web.MVC/Configuration/MVC/MvcConfiguration.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using TaskoMask.BuildingBlocks.Web.MVC.Services.AuthenticatedUser; -using TaskoMask.BuildingBlocks.Web.MVC.Services.Cookie; namespace TaskoMask.BuildingBlocks.Web.MVC.Configuration { @@ -28,8 +27,6 @@ public static void AddMvcPreConfigured(this IServiceCollection services) services.AddAuthenticatedUserService(); - services.AddCookieService(); - services.AddWebServerOptions(); } diff --git a/src/1-BuildingBlocks/Web.MVC/Configuration/MVC/WebApiConfiguration.cs b/src/1-BuildingBlocks/Web.MVC/Configuration/MVC/WebApiConfiguration.cs index 52d3e7117..e35627f3c 100644 --- a/src/1-BuildingBlocks/Web.MVC/Configuration/MVC/WebApiConfiguration.cs +++ b/src/1-BuildingBlocks/Web.MVC/Configuration/MVC/WebApiConfiguration.cs @@ -7,7 +7,6 @@ using TaskoMask.BuildingBlocks.Web.MVC.Configuration.Jwt; using TaskoMask.BuildingBlocks.Web.MVC.Configuration.Swagger; using TaskoMask.BuildingBlocks.Web.MVC.Services.AuthenticatedUser; -using TaskoMask.BuildingBlocks.Web.MVC.Services.Cookie; namespace TaskoMask.BuildingBlocks.Web.MVC.Configuration { @@ -37,8 +36,6 @@ public static void AddWebApiPreConfigured(this IServiceCollection services, ICon services.AddAuthenticatedUserService(); - services.AddCookieService(); - services.AddWebServerOptions(); services.AddJwtAuthentication(configuration); diff --git a/src/1-BuildingBlocks/Web.MVC/Extensions/MvcExtensions.cs b/src/1-BuildingBlocks/Web.MVC/Extensions/MvcExtensions.cs deleted file mode 100644 index ba8001c85..000000000 --- a/src/1-BuildingBlocks/Web.MVC/Extensions/MvcExtensions.cs +++ /dev/null @@ -1,61 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.Rendering; - -namespace TaskoMask.BuildingBlocks.Web.MVC.Extensions -{ - public static class MvcExtensions - { - - - /// - /// - /// - public static IEnumerable ToMvcSelectList(this Contracts.Models.SelectListItem[] selectListItem) - { - var mvcSelectListItem = new List(); - foreach (var item in selectListItem) - { - mvcSelectListItem.Add(new SelectListItem - { - Selected=item.Selected, - Text=item.Text, - Value=item.Value - }); - } - - return mvcSelectListItem; - } - - - - - - /// - /// - /// - public static string GetErrors(this ModelStateDictionary modelState) - { - var getError = string.Empty; - foreach (var value in modelState.Values) - { - foreach (var error in value.Errors) - { - getError += error.ErrorMessage + "
"; - } - } - return getError; - } - - - - /// - /// Determines whether the HttpRequest's X-Requested-With header has XMLHttpRequest value. - /// - public static bool IsAjaxRequest(this HttpRequest request) - { - return request?.Headers != null && request.Headers["X-Requested-With"] == "XMLHttpRequest"; - } - - } -} diff --git a/src/1-BuildingBlocks/Web.MVC/Services/Cookie/CookieExtensions.cs b/src/1-BuildingBlocks/Web.MVC/Services/Cookie/CookieExtensions.cs deleted file mode 100644 index 63b8e197c..000000000 --- a/src/1-BuildingBlocks/Web.MVC/Services/Cookie/CookieExtensions.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; - -namespace TaskoMask.BuildingBlocks.Web.MVC.Services.Cookie -{ - public static class CookieExtensions - { - - /// - /// - /// - public static IServiceCollection AddCookieService(this IServiceCollection services) - { - return services.AddScoped(); - } - } -} diff --git a/src/1-BuildingBlocks/Web.MVC/Services/Cookie/CookieService.cs b/src/1-BuildingBlocks/Web.MVC/Services/Cookie/CookieService.cs deleted file mode 100644 index 1a3f8fa3b..000000000 --- a/src/1-BuildingBlocks/Web.MVC/Services/Cookie/CookieService.cs +++ /dev/null @@ -1,56 +0,0 @@ - -using Microsoft.AspNetCore.Http; - -namespace TaskoMask.BuildingBlocks.Web.MVC.Services.Cookie -{ - public class CookieService : ICookieService - { - private readonly IHttpContextAccessor _httpContextAccessor; - - - - /// - /// - /// - public CookieService(IHttpContextAccessor httpContextAccessor) - { - _httpContextAccessor = httpContextAccessor; - } - - - - /// - /// - /// - public string Get(string key) - { - return _httpContextAccessor.HttpContext.Request.Cookies[key]; - } - - - - /// - /// - /// - public void Set(string key, string value) - { - CookieOptions option = new CookieOptions - { - HttpOnly=true, - }; - - _httpContextAccessor.HttpContext.Response.Cookies.Append(key, value, option); - - } - - - - /// - /// - /// - public void Remove(string key) - { - _httpContextAccessor.HttpContext.Response.Cookies.Delete(key); - } - } -} diff --git a/src/1-BuildingBlocks/Web.MVC/Services/Cookie/ICookieService.cs b/src/1-BuildingBlocks/Web.MVC/Services/Cookie/ICookieService.cs deleted file mode 100644 index 412f5657c..000000000 --- a/src/1-BuildingBlocks/Web.MVC/Services/Cookie/ICookieService.cs +++ /dev/null @@ -1,10 +0,0 @@ - -namespace TaskoMask.BuildingBlocks.Web.MVC.Services.Cookie -{ - public interface ICookieService - { - string Get(string key); - void Set(string key, string value); - void Remove(string key); - } -} diff --git a/src/1-BuildingBlocks/Web.MVC/Web.MVC.csproj b/src/1-BuildingBlocks/Web.MVC/Web.MVC.csproj index 16fba8382..73888f0a1 100644 --- a/src/1-BuildingBlocks/Web.MVC/Web.MVC.csproj +++ b/src/1-BuildingBlocks/Web.MVC/Web.MVC.csproj @@ -7,6 +7,12 @@ TaskoMask.BuildingBlocks.Web.MVC + + + + + + @@ -22,8 +28,5 @@ - - - diff --git a/src/1-BuildingBlocks/Web/Extensions/ClaimExtensions.cs b/src/1-BuildingBlocks/Web/Extensions/ClaimExtensions.cs deleted file mode 100644 index ee0ad2ac7..000000000 --- a/src/1-BuildingBlocks/Web/Extensions/ClaimExtensions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Security.Claims; -using TaskoMask.BuildingBlocks.Contracts.Models; - -namespace TaskoMask.BuildingBlocks.Web.Extensions -{ - public static class ClaimExtensions - { - - public static void AddList(this List claims, AuthenticatedUserModel user) - { - claims.Add(new Claim(ClaimTypes.Name, user.UserName)); - claims.Add(new Claim(ClaimTypes.NameIdentifier, user.Id)); - claims.Add(new Claim(ClaimTypes.Email, user.Email)); - - //Add user prop by reflection. it helps when AuthenticatedUser changed - var properties = new List(user.GetType().GetProperties()); - foreach (PropertyInfo property in properties) - { - object propValue = property.GetValue(user, property.GetIndexParameters()); - string name = property.Name; - string value = propValue != null ? propValue.ToString() : ""; - claims.Add(new Claim(name, value)); - } - } - } -} diff --git a/src/1-BuildingBlocks/Web/Helpers/ClientUriBuilder.cs b/src/1-BuildingBlocks/Web/Helpers/ClientUriBuilder.cs deleted file mode 100644 index 7d7dc1e83..000000000 --- a/src/1-BuildingBlocks/Web/Helpers/ClientUriBuilder.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Collections.Specialized; -using System.Web; - -namespace TaskoMask.BuildingBlocks.Web.Helpers -{ - public class ClientUriBuilder - { - private readonly NameValueCollection _collection; - private readonly UriBuilder _builder; - - public ClientUriBuilder(Uri uri) - { - _builder = new UriBuilder(uri); - _collection = HttpUtility.ParseQueryString(string.Empty); - } - - public ClientUriBuilder AddParameter(string key, string value) - { - _collection.Add(key, value); - return this; - } - - public Uri Uri - { - get - { - _builder.Query = _collection.ToString(); - return _builder.Uri; - } - } - } -} diff --git a/src/1-BuildingBlocks/Web/Helpers/JwtParser.cs b/src/1-BuildingBlocks/Web/Helpers/JwtParser.cs deleted file mode 100644 index f594e33ac..000000000 --- a/src/1-BuildingBlocks/Web/Helpers/JwtParser.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Security.Claims; -using System.Text.Json; -using TaskoMask.BuildingBlocks.Contracts.Models; - -namespace TaskoMask.BuildingBlocks.Web.Helpers -{ - /// - /// From the Steve Sanderson’s Mission Control project: - /// https://github.com/SteveSandersonMS/presentation-2019-06-NDCOslo/blob/master/demos/MissionControl/MissionControl.Client/Util/ServiceExtensions.cs - /// - public static class JwtParser - { - - - public static AuthenticatedUserModel ParseAuthenticatedUserModelFromJwt(string jwt) - { - var payload = jwt.Split('.')[1]; - - var jsonBytes = ParseBase64WithoutPadding(payload); - - return JsonSerializer.Deserialize(jsonBytes); - } - - - - public static IEnumerable ParseClaimsFromJwt(string jwt) - { - var claims = new List(); - var payload = jwt.Split('.')[1]; - - var jsonBytes = ParseBase64WithoutPadding(payload); - - var keyValuePairs = JsonSerializer.Deserialize>(jsonBytes); - claims.AddRange(keyValuePairs.Select(kvp => new Claim(kvp.Key, kvp.Value.ToString()))); - return claims; - } - - private static byte[] ParseBase64WithoutPadding(string base64) - { - switch (base64.Length % 4) - { - case 2: base64 += "=="; break; - case 3: base64 += "="; break; - } - return Convert.FromBase64String(base64); - } - } -} \ No newline at end of file diff --git a/src/2-Services/Boards/Api/Boards.Read.Api/Domain/Board.cs b/src/2-Services/Boards/Api/Boards.Read.Api/Domain/Board.cs index b31887177..f1117a338 100644 --- a/src/2-Services/Boards/Api/Boards.Read.Api/Domain/Board.cs +++ b/src/2-Services/Boards/Api/Boards.Read.Api/Domain/Board.cs @@ -1,6 +1,6 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.Services.Boards.Read.Api.Domain { diff --git a/src/2-Services/Boards/Api/Boards.Read.Api/Domain/Card.cs b/src/2-Services/Boards/Api/Boards.Read.Api/Domain/Card.cs index d52f20767..e1cd0be2d 100644 --- a/src/2-Services/Boards/Api/Boards.Read.Api/Domain/Card.cs +++ b/src/2-Services/Boards/Api/Boards.Read.Api/Domain/Card.cs @@ -1,7 +1,7 @@ using TaskoMask.BuildingBlocks.Contracts.Enums; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.Services.Boards.Read.Api.Domain { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Data/IBoardAggregateRepository.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Data/IBoardAggregateRepository.cs similarity index 72% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Data/IBoardAggregateRepository.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Data/IBoardAggregateRepository.cs index 8b3e30965..aa5e9dd5b 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Data/IBoardAggregateRepository.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Data/IBoardAggregateRepository.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Data +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data { public interface IBoardAggregateRepository : IBaseAggregateRepository { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Board.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Board.cs similarity index 91% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Board.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Board.cs index 8d49fa073..0b2f51699 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Board.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Board.cs @@ -1,19 +1,19 @@ -using TaskoMask.BuildingBlocks.Domain.Models; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards; using TaskoMask.BuildingBlocks.Contracts.Enums; -using TaskoMask.Services.Boards.Write.Api.Domain.Specifications; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications; using TaskoMask.BuildingBlocks.Contracts.Helpers; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; using TaskoMask.BuildingBlocks.Domain.Resources; using MongoDB.Bson; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards; +using TaskoMask.BuildingBlocks.Domain.Entities; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Entities +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities { public class Board: AggregateRoot { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Card.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Card.cs similarity index 89% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Card.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Card.cs index 89ddd0e87..7b4492f80 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Entities/Card.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Entities/Card.cs @@ -1,11 +1,11 @@ using TaskoMask.BuildingBlocks.Contracts.Enums; -using TaskoMask.BuildingBlocks.Domain.Models; -using TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Cards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Cards; using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Exceptions; using MongoDB.Bson; +using TaskoMask.BuildingBlocks.Domain.Entities; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Entities +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities { public class Card : BaseEntity { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardAddedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardAddedEvent.cs similarity index 82% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardAddedEvent.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardAddedEvent.cs index 9609af85b..cda8917ce 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardAddedEvent.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardAddedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards { public class BoardAddedEvent : DomainEvent { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardDeletedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardDeletedEvent.cs similarity index 70% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardDeletedEvent.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardDeletedEvent.cs index ce60a2897..bb313fba9 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardDeletedEvent.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardDeletedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards { public class BoardDeletedEvent : DomainEvent { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardUpdatedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardUpdatedEvent.cs similarity index 79% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardUpdatedEvent.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardUpdatedEvent.cs index cf77332d5..a2c4c2cb0 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Boards/BoardUpdatedEvent.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Boards/BoardUpdatedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards { public class BoardUpdatedEvent : DomainEvent { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardAddedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardAddedEvent.cs similarity index 83% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardAddedEvent.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardAddedEvent.cs index c59c31187..22a56ce41 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardAddedEvent.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardAddedEvent.cs @@ -1,8 +1,8 @@ using TaskoMask.BuildingBlocks.Contracts.Enums; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards { public class CardAddedEvent : DomainEvent { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardDeletedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardDeletedEvent.cs similarity index 70% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardDeletedEvent.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardDeletedEvent.cs index 3bd8580e9..ca5d554fb 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardDeletedEvent.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardDeletedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards { public class CardDeletedEvent : DomainEvent { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardUpdatedEvent.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardUpdatedEvent.cs similarity index 80% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardUpdatedEvent.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardUpdatedEvent.cs index 49ea8bb32..4d756f6e6 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Events/Cards/CardUpdatedEvent.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Events/Cards/CardUpdatedEvent.cs @@ -1,8 +1,8 @@ using TaskoMask.BuildingBlocks.Contracts.Enums; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards { public class CardUpdatedEvent : DomainEvent { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Services/IBoardValidatorService.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Services/IBoardValidatorService.cs similarity index 81% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Services/IBoardValidatorService.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Services/IBoardValidatorService.cs index 3cec220f0..f9df2441b 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Services/IBoardValidatorService.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Services/IBoardValidatorService.cs @@ -1,5 +1,5 @@  -namespace TaskoMask.Services.Boards.Write.Api.Domain.Services +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services { /// /// diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardMaxCardsSpecification.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardMaxCardsSpecification.cs similarity index 74% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardMaxCardsSpecification.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardMaxCardsSpecification.cs index a84d94639..4bdba84e5 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardMaxCardsSpecification.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardMaxCardsSpecification.cs @@ -1,9 +1,9 @@ using System.Linq; using TaskoMask.BuildingBlocks.Domain.Specifications; using TaskoMask.BuildingBlocks.Contracts.Helpers; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications { internal class BoardMaxCardsSpecification : ISpecification { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs similarity index 72% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs index a90a1efd4..bb3f99921 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameAndDescriptionCannotSameSpecification.cs @@ -1,7 +1,7 @@ using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications { internal class BoardNameAndDescriptionCannotSameSpecification : ISpecification { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameMustUniqueSpecification.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameMustUniqueSpecification.cs similarity index 75% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameMustUniqueSpecification.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameMustUniqueSpecification.cs index e2cfcaa3b..ad43aecee 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/BoardNameMustUniqueSpecification.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/BoardNameMustUniqueSpecification.cs @@ -1,8 +1,8 @@ using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications { internal class BoardNameMustUniqueSpecification : ISpecification { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/CardNameMustUniqueSpecification.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/CardNameMustUniqueSpecification.cs similarity index 80% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/CardNameMustUniqueSpecification.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/CardNameMustUniqueSpecification.cs index c08702a9c..6f5d3eb1e 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Specifications/CardNameMustUniqueSpecification.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/Specifications/CardNameMustUniqueSpecification.cs @@ -1,8 +1,8 @@ using System.Linq; using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; -namespace TaskoMask.Services.Boards.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.Specifications { internal class CardNameMustUniqueSpecification : ISpecification diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardDescription.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardDescription.cs similarity index 91% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardDescription.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardDescription.cs index bd7b24478..6bab3193b 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardDescription.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardDescription.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards { public class BoardDescription : BaseValueObject { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardName.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardName.cs similarity index 93% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardName.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardName.cs index 7b5f6a2e3..b0cac1bca 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardName.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardName.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards { public class BoardName : BaseValueObject { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardProjectId.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardProjectId.cs similarity index 90% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardProjectId.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardProjectId.cs index bba7fad5e..4e859e0c5 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Boards/BoardProjectId.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Boards/BoardProjectId.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards { public class BoardProjectId : BaseValueObject { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardName.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardName.cs similarity index 93% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardName.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardName.cs index 0ef7749e5..e36b9650c 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardName.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardName.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Cards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Cards { public class CardName : BaseValueObject { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardType.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardType.cs similarity index 89% rename from src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardType.cs rename to src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardType.cs index dcb5f7058..f1a171574 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Domain/ValueObjects/Cards/CardType.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Domain/Boards/ValueObjects/Cards/CardType.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Enums; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Cards +namespace TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Cards { public class CardType : BaseValueObject { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs index ed41b049e..4324eb2b8 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs @@ -3,8 +3,8 @@ using TaskoMask.BuildingBlocks.Infrastructure.Extensions; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; using TaskoMask.Services.Boards.Write.Api.Resources; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext; using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Repositories; using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Services; diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/BoardWriteDbContext.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/BoardWriteDbContext.cs index 8878aab42..69e79eac0 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/BoardWriteDbContext.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/BoardWriteDbContext.cs @@ -1,7 +1,7 @@ using MongoDB.Driver; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; using Microsoft.Extensions.Options; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs index b141c4d15..79c1bf29a 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; using System; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Repositories/BoardAggregateRepository.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Repositories/BoardAggregateRepository.cs index d5a4ec458..9eadb4078 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Repositories/BoardAggregateRepository.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Repositories/BoardAggregateRepository.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext; namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Repositories diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Services/BoardValidatorService.cs b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Services/BoardValidatorService.cs index 9d4ded2b1..24c841e47 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Services/BoardValidatorService.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/Infrastructure/Data/Services/BoardValidatorService.cs @@ -1,6 +1,6 @@  -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; namespace TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.Services { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/AddBoard/AddBoardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/AddBoard/AddBoardUseCase.cs index 69362698c..adf28995f 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/AddBoard/AddBoardUseCase.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/AddBoard/AddBoardUseCase.cs @@ -9,11 +9,11 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.BuildingBlocks.Domain.Events; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; namespace TaskoMask.Services.Boards.Write.Api.UseCases.Boards.AddBoard { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/DeleteBoard/DeleteBoardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/DeleteBoard/DeleteBoardUseCase.cs index 4c1789c23..8b560382d 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/DeleteBoard/DeleteBoardUseCase.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/DeleteBoard/DeleteBoardUseCase.cs @@ -9,10 +9,10 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards; namespace TaskoMask.Services.Boards.Write.Api.UseCases.Boards.DeleteBoard { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/UpdateBoard/UpdateBoardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/UpdateBoard/UpdateBoardUseCase.cs index d792c9eb1..d55ea6bba 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/UpdateBoard/UpdateBoardUseCase.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Boards/UpdateBoard/UpdateBoardUseCase.cs @@ -9,11 +9,11 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; namespace TaskoMask.Services.Boards.Write.Api.UseCases.Boards.UpdateBoard { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/AddCard/AddCardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/AddCard/AddCardUseCase.cs index 7938636dc..a3646f0f7 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/AddCard/AddCardUseCase.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/AddCard/AddCardUseCase.cs @@ -10,11 +10,11 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards; namespace TaskoMask.Services.Boards.Write.Api.UseCases.Cards.AddCard { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/DeleteCard/DeleteCardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/DeleteCard/DeleteCardUseCase.cs index 49e63fcd1..ff0f54489 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/DeleteCard/DeleteCardUseCase.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/DeleteCard/DeleteCardUseCase.cs @@ -9,10 +9,10 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards; namespace TaskoMask.Services.Boards.Write.Api.UseCases.Cards.DeleteCard { diff --git a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/UpdateCard/UpdateCardUseCase.cs b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/UpdateCard/UpdateCardUseCase.cs index abe1b882a..d6073984d 100644 --- a/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/UpdateCard/UpdateCardUseCase.cs +++ b/src/2-Services/Boards/Api/Boards.Write.Api/UseCases/Cards/UpdateCard/UpdateCardUseCase.cs @@ -9,10 +9,10 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards; namespace TaskoMask.Services.Boards.Write.Api.UseCases.Cards.UpdateCard { diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardBuilder.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardBuilder.cs index 98c9b5c27..1439c902f 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardBuilder.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardBuilder.cs @@ -1,5 +1,5 @@ -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; namespace TaskoMask.Services.Boards.Write.Tests.Base.TestData { diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardObjectMother.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardObjectMother.cs index 73f8b65e1..4dab47e98 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardObjectMother.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Base/TestData/BoardObjectMother.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using TaskoMask.BuildingBlocks.Contracts.Enums; using TaskoMask.BuildingBlocks.Test.TestData; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; namespace TaskoMask.Services.Boards.Write.Tests.Base.TestData { diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs index 0e513fed2..132a8ca1b 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs @@ -3,9 +3,9 @@ using NSubstitute; using TaskoMask.BuildingBlocks.Application.Bus; using TaskoMask.BuildingBlocks.Test.TestBase; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; using TaskoMask.Services.Boards.Write.Api.Infrastructure.CrossCutting.DI; using TaskoMask.Services.Boards.Write.Api.Infrastructure.Data.DbContext; diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs index 4400e9a59..0c9e4b7bd 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs @@ -1,9 +1,9 @@ using NSubstitute; using TaskoMask.BuildingBlocks.Application.Bus; using TaskoMask.BuildingBlocks.Test.TestBase; -using TaskoMask.Services.Boards.Write.Api.Domain.Data; -using TaskoMask.Services.Boards.Write.Api.Domain.Entities; -using TaskoMask.Services.Boards.Write.Api.Domain.Services; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Data; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Entities; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Services; using TaskoMask.Services.Boards.Write.Tests.Base.TestData; namespace TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/AddBoardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/AddBoardTests.cs index ce6462d81..24a143694 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/AddBoardTests.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/AddBoardTests.cs @@ -7,8 +7,8 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Boards.Write.Api.UseCases.Boards.AddBoard; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards; -using TaskoMask.Services.Boards.Write.Api.Domain.ValueObjects.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.ValueObjects.Boards; using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/DeleteBoardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/DeleteBoardTests.cs index 40805c7b5..def1d06c6 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/DeleteBoardTests.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/DeleteBoardTests.cs @@ -5,7 +5,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Boards.Write.Api.UseCases.Boards.DeleteBoard; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards; using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/UpdateBoardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/UpdateBoardTests.cs index a2e5fb92c..f71929f01 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/UpdateBoardTests.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Boards/UpdateBoardTests.cs @@ -5,7 +5,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Boards.Write.Api.UseCases.Boards.UpdateBoard; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Boards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Boards; using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/AddCardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/AddCardTests.cs index 4d4b6ab7b..3e289fee3 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/AddCardTests.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/AddCardTests.cs @@ -6,7 +6,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Boards.Write.Api.UseCases.Cards.AddCard; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards; using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/DeleteCardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/DeleteCardTests.cs index 0ab24e92f..c86519141 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/DeleteCardTests.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/DeleteCardTests.cs @@ -7,7 +7,7 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Boards.Write.Api.UseCases.Cards.DeleteCard; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards; using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures; using TaskoMask.Services.Boards.Write.Tests.Base.TestData; using Xunit; diff --git a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/UpdateCardTests.cs b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/UpdateCardTests.cs index c095b0d9c..064065950 100644 --- a/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/UpdateCardTests.cs +++ b/src/2-Services/Boards/Tests/Boards.Write.Tests.Unit/UseCases/Cards/UpdateCardTests.cs @@ -6,7 +6,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Boards.Write.Api.UseCases.Cards.UpdateCard; -using TaskoMask.Services.Boards.Write.Api.Domain.Events.Cards; +using TaskoMask.Services.Boards.Write.Api.Domain.Boards.Events.Cards; using TaskoMask.Services.Boards.Write.Tests.Unit.Fixtures; using TaskoMask.Services.Boards.Write.Tests.Base.TestData; using Xunit; diff --git a/src/2-Services/Identity/Api/Identity.Api/Domain/Events/UserRegisteredEvent.cs b/src/2-Services/Identity/Api/Identity.Api/Domain/Events/UserRegisteredEvent.cs index 32a028e2a..84d218e2d 100644 --- a/src/2-Services/Identity/Api/Identity.Api/Domain/Events/UserRegisteredEvent.cs +++ b/src/2-Services/Identity/Api/Identity.Api/Domain/Events/UserRegisteredEvent.cs @@ -1,4 +1,4 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; namespace TaskoMask.Services.Identity.Domain.Events diff --git a/src/2-Services/Identity/Api/Identity.Api/Domain/Events/UserUpdatedEvent.cs b/src/2-Services/Identity/Api/Identity.Api/Domain/Events/UserUpdatedEvent.cs index f6242230e..5a3c70a3b 100644 --- a/src/2-Services/Identity/Api/Identity.Api/Domain/Events/UserUpdatedEvent.cs +++ b/src/2-Services/Identity/Api/Identity.Api/Domain/Events/UserUpdatedEvent.cs @@ -1,4 +1,4 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; namespace TaskoMask.Services.Identity.Domain.Events diff --git a/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Organization.cs b/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Organization.cs index cc3b040d7..0947459da 100644 --- a/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Organization.cs +++ b/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Organization.cs @@ -1,6 +1,6 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.Services.Owners.Read.Api.Domain { diff --git a/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Owner.cs b/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Owner.cs index 433d886f1..c7523bf32 100644 --- a/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Owner.cs +++ b/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Owner.cs @@ -1,7 +1,7 @@ using System; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.Services.Owners.Read.Api.Domain { diff --git a/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Project.cs b/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Project.cs index 4ff6aede5..aaaab43c6 100644 --- a/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Project.cs +++ b/src/2-Services/Owners/Api/Owners.Read.Api/Domain/Project.cs @@ -1,6 +1,6 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.Services.Owners.Read.Api.Domain { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/FaultOwnerRegisteredConsumer.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/FaultOwnerRegisteredConsumer.cs index ec7628279..faa7e2a36 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/FaultOwnerRegisteredConsumer.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/FaultOwnerRegisteredConsumer.cs @@ -2,7 +2,7 @@ using TaskoMask.BuildingBlocks.Web.MVC.Consumers; using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Application.Bus; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; using System.Threading.Tasks; namespace TaskoMask.Services.Owners.Write.Api.Consumers diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/UserRegisteredConsumer.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/UserRegisteredConsumer.cs index 47b87e967..cafd21062 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/UserRegisteredConsumer.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/UserRegisteredConsumer.cs @@ -2,7 +2,7 @@ using TaskoMask.BuildingBlocks.Application.Bus; using TaskoMask.BuildingBlocks.Web.MVC.Consumers; using TaskoMask.BuildingBlocks.Contracts.Events; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; using System.Threading.Tasks; namespace TaskoMask.Services.Owners.Write.Api.Consumers diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/UserUpdatedConsumer.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/UserUpdatedConsumer.cs index 01d426e76..7b1b4fe8b 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/UserUpdatedConsumer.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Consumers/UserUpdatedConsumer.cs @@ -2,7 +2,7 @@ using TaskoMask.BuildingBlocks.Application.Bus; using TaskoMask.BuildingBlocks.Web.MVC.Consumers; using TaskoMask.BuildingBlocks.Contracts.Events; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; using System.Threading.Tasks; namespace TaskoMask.Services.Owners.Write.Api.Consumers diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Data/IOwnerAggregateRepository.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Data/IOwnerAggregateRepository.cs similarity index 76% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Data/IOwnerAggregateRepository.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Data/IOwnerAggregateRepository.cs index d7dbfb565..32edf4ec4 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Data/IOwnerAggregateRepository.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Data/IOwnerAggregateRepository.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Data +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data { public interface IOwnerAggregateRepository : IBaseAggregateRepository { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Organization.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Organization.cs similarity index 92% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Organization.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Organization.cs index 5edc48d28..c676a1a28 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Organization.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Organization.cs @@ -1,14 +1,14 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Organizations; -using TaskoMask.Services.Owners.Write.Api.Domain.Specifications; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications; using TaskoMask.BuildingBlocks.Domain.Resources; using MongoDB.Bson; using System.Collections.Generic; using System.Linq; +using TaskoMask.BuildingBlocks.Domain.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Entities +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities { public class Organization : BaseEntity { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Owner.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Owner.cs similarity index 93% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Owner.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Owner.cs index a7b90ee76..f3426d10d 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Owner.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Owner.cs @@ -1,19 +1,19 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Owners; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects; -using TaskoMask.Services.Owners.Write.Api.Domain.Specifications; -using TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Owners; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Owners; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Owners; using TaskoMask.BuildingBlocks.Domain.Resources; using MongoDB.Bson; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; using System.Linq; using System.Collections.Generic; +using TaskoMask.BuildingBlocks.Domain.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Entities +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities { /// /// Owners are those who manage their tasks in this system diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Project.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Project.cs similarity index 87% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Project.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Project.cs index b8f3dd204..06793f0e6 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Entities/Project.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Entities/Project.cs @@ -1,12 +1,12 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Specifications; -using TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Projects; using TaskoMask.BuildingBlocks.Domain.Resources; using MongoDB.Bson; +using TaskoMask.BuildingBlocks.Domain.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Entities +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities { public class Project : BaseEntity { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationAddedEvent.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationAddedEvent.cs similarity index 81% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationAddedEvent.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationAddedEvent.cs index 186d9bb58..c39c2e757 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationAddedEvent.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationAddedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations { public class OrganizationAddedEvent : DomainEvent { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationDeletedEvent.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationDeletedEvent.cs similarity index 70% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationDeletedEvent.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationDeletedEvent.cs index b45d22dd2..5fc65709f 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationDeletedEvent.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationDeletedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations { public class OrganizationDeletedEvent : DomainEvent { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationUpdatedEvent.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationUpdatedEvent.cs similarity index 78% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationUpdatedEvent.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationUpdatedEvent.cs index a2d0ffb7c..bf709324f 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Organizations/OrganizationUpdatedEvent.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Organizations/OrganizationUpdatedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations { public class OrganizationUpdatedEvent : DomainEvent { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Owners/OwnerProfileUpdatedEvent.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Owners/OwnerProfileUpdatedEvent.cs similarity index 79% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Owners/OwnerProfileUpdatedEvent.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Owners/OwnerProfileUpdatedEvent.cs index dda67bf3a..d92fa869f 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Owners/OwnerProfileUpdatedEvent.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Owners/OwnerProfileUpdatedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Events.Owners +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Owners { public class OwnerProfileUpdatedEvent : DomainEvent { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Owners/OwnerRegisteredEvent.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Owners/OwnerRegisteredEvent.cs similarity index 79% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Owners/OwnerRegisteredEvent.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Owners/OwnerRegisteredEvent.cs index ef6d927e8..0fc5564db 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Owners/OwnerRegisteredEvent.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Owners/OwnerRegisteredEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Events.Owners +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Owners { public class OwnerRegisteredEvent : DomainEvent { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectAddedEvent.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectAddedEvent.cs similarity index 84% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectAddedEvent.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectAddedEvent.cs index f3fecf9b9..0fbddb6fa 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectAddedEvent.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectAddedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects { public class ProjectAddedEvent : DomainEvent { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectDeletedEvent.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectDeletedEvent.cs similarity index 70% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectDeletedEvent.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectDeletedEvent.cs index 698d05905..2decd3484 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectDeletedEvent.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectDeletedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects { public class ProjectDeletedEvent : DomainEvent { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectUpdatedEvent.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectUpdatedEvent.cs similarity index 79% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectUpdatedEvent.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectUpdatedEvent.cs index ffd9d139f..b57172327 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Events/Projects/ProjectUpdatedEvent.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Events/Projects/ProjectUpdatedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects { public class ProjectUpdatedEvent : DomainEvent { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Services/IOwnerValidatorService.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Services/IOwnerValidatorService.cs similarity index 80% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Services/IOwnerValidatorService.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Services/IOwnerValidatorService.cs index a360677d3..c61dc8ca1 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Services/IOwnerValidatorService.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Services/IOwnerValidatorService.cs @@ -1,5 +1,5 @@  -namespace TaskoMask.Services.Owners.Write.Api.Domain.Services +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services { /// /// diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationMaxProjectsSpecification.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationMaxProjectsSpecification.cs similarity index 80% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationMaxProjectsSpecification.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationMaxProjectsSpecification.cs index 3ede9e632..38c20fb21 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationMaxProjectsSpecification.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationMaxProjectsSpecification.cs @@ -1,9 +1,9 @@ using System.Linq; using TaskoMask.BuildingBlocks.Domain.Specifications; using TaskoMask.BuildingBlocks.Contracts.Helpers; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications { internal class OrganizationMaxProjectsSpecification : ISpecification { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationNameAndDescriptionCannotSameSpecification.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationNameAndDescriptionCannotSameSpecification.cs similarity index 74% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationNameAndDescriptionCannotSameSpecification.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationNameAndDescriptionCannotSameSpecification.cs index 7a94b16e1..a0296ef70 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationNameAndDescriptionCannotSameSpecification.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationNameAndDescriptionCannotSameSpecification.cs @@ -1,7 +1,7 @@ using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications { internal class OrganizationNameAndDescriptionCannotSameSpecification : ISpecification { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationNameMustUniqueSpecification.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationNameMustUniqueSpecification.cs similarity index 82% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationNameMustUniqueSpecification.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationNameMustUniqueSpecification.cs index 47da8ba86..20924d4da 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OrganizationNameMustUniqueSpecification.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OrganizationNameMustUniqueSpecification.cs @@ -1,8 +1,8 @@ using System.Linq; using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications { internal class OrganizationNameMustUniqueSpecification : ISpecification { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OwnerEmailMustUniqueSpecification.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OwnerEmailMustUniqueSpecification.cs similarity index 74% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OwnerEmailMustUniqueSpecification.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OwnerEmailMustUniqueSpecification.cs index ab271cbcd..8c7226d52 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OwnerEmailMustUniqueSpecification.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OwnerEmailMustUniqueSpecification.cs @@ -1,8 +1,8 @@ using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications { internal class OwnerEmailMustUniqueSpecification : ISpecification { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OwnerMaxOrganizationsSpecification.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OwnerMaxOrganizationsSpecification.cs similarity index 75% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OwnerMaxOrganizationsSpecification.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OwnerMaxOrganizationsSpecification.cs index fd989b5fc..34b1a6a19 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/OwnerMaxOrganizationsSpecification.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/OwnerMaxOrganizationsSpecification.cs @@ -1,9 +1,9 @@ using System.Linq; using TaskoMask.BuildingBlocks.Domain.Specifications; using TaskoMask.BuildingBlocks.Contracts.Helpers; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications { internal class OwnerMaxOrganizationsSpecification : ISpecification { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/ProjectNameAndDescriptionCannotSameSpecification.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/ProjectNameAndDescriptionCannotSameSpecification.cs similarity index 73% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/ProjectNameAndDescriptionCannotSameSpecification.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/ProjectNameAndDescriptionCannotSameSpecification.cs index 4d42a089e..08e3fdffb 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/ProjectNameAndDescriptionCannotSameSpecification.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/ProjectNameAndDescriptionCannotSameSpecification.cs @@ -1,7 +1,7 @@ using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications { internal class ProjectNameAndDescriptionCannotSameSpecification : ISpecification { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/ProjectNameMustUniqueSpecification.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/ProjectNameMustUniqueSpecification.cs similarity index 84% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/ProjectNameMustUniqueSpecification.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/ProjectNameMustUniqueSpecification.cs index af291893d..4aaf49665 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Specifications/ProjectNameMustUniqueSpecification.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/Specifications/ProjectNameMustUniqueSpecification.cs @@ -1,8 +1,8 @@ using System.Linq; using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; -namespace TaskoMask.Services.Owners.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.Specifications { internal class ProjectNameMustUniqueSpecification : ISpecification diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Organizations/OrganizationDescription.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Organizations/OrganizationDescription.cs similarity index 91% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Organizations/OrganizationDescription.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Organizations/OrganizationDescription.cs index f5a50dbff..98b782997 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Organizations/OrganizationDescription.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Organizations/OrganizationDescription.cs @@ -1,10 +1,10 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; using System.Collections.Generic; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Organizations +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Organizations { public class OrganizationDescription : BaseValueObject { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Organizations/OrganizationName.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Organizations/OrganizationName.cs similarity index 93% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Organizations/OrganizationName.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Organizations/OrganizationName.cs index dbece412d..5bed260c2 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Organizations/OrganizationName.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Organizations/OrganizationName.cs @@ -1,10 +1,10 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; using System.Collections.Generic; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Organizations +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Organizations { public class OrganizationName : BaseValueObject { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Owners/OwnerDisplayName.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Owners/OwnerDisplayName.cs similarity index 93% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Owners/OwnerDisplayName.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Owners/OwnerDisplayName.cs index a1ec23a20..fc8fcc4ee 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Owners/OwnerDisplayName.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Owners/OwnerDisplayName.cs @@ -1,10 +1,10 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; using System.Collections.Generic; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Owners +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Owners { /// /// diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Owners/OwnerEmail.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Owners/OwnerEmail.cs similarity index 93% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Owners/OwnerEmail.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Owners/OwnerEmail.cs index b413fccbd..241a0544f 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Owners/OwnerEmail.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Owners/OwnerEmail.cs @@ -1,11 +1,11 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using System.Collections.Generic; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Owners +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Owners { /// /// diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Projects/ProjectDescription.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Projects/ProjectDescription.cs similarity index 91% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Projects/ProjectDescription.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Projects/ProjectDescription.cs index 99abde300..9b877a166 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Projects/ProjectDescription.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Projects/ProjectDescription.cs @@ -1,10 +1,10 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; using System.Collections.Generic; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Projects +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Projects { public class ProjectDescription : BaseValueObject { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Projects/ProjectName.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Projects/ProjectName.cs similarity index 93% rename from src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Projects/ProjectName.cs rename to src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Projects/ProjectName.cs index 0cdc982eb..f7e1da44d 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Domain/ValueObjects/Projects/ProjectName.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Domain/Owners/ValueObjects/Projects/ProjectName.cs @@ -1,10 +1,10 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; using System.Collections.Generic; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Projects +namespace TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Projects { public class ProjectName : BaseValueObject { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs index 3cbee801e..c2adea01b 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs @@ -3,8 +3,8 @@ using TaskoMask.BuildingBlocks.Infrastructure.Extensions; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; using TaskoMask.Services.Owners.Write.Api.UseCases.Owners.RegiserOwner; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; using TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.DbContext; using TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.Repositories; using TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.Services; diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs index 278d5b351..578c6362e 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; using System; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; namespace TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.DbContext { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/DbContext/OwnerWriteDbContext.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/DbContext/OwnerWriteDbContext.cs index f7f832533..71559a294 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/DbContext/OwnerWriteDbContext.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/DbContext/OwnerWriteDbContext.cs @@ -1,7 +1,7 @@ using MongoDB.Driver; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; using Microsoft.Extensions.Options; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; namespace TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.DbContext { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/Repositories/OwnerAggregateRepository.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/Repositories/OwnerAggregateRepository.cs index dd82e5171..9e8656fe1 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/Repositories/OwnerAggregateRepository.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/Repositories/OwnerAggregateRepository.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; using TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.DbContext; namespace TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.Repositories diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/Services/OwnerValidatorService.cs b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/Services/OwnerValidatorService.cs index e9f84307c..2742a467f 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/Services/OwnerValidatorService.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/Infrastructure/Data/Services/OwnerValidatorService.cs @@ -1,6 +1,6 @@  -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; namespace TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.Services { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/AddOrganization/AddOrganizationUseCase.cs b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/AddOrganization/AddOrganizationUseCase.cs index ccbfa628b..5092a17cf 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/AddOrganization/AddOrganizationUseCase.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/AddOrganization/AddOrganizationUseCase.cs @@ -9,12 +9,12 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; namespace TaskoMask.Services.Owners.Write.Api.UseCases.Organizations.AddOrganization { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/DeleteOrganization/DeleteOrganizationUseCase.cs b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/DeleteOrganization/DeleteOrganizationUseCase.cs index 655147546..c62fbe353 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/DeleteOrganization/DeleteOrganizationUseCase.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/DeleteOrganization/DeleteOrganizationUseCase.cs @@ -9,11 +9,11 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; namespace TaskoMask.Services.Owners.Write.Api.UseCases.Organizations.DeleteOrganization { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/UpdateOrganization/UpdateOrganizationUseCase.cs b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/UpdateOrganization/UpdateOrganizationUseCase.cs index c3a510cda..d50d94c63 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/UpdateOrganization/UpdateOrganizationUseCase.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Organizations/UpdateOrganization/UpdateOrganizationUseCase.cs @@ -9,11 +9,11 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; namespace TaskoMask.Services.Owners.Write.Api.UseCases.Organizations.UpdateOrganization { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Owners/RegisterOwner/RegisterOwnerUseCase.cs b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Owners/RegisterOwner/RegisterOwnerUseCase.cs index 875796b30..7d583ab39 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Owners/RegisterOwner/RegisterOwnerUseCase.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Owners/RegisterOwner/RegisterOwnerUseCase.cs @@ -6,9 +6,9 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; namespace TaskoMask.Services.Owners.Write.Api.UseCases.Owners.RegiserOwner { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Owners/UpdateOwnerProfile/UpdateOwnerProfileUseCase.cs b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Owners/UpdateOwnerProfile/UpdateOwnerProfileUseCase.cs index 29796f650..a0605abd1 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Owners/UpdateOwnerProfile/UpdateOwnerProfileUseCase.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Owners/UpdateOwnerProfile/UpdateOwnerProfileUseCase.cs @@ -8,9 +8,9 @@ using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; -using TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Owners; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Owners; namespace TaskoMask.Services.Owners.Write.Api.UseCases.Owners.UpdateOwnerProfile { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/AddProject/AddProjectUseCase.cs b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/AddProject/AddProjectUseCase.cs index da9c06033..050848cbf 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/AddProject/AddProjectUseCase.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/AddProject/AddProjectUseCase.cs @@ -9,9 +9,9 @@ using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects; namespace TaskoMask.Services.Owners.Write.Api.UseCases.Projects.AddProject { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/DeleteProject/DeleteProjectUseCase.cs b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/DeleteProject/DeleteProjectUseCase.cs index e0d972974..c37e02717 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/DeleteProject/DeleteProjectUseCase.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/DeleteProject/DeleteProjectUseCase.cs @@ -9,10 +9,10 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects; namespace TaskoMask.Services.Owners.Write.Api.UseCases.Projects.DeleteProject { diff --git a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/UpdateProject/UpdateProjectUseCase.cs b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/UpdateProject/UpdateProjectUseCase.cs index 60d0022f6..7e0a5ca8a 100644 --- a/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/UpdateProject/UpdateProjectUseCase.cs +++ b/src/2-Services/Owners/Api/Owners.Write.Api/UseCases/Projects/UpdateProject/UpdateProjectUseCase.cs @@ -9,12 +9,12 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; -using TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Owners; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Owners; namespace TaskoMask.Services.Owners.Write.Api.UseCases.Projects.UpdateProject { diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Base/TestData/OwnerBuilder.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Base/TestData/OwnerBuilder.cs index a84a84d9c..565f5b17d 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Base/TestData/OwnerBuilder.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Base/TestData/OwnerBuilder.cs @@ -1,5 +1,5 @@ -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; namespace TaskoMask.Services.Owners.Write.Tests.Base.TestData { diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Base/TestData/OwnerObjectMother.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Base/TestData/OwnerObjectMother.cs index 9a995dc80..e1095d47b 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Base/TestData/OwnerObjectMother.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Base/TestData/OwnerObjectMother.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Test.TestData; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; namespace TaskoMask.Services.Owners.Write.Tests.Base.TestData { diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs index 5e3154d29..687f6feb6 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs @@ -3,9 +3,9 @@ using NSubstitute; using TaskoMask.BuildingBlocks.Application.Bus; using TaskoMask.BuildingBlocks.Test.TestBase; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; using TaskoMask.Services.Owners.Write.Api.Infrastructure.CrossCutting.DI; using TaskoMask.Services.Owners.Write.Api.Infrastructure.Data.DbContext; diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs index f46622adb..114aacd4e 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs @@ -4,9 +4,9 @@ using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Application.Bus; using TaskoMask.BuildingBlocks.Test.TestBase; -using TaskoMask.Services.Owners.Write.Api.Domain.Data; -using TaskoMask.Services.Owners.Write.Api.Domain.Entities; -using TaskoMask.Services.Owners.Write.Api.Domain.Services; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Data; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Entities; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Services; using TaskoMask.Services.Owners.Write.Tests.Base.TestData; namespace TaskoMask.Services.Owners.Write.Tests.Unit.Fixtures diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/AddOrganizationTests.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/AddOrganizationTests.cs index d4d97079e..14efdde17 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/AddOrganizationTests.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/AddOrganizationTests.cs @@ -10,8 +10,8 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Owners.Write.Api.UseCases.Organizations.AddOrganization; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations; -using TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Organizations; using TaskoMask.Services.Owners.Write.Tests.Unit.Fixtures; using TaskoMask.Services.Owners.Write.Tests.Base.TestData; using Xunit; diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/DeleteOrganizationTests.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/DeleteOrganizationTests.cs index bb42638a6..f42448aca 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/DeleteOrganizationTests.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/DeleteOrganizationTests.cs @@ -10,7 +10,7 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Owners.Write.Api.UseCases.Organizations.DeleteOrganization; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations; using TaskoMask.Services.Owners.Write.Tests.Base.TestData; using TaskoMask.Services.Owners.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/UpdateOrganizationTests.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/UpdateOrganizationTests.cs index ed478d675..93a225161 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/UpdateOrganizationTests.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Organizations/UpdateOrganizationTests.cs @@ -9,7 +9,7 @@ using System.Linq; using TaskoMask.Services.Owners.Write.Tests.Base.TestData; using FluentAssertions; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Organizations; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Organizations; using MongoDB.Bson; using System; using TaskoMask.BuildingBlocks.Domain.Resources; diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Owners/RegisterOwnerTests.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Owners/RegisterOwnerTests.cs index b258e90a1..6ba2808e9 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Owners/RegisterOwnerTests.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Owners/RegisterOwnerTests.cs @@ -9,8 +9,8 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Owners.Write.Api.UseCases.Owners.RegiserOwner; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Owners; -using TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Owners; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Owners; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Owners; using TaskoMask.Services.Owners.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Owners/UpdateOwnerProfileTests.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Owners/UpdateOwnerProfileTests.cs index c15f7199c..e3744b661 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Owners/UpdateOwnerProfileTests.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Owners/UpdateOwnerProfileTests.cs @@ -9,7 +9,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Owners.Write.Api.UseCases.Owners.UpdateOwnerProfile; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Owners; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Owners; using TaskoMask.Services.Owners.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/AddProjectTests.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/AddProjectTests.cs index b1a8c8677..d8293ea09 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/AddProjectTests.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/AddProjectTests.cs @@ -12,8 +12,8 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Owners.Write.Api.UseCases.Projects.AddProject; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects; -using TaskoMask.Services.Owners.Write.Api.Domain.ValueObjects.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.ValueObjects.Projects; using TaskoMask.Services.Owners.Write.Tests.Base.TestData; using TaskoMask.Services.Owners.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/DeleteProjectTests.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/DeleteProjectTests.cs index e9af93af6..877cd5d74 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/DeleteProjectTests.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/DeleteProjectTests.cs @@ -8,7 +8,7 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Owners.Write.Api.UseCases.Projects.DeleteProject; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects; using TaskoMask.Services.Owners.Write.Tests.Base.TestData; using TaskoMask.Services.Owners.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/UpdateProjectTests.cs b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/UpdateProjectTests.cs index 469c4a898..f4feffc63 100644 --- a/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/UpdateProjectTests.cs +++ b/src/2-Services/Owners/Tests/Owners.Write.Tests.Unit/UseCases/Projects/UpdateProjectTests.cs @@ -7,7 +7,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Owners.Write.Api.UseCases.Projects.UpdateProject; -using TaskoMask.Services.Owners.Write.Api.Domain.Events.Projects; +using TaskoMask.Services.Owners.Write.Api.Domain.Owners.Events.Projects; using TaskoMask.Services.Owners.Write.Tests.Base.TestData; using TaskoMask.Services.Owners.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Activity.cs b/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Activity.cs index 90101733c..28a7ec5a3 100644 --- a/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Activity.cs +++ b/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Activity.cs @@ -1,5 +1,5 @@ -using TaskoMask.BuildingBlocks.Domain.Models; -using MongoDB.Bson; +using MongoDB.Bson; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.Services.Tasks.Read.Api.Domain { diff --git a/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Comment.cs b/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Comment.cs index 6e8e16887..300943e74 100644 --- a/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Comment.cs +++ b/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Comment.cs @@ -1,6 +1,6 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.Services.Tasks.Read.Api.Domain { diff --git a/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Task.cs b/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Task.cs index e7e2b177d..642768d20 100644 --- a/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Task.cs +++ b/src/2-Services/Tasks/Api/Tasks.Read.Api/Domain/Task.cs @@ -1,7 +1,7 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Enums; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.Entities; namespace TaskoMask.Services.Tasks.Read.Api.Domain { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Data/ITaskAggregateRepository.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Data/ITaskAggregateRepository.cs similarity index 86% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Data/ITaskAggregateRepository.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Data/ITaskAggregateRepository.cs index a40848607..efc65ea40 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Data/ITaskAggregateRepository.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Data/ITaskAggregateRepository.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using TaskoMask.BuildingBlocks.Domain.Data; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Data +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data { public interface ITaskAggregateRepository : IBaseAggregateRepository { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Entities/Comment.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Entities/Comment.cs similarity index 88% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Entities/Comment.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Entities/Comment.cs index 2c9f1d897..4c705aec7 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Entities/Comment.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Entities/Comment.cs @@ -1,10 +1,10 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.ValueObjects.Comments; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.ValueObjects.Comments; using MongoDB.Bson; +using TaskoMask.BuildingBlocks.Domain.Entities; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Entities +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities { /// /// Every board's member can leave comment on tasks diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Entities/Task.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Entities/Task.cs similarity index 92% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Entities/Task.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Entities/Task.cs index 47ec45835..cd13cf054 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Entities/Task.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Entities/Task.cs @@ -1,19 +1,19 @@ using System.Collections.Generic; using System.Linq; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; -using TaskoMask.Services.Tasks.Write.Api.Domain.Specifications; -using TaskoMask.Services.Tasks.Write.Api.Domain.ValueObjects.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Specifications; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.ValueObjects.Tasks; using TaskoMask.BuildingBlocks.Domain.Resources; using MongoDB.Bson; using System; +using TaskoMask.BuildingBlocks.Domain.Entities; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Entities +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities { public class Task : AggregateRoot diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentAddedEvent.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentAddedEvent.cs similarity index 79% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentAddedEvent.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentAddedEvent.cs index 1d928b561..44dfe1761 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentAddedEvent.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentAddedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments { public class CommentAddedEvent : DomainEvent { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentDeletedEvent.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentDeletedEvent.cs similarity index 70% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentDeletedEvent.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentDeletedEvent.cs index b7d9b409b..3dca50ab1 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentDeletedEvent.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentDeletedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments { public class CommentDeletedEvent : DomainEvent { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentUpdatedEvent.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentUpdatedEvent.cs similarity index 75% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentUpdatedEvent.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentUpdatedEvent.cs index 324c92cdd..cffeaa486 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Comments/CommentUpdatedEvent.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Comments/CommentUpdatedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments { public class CommentUpdatedEvent : DomainEvent { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskAddedEvent.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskAddedEvent.cs similarity index 85% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskAddedEvent.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskAddedEvent.cs index 41f76e7f5..e24281267 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskAddedEvent.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskAddedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks { public class TaskAddedEvent : DomainEvent { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskDeletedEvent.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskDeletedEvent.cs similarity index 70% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskDeletedEvent.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskDeletedEvent.cs index 24f73361b..2145eb514 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskDeletedEvent.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskDeletedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks { public class TaskDeletedEvent : DomainEvent { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskMovedToAnotherCardEvent.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskMovedToAnotherCardEvent.cs similarity index 77% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskMovedToAnotherCardEvent.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskMovedToAnotherCardEvent.cs index 5de20f63f..eadfe5900 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskMovedToAnotherCardEvent.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskMovedToAnotherCardEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks { public class TaskMovedToAnotherCardEvent : DomainEvent { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskUpdatedEvent.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskUpdatedEvent.cs similarity index 79% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskUpdatedEvent.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskUpdatedEvent.cs index 9540c7790..94f5ed9fe 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Events/Tasks/TaskUpdatedEvent.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Events/Tasks/TaskUpdatedEvent.cs @@ -1,7 +1,7 @@ -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks { public class TaskUpdatedEvent : DomainEvent { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Services/ITaskValidatorService.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Services/ITaskValidatorService.cs similarity index 84% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Services/ITaskValidatorService.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Services/ITaskValidatorService.cs index ea31ae225..052b95ea5 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Services/ITaskValidatorService.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Services/ITaskValidatorService.cs @@ -1,4 +1,4 @@ -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Services +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services { /// /// diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/MaxTasksSpecification.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/MaxTasksSpecification.cs similarity index 76% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/MaxTasksSpecification.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/MaxTasksSpecification.cs index b1fdf262f..0c96e35ae 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/MaxTasksSpecification.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/MaxTasksSpecification.cs @@ -1,9 +1,9 @@ using TaskoMask.BuildingBlocks.Domain.Specifications; using TaskoMask.BuildingBlocks.Contracts.Helpers; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Specifications { internal class MaxTasksSpecification : ISpecification { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/TaskTitleAndDescriptionCannotSameSpecification.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/TaskTitleAndDescriptionCannotSameSpecification.cs similarity index 73% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/TaskTitleAndDescriptionCannotSameSpecification.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/TaskTitleAndDescriptionCannotSameSpecification.cs index ddbfeb60b..995a03ccd 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/TaskTitleAndDescriptionCannotSameSpecification.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/TaskTitleAndDescriptionCannotSameSpecification.cs @@ -1,7 +1,7 @@ using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Specifications { internal class TaskTitleAndDescriptionCannotSameSpecification : ISpecification { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/TaskTitleMustUniqueSpecification.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/TaskTitleMustUniqueSpecification.cs similarity index 75% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/TaskTitleMustUniqueSpecification.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/TaskTitleMustUniqueSpecification.cs index 0bb06f8a6..a854bc9e9 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Specifications/TaskTitleMustUniqueSpecification.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/Specifications/TaskTitleMustUniqueSpecification.cs @@ -1,8 +1,8 @@ using TaskoMask.BuildingBlocks.Domain.Specifications; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.Specifications +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Specifications { internal class TaskTitleMustUniqueSpecification : ISpecification { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Comments/CommentContent.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Comments/CommentContent.cs similarity index 90% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Comments/CommentContent.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Comments/CommentContent.cs index 5a509ea88..19753a86e 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Comments/CommentContent.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Comments/CommentContent.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.ValueObjects.Comments +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.ValueObjects.Comments { public class CommentContent : BaseValueObject { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskBoardId.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskBoardId.cs similarity index 90% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskBoardId.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskBoardId.cs index c6041c8c6..c25020a31 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskBoardId.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskBoardId.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.ValueObjects.Tasks +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.ValueObjects.Tasks { public class TaskBoardId : BaseValueObject { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskCardId.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskCardId.cs similarity index 90% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskCardId.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskCardId.cs index a0d5ad745..ae93e1ce3 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskCardId.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskCardId.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.ValueObjects.Tasks +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.ValueObjects.Tasks { public class TaskCardId : BaseValueObject { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskDescription.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskDescription.cs similarity index 91% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskDescription.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskDescription.cs index 8d5cebe93..8f9d3a1d2 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskDescription.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskDescription.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.ValueObjects.Tasks +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.ValueObjects.Tasks { public class TaskDescription : BaseValueObject { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskTitle.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskTitle.cs similarity index 93% rename from src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskTitle.cs rename to src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskTitle.cs index 23fd6758b..60e1d82ce 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/ValueObjects/Tasks/TaskTitle.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Domain/Tasks/ValueObjects/Tasks/TaskTitle.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using TaskoMask.BuildingBlocks.Domain.Exceptions; -using TaskoMask.BuildingBlocks.Domain.Models; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; +using TaskoMask.BuildingBlocks.Domain.ValueObjects; -namespace TaskoMask.Services.Tasks.Write.Api.Domain.ValueObjects.Tasks +namespace TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.ValueObjects.Tasks { public class TaskTitle : BaseValueObject { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs index 7a2b7129a..bd698202f 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/CrossCutting/DI/InfrastructureModule.cs @@ -4,8 +4,8 @@ using TaskoMask.BuildingBlocks.Infrastructure.Extensions; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; using TaskoMask.Services.Tasks.Write.Api.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; using TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.DbContext; using TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.Repositories; using TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.Services; diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs index 96c086bdd..476351e67 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/DbContext/DbInitialization.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; using System; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; namespace TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.DbContext { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/DbContext/TaskWriteDbContext.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/DbContext/TaskWriteDbContext.cs index f3a3757a3..c3f529122 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/DbContext/TaskWriteDbContext.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/DbContext/TaskWriteDbContext.cs @@ -1,7 +1,7 @@ using MongoDB.Driver; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; using Microsoft.Extensions.Options; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; namespace TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.DbContext { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/Repositories/TaskAggregateRepository.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/Repositories/TaskAggregateRepository.cs index 8d62ebc6c..936bbc6ad 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/Repositories/TaskAggregateRepository.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/Repositories/TaskAggregateRepository.cs @@ -2,8 +2,8 @@ using MongoDB.Driver.Linq; using System.Linq; using TaskoMask.BuildingBlocks.Infrastructure.MongoDB; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; using TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.DbContext; namespace TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.Repositories diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/Services/TaskValidatorService.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/Services/TaskValidatorService.cs index 71b927bd3..b51124fd2 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/Services/TaskValidatorService.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/Infrastructure/Data/Services/TaskValidatorService.cs @@ -1,5 +1,5 @@ -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; namespace TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.Services { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/AddComment/AddCommentUseCase.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/AddComment/AddCommentUseCase.cs index 5a0186296..78d5b8a23 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/AddComment/AddCommentUseCase.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/AddComment/AddCommentUseCase.cs @@ -9,11 +9,11 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments; namespace TaskoMask.Services.Tasks.Write.Api.UseCases.Comments.AddComment { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/DeleteComment/DeleteCommentUseCase.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/DeleteComment/DeleteCommentUseCase.cs index 9219cee45..eafb9cadf 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/DeleteComment/DeleteCommentUseCase.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/DeleteComment/DeleteCommentUseCase.cs @@ -9,10 +9,10 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments; namespace TaskoMask.Services.Tasks.Write.Api.UseCases.Comments.DeleteComment { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/UpdateComment/UpdateCommentUseCase.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/UpdateComment/UpdateCommentUseCase.cs index 9c60f9a55..c887ea14c 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/UpdateComment/UpdateCommentUseCase.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Comments/UpdateComment/UpdateCommentUseCase.cs @@ -9,10 +9,10 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments; namespace TaskoMask.Services.Tasks.Write.Api.UseCases.Comments.UpdateComment { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/AddTask/AddTaskUseCase.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/AddTask/AddTaskUseCase.cs index 201a5d134..9c5f0325e 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/AddTask/AddTaskUseCase.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/AddTask/AddTaskUseCase.cs @@ -8,10 +8,10 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.BuildingBlocks.Domain.Events; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; namespace TaskoMask.Services.Tasks.Write.Api.UseCases.Tasks.AddTask { @@ -45,7 +45,7 @@ public AddTaskUseCase(ITaskAggregateRepository taskAggregateRepository, IMessage /// public async Task Handle(AddTaskRequest request, CancellationToken cancellationToken) { - var task = Domain.Entities.Task.AddTask(request.Title, request.Description,request.CardId, request.BoardId, _taskValidatorService); + var task = Domain.Tasks.Entities.Task.AddTask(request.Title, request.Description,request.CardId, request.BoardId, _taskValidatorService); await _taskAggregateRepository.AddAsync(task); diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/DeleteTask/DeleteTaskUseCase.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/DeleteTask/DeleteTaskUseCase.cs index 8307aaa8c..03bba1dcd 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/DeleteTask/DeleteTaskUseCase.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/DeleteTask/DeleteTaskUseCase.cs @@ -9,10 +9,10 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; namespace TaskoMask.Services.Tasks.Write.Api.UseCases.Tasks.DeleteTask { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/MoveTaskToAnotherCard/MoveTaskToAnotherCardUseCase.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/MoveTaskToAnotherCard/MoveTaskToAnotherCardUseCase.cs index 3762c645b..e0391f96f 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/MoveTaskToAnotherCard/MoveTaskToAnotherCardUseCase.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/MoveTaskToAnotherCard/MoveTaskToAnotherCardUseCase.cs @@ -9,11 +9,11 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; namespace TaskoMask.Services.Tasks.Write.Api.UseCases.Tasks.MoveTaskToAnotherCard { diff --git a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/UpdateTask/UpdateTaskUseCase.cs b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/UpdateTask/UpdateTaskUseCase.cs index 725125d03..bbfd441a9 100644 --- a/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/UpdateTask/UpdateTaskUseCase.cs +++ b/src/2-Services/Tasks/Api/Tasks.Write.Api/UseCases/Tasks/UpdateTask/UpdateTaskUseCase.cs @@ -9,11 +9,11 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Helpers; using TaskoMask.BuildingBlocks.Contracts.Resources; -using TaskoMask.BuildingBlocks.Domain.Models; +using TaskoMask.BuildingBlocks.Domain.Events; using TaskoMask.BuildingBlocks.Domain.Resources; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; namespace TaskoMask.Services.Tasks.Write.Api.UseCases.Tasks.UpdateTask { diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Base/TestData/TaskBuilder.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Base/TestData/TaskBuilder.cs index fa06e2c82..b72a6d2d2 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Base/TestData/TaskBuilder.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Base/TestData/TaskBuilder.cs @@ -1,5 +1,5 @@ -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; namespace TaskoMask.Services.Tasks.Write.Tests.Base.TestData { diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Base/TestData/TaskObjectMother.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Base/TestData/TaskObjectMother.cs index 8988269a4..85efabdf8 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Base/TestData/TaskObjectMother.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Base/TestData/TaskObjectMother.cs @@ -1,8 +1,8 @@ using MongoDB.Bson; using System.Collections.Generic; using TaskoMask.BuildingBlocks.Test.TestData; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; namespace TaskoMask.Services.Tasks.Write.Tests.Base.TestData { diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs index 380a450ca..c177c5901 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Integration/Fixtures/TestsBaseFixture.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; using TaskoMask.BuildingBlocks.Application.Bus; using TaskoMask.BuildingBlocks.Test.TestBase; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Entities; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Entities; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; using TaskoMask.Services.Tasks.Write.Api.Infrastructure.CrossCutting.DI; using TaskoMask.Services.Tasks.Write.Api.Infrastructure.Data.DbContext; diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs index a9e38cf61..da484de77 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/Fixtures/TestsBaseFixture.cs @@ -1,8 +1,8 @@ using NSubstitute; using TaskoMask.BuildingBlocks.Application.Bus; using TaskoMask.BuildingBlocks.Test.TestBase; -using TaskoMask.Services.Tasks.Write.Api.Domain.Data; -using TaskoMask.Services.Tasks.Write.Api.Domain.Services; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Data; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Services; using TaskoMask.Services.Tasks.Write.Tests.Base.TestData; namespace TaskoMask.Services.Tasks.Write.Tests.Unit.Fixtures @@ -14,7 +14,7 @@ public abstract class TestsBaseFixture : UnitTestsBase protected IInMemoryBus InMemoryBus; protected ITaskAggregateRepository TaskAggregateRepository; protected ITaskValidatorService TaskValidatorService; - protected List Tasks; + protected List Tasks; @@ -54,25 +54,25 @@ private void CommonFixtureSetup() TaskAggregateRepository = Substitute.For(); TaskAggregateRepository.GetByIdAsync(Arg.Is(x => Tasks.Any(o => o.Id == x))).Returns(args => Tasks.First(u => u.Id == (string)args[0])); - TaskAggregateRepository.AddAsync(Arg.Any()).Returns(args => { Tasks.Add((Api.Domain.Entities.Task)args[0]); return Task.CompletedTask; }); - TaskAggregateRepository.UpdateAsync(Arg.Is(x => Tasks.Any(o => o.Id == x.Id))).Returns(args => + TaskAggregateRepository.AddAsync(Arg.Any()).Returns(args => { Tasks.Add((Api.Domain.Tasks.Entities.Task)args[0]); return Task.CompletedTask; }); + TaskAggregateRepository.UpdateAsync(Arg.Is(x => Tasks.Any(o => o.Id == x.Id))).Returns(args => { - var existTask = Tasks.FirstOrDefault(u => u.Id == ((Api.Domain.Entities.Task)args[0]).Id); + var existTask = Tasks.FirstOrDefault(u => u.Id == ((Api.Domain.Tasks.Entities.Task)args[0]).Id); if (existTask != null) { Tasks.Remove(existTask); - Tasks.Add(((Api.Domain.Entities.Task)args[0])); + Tasks.Add(((Api.Domain.Tasks.Entities.Task)args[0])); } return Task.CompletedTask; }); - TaskAggregateRepository.ConcurrencySafeUpdate(Arg.Is(x => Tasks.Any(o => o.Id == x.Id)),Arg.Is(x=>x.Any())).Returns(args => + TaskAggregateRepository.ConcurrencySafeUpdate(Arg.Is(x => Tasks.Any(o => o.Id == x.Id)),Arg.Is(x=>x.Any())).Returns(args => { - var existTask = Tasks.FirstOrDefault(u => u.Id == ((Api.Domain.Entities.Task)args[0]).Id && u.Version == (string)args[1]); + var existTask = Tasks.FirstOrDefault(u => u.Id == ((Api.Domain.Tasks.Entities.Task)args[0]).Id && u.Version == (string)args[1]); if (existTask != null) { Tasks.Remove(existTask); - Tasks.Add(((Api.Domain.Entities.Task)args[0])); + Tasks.Add(((Api.Domain.Tasks.Entities.Task)args[0])); } return Task.CompletedTask; @@ -103,7 +103,7 @@ private void CommonFixtureSetup() /// /// /// - private List GenerateTasksList() + private List GenerateTasksList() { var taskValidatorService = Substitute.For(); taskValidatorService.TaskHasUniqueName(taskId: Arg.Any(), boardId: Arg.Any(), taskTitle: Arg.Any()).Returns(true); diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/AddCommentTests.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/AddCommentTests.cs index d26c82662..73ce2f6bc 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/AddCommentTests.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/AddCommentTests.cs @@ -5,7 +5,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Tasks.Write.Api.UseCases.Comments.AddComment; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments; using TaskoMask.Services.Tasks.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/DeleteCommentTests.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/DeleteCommentTests.cs index 3ada16128..f955ba576 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/DeleteCommentTests.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/DeleteCommentTests.cs @@ -7,7 +7,7 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Tasks.Write.Api.UseCases.Comments.DeleteComment; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments; using TaskoMask.Services.Tasks.Write.Tests.Unit.Fixtures; using TaskoMask.Services.Tasks.Write.Tests.Base.TestData; using Xunit; diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/UpdateCommentTests.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/UpdateCommentTests.cs index a4834c2e2..f5e01d668 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/UpdateCommentTests.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Comments/UpdateCommentTests.cs @@ -6,7 +6,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Tasks.Write.Api.UseCases.Comments.UpdateComment; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Comments; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Comments; using TaskoMask.Services.Tasks.Write.Tests.Unit.Fixtures; using TaskoMask.Services.Tasks.Write.Tests.Base.TestData; using Xunit; diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/AddTaskTests.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/AddTaskTests.cs index d62d3e9fc..716d462c7 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/AddTaskTests.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/AddTaskTests.cs @@ -7,8 +7,8 @@ using TaskoMask.BuildingBlocks.Domain.Exceptions; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Tasks.Write.Api.UseCases.Tasks.AddTask; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; -using TaskoMask.Services.Tasks.Write.Api.Domain.ValueObjects.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.ValueObjects.Tasks; using TaskoMask.Services.Tasks.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/DeleteTaskTests.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/DeleteTaskTests.cs index 21bb47512..93fe2e369 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/DeleteTaskTests.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/DeleteTaskTests.cs @@ -5,7 +5,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Tasks.Write.Api.UseCases.Tasks.DeleteTask; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; using TaskoMask.Services.Tasks.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/MoveTaskToAnotherCardTests.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/MoveTaskToAnotherCardTests.cs index c74ef6f3b..1b1bc6c86 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/MoveTaskToAnotherCardTests.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/MoveTaskToAnotherCardTests.cs @@ -4,7 +4,7 @@ using TaskoMask.BuildingBlocks.Contracts.Events; using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.Services.Tasks.Write.Api.UseCases.Tasks.MoveTaskToAnotherCard; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; using TaskoMask.Services.Tasks.Write.Tests.Unit.Fixtures; using Xunit; diff --git a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/UpdateTaskTests.cs b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/UpdateTaskTests.cs index c754a901a..3a2b3f37b 100644 --- a/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/UpdateTaskTests.cs +++ b/src/2-Services/Tasks/Tests/Tasks.Write.Tests.Unit/UseCases/Tasks/UpdateTaskTests.cs @@ -5,7 +5,7 @@ using TaskoMask.BuildingBlocks.Contracts.Resources; using TaskoMask.BuildingBlocks.Domain.Resources; using TaskoMask.Services.Tasks.Write.Api.UseCases.Tasks.UpdateTask; -using TaskoMask.Services.Tasks.Write.Api.Domain.Events.Tasks; +using TaskoMask.Services.Tasks.Write.Api.Domain.Tasks.Events.Tasks; using TaskoMask.Services.Tasks.Write.Tests.Unit.Fixtures; using Xunit;