Brizco
/
Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RELEASE VER 1.0.0.1 , complete version 1 , add scalarUi

master
Amir Hossein Khademi 2024-05-27 00:35:53 +03:30
parent ab343077bd
commit 91a73cbcef
44 changed files with 131 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@ -1 +1 @@
0.7.12.12
1.0.0.1

4
Brizco.Api/Brizco.Api.csproj
View File

@ -6,8 +6,8 @@
<ImplicitUsings>enable</ImplicitUsings>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<AssemblyVersion>0.6.10.11</AssemblyVersion>
<FileVersion>0.6.10.11</FileVersion>
<AssemblyVersion>1.0.0.1</AssemblyVersion>
<FileVersion>1.0.0.1</FileVersion>
</PropertyGroup>
<ItemGroup>

5
Brizco.Api/Program.cs
View File

@ -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();

2
Brizco.Api/Properties/launchSettings.json
View File

@ -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"
},

44
Brizco.Api/WebFramework/ScalarUi/ScalarUiConfiguration.cs 100644
View File

@ -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 = $$"""
<!doctype html>
<html>
<head>
<title>Scalar API Reference</title>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1" />
</head>
<body>
<!-- Add your own OpenAPI/Swagger specification URL here: -->
<!-- Note: The example is our public proxy (to avoid CORS issues). You can remove the `data-proxy-url` attribute if you don’t need it. -->
<script
id="api-reference"
data-url="/swagger/{{documentName}}/swagger.json"></script>
<!-- Optional: You can set a full configuration object like this: -->
<script>
var configuration = {
theme: 'purple',
}
document.getElementById('api-reference').dataset.configuration =
JSON.stringify(configuration)
</script>
<script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"></script>
</body>
</html>
""";
return Results.Content(scalarScript, "text/html");
}).ExcludeFromDescription();
}
}

2
Brizco.Core/Brizco.Core.csproj
View File

@ -37,7 +37,7 @@
<Using Include="Brizco.Core.EntityServices.Abstracts" />
<Using Include="Brizco.Domain.CommandQueries.Commands" />
<Using Include="Brizco.Domain.CommandQueries.Queries" />
<Using Include="Brizco.Domain.Dtos.LargDtos" />
<Using Include="Brizco.Domain.Dtos.LargeDtos" />
<Using Include="Brizco.Domain.Dtos.PageDto" />
<Using Include="Brizco.Domain.Dtos.RequestDtos" />
<Using Include="Brizco.Domain.Dtos.ResponseDto" />

9
Brizco.Core/CoreServices/PageService.cs
View File

@ -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<Domain.Entities.Shift.ShiftPlan>()

3
Brizco.Core/CoreServices/ReportServices/TaskReportCommandHandler.cs
View File

@ -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;

2
Brizco.Domain/Brizco.Domain.csproj
View File

@ -52,7 +52,7 @@
<Using Include="Brizco.Common.Extensions" />
<Using Include="Brizco.Common.Models.Entity" />
<Using Include="Brizco.Common.Models.Mapper" />
<Using Include="Brizco.Domain.Dtos.LargDtos" />
<Using Include="Brizco.Domain.Dtos.LargeDtos" />
<Using Include="Brizco.Domain.Dtos.ResponseDto" />
<Using Include="Brizco.Domain.Dtos.SmallDtos" />
<Using Include="Brizco.Domain.Entities.Complex" />

4
Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs
View File

@ -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,

4
Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs
View File

@ -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<KeyValuePair<Guid,Guid>> UserAndPositionIds)
:IRequest<ShiftPlanLDto>;

4
Brizco.Domain/CommandQueries/Commands/TaskCommands.cs
View File

@ -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,

4
Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs
View File

@ -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<List<ActivitySDto>>;

4
Brizco.Domain/CommandQueries/Queries/PositionQueries.cs
View File

@ -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<List<PositionSDto>>;

4
Brizco.Domain/CommandQueries/Queries/SectionQueries.cs
View File

@ -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<List<SectionSDto>>;

4
Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs
View File

@ -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<List<ShiftPlanSDto>>;

4
Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs
View File

@ -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<List<ShiftSDto>>;

4
Brizco.Domain/CommandQueries/Queries/TaskQueries.cs
View File

@ -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<List<TaskSDto>>;

4
Brizco.Domain/Dtos/LargDtos/ActivityLDto.cs → Brizco.Domain/Dtos/LargeDtos/ActivityLDto.cs
View File

@ -1,6 +1,4 @@
using Brizco.Domain.Entities.Task;
namespace Brizco.Domain.Dtos.LargDtos;
namespace Brizco.Domain.Dtos.LargeDtos;
public class ActivityLDto : BaseDto<ActivityLDto , Activity>
{

4
Brizco.Domain/Dtos/LargDtos/ComplexLDto.cs → Brizco.Domain/Dtos/LargeDtos/ComplexLDto.cs
View File

@ -1,6 +1,4 @@
using Brizco.Domain.Entities.Complex;
namespace Brizco.Domain.Dtos.LargDtos;
namespace Brizco.Domain.Dtos.LargeDtos;
public class ComplexLDto : BaseDto<ComplexLDto,Complex>
{

2
Brizco.Domain/Dtos/LargDtos/PositionLDto.cs → Brizco.Domain/Dtos/LargeDtos/PositionLDto.cs
View File

@ -1,4 +1,4 @@
namespace Brizco.Domain.Dtos.LargDtos;
namespace Brizco.Domain.Dtos.LargeDtos;
public class PositionLDto : BaseDto<PositionLDto, Position>
{

2
Brizco.Domain/Dtos/LargDtos/SectionLDto.cs → Brizco.Domain/Dtos/LargeDtos/SectionLDto.cs
View File

@ -1,4 +1,4 @@
namespace Brizco.Domain.Dtos.LargDtos;
namespace Brizco.Domain.Dtos.LargeDtos;
public class SectionLDto : BaseDto<SectionLDto, Section>
{

2
Brizco.Domain/Dtos/LargDtos/ShiftLDto.cs → Brizco.Domain/Dtos/LargeDtos/ShiftLDto.cs
View File

@ -1,4 +1,4 @@
namespace Brizco.Domain.Dtos.LargDtos;
namespace Brizco.Domain.Dtos.LargeDtos;
public class ShiftLDto : BaseDto<ShiftLDto,Shift>
{

4
Brizco.Domain/Dtos/LargDtos/ShiftPlanLDto.cs → Brizco.Domain/Dtos/LargeDtos/ShiftPlanLDto.cs
View File

@ -1,6 +1,4 @@
using Brizco.Domain.Entities.Shift;
namespace Brizco.Domain.Dtos.LargDtos;
namespace Brizco.Domain.Dtos.LargeDtos;
public class ShiftPlanLDto : BaseDto<ShiftPlanLDto , ShiftPlan>
{

4
Brizco.Domain/Dtos/LargDtos/TaskLDto.cs → Brizco.Domain/Dtos/LargeDtos/TaskLDto.cs
View File

@ -1,6 +1,4 @@
using Brizco.Domain.Entities.Task;
namespace Brizco.Domain.Dtos.LargDtos;
namespace Brizco.Domain.Dtos.LargeDtos;
public class TaskLDto : BaseDto<TaskLDto, Entities.Task.Task>
{

2
Brizco.Domain/Mappers/ActivityMapper.g.cs
View File

@ -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;

2
Brizco.Domain/Mappers/ComplexMapper.g.cs
View File

@ -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;

2
Brizco.Domain/Mappers/PositionMapper.g.cs
View File

@ -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;

2
Brizco.Domain/Mappers/SectionMapper.g.cs
View File

@ -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;

2
Brizco.Domain/Mappers/ShiftMapper.g.cs
View File

@ -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;

2
Brizco.Domain/Mappers/ShiftPlanMapper.g.cs
View File

@ -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;

2
Brizco.Domain/Mappers/TaskMapper.g.cs
View File

@ -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;

3
Brizco.Domain/MapsterRegister.cs
View File

@ -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;

7
Brizco.Infrastructure/Brizco.Infrastructure.csproj
View File

@ -6,13 +6,14 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Brizco.Core\Brizco.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Models\RestApi\KaveNegar\" />

2
Brizco.Repository/Brizco.Repository.csproj
View File

@ -42,7 +42,7 @@
<Using Include="Brizco.Common.Models.Exception" />
<Using Include="Brizco.Domain.CommandQueries.Commands" />
<Using Include="Brizco.Domain.CommandQueries.Queries" />
<Using Include="Brizco.Domain.Dtos.LargDtos" />
<Using Include="Brizco.Domain.Dtos.LargeDtos" />
<Using Include="Brizco.Domain.Dtos.ResponseDto" />
<Using Include="Brizco.Domain.Dtos.SmallDtos" />
<Using Include="Brizco.Domain.Entities.Complex" />

4
Brizco.Repository/Handlers/Activity/CreateActivityCommandHandler.cs
View File

@ -1,4 +1,6 @@
namespace Brizco.Repository.Handlers.Activity;
using Brizco.Domain.Dtos.LargeDtos;
namespace Brizco.Repository.Handlers.Activity;
public class CreateActivityCommandHandler : IRequestHandler<CreateActivityCommand, ActivityLDto>
{

2
Brizco.Repository/Handlers/Activity/GetActivityQueryHandler.cs
View File

@ -1,4 +1,4 @@
using Brizco.Domain.Dtos.LargDtos;
using Brizco.Domain.Dtos.LargeDtos;
namespace Brizco.Repository.Handlers.Activity;

4
Brizco.Repository/Handlers/Position/GetPositionQueryHandler.cs
View File

@ -1,4 +1,6 @@
namespace Brizco.Repository.Handlers.Position;
using Brizco.Domain.Dtos.LargeDtos;
namespace Brizco.Repository.Handlers.Position;
public class GetPositionQueryHandler : IRequestHandler<GetPositionQuery, PositionLDto>
{

4
Brizco.Repository/Handlers/Section/GetSectionQueryHandler.cs
View File

@ -1,4 +1,6 @@
namespace Brizco.Repository.Handlers.Section;
using Brizco.Domain.Dtos.LargeDtos;
namespace Brizco.Repository.Handlers.Section;
public class GetSectionQueryHandler : IRequestHandler<GetSectionQuery, SectionLDto>
{

3
Brizco.Repository/Handlers/Shift/GetShiftQueryHandler.cs
View File

@ -1,4 +1,5 @@
using Brizco.Domain.Entities.Shift;
using Brizco.Domain.Dtos.LargeDtos;
using Brizco.Domain.Entities.Shift;
namespace Brizco.Repository.Handlers.Shift;

4
Brizco.Repository/Handlers/ShiftPlan/CreateShiftPlanCommandHandler.cs
View File

@ -1,4 +1,6 @@
namespace Brizco.Repository.Handlers.ShiftPlan;
using Brizco.Domain.Dtos.LargeDtos;
namespace Brizco.Repository.Handlers.ShiftPlan;
public class CreateShiftPlanCommandHandler : IRequestHandler<CreateShiftPlanCommand, ShiftPlanLDto>
{

4
Brizco.Repository/Handlers/ShiftPlan/GetShiftPlanQueryHandler.cs
View File

@ -1,4 +1,6 @@
namespace Brizco.Repository.Handlers.ShiftPlan;
using Brizco.Domain.Dtos.LargeDtos;
namespace Brizco.Repository.Handlers.ShiftPlan;
public class GetShiftPlanQueryHandler : IRequestHandler<GetShiftPlanQuery, ShiftPlanLDto>
{

4
Brizco.Repository/Handlers/Task/CreateTaskCommandHandler.cs
View File

@ -1,4 +1,6 @@
namespace Brizco.Repository.Handlers.Task;
using Brizco.Domain.Dtos.LargeDtos;
namespace Brizco.Repository.Handlers.Task;
public class CreateActivityCommandHandler : IRequestHandler<CreateTaskCommand, TaskLDto>
{

2
Brizco.Repository/Handlers/Task/GetTaskQueryHandler.cs
View File

@ -1,4 +1,4 @@
using Brizco.Domain.Dtos.LargDtos;
using Brizco.Domain.Dtos.LargeDtos;
namespace Brizco.Repository.Handlers.Task;