Merge branch 'main' into refactor/dto-extends-baseDto

NikolaVetnic · Jan 31, 2025 · b3bf95f · b3bf95f
2 parents ca81cce + 816919c
commit b3bf95f
Show file tree

Hide file tree

Showing 29 changed files with 43 additions and 41 deletions.
diff --git a/Backend/src/BuildingBlocks/BuildingBlocks.Api/Converters/ReminderIdConverter.cs b/Backend/src/BuildingBlocks/BuildingBlocks.Api/Converters/ReminderIdConverter.cs
@@ -1,4 +1,4 @@
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace BuildingBlocks.Api.Converters;
 

diff --git a/Backend/src/BuildingBlocks/BuildingBlocks.Application/Data/INodesService.cs b/Backend/src/BuildingBlocks/BuildingBlocks.Application/Data/INodesService.cs
@@ -1,6 +1,6 @@
 using BuildingBlocks.Domain.Nodes.Node.Dtos;
 using BuildingBlocks.Domain.Nodes.Node.ValueObjects;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace BuildingBlocks.Application.Data;
 

diff --git a/Backend/src/BuildingBlocks/BuildingBlocks.Application/Data/IRemindersService.cs b/Backend/src/BuildingBlocks/BuildingBlocks.Application/Data/IRemindersService.cs
@@ -1,5 +1,5 @@
-using BuildingBlocks.Domain.Reminders.Dtos;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace BuildingBlocks.Application.Data;
 

diff --git a/Backend/src/BuildingBlocks/BuildingBlocks.Domain/Nodes/Node/Dtos/NodeDto.cs b/Backend/src/BuildingBlocks/BuildingBlocks.Domain/Nodes/Node/Dtos/NodeDto.cs
@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using BuildingBlocks.Domain.Reminders.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
 
 namespace BuildingBlocks.Domain.Nodes.Node.Dtos;
 

diff --git a/....Domain/Reminders/Dtos/ReminderBaseDto.cs → ...eminders/Reminder/Dtos/ReminderBaseDto.cs b/....Domain/Reminders/Dtos/ReminderBaseDto.cs → ...eminders/Reminder/Dtos/ReminderBaseDto.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace BuildingBlocks.Domain.Reminders.Dtos;
+namespace BuildingBlocks.Domain.Reminders.Reminder.Dtos;
 
 public class ReminderBaseDto(
     string? id,

diff --git a/...ocks.Domain/Reminders/Dtos/ReminderDto.cs → ...in/Reminders/Reminder/Dtos/ReminderDto.cs b/...ocks.Domain/Reminders/Dtos/ReminderDto.cs → ...in/Reminders/Reminder/Dtos/ReminderDto.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using BuildingBlocks.Domain.Nodes.Node.Dtos;
 
-namespace BuildingBlocks.Domain.Reminders.Dtos;
+namespace BuildingBlocks.Domain.Reminders.Reminder.Dtos;
 
 public class ReminderDto(
     string? id,

diff --git a/...rc/BuildingBlocks/BuildingBlocks.Domain/Reminders/Reminder/Events/ReminderCreatedEvent.cs b/...rc/BuildingBlocks/BuildingBlocks.Domain/Reminders/Reminder/Events/ReminderCreatedEvent.cs
@@ -0,0 +1,6 @@
+using BuildingBlocks.Domain.Abstractions;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
+
+namespace BuildingBlocks.Domain.Reminders.Reminder.Events;
+
+public record ReminderCreatedEvent(ReminderId ReminderId) : IDomainEvent;
diff --git a/...rc/BuildingBlocks/BuildingBlocks.Domain/Reminders/Reminder/Events/ReminderUpdatedEvent.cs b/...rc/BuildingBlocks/BuildingBlocks.Domain/Reminders/Reminder/Events/ReminderUpdatedEvent.cs
@@ -0,0 +1,6 @@
+using BuildingBlocks.Domain.Abstractions;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
+
+namespace BuildingBlocks.Domain.Reminders.Reminder.Events;
+
+public record ReminderUpdatedEvent(ReminderId ReminderId) : IDomainEvent;
diff --git a/...main/Reminders/ValueObjects/ReminderId.cs → ...nders/Reminder/ValueObjects/ReminderId.cs b/...main/Reminders/ValueObjects/ReminderId.cs → ...nders/Reminder/ValueObjects/ReminderId.cs
@@ -2,7 +2,7 @@
 using System.Text.Json.Serialization;
 using BuildingBlocks.Domain.Abstractions;
 
-namespace BuildingBlocks.Domain.Reminders.ValueObjects;
+namespace BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 [JsonConverter(typeof(ReminderIdJsonConverter))]
 public class ReminderId : StronglyTypedId

diff --git a/Backend/src/Modules/Nodes/Nodes.Application/Data/NodesService.cs b/Backend/src/Modules/Nodes/Nodes.Application/Data/NodesService.cs
@@ -1,7 +1,7 @@
 using BuildingBlocks.Application.Data;
 using BuildingBlocks.Domain.Nodes.Node.Dtos;
 using BuildingBlocks.Domain.Nodes.Node.ValueObjects;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
 using Nodes.Application.Data.Abstractions;

diff --git a/Backend/src/Modules/Nodes/Nodes.Domain/Models/Node.cs b/Backend/src/Modules/Nodes/Nodes.Domain/Models/Node.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using BuildingBlocks.Domain.Nodes.Node.Events;
 using BuildingBlocks.Domain.Nodes.Node.ValueObjects;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Nodes.Domain.Models;

diff --git a/Backend/src/Modules/Reminders/Reminders.Api/Endpoints/Reminders/CreateReminder.cs b/Backend/src/Modules/Reminders/Reminders.Api/Endpoints/Reminders/CreateReminder.cs
@@ -1,6 +1,6 @@
 using System;
 using BuildingBlocks.Domain.Nodes.Node.ValueObjects;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 using Reminders.Application.Entities.Reminders.Commands.CreateReminder;
 
 // ReSharper disable ClassNeverInstantiated.Global

diff --git a/Backend/src/Modules/Reminders/Reminders.Api/Endpoints/Reminders/GetReminderById.cs b/Backend/src/Modules/Reminders/Reminders.Api/Endpoints/Reminders/GetReminderById.cs
@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using BuildingBlocks.Domain.Reminders.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
 using Reminders.Application.Entities.Reminders.Queries.GetReminderById;
 
 namespace Reminders.Api.Endpoints.Reminders;

diff --git a/Backend/src/Modules/Reminders/Reminders.Api/Endpoints/Reminders/ListReminders.cs b/Backend/src/Modules/Reminders/Reminders.Api/Endpoints/Reminders/ListReminders.cs
@@ -1,5 +1,5 @@
 using BuildingBlocks.Application.Pagination;
-using BuildingBlocks.Domain.Reminders.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
 using Reminders.Application.Entities.Reminders.Queries.ListReminders;
 
 namespace Reminders.Api.Endpoints.Reminders;

diff --git a/...end/src/Modules/Reminders/Reminders.Application/Data/Abstractions/IRemindersRepository.cs b/...end/src/Modules/Reminders/Reminders.Application/Data/Abstractions/IRemindersRepository.cs
@@ -1,4 +1,4 @@
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace Reminders.Application.Data.Abstractions;
 

diff --git a/Backend/src/Modules/Reminders/Reminders.Application/Data/RemindersService.cs b/Backend/src/Modules/Reminders/Reminders.Application/Data/RemindersService.cs
@@ -1,6 +1,6 @@
 using BuildingBlocks.Application.Data;
-using BuildingBlocks.Domain.Reminders.Dtos;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
 using Reminders.Application.Data.Abstractions;

diff --git a/...Reminders.Application/Entities/Reminders/Commands/CreateReminder/CreateReminderCommand.cs b/...Reminders.Application/Entities/Reminders/Commands/CreateReminder/CreateReminderCommand.cs
@@ -1,5 +1,5 @@
 using BuildingBlocks.Domain.Nodes.Node.ValueObjects;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace Reminders.Application.Entities.Reminders.Commands.CreateReminder;
 

diff --git a/...Reminders.Application/Entities/Reminders/Commands/CreateReminder/CreateReminderHandler.cs b/...Reminders.Application/Entities/Reminders/Commands/CreateReminder/CreateReminderHandler.cs
@@ -1,5 +1,5 @@
 using BuildingBlocks.Application.Data;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 using Reminders.Application.Data.Abstractions;
 
 namespace Reminders.Application.Entities.Reminders.Commands.CreateReminder;

diff --git a/...Reminders.Application/Entities/Reminders/Commands/DeleteReminder/DeleteReminderCommand.cs b/...Reminders.Application/Entities/Reminders/Commands/DeleteReminder/DeleteReminderCommand.cs
@@ -1,4 +1,4 @@
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace Reminders.Application.Entities.Reminders.Commands.DeleteReminder;
 

diff --git a/...dules/Reminders/Reminders.Application/Entities/Reminders/Extensions/ReminderExtensions.cs b/...dules/Reminders/Reminders.Application/Entities/Reminders/Extensions/ReminderExtensions.cs
@@ -1,5 +1,5 @@
 using BuildingBlocks.Domain.Nodes.Node.Dtos;
-using BuildingBlocks.Domain.Reminders.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
 
 namespace Reminders.Application.Entities.Reminders.Extensions;
 

diff --git a/.../Reminders.Application/Entities/Reminders/Queries/GetReminderById/GetReminderByIdQuery.cs b/.../Reminders.Application/Entities/Reminders/Queries/GetReminderById/GetReminderByIdQuery.cs
@@ -1,7 +1,7 @@
 // ReSharper disable ClassNeverInstantiated.Global
 
-using BuildingBlocks.Domain.Reminders.Dtos;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace Reminders.Application.Entities.Reminders.Queries.GetReminderById;
 

diff --git a/...rs/Reminders.Application/Entities/Reminders/Queries/ListReminders/ListRemindersHandler.cs b/...rs/Reminders.Application/Entities/Reminders/Queries/ListReminders/ListRemindersHandler.cs
@@ -1,6 +1,6 @@
 using BuildingBlocks.Application.Data;
 using BuildingBlocks.Application.Pagination;
-using BuildingBlocks.Domain.Reminders.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
 using Reminders.Application.Data.Abstractions;
 using Reminders.Application.Entities.Reminders.Extensions;
 

diff --git a/...ders/Reminders.Application/Entities/Reminders/Queries/ListReminders/ListRemindersQuery.cs b/...ders/Reminders.Application/Entities/Reminders/Queries/ListReminders/ListRemindersQuery.cs
@@ -1,5 +1,5 @@
 using BuildingBlocks.Application.Pagination;
-using BuildingBlocks.Domain.Reminders.Dtos;
+using BuildingBlocks.Domain.Reminders.Reminder.Dtos;
 
 // ReSharper disable ClassNeverInstantiated.Global
 

diff --git a/Backend/src/Modules/Reminders/Reminders.Domain/Events/ReminderCreatedEvent.cs b/Backend/src/Modules/Reminders/Reminders.Domain/Events/ReminderCreatedEvent.cs
diff --git a/Backend/src/Modules/Reminders/Reminders.Domain/Events/ReminderUpdatedEvent.cs b/Backend/src/Modules/Reminders/Reminders.Domain/Events/ReminderUpdatedEvent.cs
diff --git a/Backend/src/Modules/Reminders/Reminders.Domain/Models/Reminder.cs b/Backend/src/Modules/Reminders/Reminders.Domain/Models/Reminder.cs
@@ -1,6 +1,6 @@
 using BuildingBlocks.Domain.Nodes.Node.ValueObjects;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
-using Reminders.Domain.Events;
+using BuildingBlocks.Domain.Reminders.Reminder.Events;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace Reminders.Domain.Models;
 
@@ -30,7 +30,7 @@ public static Reminder Create(ReminderId id, string title, string description, D
             NodeId = nodeId
         };
 
-        reminder.AddDomainEvent(new ReminderCreatedEvent(reminder));
+        reminder.AddDomainEvent(new ReminderCreatedEvent(reminder.Id));
 
         return reminder;
     }
@@ -44,7 +44,7 @@ public void Update(string title, string description, DateTime dueDateTime, int p
         NotificationTime = notificationTime;
         Status = status;
 
-        AddDomainEvent(new ReminderUpdatedEvent(this));
+        AddDomainEvent(new ReminderUpdatedEvent(Id));
     }
 
     #endregion

diff --git a/...c/Modules/Reminders/Reminders.Infrastructure/Data/Configurations/ReminderConfiguration.cs b/...c/Modules/Reminders/Reminders.Infrastructure/Data/Configurations/ReminderConfiguration.cs
@@ -1,4 +1,4 @@
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace Reminders.Infrastructure.Data.Configurations;

diff --git a/Backend/src/Modules/Reminders/Reminders.Infrastructure/Data/Extensions/InitialData.cs b/Backend/src/Modules/Reminders/Reminders.Infrastructure/Data/Extensions/InitialData.cs
@@ -1,5 +1,5 @@
 using BuildingBlocks.Domain.Nodes.Node.ValueObjects;
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 
 namespace Reminders.Infrastructure.Data.Extensions;
 

diff --git a/...d/src/Modules/Reminders/Reminders.Infrastructure/Data/Repositories/RemindersRepository.cs b/...d/src/Modules/Reminders/Reminders.Infrastructure/Data/Repositories/RemindersRepository.cs
@@ -1,4 +1,4 @@
-using BuildingBlocks.Domain.Reminders.ValueObjects;
+using BuildingBlocks.Domain.Reminders.Reminder.ValueObjects;
 using Reminders.Application.Data.Abstractions;
 using Reminders.Application.Entities.Reminders.Exceptions;