add api เพิ่มเติมระบบลงเวลา

BMA.EHR.Application/Common/Interfaces/ILeaveDbContext.cs

@@ -0,0 +1,13 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Application.Common.Interfaces
+{
+    public interface ILeaveDbContext
+    {
+        DbSet<T> Set<T>() where T : class;
+
+        void Attatch<T>(T entity) where T : class;
+
+        Task<int> SaveChangesAsync();
+    }
+}

BMA.EHR.Application/Repositories/Leaves/GenericLeaveRepository.cs

@@ -0,0 +1,97 @@
+using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Domain.Models.Base;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BMA.EHR.Application.Repositories.Leaves
+{
+    public class GenericLeaveRepository<S, T> : IGenericRepository<S, T> where T : class
+    {
+        #region " Field "
+
+        private readonly ILeaveDbContext _dbContext;
+        private readonly DbSet<T> _dbSet;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        #endregion
+
+        #region " Constructor and Destructor "
+
+        public GenericLeaveRepository(ILeaveDbContext dbContext,
+                                      IHttpContextAccessor httpContextAccessor)
+        {
+            _dbContext = dbContext;
+            _dbSet = _dbContext.Set<T>();
+            _httpContextAccessor = httpContextAccessor;
+
+        }
+
+        #endregion
+
+        #region " Properties "
+
+        protected string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+
+        protected string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
+
+        protected bool? IsPlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1");
+
+        #endregion
+
+        #region " Methods "
+
+        public virtual async Task<IReadOnlyList<T>> GetAllAsync()
+        {
+            return await _dbSet.ToListAsync();
+        }
+
+        public virtual async Task<T?> GetByIdAsync(S id)
+        {
+            return await _dbSet.FindAsync(id);
+        }
+
+        public virtual async Task<T> AddAsync(T entity)
+        {
+            if (entity is EntityBase)
+            {
+                (entity as EntityBase).CreatedUserId = UserId!;
+                (entity as EntityBase).CreatedFullName = FullName!;
+                (entity as EntityBase).CreatedAt = DateTime.Now;
+            }
+
+            await _dbSet.AddAsync(entity);
+            await _dbContext.SaveChangesAsync();
+
+            return entity;
+        }
+
+        public virtual async Task<T> UpdateAsync(T entity)
+        {
+            if (entity is EntityBase)
+            {
+                (entity as EntityBase).LastUpdateUserId = UserId!;
+                (entity as EntityBase).LastUpdateFullName = FullName!;
+                (entity as EntityBase).LastUpdatedAt = DateTime.Now;
+            }
+
+            _dbSet.Update(entity);
+            await _dbContext.SaveChangesAsync();
+
+            return entity;
+        }
+
+        public virtual async Task DeleteAsync(T entity)
+        {
+            _dbSet.Remove(entity);
+            await _dbContext.SaveChangesAsync();
+        }
+
+        #endregion
+    }
+}

BMA.EHR.Application/Repositories/Leaves/TimeAttendants/DutyTimeRepository.cs

@@ -7,11 +7,11 @@ using Microsoft.Extensions.Configuration;
 
 namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
 {
-    public class DutyTimeRepository : GenericRepository<Guid, DutyTime>
+    public class DutyTimeRepository : GenericLeaveRepository<Guid, DutyTime>
     {
         #region " Fields "
 
-        private readonly IApplicationDBContext _dbContext;
+        private readonly ILeaveDbContext _dbContext;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly OrganizationCommonRepository _organizationCommonRepository;
         private readonly UserProfileRepository _userProfileRepository;
@@ -22,7 +22,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
 
         #region " Constructor and Destuctor "
 
-        public DutyTimeRepository(IApplicationDBContext dbContext,
+        public DutyTimeRepository(ILeaveDbContext dbContext,
                                  IHttpContextAccessor httpContextAccessor,
                                  OrganizationCommonRepository organizationCommonRepository,
                                  UserProfileRepository userProfileRepository,

BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs

@@ -1,5 +1,6 @@
 using BMA.EHR.Application.Common.Interfaces;
 using BMA.EHR.Application.Messaging;
+using BMA.EHR.Domain.Extensions;
 using BMA.EHR.Domain.Models.Leave.TimeAttendants;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
@@ -7,11 +8,11 @@ using Microsoft.Extensions.Configuration;
 
 namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
 {
-    public class UserTimeStampRepository : GenericRepository<Guid, UserTimeStamp>
+    public class UserTimeStampRepository : GenericLeaveRepository<Guid, UserTimeStamp>
     {
         #region " Fields "
 
-        private readonly IApplicationDBContext _dbContext;
+        private readonly ILeaveDbContext _dbContext;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly OrganizationCommonRepository _organizationCommonRepository;
         private readonly UserProfileRepository _userProfileRepository;
@@ -22,7 +23,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
 
         #region " Constructor and Destuctor "
 
-        public UserTimeStampRepository(IApplicationDBContext dbContext,
+        public UserTimeStampRepository(ILeaveDbContext dbContext,
                                  IHttpContextAccessor httpContextAccessor,
                                  OrganizationCommonRepository organizationCommonRepository,
                                  UserProfileRepository userProfileRepository,
@@ -66,6 +67,31 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             return data;
         }
 
+        public async Task<List<UserTimeStamp>> GetTimeStampHistoryAsync(Guid keycloakId, int year, int page = 1, int pageSize = 10, string keyword = "")
+        {
+            var data = await _dbContext.Set<UserTimeStamp>()
+                                .Where(u => u.KeycloakUserId == keycloakId)
+                                .Where(u => u.CheckIn.Year.ToCeYear() == year.ToCeYear())
+                                .OrderBy(u => u.CheckIn)
+                                .Skip((page - 1) * pageSize)
+                                .Take(pageSize)
+                                .ToListAsync();
+
+            return data;
+        }
+
+        public async Task<List<UserTimeStamp>> GetTimeStampHistoryForAdminAsync(DateTime startDate,DateTime endDate, int page = 1, int pageSize = 10, string keyword = "")
+        {
+            var data = await _dbContext.Set<UserTimeStamp>()
+                                .Where(u => u.CheckIn >= startDate && u.CheckIn <= endDate)
+                                .OrderBy(u => u.CheckIn)
+                                .Skip((page - 1) * pageSize)
+                                .Take(pageSize)
+                                .ToListAsync();
+
+            return data;
+        }
+
         #endregion
     }
 }

BMA.EHR.Application/Repositories/MinIOService.cs

@@ -361,12 +361,12 @@ namespace BMA.EHR.Application.Repositories
 
                 var fileExt = Path.GetExtension(fileName);
                 var fileType = MimeTypeMap.GetMimeType(fileExt);
-                var file_name = Path.GetFileName(fileName);
+                //var file_name = Path.GetFileName(fileName);
 
                 var request = new PutObjectRequest
                 {
                     BucketName = _bucketName,
-                    Key = file_name,
+                    Key = fileName,
                     InputStream = fileStream,
                     ContentType = fileType,
                     CannedACL = S3CannedACL.BucketOwnerFullControl

BMA.EHR.Application/Repositories/UserProfileRepository.cs

@@ -28,6 +28,24 @@ namespace BMA.EHR.Application.Repositories
 
         #region " Methods "
 
+        public string GetUserFullName(Guid keycloakId)
+        {
+            try
+            {
+                var data = _dbContext.Set<Profile>().AsQueryable()
+                                .Include(x => x.Prefix)
+                                .Where(x => x.KeycloakId == keycloakId)
+                                .Select(x => $"{x.Prefix!.Name}{x.FirstName} {x.LastName}")
+                                .FirstOrDefault();
+
+                return data ?? "-";
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public Guid GetUserOCId(Guid keycloakId)
         {
             try