From 91a73cbcef914750d9f52190e27e955c4b37bdc2 Mon Sep 17 00:00:00 2001 From: "Amir.H Khademi" Date: Mon, 27 May 2024 00:35:53 +0330 Subject: [PATCH] RELEASE VER 1.0.0.1 , complete version 1 , add scalarUi --- .version | 2 +- Brizco.Api/Brizco.Api.csproj | 4 +- Brizco.Api/Program.cs | 5 ++- Brizco.Api/Properties/launchSettings.json | 2 +- .../ScalarUi/ScalarUiConfiguration.cs | 44 +++++++++++++++++++ Brizco.Core/Brizco.Core.csproj | 2 +- Brizco.Core/CoreServices/PageService.cs | 9 ++-- .../TaskReportCommandHandler.cs | 3 +- Brizco.Domain/Brizco.Domain.csproj | 2 +- .../Commands/ActivityCommands.cs | 4 +- .../Commands/ShiftPlanCommands.cs | 4 +- .../CommandQueries/Commands/TaskCommands.cs | 4 +- .../CommandQueries/Queries/ActivityQueries.cs | 4 +- .../CommandQueries/Queries/PositionQueries.cs | 4 +- .../CommandQueries/Queries/SectionQueries.cs | 4 +- .../Queries/ShiftPlanQueries.cs | 4 +- .../CommandQueries/Queries/ShiftQueries.cs | 4 +- .../CommandQueries/Queries/TaskQueries.cs | 4 +- .../{LargDtos => LargeDtos}/ActivityLDto.cs | 4 +- .../{LargDtos => LargeDtos}/ComplexLDto.cs | 4 +- .../{LargDtos => LargeDtos}/PositionLDto.cs | 2 +- .../{LargDtos => LargeDtos}/SectionLDto.cs | 2 +- .../Dtos/{LargDtos => LargeDtos}/ShiftLDto.cs | 2 +- .../{LargDtos => LargeDtos}/ShiftPlanLDto.cs | 4 +- .../Dtos/{LargDtos => LargeDtos}/TaskLDto.cs | 4 +- Brizco.Domain/Mappers/ActivityMapper.g.cs | 2 +- Brizco.Domain/Mappers/ComplexMapper.g.cs | 2 +- Brizco.Domain/Mappers/PositionMapper.g.cs | 2 +- Brizco.Domain/Mappers/SectionMapper.g.cs | 2 +- Brizco.Domain/Mappers/ShiftMapper.g.cs | 2 +- Brizco.Domain/Mappers/ShiftPlanMapper.g.cs | 2 +- Brizco.Domain/Mappers/TaskMapper.g.cs | 2 +- Brizco.Domain/MapsterRegister.cs | 3 +- .../Brizco.Infrastructure.csproj | 7 +-- Brizco.Repository/Brizco.Repository.csproj | 2 +- .../Activity/CreateActivityCommandHandler.cs | 4 +- .../Activity/GetActivityQueryHandler.cs | 2 +- .../Position/GetPositionQueryHandler.cs | 4 +- .../Section/GetSectionQueryHandler.cs | 4 +- .../Handlers/Shift/GetShiftQueryHandler.cs | 3 +- .../CreateShiftPlanCommandHandler.cs | 4 +- .../ShiftPlan/GetShiftPlanQueryHandler.cs | 4 +- .../Handlers/Task/CreateTaskCommandHandler.cs | 4 +- .../Handlers/Task/GetTaskQueryHandler.cs | 2 +- 44 files changed, 131 insertions(+), 57 deletions(-) create mode 100644 Brizco.Api/WebFramework/ScalarUi/ScalarUiConfiguration.cs rename Brizco.Domain/Dtos/{LargDtos => LargeDtos}/ActivityLDto.cs (90%) rename Brizco.Domain/Dtos/{LargDtos => LargeDtos}/ComplexLDto.cs (78%) rename Brizco.Domain/Dtos/{LargDtos => LargeDtos}/PositionLDto.cs (87%) rename Brizco.Domain/Dtos/{LargDtos => LargeDtos}/SectionLDto.cs (87%) rename Brizco.Domain/Dtos/{LargDtos => LargeDtos}/ShiftLDto.cs (90%) rename Brizco.Domain/Dtos/{LargDtos => LargeDtos}/ShiftPlanLDto.cs (86%) rename Brizco.Domain/Dtos/{LargDtos => LargeDtos}/TaskLDto.cs (90%) diff --git a/.version b/.version index e7898aa..217625a 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.7.12.12 \ No newline at end of file +1.0.0.1 \ No newline at end of file diff --git a/Brizco.Api/Brizco.Api.csproj b/Brizco.Api/Brizco.Api.csproj index 1723c35..e5892c1 100644 --- a/Brizco.Api/Brizco.Api.csproj +++ b/Brizco.Api/Brizco.Api.csproj @@ -6,8 +6,8 @@ enable Linux ..\docker-compose.dcproj - 0.6.10.11 - 0.6.10.11 + 1.0.0.1 + 1.0.0.1 diff --git a/Brizco.Api/Program.cs b/Brizco.Api/Program.cs index 911b1c3..dd8f963 100644 --- a/Brizco.Api/Program.cs +++ b/Brizco.Api/Program.cs @@ -7,6 +7,7 @@ using Brizco.Domain.Models.Settings; using Brizco.Infrastructure; using Brizco.Repository; using System.Configuration; +using Brizco.Api.WebFramework.ScalarUi; using Carter; using FluentValidation; using MediatR.Extensions.Autofac.DependencyInjection; @@ -109,7 +110,9 @@ if (app.Environment.IsDevelopment()) } app.UseCors("CorsPolicy"); -app.UseCustomSwagger(siteSetting.BaseUrl); +//app.UseCustomSwagger(siteSetting.BaseUrl); +app.UseSwagger(); +app.MapScalarUi(); app.UseAuthorization(); app.UseAuthentication(); diff --git a/Brizco.Api/Properties/launchSettings.json b/Brizco.Api/Properties/launchSettings.json index a13897b..4a0a476 100644 --- a/Brizco.Api/Properties/launchSettings.json +++ b/Brizco.Api/Properties/launchSettings.json @@ -21,7 +21,7 @@ "Docker": { "commandName": "Docker", "launchBrowser": true, - "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger", + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/scalar/v1", "environmentVariables": { "ASPNETCORE_URLS": "http://+:80" }, diff --git a/Brizco.Api/WebFramework/ScalarUi/ScalarUiConfiguration.cs b/Brizco.Api/WebFramework/ScalarUi/ScalarUiConfiguration.cs new file mode 100644 index 0000000..9245926 --- /dev/null +++ b/Brizco.Api/WebFramework/ScalarUi/ScalarUiConfiguration.cs @@ -0,0 +1,44 @@ +namespace Brizco.Api.WebFramework.ScalarUi; + +public static class ScalarUiConfiguration +{ + public static void MapScalarUi(this IEndpointRouteBuilder app) + { + app.MapGet("/scalar/{documentName}", (string documentName) => + { + + var scalarScript = $$""" + + + + Scalar API Reference + + + + + + + + + + + + + + """; + + return Results.Content(scalarScript, "text/html"); + }).ExcludeFromDescription(); + } +} \ No newline at end of file diff --git a/Brizco.Core/Brizco.Core.csproj b/Brizco.Core/Brizco.Core.csproj index 270e93e..e7ddde3 100644 --- a/Brizco.Core/Brizco.Core.csproj +++ b/Brizco.Core/Brizco.Core.csproj @@ -37,7 +37,7 @@ - + diff --git a/Brizco.Core/CoreServices/PageService.cs b/Brizco.Core/CoreServices/PageService.cs index ff61878..2504e5c 100644 --- a/Brizco.Core/CoreServices/PageService.cs +++ b/Brizco.Core/CoreServices/PageService.cs @@ -50,7 +50,7 @@ public class PageService : IPageService UnDoneActivitiesToday = todayTasks.Count(t => t.IsDone!), TotalShiftToday = todayShiftPlans.Count, TodayStaffNames = names, - TotalStaffToday = todayShiftPlans.SelectMany(sp => sp.Users).Count() + TotalStaffToday = todayShiftPlans.SelectMany(sp => sp.Users).GroupBy(u=>u.UserId).Count() }; var currentShift = todayShiftPlans.FirstOrDefault(s => s.EndAt >= DateTime.Now.TimeOfDay && s.StartAt <= DateTime.Now.TimeOfDay); @@ -164,7 +164,7 @@ public class PageService : IPageService } } - page.SignUpCompletePercent = ((totalStepCount * 100) / completeStepCount); + page.SignUpCompletePercent = completeStepCount != 0 ? ((totalStepCount * 100) / completeStepCount) : 0; page.CurrentSignUpStep = currentStep; } @@ -185,13 +185,14 @@ public class PageService : IPageService var shifts = await _mediator.Send(new GetRoutineShiftsQuery(routineId, 0), cancellationToken); - for (int i = 0 ; i < 15; i++ , day = day.AddDays(i)) + for (int i = 0 ; i < 15; i++ , day = day.AddDays(1)) { var item = new AppShiftingPageDayDto { DateTime = DateTimeExtensions.DateTimeToUnixTimeStamp(day) }; - shifts.Where(s=>s.Day == day.DayOfWeek).SelectMany(s=>s.Shifts).ToList().ForEach(s=>item.Shifts.Add(s.Clone())); + shifts.Where(s=>s.Day == day.DayOfWeek) + .SelectMany(s=>s.Shifts).OrderBy(s=>s.StartAt).ToList().ForEach(s=>item.Shifts.Add(s.Clone())); foreach (var shift in item.Shifts) { var existedShiftPlan = await _repositoryWrapper.SetRepository() diff --git a/Brizco.Core/CoreServices/ReportServices/TaskReportCommandHandler.cs b/Brizco.Core/CoreServices/ReportServices/TaskReportCommandHandler.cs index b5e01fa..ff25ef7 100644 --- a/Brizco.Core/CoreServices/ReportServices/TaskReportCommandHandler.cs +++ b/Brizco.Core/CoreServices/ReportServices/TaskReportCommandHandler.cs @@ -1,4 +1,5 @@ -using Brizco.Domain.Entities.Task; +using Brizco.Domain.Dtos.LargeDtos; +using Brizco.Domain.Entities.Task; using Task = System.Threading.Tasks.Task; namespace Brizco.Core.CoreServices.ReportServices; diff --git a/Brizco.Domain/Brizco.Domain.csproj b/Brizco.Domain/Brizco.Domain.csproj index 34a5dcb..679e3c4 100644 --- a/Brizco.Domain/Brizco.Domain.csproj +++ b/Brizco.Domain/Brizco.Domain.csproj @@ -52,7 +52,7 @@ - + diff --git a/Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs b/Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs index 505ebe2..a486158 100644 --- a/Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs +++ b/Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Commands; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Commands; public sealed record CreateActivityCommand( TaskType Type, diff --git a/Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs b/Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs index 69e38f0..81f7a76 100644 --- a/Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs +++ b/Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Commands; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Commands; public record CreateShiftPlanCommand(long PlanDate,Guid ShiftId,Guid RoutineId,Guid SupervisionUserId, List> UserAndPositionIds) :IRequest; diff --git a/Brizco.Domain/CommandQueries/Commands/TaskCommands.cs b/Brizco.Domain/CommandQueries/Commands/TaskCommands.cs index ca7baa9..1fa76df 100644 --- a/Brizco.Domain/CommandQueries/Commands/TaskCommands.cs +++ b/Brizco.Domain/CommandQueries/Commands/TaskCommands.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Commands; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Commands; public sealed record CreateTaskCommand(TaskType Type, string Title, diff --git a/Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs b/Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs index 07d5564..a670b97 100644 --- a/Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs +++ b/Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Queries; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Queries; public sealed record GetActivitiesQuery(int Page = 0 , long SelectedDate = 0 , Guid SelectedShiftPlanId = default , DateQueryFilter? DateQueryFilter = null) : IRequest>; diff --git a/Brizco.Domain/CommandQueries/Queries/PositionQueries.cs b/Brizco.Domain/CommandQueries/Queries/PositionQueries.cs index f651b30..b51cae0 100644 --- a/Brizco.Domain/CommandQueries/Queries/PositionQueries.cs +++ b/Brizco.Domain/CommandQueries/Queries/PositionQueries.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Queries; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Queries; public sealed record GetPositionsQuery(int Page = 0) : IRequest>; diff --git a/Brizco.Domain/CommandQueries/Queries/SectionQueries.cs b/Brizco.Domain/CommandQueries/Queries/SectionQueries.cs index 612258e..91f7794 100644 --- a/Brizco.Domain/CommandQueries/Queries/SectionQueries.cs +++ b/Brizco.Domain/CommandQueries/Queries/SectionQueries.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Queries; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Queries; public sealed record GetSectionsQuery(int Page = 0) : IRequest>; diff --git a/Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs b/Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs index 1b31a39..e71b14b 100644 --- a/Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs +++ b/Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Queries; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Queries; public sealed record GetShiftPlansQuery(int Page = 0 , long SelectedDate = 0 , DateTimeQueryFilter? DateTimeQueryFilter = DateTimeQueryFilter.CustomDate) : IRequest>; diff --git a/Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs b/Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs index 77da97d..a56a319 100644 --- a/Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs +++ b/Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Queries; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Queries; public sealed record GetShiftsQuery(int Page = 0,long SelectedDate = 0) : IRequest>; diff --git a/Brizco.Domain/CommandQueries/Queries/TaskQueries.cs b/Brizco.Domain/CommandQueries/Queries/TaskQueries.cs index 3d9aef6..d66bec0 100644 --- a/Brizco.Domain/CommandQueries/Queries/TaskQueries.cs +++ b/Brizco.Domain/CommandQueries/Queries/TaskQueries.cs @@ -1,4 +1,6 @@ -namespace Brizco.Domain.CommandQueries.Queries; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Domain.CommandQueries.Queries; public sealed record GetTasksQuery(int Page = 0) : IRequest>; diff --git a/Brizco.Domain/Dtos/LargDtos/ActivityLDto.cs b/Brizco.Domain/Dtos/LargeDtos/ActivityLDto.cs similarity index 90% rename from Brizco.Domain/Dtos/LargDtos/ActivityLDto.cs rename to Brizco.Domain/Dtos/LargeDtos/ActivityLDto.cs index 3f743bb..90e05e6 100644 --- a/Brizco.Domain/Dtos/LargDtos/ActivityLDto.cs +++ b/Brizco.Domain/Dtos/LargeDtos/ActivityLDto.cs @@ -1,6 +1,4 @@ -using Brizco.Domain.Entities.Task; - -namespace Brizco.Domain.Dtos.LargDtos; +namespace Brizco.Domain.Dtos.LargeDtos; public class ActivityLDto : BaseDto { diff --git a/Brizco.Domain/Dtos/LargDtos/ComplexLDto.cs b/Brizco.Domain/Dtos/LargeDtos/ComplexLDto.cs similarity index 78% rename from Brizco.Domain/Dtos/LargDtos/ComplexLDto.cs rename to Brizco.Domain/Dtos/LargeDtos/ComplexLDto.cs index 4ca46d3..0fb65cd 100644 --- a/Brizco.Domain/Dtos/LargDtos/ComplexLDto.cs +++ b/Brizco.Domain/Dtos/LargeDtos/ComplexLDto.cs @@ -1,6 +1,4 @@ -using Brizco.Domain.Entities.Complex; - -namespace Brizco.Domain.Dtos.LargDtos; +namespace Brizco.Domain.Dtos.LargeDtos; public class ComplexLDto : BaseDto { diff --git a/Brizco.Domain/Dtos/LargDtos/PositionLDto.cs b/Brizco.Domain/Dtos/LargeDtos/PositionLDto.cs similarity index 87% rename from Brizco.Domain/Dtos/LargDtos/PositionLDto.cs rename to Brizco.Domain/Dtos/LargeDtos/PositionLDto.cs index a131c6f..4c87d4c 100644 --- a/Brizco.Domain/Dtos/LargDtos/PositionLDto.cs +++ b/Brizco.Domain/Dtos/LargeDtos/PositionLDto.cs @@ -1,4 +1,4 @@ -namespace Brizco.Domain.Dtos.LargDtos; +namespace Brizco.Domain.Dtos.LargeDtos; public class PositionLDto : BaseDto { diff --git a/Brizco.Domain/Dtos/LargDtos/SectionLDto.cs b/Brizco.Domain/Dtos/LargeDtos/SectionLDto.cs similarity index 87% rename from Brizco.Domain/Dtos/LargDtos/SectionLDto.cs rename to Brizco.Domain/Dtos/LargeDtos/SectionLDto.cs index 84e06e8..712e8e4 100644 --- a/Brizco.Domain/Dtos/LargDtos/SectionLDto.cs +++ b/Brizco.Domain/Dtos/LargeDtos/SectionLDto.cs @@ -1,4 +1,4 @@ -namespace Brizco.Domain.Dtos.LargDtos; +namespace Brizco.Domain.Dtos.LargeDtos; public class SectionLDto : BaseDto { diff --git a/Brizco.Domain/Dtos/LargDtos/ShiftLDto.cs b/Brizco.Domain/Dtos/LargeDtos/ShiftLDto.cs similarity index 90% rename from Brizco.Domain/Dtos/LargDtos/ShiftLDto.cs rename to Brizco.Domain/Dtos/LargeDtos/ShiftLDto.cs index 09b3fe4..d503c99 100644 --- a/Brizco.Domain/Dtos/LargDtos/ShiftLDto.cs +++ b/Brizco.Domain/Dtos/LargeDtos/ShiftLDto.cs @@ -1,4 +1,4 @@ -namespace Brizco.Domain.Dtos.LargDtos; +namespace Brizco.Domain.Dtos.LargeDtos; public class ShiftLDto : BaseDto { diff --git a/Brizco.Domain/Dtos/LargDtos/ShiftPlanLDto.cs b/Brizco.Domain/Dtos/LargeDtos/ShiftPlanLDto.cs similarity index 86% rename from Brizco.Domain/Dtos/LargDtos/ShiftPlanLDto.cs rename to Brizco.Domain/Dtos/LargeDtos/ShiftPlanLDto.cs index 46be1e6..10bf32f 100644 --- a/Brizco.Domain/Dtos/LargDtos/ShiftPlanLDto.cs +++ b/Brizco.Domain/Dtos/LargeDtos/ShiftPlanLDto.cs @@ -1,6 +1,4 @@ -using Brizco.Domain.Entities.Shift; - -namespace Brizco.Domain.Dtos.LargDtos; +namespace Brizco.Domain.Dtos.LargeDtos; public class ShiftPlanLDto : BaseDto { diff --git a/Brizco.Domain/Dtos/LargDtos/TaskLDto.cs b/Brizco.Domain/Dtos/LargeDtos/TaskLDto.cs similarity index 90% rename from Brizco.Domain/Dtos/LargDtos/TaskLDto.cs rename to Brizco.Domain/Dtos/LargeDtos/TaskLDto.cs index c1bfd0f..bde71bb 100644 --- a/Brizco.Domain/Dtos/LargDtos/TaskLDto.cs +++ b/Brizco.Domain/Dtos/LargeDtos/TaskLDto.cs @@ -1,6 +1,4 @@ -using Brizco.Domain.Entities.Task; - -namespace Brizco.Domain.Dtos.LargDtos; +namespace Brizco.Domain.Dtos.LargeDtos; public class TaskLDto : BaseDto { diff --git a/Brizco.Domain/Mappers/ActivityMapper.g.cs b/Brizco.Domain/Mappers/ActivityMapper.g.cs index 659fc9a..3021ae8 100644 --- a/Brizco.Domain/Mappers/ActivityMapper.g.cs +++ b/Brizco.Domain/Mappers/ActivityMapper.g.cs @@ -1,6 +1,6 @@ using System; using System.Linq.Expressions; -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; using Brizco.Domain.Dtos.SmallDtos; using Brizco.Domain.Entities.Shift; using Brizco.Domain.Entities.Task; diff --git a/Brizco.Domain/Mappers/ComplexMapper.g.cs b/Brizco.Domain/Mappers/ComplexMapper.g.cs index 9637a34..b9e78f6 100644 --- a/Brizco.Domain/Mappers/ComplexMapper.g.cs +++ b/Brizco.Domain/Mappers/ComplexMapper.g.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; using Brizco.Domain.Dtos.SmallDtos; using Brizco.Domain.Entities.Complex; using Brizco.Domain.Entities.User; diff --git a/Brizco.Domain/Mappers/PositionMapper.g.cs b/Brizco.Domain/Mappers/PositionMapper.g.cs index d1d25b5..8b63995 100644 --- a/Brizco.Domain/Mappers/PositionMapper.g.cs +++ b/Brizco.Domain/Mappers/PositionMapper.g.cs @@ -1,6 +1,6 @@ using System; using System.Linq.Expressions; -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; using Brizco.Domain.Dtos.SmallDtos; using Brizco.Domain.Entities.Complex; using Mapster.Models; diff --git a/Brizco.Domain/Mappers/SectionMapper.g.cs b/Brizco.Domain/Mappers/SectionMapper.g.cs index f557842..61dc964 100644 --- a/Brizco.Domain/Mappers/SectionMapper.g.cs +++ b/Brizco.Domain/Mappers/SectionMapper.g.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; using Brizco.Domain.Dtos.SmallDtos; using Brizco.Domain.Entities.Complex; diff --git a/Brizco.Domain/Mappers/ShiftMapper.g.cs b/Brizco.Domain/Mappers/ShiftMapper.g.cs index 6c103cc..52b2923 100644 --- a/Brizco.Domain/Mappers/ShiftMapper.g.cs +++ b/Brizco.Domain/Mappers/ShiftMapper.g.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; using Brizco.Domain.Dtos.SmallDtos; using Brizco.Domain.Entities.Complex; using Brizco.Domain.Entities.Shift; diff --git a/Brizco.Domain/Mappers/ShiftPlanMapper.g.cs b/Brizco.Domain/Mappers/ShiftPlanMapper.g.cs index f2986db..1170d98 100644 --- a/Brizco.Domain/Mappers/ShiftPlanMapper.g.cs +++ b/Brizco.Domain/Mappers/ShiftPlanMapper.g.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; using Brizco.Domain.Dtos.SmallDtos; using Brizco.Domain.Entities.Complex; using Brizco.Domain.Entities.Routine; diff --git a/Brizco.Domain/Mappers/TaskMapper.g.cs b/Brizco.Domain/Mappers/TaskMapper.g.cs index dc1a447..e62f466 100644 --- a/Brizco.Domain/Mappers/TaskMapper.g.cs +++ b/Brizco.Domain/Mappers/TaskMapper.g.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using Brizco.Common.Extensions; -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; using Brizco.Domain.Dtos.SmallDtos; using Brizco.Domain.Entities.Complex; using Brizco.Domain.Entities.Shift; diff --git a/Brizco.Domain/MapsterRegister.cs b/Brizco.Domain/MapsterRegister.cs index 4b502c0..08ce055 100644 --- a/Brizco.Domain/MapsterRegister.cs +++ b/Brizco.Domain/MapsterRegister.cs @@ -1,4 +1,5 @@ -using MD.PersianDateTime.Standard; +using Brizco.Domain.Dtos.LargeDtos; +using MD.PersianDateTime.Standard; using Task = Brizco.Domain.Entities.Task.Task; namespace Brizco.Domain; diff --git a/Brizco.Infrastructure/Brizco.Infrastructure.csproj b/Brizco.Infrastructure/Brizco.Infrastructure.csproj index 7a8bfbd..808ebd3 100644 --- a/Brizco.Infrastructure/Brizco.Infrastructure.csproj +++ b/Brizco.Infrastructure/Brizco.Infrastructure.csproj @@ -6,13 +6,14 @@ enable + + + + - - - diff --git a/Brizco.Repository/Brizco.Repository.csproj b/Brizco.Repository/Brizco.Repository.csproj index 3ba8c5d..e0ad4d9 100644 --- a/Brizco.Repository/Brizco.Repository.csproj +++ b/Brizco.Repository/Brizco.Repository.csproj @@ -42,7 +42,7 @@ - + diff --git a/Brizco.Repository/Handlers/Activity/CreateActivityCommandHandler.cs b/Brizco.Repository/Handlers/Activity/CreateActivityCommandHandler.cs index edfe24f..2810413 100644 --- a/Brizco.Repository/Handlers/Activity/CreateActivityCommandHandler.cs +++ b/Brizco.Repository/Handlers/Activity/CreateActivityCommandHandler.cs @@ -1,4 +1,6 @@ -namespace Brizco.Repository.Handlers.Activity; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Repository.Handlers.Activity; public class CreateActivityCommandHandler : IRequestHandler { diff --git a/Brizco.Repository/Handlers/Activity/GetActivityQueryHandler.cs b/Brizco.Repository/Handlers/Activity/GetActivityQueryHandler.cs index 292d286..b54efdc 100644 --- a/Brizco.Repository/Handlers/Activity/GetActivityQueryHandler.cs +++ b/Brizco.Repository/Handlers/Activity/GetActivityQueryHandler.cs @@ -1,4 +1,4 @@ -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; namespace Brizco.Repository.Handlers.Activity; diff --git a/Brizco.Repository/Handlers/Position/GetPositionQueryHandler.cs b/Brizco.Repository/Handlers/Position/GetPositionQueryHandler.cs index 473f39c..266037c 100644 --- a/Brizco.Repository/Handlers/Position/GetPositionQueryHandler.cs +++ b/Brizco.Repository/Handlers/Position/GetPositionQueryHandler.cs @@ -1,4 +1,6 @@ -namespace Brizco.Repository.Handlers.Position; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Repository.Handlers.Position; public class GetPositionQueryHandler : IRequestHandler { diff --git a/Brizco.Repository/Handlers/Section/GetSectionQueryHandler.cs b/Brizco.Repository/Handlers/Section/GetSectionQueryHandler.cs index bd4d3ab..899e746 100644 --- a/Brizco.Repository/Handlers/Section/GetSectionQueryHandler.cs +++ b/Brizco.Repository/Handlers/Section/GetSectionQueryHandler.cs @@ -1,4 +1,6 @@ -namespace Brizco.Repository.Handlers.Section; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Repository.Handlers.Section; public class GetSectionQueryHandler : IRequestHandler { diff --git a/Brizco.Repository/Handlers/Shift/GetShiftQueryHandler.cs b/Brizco.Repository/Handlers/Shift/GetShiftQueryHandler.cs index fe037c0..e71f146 100644 --- a/Brizco.Repository/Handlers/Shift/GetShiftQueryHandler.cs +++ b/Brizco.Repository/Handlers/Shift/GetShiftQueryHandler.cs @@ -1,4 +1,5 @@ -using Brizco.Domain.Entities.Shift; +using Brizco.Domain.Dtos.LargeDtos; +using Brizco.Domain.Entities.Shift; namespace Brizco.Repository.Handlers.Shift; diff --git a/Brizco.Repository/Handlers/ShiftPlan/CreateShiftPlanCommandHandler.cs b/Brizco.Repository/Handlers/ShiftPlan/CreateShiftPlanCommandHandler.cs index 4a5bdcc..f3456b0 100644 --- a/Brizco.Repository/Handlers/ShiftPlan/CreateShiftPlanCommandHandler.cs +++ b/Brizco.Repository/Handlers/ShiftPlan/CreateShiftPlanCommandHandler.cs @@ -1,4 +1,6 @@ -namespace Brizco.Repository.Handlers.ShiftPlan; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Repository.Handlers.ShiftPlan; public class CreateShiftPlanCommandHandler : IRequestHandler { diff --git a/Brizco.Repository/Handlers/ShiftPlan/GetShiftPlanQueryHandler.cs b/Brizco.Repository/Handlers/ShiftPlan/GetShiftPlanQueryHandler.cs index 55d93c5..d75c277 100644 --- a/Brizco.Repository/Handlers/ShiftPlan/GetShiftPlanQueryHandler.cs +++ b/Brizco.Repository/Handlers/ShiftPlan/GetShiftPlanQueryHandler.cs @@ -1,4 +1,6 @@ -namespace Brizco.Repository.Handlers.ShiftPlan; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Repository.Handlers.ShiftPlan; public class GetShiftPlanQueryHandler : IRequestHandler { diff --git a/Brizco.Repository/Handlers/Task/CreateTaskCommandHandler.cs b/Brizco.Repository/Handlers/Task/CreateTaskCommandHandler.cs index 295e653..6212821 100644 --- a/Brizco.Repository/Handlers/Task/CreateTaskCommandHandler.cs +++ b/Brizco.Repository/Handlers/Task/CreateTaskCommandHandler.cs @@ -1,4 +1,6 @@ -namespace Brizco.Repository.Handlers.Task; +using Brizco.Domain.Dtos.LargeDtos; + +namespace Brizco.Repository.Handlers.Task; public class CreateActivityCommandHandler : IRequestHandler { diff --git a/Brizco.Repository/Handlers/Task/GetTaskQueryHandler.cs b/Brizco.Repository/Handlers/Task/GetTaskQueryHandler.cs index 75e87b6..5df39b0 100644 --- a/Brizco.Repository/Handlers/Task/GetTaskQueryHandler.cs +++ b/Brizco.Repository/Handlers/Task/GetTaskQueryHandler.cs @@ -1,4 +1,4 @@ -using Brizco.Domain.Dtos.LargDtos; +using Brizco.Domain.Dtos.LargeDtos; namespace Brizco.Repository.Handlers.Task;