feat: add permission handling methods and project board detail query

This commit is contained in:
2025-12-16 12:56:49 +03:30
parent f7351454f3
commit 2972807c9f
7 changed files with 133 additions and 24 deletions

View File

@@ -0,0 +1,74 @@
using GozareshgirProgramManager.Application._Common.Interfaces;
using GozareshgirProgramManager.Application._Common.Models;
using GozareshgirProgramManager.Domain._Common;
using Microsoft.EntityFrameworkCore;
namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardDetail;
public record ProjectBoardDetailQuery(Guid SectionId) : IBaseQuery<ProjectBoardDetailResponse>;
public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime);
public record ProjectBoardDetailUserResponse
{
public List<ProjectBoardDetailUserHistoryResponse> Histories { get; set; } = new();
public string UserFullName { get; set; }
public long UserId { get; set; }
}
public class ProjectBoardDetailUserHistoryResponse
{
public string Date { get; set; }
public string startTime { get; set; }
public string EndTime { get; set; }
public string TotalTime { get; set; }
}
public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDetailQuery, ProjectBoardDetailResponse>
{
private readonly IProgramManagerDbContext _programManagerDbContext;
public ProjectBoardDetailQueryHandler(IProgramManagerDbContext programManagerDbContext)
{
_programManagerDbContext = programManagerDbContext;
}
public async Task<OperationResult<ProjectBoardDetailResponse>> Handle(ProjectBoardDetailQuery request,
CancellationToken cancellationToken)
{
var section = await _programManagerDbContext.TaskSections
.Include(x => x.Activities)
.FirstOrDefaultAsync(x => x.Id == request.SectionId, cancellationToken: cancellationToken);
if (section == null)
return OperationResult<ProjectBoardDetailResponse>.NotFound("بخش مورد نظر یافت نشد");
var userIds = section.Activities.Select(x => x.UserId).Distinct().ToList();
var usersDict = await _programManagerDbContext.Users
.Where(x => userIds.Contains(x.Id))
.ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
var totalTimeSpan = section.Activities
.Select(x => x.GetTimeSpent())
.Aggregate(TimeSpan.Zero, (sum, next) => sum.Add(next));
var users = section.Activities.GroupBy(x => x.UserId).Select(x =>
{
return new ProjectBoardDetailUserResponse()
{
UserId = x.Key,
UserFullName = usersDict[x.Key],
Histories = x.Select(h => new ProjectBoardDetailUserHistoryResponse()
{
Date = h.StartDate.ToFarsi(),
startTime = h.StartDate.ToString("HH:mm"),
EndTime = h.EndDate?.ToString("HH:mm") ?? "-",
TotalTime = h.GetTimeSpent().ToString(@"hh\:mm")
}).ToList()
};
}).ToList();
var response = new ProjectBoardDetailResponse(users, $"{totalTimeSpan.TotalHours}:{totalTimeSpan.Minutes:D2}");
return OperationResult<ProjectBoardDetailResponse>.Success(response);
}
}

View File

@@ -6,5 +6,5 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
public record ProjectBoardListQuery: IBaseQuery<List<ProjectBoardListResponse>>
{
}
public TaskSectionStatus? Status { get; set; }
}

View File

@@ -1,6 +1,9 @@
using GozareshgirProgramManager.Application._Common.Constants;
using GozareshgirProgramManager.Application._Common.Interfaces;
using GozareshgirProgramManager.Application._Common.Models;
using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Query.Internal;
namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
@@ -19,15 +22,24 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
CancellationToken cancellationToken)
{
var currentUserId = _authHelper.GetCurrentUserId();
var data = await _programManagerDbContext.TaskSections.AsNoTracking()
.Where(x => x.CurrentAssignedUserId == currentUserId)
var queryable = _programManagerDbContext.TaskSections.AsNoTracking()
.Where(x => x.InitialEstimatedHours > TimeSpan.Zero)
.Include(x => x.Task)
.ThenInclude(x => x.Phase)
.ThenInclude(x => x.Project)
.Include(x => x.Activities)
.Include(x => x.AdditionalTimes)
.ToListAsync(cancellationToken);
.Include(x => x.AdditionalTimes).AsQueryable();
if (!_authHelper.HasPermission(ProgramManagerPermissionCode.Board.All.ViewAll))
{
queryable = queryable.Where(x => x.CurrentAssignedUserId == currentUserId);
}
if (request.Status != null)
{
queryable = queryable.Where(x => x.Status == request.Status);
}
var data = await queryable.ToListAsync(cancellationToken);
var activityUserIds = data.SelectMany(x => x.Activities).Select(a => a.UserId).Distinct().ToList();
var users = await _programManagerDbContext.Users.AsNoTracking()

View File

@@ -71,6 +71,10 @@ public interface IAuthHelper
/// دریافت نام کامل کاربر جاری از Claims
/// </summary>
string? GetCurrentFullName();
bool HasPermission(int permission);
List<int> GetPermissions();
}

View File

@@ -8,6 +8,7 @@
<ItemGroup>
<PackageReference Include="DNTPersianUtils.Core" Version="6.7.1" />
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
<PackageReference Include="PersianTools.Core" Version="2.0.4" />
</ItemGroup>

View File

@@ -1,5 +1,7 @@
using System.Globalization;
using System.Text.RegularExpressions;
using Newtonsoft.Json;
using Newtonsoft.Json.Bson;
using PersianTools.Core;
@@ -1704,25 +1706,25 @@ public static class Tools
// return Convert.ToBase64String(bsonData);
//}
////بیسان هایی که بصورت لیست بودند استخراج میشود
//public static List<T> DeserializeFromBsonList<T>(string base64Data)
//{
// byte[] data = Convert.FromBase64String(base64Data);
public static List<T> DeserializeFromBsonList<T>(string base64Data)
{
byte[] data = Convert.FromBase64String(base64Data);
// using MemoryStream memoryStream = new MemoryStream(data);
// using BsonDataReader reader = new BsonDataReader(memoryStream);
// reader.ReadRootValueAsArray = true;
// JsonSerializer serializer = new JsonSerializer();
// return serializer.Deserialize<List<T>>(reader);
//}
////بیسان هایی که بصورت تکی بودند استخراج میشود
//public static T DeserializeFromBson<T>(string base64Data)
//{
// byte[] bsonData = Convert.FromBase64String(base64Data);
// using MemoryStream memoryStream = new MemoryStream(bsonData);
// using BsonDataReader bsonReader = new BsonDataReader(memoryStream);
// JsonSerializer serializer = new JsonSerializer();
// return serializer.Deserialize<T>(bsonReader);
//}
using MemoryStream memoryStream = new MemoryStream(data);
using BsonDataReader reader = new BsonDataReader(memoryStream);
reader.ReadRootValueAsArray = true;
JsonSerializer serializer = new JsonSerializer();
return serializer.Deserialize<List<T>>(reader);
}
//بیسان هایی که بصورت تکی بودند استخراج میشود
public static T DeserializeFromBson<T>(string base64Data)
{
byte[] bsonData = Convert.FromBase64String(base64Data);
using MemoryStream memoryStream = new MemoryStream(bsonData);
using BsonDataReader bsonReader = new BsonDataReader(memoryStream);
JsonSerializer serializer = new JsonSerializer();
return serializer.Deserialize<T>(bsonReader);
}
//public static TimeOnly CalculateOffset(ICollection<CustomizeSifts> shiftDetailsRegularShifts)
//{

View File

@@ -1,5 +1,6 @@
using System.Security.Claims;
using GozareshgirProgramManager.Application._Common.Interfaces;
using GozareshgirProgramManager.Domain._Common;
using Microsoft.AspNetCore.Http;
namespace GozareshgirProgramManager.Infrastructure.Services.Authentication;
@@ -106,6 +107,21 @@ public class AuthHelper : IAuthHelper
return _httpContextAccessor.HttpContext?.User?.FindFirst("FullName")?.Value;
}
public bool HasPermission(int permission)
{
return GetPermissions().Any(x => x == permission);
}
public List<int> GetPermissions()
{
if (!IsAuthenticated())
return new List<int>();
var permissions = _httpContextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
?.Value;
return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
}
// /// <summary>
// /// دریافت AccountId کاربر جاری از Claims
// /// </summary>