Feature add service

Trimly.Core.Application/AddApplication.cs

@@ -1,11 +1,18 @@
 using Microsoft.Extensions.DependencyInjection;
+using Trimly.Core.Application.Interfaces.Service;
+using Trimly.Core.Application.Services;
 
 namespace Trimly.Core.Application
 {
     public static class AddApplication
     {
         public static IServiceCollection AddApplicationLayer(this IServiceCollection services)
         {
+            services.AddScoped<IRegisteredCompaniesService, RegisteredCompaniesService>();
+            services.AddScoped<IAppointmentService, AppointmentService>();
+            services.AddScoped<IServicesService, ServicesService>();
+            services.AddScoped<IReviewService, ReviewService>();
+            services.AddScoped<ISchedulesService, SchedulesService>();
             return services;
         }
     }

Trimly.Core.Application/DTOs/Appointment/AppointmentDTos.cs

@@ -7,8 +7,6 @@ public sealed record AppointmentDTos
         DateTime? StartDateTime,
         DateTime? EndDateTime,
         AppointmentStatus AppointmentStatus,
-        string? ConfirmationCode,
-        string? CancellationReason,
         Guid? ServiceId,
         DateTime? CreatedAt,
         DateTime? UpdateAt

Trimly.Core.Application/DTOs/Appointment/ConfirmAppointmentDTos.cs

@@ -0,0 +1,10 @@
+using Trimly.Core.Domain.Enum;
+
+namespace Trimly.Core.Application.DTOs.Appointment;
+
+public sealed record ConfirmAppointmentDTos
+(
+    AppointmentStatus AppointmentStatus,
+    DateTime? StartDateTime,
+    DateTime? EndDateTime
+);

Trimly.Core.Application/DTOs/Appointment/CreateAppointmentDTos.cs

@@ -5,10 +5,8 @@ namespace Trimly.Core.Application.DTOs.Appointment
 {
     public sealed record CreateAppointmentDTos
     (
-        DateTime? StarDateTime,
-        DateTime? EndDateTime,
-        AppointmentStatus AppointmentStatus, 
-        string? CancellationReason,
+        DateTime StarDateTime,
+        DateTime EndDateTime,
         Guid? ServiceId
     );
 }

Trimly.Core.Application/DTOs/Appointment/UpdateAppoinmentDTos.cs

@@ -5,7 +5,6 @@ public sealed record UpdateAppoinmentDTos
     (
         DateTime? StarDateTime,
         DateTime? EndDateTime,
-        string? CancellationReason,
         Guid? ServiceId
     );
 }

Trimly.Core.Application/DTOs/RegisteredCompanies/CreateRegisteredCompaniesDTos.cs

@@ -1,4 +1,5 @@
-
+using Microsoft.AspNetCore.Http;
+
 namespace Trimly.Core.Application.DTOs.RegisteredCompanies
 {
     public sealed record CreateRegisteredCompaniesDTos
@@ -9,7 +10,6 @@ public sealed record CreateRegisteredCompaniesDTos
         string? AddresCompanies,
         string? Email,
         string? DescriptionCompanies,
-        string? LogoUrl,
-        Domain.Enum.Status? Status
+        IFormFile? ImageFile
     );
 }

Trimly.Core.Application/DTOs/Review/CreateReviewsDTos.cs

@@ -5,6 +5,7 @@ public sealed record CreateReviewsDTos
     (
         string? Title,
         string? Comment,
-        int Rating
+        int Rating,
+        Guid? RegisteredCompanyId
     );
 }

Trimly.Core.Application/DTOs/Schedules/CreateSchedulesDTos.cs

@@ -3,11 +3,11 @@ namespace Trimly.Core.Application.DTOs.Schedules
 {
     public sealed record CreateSchedulesDTos
     (
-        Weekday? Days,
+        Weekday Days,
         TimeOnly OpeningTime,
         TimeOnly ClosingTime,
         string? Notes,
-        Status? IsHolady,
+        Status? IsHoliday,  
         Guid? RegisteredCompanyId
     );
 }

Trimly.Core.Application/DTOs/Schedules/SchedulesDTos.cs

@@ -4,12 +4,12 @@ namespace Trimly.Core.Application.DTOs.Schedules
 {
     public sealed record SchedulesDTos
     (
-        Guid? ShedulesId,
+        Guid? SchedulesId,
         Weekday? Days,
         TimeOnly OpeningTime,
         TimeOnly ClosingTime,
         string? Notes,
-        Status? IsHolady,
+        Status? IsHoliday,
         Guid? RegisteredCompanyId,
         DateTime? CreatedAt,
         DateTime? UpdateAt

Trimly.Core.Application/DTOs/Schedules/UpdateSchedulesDTos.cs

@@ -3,10 +3,10 @@ namespace Trimly.Core.Application.DTOs.Schedules
 {
     public sealed record UpdateSchedulesDTos
     (
-        Weekday? Days,
+        Weekday Days,
         TimeOnly OpeningTime,
         TimeOnly ClosingTime,
         string? Notes,
-        Status? IsHolady
+        Status? IsHoliday
     ); 
 }

Trimly.Core.Application/DTOs/Service/CreateServiceDTos.cs

@@ -1,4 +1,6 @@
 
+using Microsoft.AspNetCore.Http;
+
 namespace Trimly.Core.Application.DTOs.Service
 {
     public sealed record CreateServiceDTos
@@ -7,8 +9,7 @@ public sealed record CreateServiceDTos
         decimal Price,
         string? Description,
         int DurationInMinutes,
-        string? ImageUrl,
-        Guid? RegisteredCompanyId,
-        decimal PenaltyAmount
+        IFormFile? ImageFile,
+        Guid? RegisteredCompanyId
     );
 }

Trimly.Core.Application/DTOs/Service/ServiceFilterDTos.cs

@@ -7,9 +7,6 @@ public sealed record ServiceFilterDTos
         decimal Price,
         string? Description,
         int DurationInMinutes,
-        string? ImageUrl,
-        Guid? RegisteredCompanyId,
-        DateTime? CreatedAt,
-        DateTime? UpdateAt
+        string? ImageUrl
     );
 }

Trimly.Core.Application/DTOs/Service/ServicesDTos.cs

@@ -12,7 +12,6 @@ public sealed record ServicesDTos
         Domain.Enum.Status? Status,
         Guid? RegisteredCompanyId,
         DateTime? CreatedAt,
-        DateTime? UpdateAt,
-        decimal PenaltyAmount
+        DateTime? UpdateAt
     );
 }

Trimly.Core.Application/DTOs/Service/UpdateServiceDTos.cs

@@ -6,7 +6,6 @@ public sealed record UpdateServiceDTos
         string? Name,
         decimal Price,
         string? Description,
-        int DurationInMinutes,
-        decimal PenaltyAmount
+        int DurationInMinutes
     );
 }

Trimly.Core.Application/Interfaces/Repository/IAppointmentRepository.cs

@@ -14,7 +14,9 @@ public interface IAppointmentRepository : IGenericRepository<Appointments>
         Task ConfirmAppointmentAutomaticallyAsync(Appointments appointments,CancellationToken cancellationToken);
 
         Task<int> GetTotalAppointmentCountAsync(Guid serviceId, CancellationToken cancellationToken);
-
+        
         Task<IEnumerable<Appointments>> FilterByStatusAsync(AppointmentStatus appointmentStatus, CancellationToken cancellationToken);
+
+        Task<bool> ValidateAppointmentAsync(DateTime startDate, DateTime endDate, CancellationToken cancellationToken);
     }
 }

Trimly.Core.Application/Interfaces/Repository/IGenericRepository.cs

@@ -1,4 +1,5 @@
-using System.Threading;
+using System.Linq.Expressions;
+using System.Threading;
 using Trimly.Core.Application.Pagination;
 
 namespace Trimly.Core.Application.Interfaces.Repository
@@ -17,5 +18,7 @@ public interface IGenericRepository<TEntity>
         Task<PagedResult<TEntity>> GetPagedResultAsync(int pageNumber,int pageSize, CancellationToken cancellationToken);
 
         Task SaveChangesAsync(CancellationToken cancellationToken);
+
+        Task<bool> ValidateAsync(Expression<Func<TEntity, bool>> predicate);
     }
 }

Trimly.Core.Application/Interfaces/Repository/IServiceRepository.cs

@@ -2,17 +2,19 @@
 
 namespace Trimly.Core.Application.Interfaces.Repository
 {
-    public interface IServiceRepository : IGenericRepository<Services>
+    public interface IServiceRepository : IGenericRepository<Domain.Models.Services>
     {
-        Task<IEnumerable<Services>> GetServicesByNameAsync(Guid registeredCompaniesId, string name,CancellationToken cancellationToken);
+        Task<IEnumerable<Domain.Models.Services>> GetServicesByNameAsync(Guid registeredCompaniesId, string name,CancellationToken cancellationToken);
 
-        Task<IEnumerable<Services>> GetServicesByPriceAsync(Guid registeredCompaniesId, decimal price, CancellationToken cancellationToken);
+        Task<IEnumerable<Domain.Models.Services>> GetServicesByPriceAsync(Guid registeredCompaniesId, decimal price, CancellationToken cancellationToken);
 
-        Task<IEnumerable<Services>> GetServicesByDurationInMinutesAsync(Guid registeredCompaniesId, int durationInMinutes, CancellationToken cancellationToken);
+        Task<IEnumerable<Domain.Models.Services>> GetServicesByDurationInMinutesAsync(Guid registeredCompaniesId, int durationInMinutes, CancellationToken cancellationToken);
 
-        Task ApplyDiscountCodeAsync(Services services, Guid registeredCompaniesId, string discountCode ,CancellationToken cancellationToken);
+        Task ApplyDiscountCodeAsync(Domain.Models.Services services, Guid registeredCompaniesId, string discountCode ,CancellationToken cancellationToken);
 
-        Task<IEnumerable<Services>> GetServicesWithDurationLessThan30MinutesAsync(Guid registeredCompaniesId, CancellationToken cancellationToken);
+        Task<IEnumerable<Domain.Models.Services>> GetServicesWithDurationLessThan30MinutesAsync(Guid registeredCompaniesId, CancellationToken cancellationToken);
+
+        Task<IEnumerable<Domain.Models.Services>> GetServicesByCompanyIdAsync(Guid companyId, CancellationToken cancellationToken);
 
     }
 }

Trimly.Core.Application/Interfaces/Service/IAppointmentService.cs

@@ -16,14 +16,12 @@ public interface IAppointmentService : IGenericService<
 
         Task<ResultT<RescheduleAppointmentDTos>> RescheduleAppointmentAsync(Guid appointmentId, RescheduleAppointmentDTos rescheduleAppointment, CancellationToken cancellationToken);
 
-        Task<ResultT<Guid>> ConfirmAppointmentAutomaticallyAsync(AppointmentStatus appointmentStatus, CancellationToken cancellationToken);
+        Task<ResultT<Guid>> ConfirmAppointmentAutomaticallyAsync(Guid appointmentId, CancellationToken cancellationToken);
 
         Task<ResultT<Guid>> CancelAppointmentWithoutPenaltyAsync(Guid appointmentId, string cancellationReason, CancellationToken cancellationToken);
-
-        Task<ResultT<IEnumerable<AppointmentDTos>>> GetAvailableAppointmentsAsync(AppointmentDateFilterType filterType, CancellationToken cancellationToken);
-
+
         Task<ResultT<int>> GetTotalAppointmentsCountAsync(Guid serviceId, CancellationToken cancellationToken);
-
-        Task<ResultT<AppointmentDTos>> ConfirmAppointment(Guid appointmentId, string confirmationCode, CancellationToken cancellationToken);
+        Task<ResultT<string>> CancelAppointmentWithPenaltyAsync(Guid appointmentId, double penalizationPorcentage ,CancellationToken cancellationToken);
+        Task<ResultT<ConfirmAppointmentDTos>> ConfirmAppointment(Guid appointmentId, string confirmationCode, CancellationToken cancellationToken);
     }
 }

Trimly.Core.Application/Interfaces/Service/ICodeConfirmationService.cs

@@ -0,0 +1,6 @@
+namespace Trimly.Core.Application.Interfaces.Service;
+
+public interface ICodeConfirmationService
+{
+    Task<string> GenerateCodeConfirmation(string emailAddress);
+}

Trimly.Core.Application/Interfaces/Service/IGenericService.cs

@@ -15,7 +15,7 @@ public interface IGenericService <TCreateDTo,TUpdateDTo,TResponseDTo>
 
         Task<ResultT<TResponseDTo>> GetByIdAsync(Guid id, CancellationToken cancellationToken);
 
-        Task<ResultT<TResponseDTo>> CreateAsync(TCreateDTo entity, CancellationToken cancellationToken);
+        Task<ResultT<TResponseDTo>> CreateAsync(TCreateDTo entityCreateDTo, CancellationToken cancellationToken);
 
         Task<ResultT<TResponseDTo>> UpdateAsync(Guid id, TUpdateDTo entity,CancellationToken cancellation);
 

Trimly.Core.Application/Interfaces/Service/ISchedulesService.cs

@@ -13,7 +13,7 @@ public interface ISchedulesService : IGenericService<
 
         Task<ResultT<IEnumerable<SchedulesDTos>>> FilterByOpeningTimeAsync(Guid registeredCompany, TimeOnly openingTime, CancellationToken cancellationToken);
 
-        Task<ResultT<IEnumerable<SchedulesDTos>>> FilterByIsHolidayAsync(Guid registeredCompany, CancellationToken cancellationToken);
+        Task<ResultT<IEnumerable<SchedulesDTos>>> FilterByIsHolidayAsync(Guid registeredCompany, Status isHoliday ,CancellationToken cancellationToken);
 
         Task<ResultT<IEnumerable<SchedulesDTos>>> FilterByWeekDayAsync(Guid registeredCompany, Weekday weekday, CancellationToken cancellationToken);
 

Trimly.Core.Application/Interfaces/Service/IServicesService.cs

@@ -8,14 +8,14 @@ public interface IServicesService : IGenericService<
         UpdateServiceDTos,
         ServicesDTos>
     {
-        Task<ResultT<Guid>> ApplyDiscountCodeAsync(Guid serviceId,Guid registeredCompanyId, double discount, string discountCode, CancellationToken cancellationToken);
+        Task<ResultT<Guid>> ApplyDiscountCodeAsync(Guid serviceId,Guid registeredCompanyId, string discountCode, CancellationToken cancellationToken);
 
         Task<ResultT<IEnumerable<ServiceFilterDTos>>> GetServicesWithDurationLessThan30MinutesAsync(Guid registeredCompany, CancellationToken cancellationToken);
 
         Task<ResultT<IEnumerable<ServicesDTos>>> GetServicesByCompanyIdAsync(Guid registeredCompaniesId, CancellationToken cancellationToken);
 
         Task<ResultT<IEnumerable<ServiceFilterDTos>>> GetServicesByNameAsync(string name, Guid registeredCompanyId, CancellationToken cancellationToken);
 
-        Task<ResultT<IEnumerable<ServiceFilterDTos>>> GetServicesByPriceAsync(double price, Guid registeredCompanyId, CancellationToken cancellationToken);
+        Task<ResultT<IEnumerable<ServiceFilterDTos>>> GetServicesByPriceAsync(decimal price, Guid registeredCompanyId, CancellationToken cancellationToken);
     }
 }