Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

BMA.EHR.Application/ApplicationServicesRegistration.cs

@@ -51,6 +51,7 @@ namespace BMA.EHR.Application
             services.AddTransient<ProcessUserTimeStampRepository>();
             services.AddTransient<UserDutyTimeRepository>();
             services.AddTransient<AdditionalCheckRequestRepository>();
+            services.AddTransient<UserCalendarRepository>();
 
             services.AddTransient<LeaveTypeRepository>();
             services.AddTransient<LeaveRequestRepository>();

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

@@ -0,0 +1,80 @@
+using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Application.Messaging;
+using BMA.EHR.Domain.Models.Leave.TimeAttendants;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+
+namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
+{
+    public class UserCalendarRepository : GenericLeaveRepository<Guid, UserCalendar>
+    {
+        #region " Fields "
+
+        private readonly ILeaveDbContext _dbContext;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly OrganizationCommonRepository _organizationCommonRepository;
+        private readonly UserProfileRepository _userProfileRepository;
+        private readonly IConfiguration _configuration;
+        private readonly EmailSenderService _emailSenderService;
+
+        #endregion
+
+        #region " Constructor and Destuctor "
+
+        public UserCalendarRepository(ILeaveDbContext dbContext,
+                                 IHttpContextAccessor httpContextAccessor,
+                                 OrganizationCommonRepository organizationCommonRepository,
+                                 UserProfileRepository userProfileRepository,
+                                 IConfiguration configuration,
+                                 EmailSenderService emailSenderService) : base(dbContext, httpContextAccessor)
+        {
+            _dbContext = dbContext;
+            _httpContextAccessor = httpContextAccessor;
+            _organizationCommonRepository = organizationCommonRepository;
+            _userProfileRepository = userProfileRepository;
+            _configuration = configuration;
+            _emailSenderService = emailSenderService;
+        }
+
+        #endregion
+
+        #region " Properties "
+
+        protected Guid UserOrganizationId
+        {
+            get
+            {
+                if (UserId != null || UserId != "")
+                    return _userProfileRepository.GetUserOCId(Guid.Parse(UserId!));
+                else
+                    return Guid.Empty;
+            }
+        }
+
+        #endregion
+
+        #region " Methods "
+
+        public async Task<List<UserCalendar>> GetListByProfileIdAsync(Guid profileId)
+        {
+            var data = await _dbContext.Set<UserCalendar>().AsQueryable()
+                            .Where(x => x.ProfileId == profileId)
+                            .ToListAsync();
+
+            return data;
+        }
+
+        public async Task<UserCalendar?> GetExist(Guid profileId)
+        {
+            var data = await _dbContext.Set<UserCalendar>()
+                            .Where(x => x.ProfileId == profileId)
+                            .FirstOrDefaultAsync();
+
+            return data;
+        }
+
+        #endregion
+
+    }
+}

BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs

@@ -36,7 +36,7 @@ namespace BMA.EHR.Application.Repositories.MetaData
             return data;
         }
 
-        public int GetWeekEndCount(DateTime startDate, DateTime endDate)
+        public int GetWeekEndCount(DateTime startDate, DateTime endDate, string category = "NORMAL")
         {
             var dates = new List<DateTime>();
 
@@ -45,7 +45,11 @@ namespace BMA.EHR.Application.Repositories.MetaData
                 dates.Add(i);
             }
 
-            var count = dates.Where(d => d.DayOfWeek == DayOfWeek.Saturday || d.DayOfWeek == DayOfWeek.Sunday).Count();
+            var count = 0;
+            if (category == "NORMAL")
+                count = dates.Where(d => d.DayOfWeek == DayOfWeek.Saturday || d.DayOfWeek == DayOfWeek.Sunday).Count();
+            else
+                count = dates.Where(d => d.DayOfWeek == DayOfWeek.Sunday).Count();
 
             return count;
         }

BMA.EHR.Domain/Models/Leave/Requests/LeaveDocument.cs

@@ -0,0 +1,12 @@
+using BMA.EHR.Domain.Models.Base;
+using BMA.EHR.Domain.Models.Documents;
+
+namespace BMA.EHR.Domain.Models.Leave.Requests
+{
+    public class LeaveDocument : EntityBase
+    {
+        public Document Document { get; set; }
+
+        public LeaveRequest LeaveRequest { get; set; }
+    }
+}

BMA.EHR.Domain/Models/Leave/Requests/LeaveRequest.cs

@@ -29,7 +29,7 @@ namespace BMA.EHR.Domain.Models.Leave.Requests
         [Required, Comment("รายละเอียดการลา")]
         public string LeaveDetail { get; set; } = string.Empty;
 
-        public Document? LeaveDocument { get; set; }
+        public List<LeaveDocument> LeaveDocument { get; set; } = new();
 
         public Document? LeaveDraftDocument { get; set; }
 

BMA.EHR.Domain/Models/Leave/TimeAttendants/UserCalendar.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+using BMA.EHR.Domain.Models.Base;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Domain.Models.Leave.TimeAttendants
+{
+    public class UserCalendar : EntityBase
+    {
+        [Required, Comment("รหัส Profile ในระบบทะเบียนประวัติ")]
+        public Guid ProfileId { get; set; } = Guid.Empty;
+
+        [Required, Comment("ปฏิทินการทำงานของ ขรก ปกติ หรือ 6 วันต่อสัปดาห์")]
+        public string Calendar { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Infrastructure/Migrations/LeaveDb/20240109022804_Add UserCalendar Table.cs

@@ -0,0 +1,47 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class AddUserCalendarTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "UserCalendars",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, comment: "PrimaryKey", collation: "ascii_general_ci"),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "สร้างข้อมูลเมื่อ"),
+                    CreatedUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "แก้ไขข้อมูลล่าสุดเมื่อ"),
+                    LastUpdateUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreatedFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdateFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ProfileId = table.Column<Guid>(type: "char(36)", nullable: false, comment: "รหัส Profile ในระบบทะเบียนประวัติ", collation: "ascii_general_ci"),
+                    Calendar = table.Column<string>(type: "longtext", nullable: false, comment: "ปฏิทินการทำงานของ ขรก ปกติ หรือ 6 วันต่อสัปดาห์")
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UserCalendars", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "UserCalendars");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/LeaveDb/20240109041738_Add LeaveDocument Table.cs

@@ -0,0 +1,99 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class AddLeaveDocumentTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_LeaveRequests_Document_LeaveDocumentId",
+                table: "LeaveRequests");
+
+            migrationBuilder.DropIndex(
+                name: "IX_LeaveRequests_LeaveDocumentId",
+                table: "LeaveRequests");
+
+            migrationBuilder.DropColumn(
+                name: "LeaveDocumentId",
+                table: "LeaveRequests");
+
+            migrationBuilder.CreateTable(
+                name: "LeaveDocuments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, comment: "PrimaryKey", collation: "ascii_general_ci"),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "สร้างข้อมูลเมื่อ"),
+                    CreatedUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "แก้ไขข้อมูลล่าสุดเมื่อ"),
+                    LastUpdateUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreatedFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdateFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DocumentId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    LeaveRequestId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_LeaveDocuments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_LeaveDocuments_Document_DocumentId",
+                        column: x => x.DocumentId,
+                        principalTable: "Document",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_LeaveDocuments_LeaveRequests_LeaveRequestId",
+                        column: x => x.LeaveRequestId,
+                        principalTable: "LeaveRequests",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_LeaveDocuments_DocumentId",
+                table: "LeaveDocuments",
+                column: "DocumentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_LeaveDocuments_LeaveRequestId",
+                table: "LeaveDocuments",
+                column: "LeaveRequestId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "LeaveDocuments");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "LeaveDocumentId",
+                table: "LeaveRequests",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_LeaveRequests_LeaveDocumentId",
+                table: "LeaveRequests",
+                column: "LeaveDocumentId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_LeaveRequests_Document_LeaveDocumentId",
+                table: "LeaveRequests",
+                column: "LeaveDocumentId",
+                principalTable: "Document",
+                principalColumn: "Id");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/LeaveDb/LeaveDbContextModelSnapshot.cs

@@ -119,6 +119,68 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                     b.ToTable("LeaveTypes");
                 });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveDocuments");
+                });
+
             modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
                 {
                     b.Property<Guid>("Id")
@@ -269,9 +331,6 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                         .HasColumnType("longtext")
                         .HasComment("ความเห็นของผู้อำนวยการสำนัก");
 
-                    b.Property<Guid?>("LeaveDocumentId")
-                        .HasColumnType("char(36)");
-
                     b.Property<Guid?>("LeaveDraftDocumentId")
                         .HasColumnType("char(36)");
 
@@ -409,8 +468,6 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
 
                     b.HasIndex("LeaveCancelDocumentId");
 
-                    b.HasIndex("LeaveDocumentId");
-
                     b.HasIndex("LeaveDraftDocumentId");
 
                     b.HasIndex("TypeId");
@@ -730,6 +787,67 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                     b.ToTable("ProcessUserTimeStamps");
                 });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserCalendar", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ปฏิทินการทำงานของ ขรก ปกติ หรือ 6 วันต่อสัปดาห์");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserCalendars");
+                });
+
             modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
                 {
                     b.Property<Guid>("Id")
@@ -932,16 +1050,31 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                     b.ToTable("UserTimeStamps");
                 });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("LeaveDocument")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("LeaveRequest");
+                });
+
             modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
                 {
                     b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveCancelDocument")
                         .WithMany()
                         .HasForeignKey("LeaveCancelDocumentId");
 
-                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveDocument")
-                        .WithMany()
-                        .HasForeignKey("LeaveDocumentId");
-
                     b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveDraftDocument")
                         .WithMany()
                         .HasForeignKey("LeaveDraftDocumentId");
@@ -954,8 +1087,6 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
 
                     b.Navigation("LeaveCancelDocument");
 
-                    b.Navigation("LeaveDocument");
-
                     b.Navigation("LeaveDraftDocument");
 
                     b.Navigation("Type");
@@ -971,6 +1102,11 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
 
                     b.Navigation("DutyTime");
                 });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Navigation("LeaveDocument");
+                });
 #pragma warning restore 612, 618
         }
     }

BMA.EHR.Infrastructure/Persistence/LeaveDbContext.cs

@@ -14,12 +14,14 @@ namespace BMA.EHR.Infrastructure.Persistence
 
         public DbSet<UserTimeStamp> UserTimeStamps { get; set; }
 
-        public DbSet<ProcessUserTimeStamp> ProcessUserTimeStamps { get; set; }  
+        public DbSet<ProcessUserTimeStamp> ProcessUserTimeStamps { get; set; }
 
         public DbSet<UserDutyTime> UserDutyTimes { get; set; }
 
         public DbSet<AdditionalCheckRequest> AdditionalCheckRequests { get; set; }
 
+        public DbSet<UserCalendar> UserCalendars { get; set; }
+
         #endregion
 
         #region " Leave System "
@@ -28,6 +30,8 @@ namespace BMA.EHR.Infrastructure.Persistence
 
         public DbSet<LeaveRequest> LeaveRequests { get; set; }
 
+        public DbSet<LeaveDocument> LeaveDocuments { get; set; }
+
 
         #endregion
 

BMA.EHR.Leave.Service/Controllers/LeaveController.cs

@@ -5,6 +5,7 @@ using BMA.EHR.Domain.Models.Leave.TimeAttendants;
 using BMA.EHR.Domain.Shared;
 using BMA.EHR.Infrastructure.Persistence;
 using BMA.EHR.Leave.Service.DTOs.AdditionalCheck;
+using BMA.EHR.Leave.Service.DTOs.Calendar;
 using BMA.EHR.Leave.Service.DTOs.ChangeRound;
 using BMA.EHR.Leave.Service.DTOs.CheckIn;
 using BMA.EHR.Leave.Service.DTOs.DutyTime;
@@ -38,6 +39,8 @@ namespace BMA.EHR.Leave.Service.Controllers
         private readonly UserDutyTimeRepository _userDutyTimeRepository;
         private readonly AdditionalCheckRequestRepository _additionalCheckRequestRepository;
 
+        private readonly UserCalendarRepository _userCalendarRepository;
+
         private readonly string _bucketName = "check-in";
 
         #endregion
@@ -54,7 +57,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 MinIOService minIOService,
                                 ProcessUserTimeStampRepository processUserTimeStampRepository,
                                 UserDutyTimeRepository userDutyTimeRepository,
-                                AdditionalCheckRequestRepository additionalCheckRequestRepository)
+                                AdditionalCheckRequestRepository additionalCheckRequestRepository,
+                                UserCalendarRepository userCalendarRepository)
         {
             _dutyTimeRepository = dutyTimeRepository;
             _context = context;
@@ -67,6 +71,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             _processUserTimeStampRepository = processUserTimeStampRepository;
             _userDutyTimeRepository = userDutyTimeRepository;
             _additionalCheckRequestRepository = additionalCheckRequestRepository;
+            _userCalendarRepository = userCalendarRepository;
         }
 
         #endregion
@@ -1490,6 +1495,66 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         #endregion
 
-        #endregion
+        #region " ปฏิทินการทำงานของ ขรก. "
+
+        /// <summary>
+        /// LV1_023 - แสดงปฏิทินวันทำงานรายคน (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("admin/work/{id:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> GetCalendarByProfileAsync(Guid id)
+        {
+            var data = await _userCalendarRepository.GetExist(id);
+            if (data == null)
+                return Success(new { Work = "NORMAL" });
+            else
+                return Success(new { Work = data.Calendar });
+        }
+
+        /// <summary>
+        /// LV1_024 - บันทึกแก้ไขปฏิทินวันทำงาน (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("admin/work/{id:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> UpdateCalendarByProfileAsync(Guid id, [FromBody] UpdateCalendarDto req)
+        {
+            var data = await _userCalendarRepository.GetExist(id);
+            if (data != null)
+            {
+                data.Calendar = req.Work;
+                await _userCalendarRepository.UpdateAsync(data);
+                return Success();
+            }
+            else
+            {
+                data = new UserCalendar
+                {
+                    ProfileId = id,
+                    Calendar = req.Work
+                };
+
+                await _userCalendarRepository.AddAsync(data);
+
+                return Success();
+            }
+
+            #endregion
+
+            #endregion
+        }
     }
 }

BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs

@@ -12,6 +12,8 @@ using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Security.Claims;
 using BMA.EHR.Application.Repositories.Commands;
+using BMA.EHR.Application.Repositories.Leaves.TimeAttendants;
+using Org.BouncyCastle.Ocsp;
 
 namespace BMA.EHR.Leave.Service.Controllers
 {
@@ -35,6 +37,7 @@ namespace BMA.EHR.Leave.Service.Controllers
         private readonly MinIOLeaveService _minIOService;
         private readonly HolidayRepository _holidayRepository;
         private readonly CommandRepository _commandRepository;
+        private readonly UserCalendarRepository _userCalendarRepository;
 
         private const string APPROVE_STEP_CREATE = "st1";
         private const string APPROVE_STEP_OFFICER_APPROVE = "st2";
@@ -55,7 +58,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             LeaveRequestRepository leaveRequestRepository,
             MinIOLeaveService minIOService,
             HolidayRepository holidayRepository,
-            CommandRepository commandRepository)
+            CommandRepository commandRepository,
+            UserCalendarRepository userCalendarRepository)
         {
             _context = context;
             _httpContextAccessor = httpContextAccessor;
@@ -67,6 +71,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             _minIOService = minIOService;
             _holidayRepository = holidayRepository;
             _commandRepository = commandRepository;
+            _userCalendarRepository = userCalendarRepository;
         }
 
         #endregion
@@ -118,6 +123,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
+            var userCalendar = await _userCalendarRepository.GetExist(profile.Id);
+            var category = userCalendar == null ? "NORMAL" : userCalendar.Calendar;
+
             var leaveType = await _leaveTypeRepository.GetByIdAsync(req.Type);
             if (leaveType == null)
             {
@@ -125,8 +133,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
 
             var sumLeave = req.LeaveStartDate.DiffDay(req.LeaveEndDate);
-            var sumHoliday = await _holidayRepository.GetHolidayCountAsync(req.LeaveStartDate, req.LeaveEndDate);
+            var sumHoliday = await _holidayRepository.GetHolidayCountAsync(req.LeaveStartDate, req.LeaveEndDate, category);
-            var sumWeekend = _holidayRepository.GetWeekEndCount(req.LeaveStartDate, req.LeaveEndDate);
+            var sumWeekend = _holidayRepository.GetWeekEndCount(req.LeaveStartDate, req.LeaveEndDate, category);
 
             var leaveTotal = 0.0;
             if (req.LeaveRange != "ALL")
@@ -160,10 +168,13 @@ namespace BMA.EHR.Leave.Service.Controllers
             // upload document
             if (req.LeaveDocument != null)
             {
-                var doc = await _minIOService.UploadFileAsync(req.LeaveDocument);
+                foreach (var d in req.LeaveDocument)
-                if (doc != null)
                 {
-                    leaveRequest.LeaveDocument = doc;
+                    var doc = await _minIOService.UploadFileAsync(d);
+                    if (doc != null)
+                    {
+                        leaveRequest.LeaveDocument.Add(new LeaveDocument { Document = doc });
+                    }
                 }
             }
 
@@ -328,6 +339,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
+            var userCalendar = await _userCalendarRepository.GetExist(profile.Id);
+            var category = userCalendar == null ? "NORMAL" : userCalendar.Calendar;
+
             var leaveType = await _leaveTypeRepository.GetByIdAsync(req.Type);
             if (leaveType == null)
             {
@@ -335,8 +349,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
 
             var sumLeave = req.LeaveStartDate.DiffDay(req.LeaveEndDate);
-            var sumHoliday = await _holidayRepository.GetHolidayCountAsync(req.LeaveStartDate, req.LeaveEndDate);
+            var sumHoliday = await _holidayRepository.GetHolidayCountAsync(req.LeaveStartDate, req.LeaveEndDate, category);
-            var sumWeekend = _holidayRepository.GetWeekEndCount(req.LeaveStartDate, req.LeaveEndDate);
+            var sumWeekend = _holidayRepository.GetWeekEndCount(req.LeaveStartDate, req.LeaveEndDate, category);
 
             var leaveTotal = 0.0;
             if (req.LeaveRange != "ALL")
@@ -371,10 +385,13 @@ namespace BMA.EHR.Leave.Service.Controllers
             // upload document
             if (req.LeaveDocument != null)
             {
-                var doc = await _minIOService.UploadFileAsync(req.LeaveDocument);
+                foreach (var d in req.LeaveDocument)
-                if (doc != null)
                 {
-                    leaveRequest.LeaveDocument = doc;
+                    var doc = await _minIOService.UploadFileAsync(d);
+                    if (doc != null)
+                    {
+                        leaveRequest.LeaveDocument.Add(new LeaveDocument { Document = doc });
+                    }
                 }
             }
 
@@ -593,17 +610,28 @@ namespace BMA.EHR.Leave.Service.Controllers
         public async Task<ActionResult<ResponseObject>> CheckUserLeaveAsync([FromBody] GetLeaveCheckDto req)
         {
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId);
+
+            if (profile == null)
+            {
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            }
+
             var leaveType = await _leaveTypeRepository.GetByIdAsync(req.Type);
             if (leaveType == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
+            var userCalendar = await _userCalendarRepository.GetExist(profile.Id);
+            var category = userCalendar == null ? "NORMAL" : userCalendar.Calendar;
+
             var sumLeave =
                 await _leaveRequestRepository.GetSumLeaveByTypeForUserAsync(userId, req.Type, req.StartLeaveDate.Year);
-            var sumWorkDay = await _holidayRepository.GetHolidayCountAsync(req.StartLeaveDate, req.EndLeaveDate);
+            var sumWorkDay = await _holidayRepository.GetHolidayCountAsync(req.StartLeaveDate, req.EndLeaveDate, category);
             var totalDay = req.StartLeaveDate.DiffDay(req.EndLeaveDate);
-            var sumWeekend = _holidayRepository.GetWeekEndCount(req.StartLeaveDate, req.EndLeaveDate);
+            var sumWeekend = _holidayRepository.GetWeekEndCount(req.StartLeaveDate, req.EndLeaveDate, category);
 
             var isLeave = sumLeave + (totalDay - sumWorkDay) <= leaveType.Limit;
 
@@ -745,6 +773,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
+            var userCalendar = await _userCalendarRepository.GetExist(profile.Id);
+            var category = userCalendar == null ? "NORMAL" : userCalendar.Calendar;
+
             var lastSalary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault();
             var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount ?? 0;
 
@@ -753,8 +784,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     rawData.Type.Id);
 
             var sumLeave = rawData.LeaveStartDate.DiffDay(rawData.LeaveEndDate);
-            var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate);
+            var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
-            var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate);
+            var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
 
             var result = new GetLeaveRequestByIdDto
             {
@@ -771,7 +802,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                 LeaveAddress = rawData.LeaveAddress,
                 LeaveNumber = rawData.LeaveNumber,
                 LeaveDetail = rawData.LeaveDetail,
-                LeaveDocument = rawData.LeaveDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
+                LeaveDocument = new(),
+                //LeaveDocument = rawData.LeaveDocument == null ? null : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
                 LeaveDraftDocument = rawData.LeaveDraftDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDraftDocument.Id),
 
                 LeaveLastStart = lastLeaveRequest == null ? null : lastLeaveRequest.LeaveStartDate,
@@ -831,6 +863,17 @@ namespace BMA.EHR.Leave.Service.Controllers
                 LeaveTypeCode = rawData.LeaveTypeCode ?? ""
             };
 
+
+            if (rawData.LeaveDocument != null && rawData.LeaveDocument.Count > 0)
+            {
+                foreach (var d in rawData.LeaveDocument)
+                {
+                    var file = await _minIOService.ImagesPath(d.Document.Id);
+                    result.LeaveDocument.Add(file);
+                }
+            }
+
+
             return Success(result);
         }
 
@@ -1201,6 +1244,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
+            var userCalendar = await _userCalendarRepository.GetExist(profile.Id);
+            var category = userCalendar == null ? "NORMAL" : userCalendar.Calendar;
+
             var lastSalary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault();
             var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount ?? 0;
 
@@ -1220,8 +1266,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             var leaveSummary = await _leaveRequestRepository.GetSumApproveLeaveByTypeForUserAsync(userId, rawData.Type.Id, thisYear);
 
             var sumLeave = rawData.LeaveStartDate.DiffDay(rawData.LeaveEndDate);
-            var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate);
+            var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
-            var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate);
+            var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category);
 
             var result = new GetLeaveRequestForAdminByIdDto
             {
@@ -1240,7 +1286,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                 LeaveAddress = rawData.LeaveAddress,
                 LeaveNumber = rawData.LeaveNumber,
                 LeaveDetail = rawData.LeaveDetail,
-                LeaveDocument = rawData.LeaveDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
+                LeaveDocument = new(),
+                //LeaveDocument = rawData.LeaveDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDocument.Id),
                 LeaveDraftDocument = rawData.LeaveDraftDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDraftDocument.Id),
 
                 LeaveLastStart = lastLeaveRequest == null ? null : lastLeaveRequest.LeaveStartDate,
@@ -1312,6 +1359,15 @@ namespace BMA.EHR.Leave.Service.Controllers
                 LeaveRemain = rawData.Type.Limit - leaveSummary
             };
 
+            if (rawData.LeaveDocument != null && rawData.LeaveDocument.Count > 0)
+            {
+                foreach (var d in rawData.LeaveDocument)
+                {
+                    var file = await _minIOService.ImagesPath(d.Document.Id);
+                    result.LeaveDocument.Add(file);
+                }
+            }
+
             return Success(result);
         }
 

BMA.EHR.Leave.Service/DTOs/Calendar/UpdateCalendarDto.cs

@@ -0,0 +1,7 @@
+namespace BMA.EHR.Leave.Service.DTOs.Calendar
+{
+    public class UpdateCalendarDto
+    {
+        public string Work { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Leave.Service/DTOs/LeaveRequest/CreateLeaveRequestDto.cs

@@ -23,7 +23,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
 
         public string? LeaveDetail { get; set; }
 
-        public IFormFile? LeaveDocument { get; set; }
+        public List<IFormFile> LeaveDocument { get; set; } = new();
 
         public IFormFile? LeaveDraftDocument { get; set; }
 

BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs

@@ -31,7 +31,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
 
         public string LeaveDetail { get; set; } = string.Empty;
 
-        public string LeaveDocument { get; set; }
+        public List<string> LeaveDocument { get; set; } = new();
 
         public string LeaveDraftDocument { get; set; }
 

BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs

@@ -38,7 +38,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
 
         public string LeaveDetail { get; set; } = string.Empty;
 
-        public string LeaveDocument { get; set; }
+        public List<string> LeaveDocument { get; set; } = new();
 
         public string LeaveDraftDocument { get; set; }