Merge pull request #124 from EduardoKroetz/refactor/invoice-entity

Refactor: refatorar entidade Invoice

Hotel.Domain/Controllers/InvoiceController.cs

@@ -28,7 +28,7 @@ public async Task<IActionResult> GetAsync(
       [FromQuery] int? skip,
       [FromQuery] int? take,
       [FromQuery] string? number,
-      [FromQuery] EPaymentMethod? paymentMethod,
+      [FromQuery] string? paymentMethod,
       [FromQuery] decimal? totalAmount,
       [FromQuery] string? totalAmountOperator,
       [FromQuery] EStatus? status,
@@ -42,9 +42,7 @@ [FromQuery] string? issueDateOperator
     )
     {
         var queryParameters = new InvoiceQueryParameters(
-            skip, take, number, paymentMethod, totalAmount, totalAmountOperator, status,
-            customerId, reservationId, serviceId, taxInformation, taxInformationOperator,
-            issueDate, issueDateOperator
+            skip, take, paymentMethod, totalAmount, totalAmountOperator, customerId, reservationId, serviceId
         );
 
         return Ok(await _handler.HandleGetAsync(queryParameters));

Hotel.Domain/DTOs/InvoiceDTOs/GetInvoice.cs

@@ -1,30 +1,25 @@
-using Hotel.Domain.Enums;
+
+using Hotel.Domain.DTOs.ServiceDTOs;
 
 namespace Hotel.Domain.DTOs.InvoiceDTOs;
 
 public class GetInvoice : IDataTransferObject
 {
-    public GetInvoice(Guid id, string number, EPaymentMethod paymentMethod, Guid reservationId, DateTime issueDate, decimal totalAmount, EStatus status, decimal taxInformation, Guid customerId)
+    public GetInvoice(Guid id, string paymentMethod, Guid reservationId, decimal totalAmount, Guid customerId, IEnumerable<GetService> services)
     {
         Id = id;
         PaymentMethod = paymentMethod;
-        TaxInformation = taxInformation;
         ReservationId = reservationId;
-        Number = number;
-        IssueDate = issueDate;
         TotalAmount = totalAmount;
-        Status = status;
         CustomerId = customerId;
+        Services = services;
     }
 
     public Guid? Id { get; private set; }
-    public EPaymentMethod PaymentMethod { get; private set; }
-    public decimal TaxInformation { get; private set; }
+    public string PaymentMethod { get; private set; }
     public Guid ReservationId { get; private set; }
-    public string Number { get; private set; }
-    public DateTime IssueDate { get; private set; }
     public decimal TotalAmount { get; private set; }
-    public EStatus Status { get; private set; }
     public Guid CustomerId { get; private set; }
+    public IEnumerable<GetService> Services { get; private set; }
 
 }

Hotel.Domain/DTOs/InvoiceDTOs/InvoiceQueryParameters.cs

@@ -4,35 +4,23 @@ namespace Hotel.Domain.DTOs.InvoiceDTOs;
 
 public class InvoiceQueryParameters : IDataTransferObject
 {
-    public InvoiceQueryParameters(int? skip, int? take, string? number, EPaymentMethod? paymentMethod, decimal? totalAmount, string? totalAmountOperator, EStatus? status, Guid? customerId, Guid? reservationId, Guid? serviceId, decimal? taxInformation, string? taxInformationOperator, DateTime? issueDate, string? issueDateOperator)
+    public InvoiceQueryParameters(int? skip, int? take, string? paymentMethod, decimal? totalAmount, string? totalAmountOperator, Guid? customerId, Guid? reservationId, Guid? serviceId)
     {
         Skip = skip;
         Take = take;
-        Number = number;
-        IssueDate = issueDate;
         TotalAmount = totalAmount;
-        Status = status;
         PaymentMethod = paymentMethod;
         CustomerId = customerId;
         ReservationId = reservationId;
         ServiceId = serviceId;
-        TaxInformation = taxInformation;
-        IssueDateOperator = issueDateOperator;
         TotalAmountOperator = totalAmountOperator;
-        TaxInformationOperator = taxInformationOperator;
     }
     public int? Skip { get; private set; }
     public int? Take { get; private set; }
-    public string? Number { get; private set; }
-    public DateTime? IssueDate { get; private set; }
-    public string? IssueDateOperator { get; private set; }
     public decimal? TotalAmount { get; private set; }
     public string? TotalAmountOperator { get; private set; }
-    public EStatus? Status { get; private set; }
-    public EPaymentMethod? PaymentMethod { get; private set; }
+    public string? PaymentMethod { get; private set; }
     public Guid? CustomerId { get; set; }
     public Guid? ReservationId { get; private set; }
     public Guid? ServiceId { get; private set; }
-    public decimal? TaxInformation { get; private set; }
-    public string? TaxInformationOperator { get; private set; }
 }

Hotel.Domain/Data/Mappings/InvoiceMapping.cs

@@ -13,33 +13,13 @@ public void Configure(EntityTypeBuilder<Invoice> builder)
 
         builder.ToTable("Invoices");
 
-        builder.Property(x => x.Number)
-            .IsRequired()
-            .HasMaxLength(50);
-
-        builder.HasIndex(x => x.Number)
-          .IsUnique();
-
-        builder.Property(x => x.IssueDate)
-            .IsRequired();
-
         builder.Property(x => x.TotalAmount)
             .IsRequired()
             .HasColumnType("DECIMAL(18,2)");
-        ;
-
-        builder.Property(x => x.Status)
-            .IsRequired()
-            .HasConversion<int>();
 
         builder.Property(x => x.PaymentMethod)
-            .IsRequired()
-            .HasConversion<int>();
-
-        builder.Property(x => x.TaxInformation)
-            .IsRequired()
-            .HasColumnType("DECIMAL(18,2)");
-
+            .IsRequired();
+
         builder.Property(x => x.ReservationId)
             .IsRequired()
             .HasColumnType("UNIQUEIDENTIFIER");

Hotel.Domain/Entities/Interfaces/IInvoice.cs

@@ -2,18 +2,13 @@
 using Hotel.Domain.Entities.CustomerEntity;
 using Hotel.Domain.Entities.ReservationEntity;
 using Hotel.Domain.Entities.ServiceEntity;
-using Hotel.Domain.Enums;
 
 namespace Hotel.Domain.Entities.Interfaces;
 
 public interface IInvoice : IEntity
 {
-    string Number { get; }
-    DateTime IssueDate { get; }
     decimal TotalAmount { get; }
-    EStatus Status { get; }
-    EPaymentMethod PaymentMethod { get; }
-    decimal TaxInformation { get; }
+    string PaymentMethod { get; }
     Customer? Customer { get; }
     Guid ReservationId { get; }
     Reservation? Reservation { get; }

Hotel.Domain/Entities/InvoiceEntity/Invoice.cs

@@ -3,38 +3,28 @@
 using Hotel.Domain.Entities.Interfaces;
 using Hotel.Domain.Entities.ReservationEntity;
 using Hotel.Domain.Entities.ServiceEntity;
-using Hotel.Domain.Enums;
 
 namespace Hotel.Domain.Entities.InvoiceEntity;
 
 public partial class Invoice : Entity, IInvoice
 {
     internal Invoice() { }
 
-    public Invoice(EPaymentMethod paymentMethod, Reservation reservation, decimal taxInformation = 0)
+    public Invoice(Reservation reservation)
     {
         TotalAmount = reservation.TotalAmount();
-        Number = Guid.NewGuid().ToString(); //Serviço para gerar número
-        IssueDate = DateTime.Now;
-        Status = EStatus.Pending;
-        PaymentMethod = paymentMethod;
-        TaxInformation = taxInformation;
+        PaymentMethod = "card";
         CustomerId = reservation.CustomerId;
         Customer = reservation.Customer;
-        Reservation = reservation;
         ReservationId = reservation.Id;
         Services = reservation.Services;
 
         Validate();
 
     }
 
-    public string Number { get; private set; } = string.Empty;
-    public DateTime IssueDate { get; private set; }
     public decimal TotalAmount { get; private set; }
-    public EStatus Status { get; private set; }
-    public EPaymentMethod PaymentMethod { get; private set; }
-    public decimal TaxInformation { get; private set; }
+    public string PaymentMethod { get; private set; } = null!;
     public Guid CustomerId { get; private set; }
     public Customer? Customer { get; private set; }
     public Guid ReservationId { get; private set; }

Hotel.Domain/Entities/ReservationEntity/Finish.cs

@@ -1,6 +1,5 @@
 using Hotel.Domain.Entities.InvoiceEntity;
 using Hotel.Domain.Enums;
-using Hotel.Domain.Exceptions;
 
 namespace Hotel.Domain.Entities.ReservationEntity;
 
@@ -28,7 +27,7 @@ public Invoice Finish()
         UpdateCheckOut(DateTime.Now)
           .ToCheckOut(); // Muda o status para CheckedOut
 
-        Invoice = new Invoice(EPaymentMethod.CreditCard, this, 0); //Gera uma instância de uma fatura
+        Invoice = new Invoice(this); //Gera uma instância de uma fatura
 
         Room?.ChangeStatus(ERoomStatus.OutOfService); //troca o status do quarto para 'OutOfService'(Fora de serviço)
 

Hotel.Domain/Repositories/InvoiceRepository.cs

@@ -1,5 +1,6 @@
 using Hotel.Domain.Data;
 using Hotel.Domain.DTOs.InvoiceDTOs;
+using Hotel.Domain.DTOs.ServiceDTOs;
 using Hotel.Domain.Entities.InvoiceEntity;
 using Hotel.Domain.Extensions;
 using Hotel.Domain.Repositories.Base;
@@ -12,14 +13,22 @@ public class InvoiceRepository : GenericRepository<Invoice>, IInvoiceRepository
 {
     public InvoiceRepository(HotelDbContext context) : base(context) { }
 
-
     public async Task<GetInvoice?> GetByIdAsync(Guid id)
     {
         return await _context
           .Invoices
           .AsNoTracking()
           .Where(x => x.Id == id)
-          .Select(x => new GetInvoice(x.Id, x.Number, x.PaymentMethod, x.ReservationId, x.IssueDate, x.TotalAmount, x.Status, x.TaxInformation, x.CustomerId))
+          .Include(x => x.Services)
+          .Select(x => 
+            new GetInvoice(
+                x.Id,
+                x.PaymentMethod, 
+                x.ReservationId,
+                x.TotalAmount, 
+                x.CustomerId, 
+                x.Services.Select(s => 
+                    new GetService(s.Id, s.Name, s.Price, s.Priority, s.IsActive, s.TimeInMinutes, s.CreatedAt))))
           .FirstOrDefaultAsync();
 
     }
@@ -28,19 +37,7 @@ public async Task<IEnumerable<GetInvoice>> GetAsync(InvoiceQueryParameters query
     {
         var query = _context.Invoices.AsQueryable();
 
-        if (queryParameters.Number != null)
-            query = query.Where(x => x.Number.Contains(queryParameters.Number));
-
-        if (queryParameters.IssueDate.HasValue)
-            query = query.FilterByOperator(queryParameters.IssueDateOperator, x => x.IssueDate, queryParameters.IssueDate);
-
-        if (queryParameters.TotalAmount.HasValue)
-            query = query.FilterByOperator(queryParameters.TotalAmountOperator, x => x.TotalAmount, queryParameters.TotalAmount);
-
-        if (queryParameters.Status.HasValue)
-            query = query.Where(x => x.Status == queryParameters.Status);
-
-        if (queryParameters.PaymentMethod.HasValue)
+        if (queryParameters.PaymentMethod != null)
             query = query.Where(x => x.PaymentMethod == queryParameters.PaymentMethod);
 
         if (queryParameters.CustomerId.HasValue)
@@ -52,22 +49,20 @@ public async Task<IEnumerable<GetInvoice>> GetAsync(InvoiceQueryParameters query
         if (queryParameters.ServiceId.HasValue)
             query = query.Where(x => x.Services.Any(x => x.Id == queryParameters.ServiceId));
 
-        if (queryParameters.TaxInformation.HasValue)
-            query = query.FilterByOperator(queryParameters.TaxInformationOperator, x => x.TaxInformation, queryParameters.TaxInformation);
+        if (queryParameters.TotalAmount.HasValue)
+            query = query.FilterByOperator(queryParameters.TotalAmountOperator, x => x.TotalAmount, queryParameters.TotalAmount);
 
         query = query.Skip(queryParameters.Skip ?? 0).Take(queryParameters.Take ?? 1);
         query = query.AsNoTracking();
 
         return await query.Select(x => new GetInvoice(
-          x.Id,
-          x.Number,
-          x.PaymentMethod,
-          x.ReservationId,
-          x.IssueDate,
-          x.TotalAmount,
-          x.Status,
-          x.TaxInformation,
-          x.CustomerId
+            x.Id,
+            x.PaymentMethod,
+            x.ReservationId,
+            x.TotalAmount,
+            x.CustomerId,
+            x.Services.Select(s =>
+                new GetService(s.Id, s.Name, s.Price, s.Priority, s.IsActive, s.TimeInMinutes, s.CreatedAt))
         )).ToListAsync();
     }
 }

Hotel.Tests/UnitTests/Entities/InvoiceEntityTest.cs

@@ -10,30 +10,6 @@ namespace Hotel.Tests.UnitTests.Entities;
 [TestClass]
 public class InvoiceEntityTest
 {
-
-    [TestMethod]
-    public void ValidInvoice_MustBeValid()
-    {
-        var room = new Room("Quarto",1, 50, 3, "Quarto padrão", TestParameters.Category);
-        var reservation = new Reservation(room, DateTime.Now.Date, DateTime.Now.AddDays(1), TestParameters.Customer, 2);
-
-        reservation.ToCheckIn();
-        reservation.Finish();
-        Assert.IsTrue(reservation?.Invoice?.IsValid);
-    }
-
-    [TestMethod]
-    [ExpectedException(typeof(ValidationException))]
-    public void InvoiceWithoutCheckOutStatusReservation_ExpectedException()
-    {
-        var room = new Room("Quarto",1, 50, 3, "Quarto padrão", TestParameters.Category);
-        var reservation = new Reservation(room, DateTime.Now.Date, DateTime.Now.AddDays(1), TestParameters.Customer, 2);
-        reservation.ToCheckIn();
-
-        new Invoice(EPaymentMethod.Pix, reservation);
-        Assert.Fail();
-    }
-
     [TestMethod]
     public void TheCustomersInReservation_MustBeSameOnInvoice()
     {
@@ -45,19 +21,4 @@ public void TheCustomersInReservation_MustBeSameOnInvoice()
         Assert.AreEqual(reservation.Customer, invoice.Customer);
     }
 
-    [TestMethod]
-    public void ChangeToFinishInvoiceStatus_MustBeFinishStatus()
-    {
-        var room = new Room("Quarto",1, 50, 3, "Quarto padrão", TestParameters.Category);
-        var reservation = new Reservation(room, DateTime.Now.Date, DateTime.Now.AddDays(1), TestParameters.Customer, 2);
-        reservation.ToCheckIn();
-
-        var invoice = reservation.Finish();
-        invoice.FinishInvoice();
-        Assert.AreEqual(EStatus.Finish, invoice.Status);
-    }
-
-
-
-
 }