เพิ่ม org ใน orgemployee

BMA.EHR.Domain/Models/OrganizationEmployee/OrganizationEmployee.cs

@@ -23,6 +23,7 @@ namespace BMA.EHR.Domain.Models.OrganizationEmployee
         public string? OrganizationOrder { get; set; }
         public bool? IsPublic { get; set; } = true;
 
+        public OrganizationEntity? Organization { get; set; }
         public OrganizationFax? OrganizationFax { get; set; }
         public OrganizationLevel? OrganizationLevel { get; set; }
         public OrganizationOrganization? OrganizationOrganization { get; set; }

BMA.EHR.Infrastructure/Migrations/20230915055132_update table orgemployee add organization.cs

@@ -0,0 +1,50 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class updatetableorgemployeeaddorganization : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "OrganizationId",
+                table: "OrganizationEmployees",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OrganizationEmployees_OrganizationId",
+                table: "OrganizationEmployees",
+                column: "OrganizationId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_OrganizationEmployees_Organizations_OrganizationId",
+                table: "OrganizationEmployees",
+                column: "OrganizationId",
+                principalTable: "Organizations",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_OrganizationEmployees_Organizations_OrganizationId",
+                table: "OrganizationEmployees");
+
+            migrationBuilder.DropIndex(
+                name: "IX_OrganizationEmployees_OrganizationId",
+                table: "OrganizationEmployees");
+
+            migrationBuilder.DropColumn(
+                name: "OrganizationId",
+                table: "OrganizationEmployees");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -9169,6 +9169,9 @@ namespace BMA.EHR.Infrastructure.Migrations
                     b.Property<Guid?>("OrganizationGovernmentAgencyId")
                         .HasColumnType("char(36)");
 
+                    b.Property<Guid?>("OrganizationId")
+                        .HasColumnType("char(36)");
+
                     b.Property<Guid?>("OrganizationLevelId")
                         .HasColumnType("char(36)");
 
@@ -9228,6 +9231,8 @@ namespace BMA.EHR.Infrastructure.Migrations
 
                     b.HasIndex("OrganizationGovernmentAgencyId");
 
+                    b.HasIndex("OrganizationId");
+
                     b.HasIndex("OrganizationLevelId");
 
                     b.HasIndex("OrganizationOrganizationId");
@@ -14870,6 +14875,10 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .WithMany()
                         .HasForeignKey("OrganizationGovernmentAgencyId");
 
+                    b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId");
+
                     b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationLevel", "OrganizationLevel")
                         .WithMany()
                         .HasForeignKey("OrganizationLevelId");
@@ -14910,6 +14919,8 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .WithMany()
                         .HasForeignKey("ProfileId");
 
+                    b.Navigation("Organization");
+
                     b.Navigation("OrganizationAgency");
 
                     b.Navigation("OrganizationFax");

BMA.EHR.OrganizationEmployee.Service/Controllers/OrganizationEmployeeController.cs

@@ -63,6 +63,7 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers
                 PositionMasterUserNote = x.PositionMasterUserNote,
                 OrganizationOrder = x.OrganizationOrder,
 
+                OrganizationId = x.Organization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.Organization.Id,
                 OrganizationFaxId = x.OrganizationFax == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationFax.Id,
                 OrganizationLevelId = x.OrganizationLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationLevel.Id,
                 OrganizationOrganizationId = x.OrganizationOrganization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationOrganization.Id,
@@ -126,6 +127,7 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers
                 PositionMasterUserNote = x.PositionMasterUserNote,
                 OrganizationOrder = x.OrganizationOrder,
 
+                OrganizationId = x.Organization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.Organization.Id,
                 OrganizationFaxId = x.OrganizationFax == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationFax.Id,
                 OrganizationLevelId = x.OrganizationLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationLevel.Id,
                 OrganizationOrganizationId = x.OrganizationOrganization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationOrganization.Id,
@@ -220,6 +222,7 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers
                 PositionCondition = req.PositionCondition,
                 PositionMasterUserNote = req.PositionMasterUserNote,
                 OrganizationOrder = req.OrganizationOrder,
+                Organization = await _context.Organizations.FindAsync(req.OrganizationId),
                 OrganizationFax = await _context.OrganizationFaxs.FindAsync(req.OrganizationFaxId),
                 OrganizationLevel = await _context.OrganizationLevels.FindAsync(req.OrganizationLevelId),
                 OrganizationOrganization = await _context.OrganizationOrganizations.FindAsync(req.OrganizationOrganizationId),
@@ -305,6 +308,7 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers
             organizationEmployee.PositionCondition = req.PositionCondition;
             organizationEmployee.PositionMasterUserNote = req.PositionMasterUserNote;
             organizationEmployee.OrganizationOrder = req.OrganizationOrder;
+            organizationEmployee.Organization = await _context.Organizations.FindAsync(req.OrganizationId);
             organizationEmployee.OrganizationFax = await _context.OrganizationFaxs.FindAsync(req.OrganizationFaxId);
             organizationEmployee.OrganizationLevel = await _context.OrganizationLevels.FindAsync(req.OrganizationLevelId);
             organizationEmployee.OrganizationOrganization = await _context.OrganizationOrganizations.FindAsync(req.OrganizationOrganizationId);
@@ -372,6 +376,7 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers
                                                     PositionMasterUserNote = x.PositionMasterUserNote,
                                                     OrganizationOrder = x.OrganizationOrder,
 
+                                                    OrganizationId = x.Organization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.Organization.Id,
                                                     OrganizationFaxId = x.OrganizationFax == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationFax.Id,
                                                     OrganizationLevelId = x.OrganizationLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationLevel.Id,
                                                     OrganizationOrganizationId = x.OrganizationOrganization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationOrganization.Id,
@@ -481,6 +486,7 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers
                                                     PositionMasterUserNote = x.PositionMasterUserNote,
                                                     OrganizationOrder = x.OrganizationOrder,
 
+                                                    OrganizationId = x.Organization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.Organization.Id,
                                                     OrganizationFaxId = x.OrganizationFax == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationFax.Id,
                                                     OrganizationLevelId = x.OrganizationLevel == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationLevel.Id,
                                                     OrganizationOrganizationId = x.OrganizationOrganization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.OrganizationOrganization.Id,

BMA.EHR.OrganizationEmployee.Service/Requests/PersonAddressRequest.cs

@@ -21,6 +21,7 @@ namespace BMA.EHR.OrganizationEmployee.Service.Requests
         public string? OrganizationOrder { get; set; }
         public string? OrganizationShortName { get; set; }
 
+        public Guid? OrganizationId { get; set; }
         public Guid? OrganizationFaxId { get; set; }
         public Guid? OrganizationLevelId { get; set; }
         public Guid? OrganizationOrganizationId { get; set; }