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

complete creata activities

master
Amir Hossein Khademi 2023-11-26 16:56:38 +03:30
parent 8a32e23e03
commit e494f16542
16 changed files with 162 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Brizco.Api/Controllers/ActivityController.cs
View File

@ -17,6 +17,10 @@ public class ActivityController : ICarterModule
.WithDisplayName("GetActivity")
.HasApiVersion(1.0);
group.MapGet("done/{id:guid}", DoneActivityAsync)
.WithDisplayName("DoneActivity")
.HasApiVersion(1.0);
//group.MapPost("", Post)
// .AllowAnonymous()
// .HasApiVersion(1.0);
@ -35,7 +39,10 @@ public class ActivityController : ICarterModule
=> TypedResults.Ok(await sender.Send(new GetActivitiesQuery(page), cancellationToken));
// GET:Get An Entity By Id
public async Task<IResult> GetAsync(Guid id, ISender sender, CancellationToken cancellationToken)
public async Task<IResult> GetAsync(Guid id, IActivityService activityService, CancellationToken cancellationToken)
=> TypedResults.Ok(await activityService.DoneActivityAsync(id,cancellationToken));
public async Task<IResult> DoneActivityAsync(Guid id, ISender sender, CancellationToken cancellationToken)
=> TypedResults.Ok(await sender.Send(new GetActivityQuery(id), cancellationToken));
//// POST:Create Entity

2
Brizco.Api/Controllers/HomeController.cs
View File

@ -9,6 +9,6 @@ public class HomeController : Controller
[HttpGet]
public IActionResult Index()
{
return View("Index", new IndexModel());
return View("Index", new IndexModel());
}
}

26
Brizco.Common/Models/Api/AccessToken.cs
View File

@ -48,4 +48,30 @@ namespace Brizco.Common.Models.Api
public string BearerToken => $"Bearer {access_token}";
public List<string> Permissions { get; set; }
}
public class AccessToken<TUser,TRole>
{
public AccessToken()
{
}
public AccessToken(JwtSecurityToken securityToken)
{
access_token = new JwtSecurityTokenHandler().WriteToken(securityToken);
token_type = "Bearer";
expires_in = (int)(securityToken.ValidTo - DateTime.UtcNow).TotalSeconds;
}
public string access_token { get; set; } = string.Empty;
public string ig_access_token { get; set; } = string.Empty;
public string refresh_token { get; set; } = string.Empty;
public string token_type { get; set; } = string.Empty;
public int expires_in { get; set; }
public TUser User { get; set; }
public string BearerToken => $"Bearer {access_token}";
public List<string> Permissions { get; set; }
public List<TRole> Roles { get; set; } = new();
}
}

1
Brizco.Core/BaseServices/Abstracts/IJwtService.cs
View File

@ -7,6 +7,7 @@ public interface IJwtService : IScopedDependency
Task<AccessToken<TUser>> Generate<TUser>(TUser user) where TUser : ApplicationUser;
Task<AccessToken<TUserDto>> Generate<TUserDto, TUser>(TUser user, Guid complexId, Guid roleId) where TUser : ApplicationUser;
Task<AccessToken<TUserDto,TRole>> Generate<TUserDto, TUser, TRole>(TUser user, Guid complexId, Guid roleId) where TUser : ApplicationUser;
Task<AccessToken<TUserDto>> Generate<TUserDto, TUser>(TUser user, Guid complexId) where TUser : ApplicationUser;
Task<AccessToken<TUserDto>> Generate<TUserDto, TUser>(TUser user) where TUser : ApplicationUser;
}

31
Brizco.Core/BaseServices/JwtService.cs
View File

@ -63,6 +63,16 @@ public class JwtService : IJwtService
token.Permissions = claims.Where(c => c.Type == "Permission").Select(c => c.Value).ToList();
return token;
}
public async Task<AccessToken<TUserDto,TRole>> Generate<TUserDto, TUser, TRole>(TUser user, Guid complexId, Guid roleId) where TUser : ApplicationUser
{
var tokenId = StringExtensions.GetId(8);
var claims = await GetClaims(user, tokenId);
claims.Add(new Claim("ComplexId", complexId.ToString()));
return BaseGenerate<TUserDto, TUser, TRole>(user, claims);
}
public async Task<AccessToken<TUserDto>> Generate<TUserDto, TUser>(TUser user, Guid complexId) where TUser : ApplicationUser
{
var tokenId = StringExtensions.GetId(8);
@ -122,6 +132,27 @@ public class JwtService : IJwtService
return token;
}
private AccessToken<TUserDto,TRole> BaseGenerate<TUserDto, TUser, TRole>(TUser user, List<Claim> claims) where TUser : ApplicationUser
{
var secretKey = Encoding.UTF8.GetBytes(_siteSettings.JwtSettings.SecretKey);
var signingCredintial = new SigningCredentials(new SymmetricSecurityKey(secretKey), SecurityAlgorithms.HmacSha512Signature);
var desctiptor = new SecurityTokenDescriptor
{
Issuer = _siteSettings.JwtSettings.Issuer,
Audience = _siteSettings.JwtSettings.Audience,
IssuedAt = DateTime.Now,
NotBefore = DateTime.Now,
Expires = DateTime.Now.AddDays(_siteSettings.JwtSettings.ExpireAddDay),
SigningCredentials = signingCredintial,
Subject = new ClaimsIdentity(claims)
};
var handler = new JwtSecurityTokenHandler();
var token = new AccessToken<TUserDto, TRole>(handler.CreateJwtSecurityToken(desctiptor));
token.User = user.Adapt<TUserDto>();
return token;
}
private async Task<List<Claim>> GetClaims<TUser>(TUser baseUser, string jwtId) where TUser : ApplicationUser
{

6
Brizco.Core/CoreServices/Abstracts/IAccountService.cs
View File

@ -2,10 +2,10 @@
public interface IAccountService : IScopedDependency
{
public Task<AccessToken<ApplicationUserSDto>> LoginWithPasswordAsync(string userName, string password, CancellationToken cancellationToken);
public Task<AccessToken<ApplicationUserSDto>> LoginWithVerifyCodeAsync(string userName, string verifyCode, CancellationToken cancellationToken);
public Task<AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>> LoginWithPasswordAsync(string userName, string password, CancellationToken cancellationToken);
public Task<AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>> LoginWithVerifyCodeAsync(string userName, string verifyCode, CancellationToken cancellationToken);
public Task<VerifyCodeResponseDto> GetVerifyCodeAsync(string phoneNumber);
public Task<bool> ForgetPasswordAsync(string phoneNumber);
public Task<bool> CheckMemberShipAsync(string phoneNumber);
public Task<AccessToken<ApplicationUserSDto>> CompleteComplexSignUpAsync(SignUpRequestDto requestDto, CancellationToken cancellationToken);
public Task<AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>> CompleteComplexSignUpAsync(SignUpRequestDto requestDto, CancellationToken cancellationToken);
}

31
Brizco.Core/CoreServices/AccountService.cs
View File

@ -1,5 +1,7 @@
using Brizco.Domain.Entities.Complex;
using Brizco.Domain.Mappers;
using System.Linq;
using Mapster;
namespace Brizco.Core.CoreServices;
@ -77,11 +79,11 @@ public class AccountService : IAccountService
user = await _userService.CreateUserAsync(phoneNumber);
var token = await _userManager.GenerateTwoFactorTokenAsync(user, "Phone");
//await _smsService.SendVerifyCodeAsync(newPhoneNumber, token);
await _smsService.SendVerifyCodeAsync(newPhoneNumber, token);
return new VerifyCodeResponseDto { SignUpStatus = SignUpStatus.StartSignOn };
}
public async Task<AccessToken<ApplicationUserSDto>> LoginWithPasswordAsync(string userName, string password, CancellationToken cancellationToken)
public async Task<AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>> LoginWithPasswordAsync(string userName, string password, CancellationToken cancellationToken)
{
var result = await _userSignInManager.PasswordSignInAsync(userName, password, false, false);
if (!result.Succeeded)
@ -94,7 +96,7 @@ public class AccountService : IAccountService
return await CompleteLogin(admin, cancellationToken);
}
public async Task<AccessToken<ApplicationUserSDto>> LoginWithVerifyCodeAsync(string userName, string verifyCode, CancellationToken cancellationToken)
public async Task<AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>> LoginWithVerifyCodeAsync(string userName, string verifyCode, CancellationToken cancellationToken)
{
var user = await _userManager.FindByNameAsync(userName);
if (user == null)
@ -116,7 +118,7 @@ public class AccountService : IAccountService
return await CompleteLogin(user, cancellationToken);
}
public async Task<AccessToken<ApplicationUserSDto>> CompleteComplexSignUpAsync(SignUpRequestDto requestDto, CancellationToken cancellationToken)
public async Task<AccessToken<ApplicationUserSDto,ComplexUserRoleSDto>> CompleteComplexSignUpAsync(SignUpRequestDto requestDto, CancellationToken cancellationToken)
{
if (_currentUserService.UserId == null)
throw new AppException("User Id is null");
@ -155,16 +157,13 @@ public class AccountService : IAccountService
}
private async Task<AccessToken<ApplicationUserSDto>> CompleteLogin(ApplicationUser user, CancellationToken cancellationToken)
private async Task<AccessToken<ApplicationUserSDto,ComplexUserRoleSDto>> CompleteLogin(ApplicationUser user, CancellationToken cancellationToken)
{
AccessToken<ApplicationUserSDto> jwt;
AccessToken<ApplicationUserSDto,ComplexUserRoleSDto> jwt;
if (user.SelectedComplexUserRoleId != Guid.Empty)
{
var complexUserRole = await _repositoryWrapper.SetRepository<ComplexUserRole>()
.TableNoTracking
.Where(c => c.Id == user.SelectedComplexUserRoleId)
.Select(ComplexUserRoleMapper.ProjectToSDto)
.FirstOrDefaultAsync(cancellationToken);
var userComplexRoles = await _userService.GetUserRolesAsync(user.Id, cancellationToken);
var complexUserRole = userComplexRoles.FirstOrDefault(c => c.Id == user.SelectedComplexUserRoleId);
var complexUser = await _repositoryWrapper.SetRepository<ComplexUser>()
.TableNoTracking
@ -172,9 +171,10 @@ public class AccountService : IAccountService
.Select(ComplexUserMapper.ProjectToSDto)
.FirstOrDefaultAsync( cancellationToken);
jwt = await _jwtService.Generate<ApplicationUserSDto, ApplicationUser>(user, complexUser!.ComplexId, complexUserRole!.RoleId);
jwt = await _jwtService.Generate<ApplicationUserSDto, ApplicationUser, ComplexUserRoleSDto>(user, complexUser!.ComplexId, complexUserRole!.RoleId);
jwt.User.SelectedComplexName = complexUser.ComplexName;
jwt.User.SelectedRoleName = complexUserRole.RoleName;
jwt.Roles = userComplexRoles;
}
else
{
@ -185,7 +185,7 @@ public class AccountService : IAccountService
.Select(ComplexUserMapper.ProjectToSDto)
.FirstOrDefaultAsync(cancellationToken);
if (complexUser == null)
return await _jwtService.Generate<ApplicationUserSDto, ApplicationUser>(user);
return (await _jwtService.Generate<ApplicationUserSDto, ApplicationUser>(user)).Adapt<AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>>();
var complexUserRole = await _repositoryWrapper.SetRepository<ComplexUserRole>()
.TableNoTracking
@ -201,12 +201,13 @@ public class AccountService : IAccountService
user.SelectedComplexUserRoleId = complexUserRole.Id;
await _userManager.UpdateAsync(user);
jwt = await _jwtService.Generate<ApplicationUserSDto, ApplicationUser>(user, complexUser.ComplexId, complexUserRole.RoleId);
jwt = (await _jwtService.Generate<ApplicationUserSDto, ApplicationUser>(user, complexUser.ComplexId, complexUserRole.RoleId)).Adapt<AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>>();
jwt.User.SelectedComplexName = complexUser.ComplexName;
jwt.User.SelectedRoleName = complexUserRole.RoleName;
jwt.Roles = new List<ComplexUserRoleSDto> { complexUserRole };
}
else
jwt = await _jwtService.Generate<ApplicationUserSDto, ApplicationUser>(user);
jwt = (new AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>()).Adapt<AccessToken<ApplicationUserSDto, ComplexUserRoleSDto>>();
}

1
Brizco.Core/EntityServices/Abstracts/IActivityService.cs
View File

@ -3,4 +3,5 @@
public interface IActivityService : IScopedDependency
{
Task<bool> CreateActivitiesByShiftPlan(Guid shiftPlanId, CancellationToken cancellationToken);
Task<bool> DoneActivityAsync(Guid activityId, CancellationToken cancellationToken);
}

1
Brizco.Core/EntityServices/Abstracts/IUserService.cs
View File

@ -4,6 +4,7 @@ public interface IUserService : IScopedDependency
{
Task<ProfileResponseDto> GetUserProfileAsync(CancellationToken cancellationToken);
Task<List<ComplexUserRoleSDto>> GetUserRolesAsync(CancellationToken cancellationToken);
Task<List<ComplexUserRoleSDto>> GetUserRolesAsync(Guid userId, CancellationToken cancellationToken);
Task<List<ComplexUserSDto>> GetUsersAsync(int page = 0, CancellationToken cancellationToken = default);
Task<ApplicationUserSDto> GetUserAsync(Guid userId);
Task<ApplicationUser> CreateUserAsync(string phoneNumber);

35
Brizco.Core/EntityServices/ActivityService.cs
View File

@ -15,11 +15,28 @@ public class ActivityService : IActivityService
_mediator = mediator;
_repositoryWrapper = repositoryWrapper;
}
public async Task<bool> DoneActivityAsync(Guid activityId, CancellationToken cancellationToken)
{
var activity = await _repositoryWrapper.SetRepository<Activity>()
.TableNoTracking
.FirstOrDefaultAsync(a => a.Id == activityId, cancellationToken);
if (activity == null)
throw new AppException("Activity not found ", ApiResultStatusCode.NotFound);
activity.DoneActivity();
_repositoryWrapper.SetRepository<Activity>()
.Update(activity);
await _repositoryWrapper.SaveChangesAsync(cancellationToken);
return true;
}
public async Task<bool> CreateActivitiesByShiftPlan(Guid shiftPlanId,CancellationToken cancellationToken)
{
var shiftPlan = await _mediator.Send(new GetShiftPlanQuery(shiftPlanId), cancellationToken);
if (shiftPlan.Id == Guid.Empty)
return false;
var tasks = await _repositoryWrapper.SetRepository<Brizco.Domain.Entities.Task.Task>()
.ExecuteCommand(
$@"SELECT t.""Id"", t.""Amount"", t.""AmountType"", t.""ComplexId"",
@ -46,25 +63,15 @@ GROUP BY t.""Id""").ToListAsync(cancellationToken);
.TableNoTracking
.Where(tp => tp.TaskId == task.Id)
.ToListAsync(cancellationToken);
foreach (var taskPosition in taskPositions)
{
var fundedUser = shiftPlanPositions.FirstOrDefault(spu => spu.PositionId == taskPosition.PositionId);
if (fundedUser != null)
{
var activity = Activity.Create(ActivityStatus.Created,
DateTime.MinValue,
string.Empty,
task.Title,
task.Description,
task.Type,
task.IsDisposable,
task.SetFor,
task.HasDisposed,
task.Amount,
task.AmountType,
task.ComplexId,
task.ScheduleType);
activity.SetUser(fundedUser.UserId);
await _mediator.Send(new CreateActivityCommand(task.Type, task.Title, task.Description, task.IsDisposable,
task.SetFor, task.HasDisposed, task.Amount, task.AmountType,
task.ScheduleType, shiftPlan.ShiftId, new List<Guid> { fundedUser.UserId }),cancellationToken);
}
}
}

2
Brizco.Core/EntityServices/ShiftPlanService.cs
View File

@ -21,7 +21,7 @@ public class ShiftPlanService : IShiftPlanService
public async Task<bool> CreateAsync(CreateShiftPlanCommand createShiftPlanCommand, CancellationToken cancellationToken)
{
var shiftPlan = await _sender.Send(createShiftPlanCommand, cancellationToken);
_activityService.CreateActivitiesByShiftPlan(shiftPlan.Id, cancellationToken);
await _activityService.CreateActivitiesByShiftPlan(shiftPlan.Id, cancellationToken);
return true;
}
}

33
Brizco.Core/EntityServices/UserService.cs
View File

@ -49,7 +49,7 @@ public class UserService : IUserService
userSDto.SelectedComplexName = complexUserRole!.ComplexName;
userSDto.SelectedRoleName = complexUserRole!.RoleName;
var role = await _roleManager.FindByNameAsync(complexUserRole.RoleName);
var role = await _roleManager.FindByIdAsync(complexUserRole.RoleId.ToString());
if (role != null)
{
var roleClaims = await _roleManager.GetClaimsAsync(role);
@ -93,6 +93,37 @@ public class UserService : IUserService
return response;
}
public async Task<List<ComplexUserRoleSDto>> GetUserRolesAsync(Guid userId,CancellationToken cancellationToken)
{
var user = await _userManager.FindByIdAsync(userId.ToString());
if (user == null)
throw new AppException("User NotFound", ApiResultStatusCode.NotFound);
var response = new List<ComplexUserRoleSDto>();
var complexUsers = await _repositoryWrapper.SetRepository<ComplexUser>()
.TableNoTracking
.Where(mcu => mcu.UserId == user.Id)
.Select(ComplexUserMapper.ProjectToSDto)
.ToListAsync(cancellationToken);
if (complexUsers.Count == 0)
return response;
foreach (var complexUser in complexUsers)
{
var complexUserRoles = await _repositoryWrapper.SetRepository<ComplexUserRole>()
.TableNoTracking
.Where(c => c.ComplexUserId == complexUser.Id)
.Select(ComplexUserRoleMapper.ProjectToSDto)
.ToListAsync(cancellationToken);
foreach (var userRole in complexUserRoles)
{
userRole.ComplexName = complexUser.ComplexName;
response.Add(userRole);
}
}
return response;
}
public async Task<List<ComplexUserSDto>> GetUsersAsync(int page = 0, CancellationToken cancellationToken = default)
{
if (_currentUserService.ComplexId.IsNullOrEmpty())

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

@ -1,9 +1,6 @@
namespace Brizco.Domain.CommandQueries.Commands;
public sealed record CreateActivityCommand(
ActivityStatus Status,
DateTime DoneAt,
string PerformanceDescription,
TaskType Type,
string Title,
string Description,
@ -13,9 +10,8 @@ public sealed record CreateActivityCommand(
int Amount,
PurchaseAmountType AmountType,
TaskScheduleType ScheduleType,
List<Guid> Routines,
List<Guid> Shifts,
List<Guid> Positions) : IRequest<ActivityLDto>;
Guid ShiftId,
List<Guid> UserIds) : IRequest<ActivityLDto>;
public sealed record UpdateActivityCommand(Guid Id,
ActivityStatus Status,
@ -30,9 +26,7 @@ public sealed record UpdateActivityCommand(Guid Id,
int Amount,
PurchaseAmountType AmountType,
TaskScheduleType ScheduleType,
List<Guid> Routines,
List<Guid> Shifts,
List<Guid> Positions) : IRequest<bool>;
List<Guid> UserIds) : IRequest<bool>;
public sealed record DeleteActivityCommand(Guid Id)

7
Brizco.Domain/Entities/Task/Aggregate.Task.cs
View File

@ -128,6 +128,12 @@ public partial class Activity
scheduleType);
}
public void SetShift(Guid shiftId)
{
this.ShiftId = shiftId;
}
public void SetUser(Guid userId)
{
this.UserId = userId;
@ -137,5 +143,6 @@ public partial class Activity
{
DoneAt = DateTime.UtcNow;
IsDone = true;
Status = ActivityStatus.InProgress;
}
}

2
Brizco.Infrastructure/Services/SmsService.cs
View File

@ -24,7 +24,7 @@ public class SmsService : ISmsService
public async Task SendVerifyCodeAsync(string phoneNumber, string verifyCode)
{
var rest = await _restApiWrapper.KaveNegarRestApi.SendLookUp(_siteSettings.KaveNegarApiKey, phoneNumber, verifyCode, null, null, null, "login");
var rest = await _restApiWrapper.KaveNegarRestApi.SendLookUp(_siteSettings.KaveNegarApiKey, phoneNumber, verifyCode, null, null, null, "login-brizco");
if (rest.Return.status != 200)
throw new BaseApiException(ApiResultStatusCode.SendSmsError, rest.Return.message);

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

@ -20,11 +20,11 @@ public class CreateActivityCommandHandler : IRequestHandler<CreateActivityComman
try
{
await _repositoryWrapper.BeginTransaction(cancellationToken);
var task = Domain.Entities.Task.Activity
var activity = Domain.Entities.Task.Activity
.Create(
request.Status,
request.DoneAt,
request.PerformanceDescription,
ActivityStatus.Created,
DateTime.MinValue,
string.Empty,
request.Title,
request.Description,
request.Type,
@ -35,13 +35,15 @@ public class CreateActivityCommandHandler : IRequestHandler<CreateActivityComman
request.AmountType,
complexId,
request.ScheduleType);
foreach (var requestUserId in request.UserIds)
activity.SetUser(requestUserId);
activity.SetShift(request.ShiftId);
_repositoryWrapper.SetRepository<Domain.Entities.Task.Activity>().Add(task);
_repositoryWrapper.SetRepository<Domain.Entities.Task.Activity>().Add(activity);
await _repositoryWrapper.SaveChangesAsync(cancellationToken);
await _repositoryWrapper.CommitAsync(cancellationToken);
return task.AdaptToLDto();
return activity.AdaptToLDto();
}
catch (Exception)
{