taskAttachments

MTWorkHR.Application/Dtos/Identity/AttachmentDto.cs

@@ -14,8 +14,13 @@ namespace MTWorkHR.Application.Models
 
         public IFormFile? FileData { get; set; }
         public string? FileName { get; set; }
+        public long? FileSize { get; set; }
 
         public string? CreateDate { get; set; }
+        public string? CreateUser { get; set; }
+        
+        public string? CreatedUserName { get; set; }
+        public string? ProfileImage { get; set; }
         public string? OriginalName { get; set; }
         public string? FilePath { get; set; }
         public byte[]? Content { get; set; }

MTWorkHR.Application/Dtos/Identity/AttachmentResponseDto.cs

@@ -11,6 +11,9 @@ namespace MTWorkHR.Application.Models
         public string? FileName { get; set; }
 
         public string? FilePath { get; set; }
+        public long? FileSize { get; set; }
+        public string? ContentType { get; set; }
+        
 
     }
 }

MTWorkHR.Application/Dtos/User/TeamUserDto.cs

@@ -14,6 +14,7 @@ namespace MTWorkHR.Application.Models
         public string AssignedUserId { get; set; }
         public string? AssignedUserName { get; set; }
         public string? AssignedUserEmail { get; set; }
+        public string? ProfileImage { get; set; }
 
     }
 }

MTWorkHR.Application/Mapper/MappingProfile.cs

@@ -50,7 +50,12 @@ namespace MTWorkHR.Application.Mapper
               //  .ForMember(m => m.UserAddress, op => op.Ignore())
                 .ForMember(m => m.Id, op => op.Ignore());
 
-            CreateMap<ApplicationUser, UserUpdateDto>().ForMember(m => m.Password, op => op.Ignore());
+            CreateMap<ApplicationUser, UserUpdateDto>().ForMember(m => m.Password, op => op.Ignore())
+                .ForMember(s => s.QualificationName, o => o.MapFrom(s => s.Qualification == null ? "" : GlobalInfo.lang == "ar" ? s.Qualification.NameAr : s.Qualification.NameEn))
+                .ForMember(s => s.JobTitleName, o => o.MapFrom(s => s.JobTitle == null ? "" : GlobalInfo.lang == "ar" ? s.JobTitle.NameAr : s.JobTitle.NameEn))
+                .ForMember(s => s.IndustryName, o => o.MapFrom(s => s.Industry == null ? "" : GlobalInfo.lang == "ar" ? s.Industry.NameAr : s.Industry.NameEn))
+                .ForMember(s => s.CountryName, o => o.MapFrom(s => s.Country == null ? "" : GlobalInfo.lang == "ar" ? s.Country.NameAr : s.Country.NameEn))
+                .ForMember(s => s.UniversityName, o => o.MapFrom(s => s.University == null ? "" : GlobalInfo.lang == "ar" ? s.University.NameAr : s.University.NameEn));
             CreateMap<UserDto, UserUpdateDto>()
                 //.ForMember(m => m.CVAttach, op => op.Ignore())
                 //.ForMember(m => m.EduCertificateAttach, op => op.Ignore())

MTWorkHR.Application/Services/Base/BlobFileService.cs

@@ -31,7 +31,7 @@ namespace MTWorkHR.Application.Services
             _logger = logger;
         }
 
-        public async Task<AttachmentResponseDto> UploadFile(IFormFile file)
+        public async Task<AttachmentResponseDto> UploadFile2(IFormFile file)
         {
             AttachmentResponseDto result = new AttachmentResponseDto();
             try
@@ -46,6 +46,8 @@ namespace MTWorkHR.Application.Services
                         uniqueFileName = GenerateUniqueFileName(file.FileName);
                     }
                     var status = await blobClient.UploadAsync(file.OpenReadStream(), true);
+                    result.ContentType = file.ContentType;
+                    result.FileSize = file.Length;
                     result.OriginalName = file.FileName;
                     result.FileName = uniqueFileName;
                     result.FilePath = blobClient.Uri.AbsoluteUri;
@@ -60,6 +62,51 @@ namespace MTWorkHR.Application.Services
                 return result;
             }
         }
+
+        public async Task<AttachmentResponseDto> UploadFile(IFormFile file)
+        {
+            AttachmentResponseDto result = new AttachmentResponseDto();
+            try
+            {
+                if (file == null || file.Length == 0)
+                {
+                    _logger.LogWarning("No file uploaded or file is empty.");
+                    throw new AppException(ExceptionEnum.InCorrectFileLength);
+                }
+
+                _logger.LogInformation("Received file: Name={FileName}, ContentType={ContentType}, Length={Length}",
+                    file.FileName, file.ContentType, file.Length);
+
+                string uniqueFileName = GenerateUniqueFileName(file.FileName);
+                var blobClient = _containerClient.GetBlobClient(uniqueFileName);
+
+                if (await blobClient.ExistsAsync())
+                {
+                    uniqueFileName = GenerateUniqueFileName(file.FileName);
+                    blobClient = _containerClient.GetBlobClient(uniqueFileName);
+                }
+
+                using var stream = file.OpenReadStream();
+                if (stream.Length == 0)
+                {
+                    _logger.LogWarning("File stream is empty for file: {FileName}", file.FileName);
+                    throw new AppException(ExceptionEnum.InCorrectFileLength);
+                }
+
+                var status = await blobClient.UploadAsync(stream, true);
+                result.ContentType = file.ContentType;
+                result.FileSize = file.Length; // Should now reflect the correct size
+                result.OriginalName = file.FileName;
+                result.FileName = uniqueFileName;
+                result.FilePath = blobClient.Uri.AbsoluteUri;
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to upload file: {Message}", ex.Message);
+                throw new AppException(ExceptionEnum.CouldNotMoveFiles);
+            }
+        }
         public async Task<string> UploadFileCloud(AttachmentDto file)
         {
             try

MTWorkHR.Application/Services/Interfaces/IUserService.cs

@@ -42,7 +42,7 @@ namespace MTWorkHR.Application.Identity
         Task<bool> Update(string userId, long companyId);
         Task Suspend(string id);
         Task<bool> UnAssignCompanyEmployees(long companyId);
-        Task<(string FullName, string Email)> GetUserNameEmail(string userId);
+        Task<(string FullName, string Email, string ProfileImage)> GetUserNameEmail(string userId);
 
     }
 }

MTWorkHR.Application/Services/Task/UserTaskAttachmentService.cs

@@ -12,20 +12,26 @@ using MTWorkHR.Infrastructure.UnitOfWorks;
 using MTWorkHR.Core.IRepositories.Base;
 using Microsoft.AspNetCore.Http;
 using System.IO;
+using System.Linq.Dynamic.Core;
+using Microsoft.EntityFrameworkCore;
+using MTWorkHR.Application.Identity;
+
 
 namespace MTWorkHR.Application.Services
 {
     public class UserTaskAttachmentService : BaseService<UserTaskAttachment, AttachmentDto, AttachmentDto>, IUserTaskAttachmentService
     {
         private readonly IUnitOfWork _unitOfWork;
-        //private readonly AppSettingsConfiguration _configuration;
-        //private readonly GlobalInfo _globalInfo;
+        private readonly IUserService _userService;
         private readonly IFileService _fileService;
+        private readonly GlobalInfo _globalInfo;
 
-        public UserTaskAttachmentService(IUnitOfWork unitOfWork, IFileService fileService) : base(unitOfWork)
+        public UserTaskAttachmentService(IUnitOfWork unitOfWork, IFileService fileService, GlobalInfo globalInfo, IUserService userService) : base(unitOfWork)
         {
             _unitOfWork = unitOfWork;
             _fileService = fileService;
+            _globalInfo = globalInfo;
+            _userService = userService;
         }
 
 
@@ -36,6 +42,41 @@ namespace MTWorkHR.Application.Services
             return response;
         }
 
+        public override async Task<PagingResultDto<AttachmentDto>> GetAll(PagingInputDto PagingInputDto)
+        {
+            var res = await _unitOfWork.UserTaskAttachment.GetAllWithChildrenAsync();
+            var query = res.Item1;
+          
+            if (PagingInputDto.Filter != null)
+            {
+                var filter = PagingInputDto.Filter;
+                query = query.Where(u => u.FileName.Contains(filter));
+            }
+
+            var order = query.OrderBy(PagingInputDto.OrderByField + " " + PagingInputDto.OrderType);
+
+            var page = order.Skip((PagingInputDto.PageNumber * PagingInputDto.PageSize) - PagingInputDto.PageSize).Take(PagingInputDto.PageSize);
+
+            var total = await query.CountAsync();
+
+            var list = MapperObject.Mapper
+                .Map<IList<AttachmentDto>>(await page.ToListAsync());
+            // Fetch user data for all employees
+            foreach (var attach in list)
+            {
+                var user = await _userService.GetUserNameEmail(attach.CreateUser);
+                attach.ProfileImage = user.ProfileImage;
+                attach.CreatedUserName = user.FullName;
+            }
+            var response = new PagingResultDto<AttachmentDto>
+            {
+                Result = list,
+                Total = total
+            };
+
+            return response;
+        }
+
         public override async Task<AttachmentDto> Create(AttachmentDto input)
         {
             //if (input.FileData != null)
@@ -54,26 +95,33 @@ namespace MTWorkHR.Application.Services
                 throw new AppException(ExceptionEnum.MapperIssue);
             }
 
-            var task = await _unitOfWork.UserTaskAttachment.AddAsync(entity);
+            var attach = await _unitOfWork.UserTaskAttachment.AddAsync(entity);
             await _unitOfWork.CompleteAsync();
 
-            var response = MapperObject.Mapper.Map<AttachmentDto>(task);
-           
+            var response = MapperObject.Mapper.Map<AttachmentDto>(attach);
+            var user = await _userService.GetUserNameEmail(attach.CreateUser);
+            response.ProfileImage = user.ProfileImage;
+            response.CreatedUserName = user.FullName;
             return response;
         }
 
 
         public override async Task<AttachmentDto> Update(AttachmentDto input)
         {
-            var entitiy = await _unitOfWork.UserTaskAttachment.GetByIdAsync(input.Id);
+            var attach = await _unitOfWork.UserTaskAttachment.GetByIdAsync(input.Id);
 
-            if (entitiy == null)
+            if (attach == null)
                 throw new AppException(ExceptionEnum.RecordNotExist);
 
-            MapperObject.Mapper.Map(input, entitiy, typeof(AttachmentDto), typeof(UserTaskAttachment));
+            MapperObject.Mapper.Map(input, attach, typeof(AttachmentDto), typeof(UserTaskAttachment));
 
             await _unitOfWork.CompleteAsync();
 
+            var response = MapperObject.Mapper.Map<AttachmentDto>(attach);
+
+            var user = await _userService.GetUserNameEmail(attach.CreateUser);
+            response.ProfileImage = user.ProfileImage;
+            response.CreatedUserName = user.FullName;
             return input;
         }
     }

MTWorkHR.Application/Services/Task/UserTaskService.cs

@@ -33,6 +33,13 @@ namespace MTWorkHR.Application.Services
         {
             var entity = await _unitOfWork.UserTask.GetByIdWithAllChildren(id);
             var response = MapperObject.Mapper.Map<UserTaskDto>(entity);
+
+            foreach (var attach in response.TaskAttachments)
+            {
+                var user = await _userService.GetUserNameEmail(attach.CreateUser);
+                attach.ProfileImage = user.ProfileImage;
+                attach.CreatedUserName = user.FullName;
+            }
             await GetUserData(response);
             return response;
         }

MTWorkHR.Application/Services/User/TeamService.cs

@@ -92,6 +92,7 @@ namespace MTWorkHR.Application.Services
                     AssignedUserId = teamUserId,
                     AssignedUserName = userInfo.FullName,
                     AssignedUserEmail = userInfo.Email,
+                    ProfileImage = userInfo.ProfileImage,
                     IsAdmin = false
                 });
             }         
@@ -133,6 +134,7 @@ namespace MTWorkHR.Application.Services
                     AssignedUserId = teamUserId,
                     AssignedUserName = userInfo.FullName,
                     AssignedUserEmail = userInfo.Email,
+                    ProfileImage = userInfo.ProfileImage,
                     IsAdmin = false
                 });
             }

MTWorkHR.Application/Services/User/UserService.cs

@@ -28,6 +28,7 @@ using System.ComponentModel.Design;
 using static iText.StyledXmlParser.Jsoup.Select.Evaluator;
 using static iText.IO.Util.IntHashtable;
 using Microsoft.Extensions.Logging;
+using iText.IO.Image;
 
 namespace MTWorkHR.Application.Services
 {
@@ -264,7 +265,7 @@ namespace MTWorkHR.Application.Services
         }
         public async Task<UserDto> GetUserById(string id)
         {
-            var entity = await _userManager.Users
+            var entity = await _userManager.Users.Include(u=> u.UserAttachments)
                 .FirstOrDefaultAsync(x => x.Id == id);
             var response = MapperObject.Mapper.Map<UserDto>(entity);
 
@@ -277,17 +278,23 @@ namespace MTWorkHR.Application.Services
             return name;
         }
 
-        public async Task<(string FullName, string Email)> GetUserNameEmail(string userId)
+        public async Task<(string FullName, string Email, string ProfileImage)> GetUserNameEmail(string userId)
         {
             var entity = await GetUserById(userId);
+            var imagePath = "";
 
             if (entity == null)
-                return (string.Empty, string.Empty);
+                return (string.Empty, string.Empty, string.Empty);
 
+            if (entity != null)
+            {
+                var imageAtt = entity.UserAttachments?.FirstOrDefault(a => a.AttachmentTypeId == 9);
+                imagePath = imageAtt != null ? imageAtt.FilePath : "";
+            }
             var name = $"{entity.FirstName} {entity.LastName}".Trim();
             var email = entity.Email ?? string.Empty;
 
-            return (name, email);
+            return (name, email, imagePath);
         }
 
         public async Task<UserDto> GetUserWithAttachmentById(string id)

MTWorkHR.Core/Entities/User/TeamUser.cs

@@ -19,6 +19,7 @@ namespace MTWorkHR.Core.Entities
         public string AssignedUserId { get; set; }
         public string AssignedUserName { get; set; }
         public string AssignedUserEmail { get; set; }
+        public string? ProfileImage { get; set; }
         public bool IsAdmin { get; set; }
 
     }

MTWorkHR.Core/Entities/User/UserTaskAttachment.cs

@@ -21,7 +21,7 @@ namespace MTWorkHR.Core.Entities
 
         [MaxLength(250)]
         public string? OriginalName { get; set; }
-
+        public long? FileSize { get; set; }
         public byte[] Content { get; set; }
         public string? FilePath { get; set; }
         public string? ContentType { get; set; }

MTWorkHR.Core/IRepositories/Task/IUserTaskAttachmentRepository.cs

@@ -11,5 +11,6 @@ namespace MTWorkHR.Core.IRepositories
 {
     public interface IUserTaskAttachmentRepository : IRepository<UserTaskAttachment>
     {
+        Task<Tuple<IQueryable<UserTaskAttachment>, int>> GetAllWithChildrenAsync();
     }
 }

MTWorkHR.Infrastructure/InfrastructureServiceRegistration.cs

@@ -32,7 +32,7 @@ namespace MTWorkHR.Infrastructure
             
             services.AddDbContext<HRDataContext>(options =>
                 options.UseSqlServer(
-                    config.ConnectionStrings.MTWorkHRConnectionString  //configuration.GetSection("ConnectionString:MTWorkHRConnectionString").Value
+                    config.ConnectionStrings.LocalConnectionString  //configuration.GetSection("ConnectionString:MTWorkHRConnectionString").Value
                     ));
            
             services.AddIdentity<ApplicationUser, ApplicationRole>().AddEntityFrameworkStores<HRDataContext>().AddDefaultTokenProviders();

MTWorkHR.Infrastructure/Migrations/20250529131711_altrTaskAttachment.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MTWorkHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class altrTaskAttachment : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<long>(
+                name: "FileSize",
+                table: "UserTaskAttachments",
+                type: "bigint",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ProfileImage",
+                table: "TeamUser",
+                type: "nvarchar(max)",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "FileSize",
+                table: "UserTaskAttachments");
+
+            migrationBuilder.DropColumn(
+                name: "ProfileImage",
+                table: "TeamUser");
+        }
+    }
+}

MTWorkHR.Infrastructure/Migrations/HRDataContextModelSnapshot.cs

@@ -4845,6 +4845,9 @@ namespace MTWorkHR.Infrastructure.Migrations
                     b.Property<bool>("IsAdmin")
                         .HasColumnType("bit");
 
+                    b.Property<string>("ProfileImage")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<long>("TeamId")
                         .HasColumnType("bigint");
 
@@ -5162,6 +5165,9 @@ namespace MTWorkHR.Infrastructure.Migrations
                     b.Property<string>("FilePath")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<long?>("FileSize")
+                        .HasColumnType("bigint");
+
                     b.Property<string>("OriginalName")
                         .HasMaxLength(250)
                         .HasColumnType("nvarchar(250)");

MTWorkHR.Infrastructure/Repositories/Task/TaskAttachmentRepository.cs

@@ -9,9 +9,19 @@ namespace MTWorkHR.Infrastructure.Repositories
 {
     public class UserTaskAttachmentRepository : Repository<UserTaskAttachment>, IUserTaskAttachmentRepository
     {
+        private readonly DbSet<UserTaskAttachment> dbSet;
+
         public UserTaskAttachmentRepository(HRDataContext context) : base(context)
         {
+            dbSet = context.Set<UserTaskAttachment>();
+
         }
+        public async Task<Tuple<IQueryable<UserTaskAttachment>, int>> GetAllWithChildrenAsync()
+        {
+            var query = dbSet.AsQueryable();
+            var total = await query.CountAsync();
 
+            return new Tuple<IQueryable<UserTaskAttachment>, int>(query, total);
+        }
     }
 }