Merge branch 'develop' into adiDev

2025-03-26 17:15:15 +07:00 · 2025-03-26 17:15:15 +07:00 · 3779128e6c
commit 3779128e6c
parent bcb7c7781c e4dccb5c1f
26 changed files with 1912 additions and 191 deletions
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
@ -574,6 +574,7 @@ namespace BMA.EHR.Placement.Service.Controllers
            uppdated.positionId = req.positionId;
            uppdated.posMasterNo = req.posMasterNo;
            uppdated.position = req.positionName;
+            uppdated.PositionExecutive = req.posExecutiveName;
            uppdated.positionField = req.positionField;
            uppdated.posTypeId = req.posTypeId;
            uppdated.posTypeName = req.posTypeName;
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@ -968,6 +968,7 @@ namespace BMA.EHR.Placement.Service.Controllers
            person.positionId = req.positionId;
            person.posMasterNo = req.posMasterNo;
            person.positionName = req.positionName;
+            person.PositionExecutive = req.posExecutiveName;
            person.positionField = req.positionField;
            person.posTypeId = req.posTypeId;
            person.posTypeName = req.posTypeName;
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@ -673,6 +673,7 @@ namespace BMA.EHR.Placement.Service.Controllers
            uppdated.positionId = req.positionId;
            uppdated.posMasterNo = req.posMasterNo;
            uppdated.position = req.positionName;
+            uppdated.PositionExecutive = req.posExecutiveName;
            uppdated.positionField = req.positionField;
            uppdated.posTypeId = req.posTypeId;
            uppdated.posTypeName = req.posTypeName;
--- a/BMA.EHR.Placement.Service/Program.cs
+++ b/BMA.EHR.Placement.Service/Program.cs
@ -68,8 +68,8 @@ var builder = WebApplication.CreateBuilder(args);
    builder.Services.AddAuthorization();

    // use serilog
-    ConfigureLogs();
-    builder.Host.UseSerilog();
+    //ConfigureLogs();
+    //builder.Host.UseSerilog();

    // Add config CORS
    builder.Services.AddCors(options => options.AddDefaultPolicy(builder =>
@ -153,6 +153,8 @@ var app = builder.Build();
    app.UseStaticFiles();
    app.MapControllers();
    app.UseMiddleware<ErrorHandlerMiddleware>();
+    app.UseMiddleware<RequestLoggingMiddleware>();
+
    app.UseHangfireDashboard("/hangfire", new DashboardOptions()
    {
        Authorization = new[] { new CustomAuthorizeFilter() }
--- a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs
+++ b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionAppointmentRequest.cs
@ -29,5 +29,6 @@ namespace BMA.EHR.Placement.Service.Requests
        public string? posLevelId { get; set; }
        public string? posLevelName { get; set; }
        public string? typeCommand { get; set; }
+        public string? posExecutiveName { get; set; }
    }
 }
--- a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs
+++ b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs
@ -29,5 +29,6 @@ namespace BMA.EHR.Placement.Service.Requests
        public string? posLevelId { get; set; }
        public string? posLevelName { get; set; }
        public string? typeCommand { get; set; }
+        public string? posExecutiveName { get; set; }
    }
 }
--- a/BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs
+++ b/BMA.EHR.Placement.Service/Requests/PersonSelectPositionRequest.cs
@ -38,5 +38,6 @@ namespace BMA.EHR.Placement.Service.Requests
        public string? posLevelId { get; set; }
        public string? posLevelName { get; set; }
        public string? typeCommand { get; set; }
+        public string? posExecutiveName { get; set; }
    }
 }
--- a/BMA.EHR.Placement.Service/appsettings.json
+++ b/BMA.EHR.Placement.Service/appsettings.json
@ -1,49 +1,51 @@
 {
-  "Serilog": {
-    "MinimumLevel": {
-      "Default": "Information",
-      "Override": {
-        "Microsoft": "Information",
-        "System": "Warning"
-      }
-    }
-  },
-  "ElasticConfiguration": {
-    "Uri": "http://localhost:9200"
-  },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
-    "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
-  },
-  "Jwt": {
-    "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
-    "Issuer": "https://id.frappet.synology.me/realms/hrms"
-  },
-  "EPPlus": {
-    "ExcelPackage": {
-      "LicenseContext": "NonCommercial"
-    }
-  },
-  "MinIO": {
-    "Endpoint": "https://edm-s3.frappet.synology.me/",
-    "AccessKey": "XxtdnJajPjp3hHuKdOMn",
-    "SecretKey": "rVPzB05giC7bA400cUuIThzT4T9SGCcpcmL3tBBg",
-    "BucketName": "bma-ehr-fpt"
-  },
-  "KeycloakCron": {
-    "Hour": "08",
-    "Minute": "00"
-  },
-  "Mail": {
-    "Server": "smtp.gmail.com",
-    "User": "suphonchai.ph@gmail.com",
-    "Password": "nnjazjcnwhepkxdm",
-    "MailFrom": "suphonchai.ph@gmail.com",
-    "Port": "587"
-  },
-  "Protocol": "HTTPS",
-  "APIPROBATION": "https://bma-ehr.frappet.synology.me/api/v1/probation",
-  "API": "https://bma-ehr.frappet.synology.me/api/v1",
-  "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz"
+    "Serilog": {
+        "MinimumLevel": {
+            "Default": "Information",
+            "Override": {
+                "Microsoft": "Information",
+                "System": "Warning"
+            }
+        }
+    },
+    "ElasticConfiguration": {
+        "Uri": "http://192.168.1.40:9200",
+        "IndexFormat": "bma-ehr-log-index",
+        "SystemName": "placement"
+    },
+    "AllowedHosts": "*",
+    "ConnectionStrings": {
+        //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
+        "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
+    },
+    "Jwt": {
+        "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
+        "Issuer": "https://id.frappet.synology.me/realms/hrms"
+    },
+    "EPPlus": {
+        "ExcelPackage": {
+            "LicenseContext": "NonCommercial"
+        }
+    },
+    "MinIO": {
+        "Endpoint": "https://edm-s3.frappet.synology.me/",
+        "AccessKey": "XxtdnJajPjp3hHuKdOMn",
+        "SecretKey": "rVPzB05giC7bA400cUuIThzT4T9SGCcpcmL3tBBg",
+        "BucketName": "bma-ehr-fpt"
+    },
+    "KeycloakCron": {
+        "Hour": "08",
+        "Minute": "00"
+    },
+    "Mail": {
+        "Server": "smtp.gmail.com",
+        "User": "suphonchai.ph@gmail.com",
+        "Password": "nnjazjcnwhepkxdm",
+        "MailFrom": "suphonchai.ph@gmail.com",
+        "Port": "587"
+    },
+    "Protocol": "HTTPS",
+    "APIPROBATION": "https://bma-ehr.frappet.synology.me/api/v1/probation",
+    "API": "https://bma-ehr.frappet.synology.me/api/v1",
+    "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz"
 }