ปรับ api ให้สามารถ upload เอกสารประกอบได้หลายไฟล์

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.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");
@@ -993,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");
@@ -1015,8 +1087,6 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
 
                     b.Navigation("LeaveCancelDocument");
 
-                    b.Navigation("LeaveDocument");
-
                     b.Navigation("LeaveDraftDocument");
 
                     b.Navigation("Type");
@@ -1032,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

@@ -30,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/LeaveRequestController.cs

@@ -13,6 +13,7 @@ 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
 {
@@ -167,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 });
+                    }
                 }
             }
 
@@ -381,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 });
+                    }
                 }
             }
 
@@ -795,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,
@@ -855,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);
         }
 
@@ -1267,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,
@@ -1339,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/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; }