From de85a8f3693b00b084671dd68fd750448348865e Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 19 Mar 2025 15:58:11 +0700 Subject: [PATCH] fix issue #1255 --- BMA.EHR.Leave/Controllers/LeaveController.cs | 20 ++++++++++---------- BMA.EHR.Leave/appsettings.json | 15 +++++++++------ BMA.EHR.Leave/wwwroot/keycloak.json | 12 +++++++----- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index 6e104be7..e474850d 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -1808,22 +1808,22 @@ namespace BMA.EHR.Leave.Service.Controllers foreach (var data in rawData) { - // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken); - // if (profile == null) - // { - // return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound); - // } + var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken); + if (profile == null) + { + return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound); + } //var userRound = await _dutyTimeRepository.GetByIdAsync(profile.DutyTimeId ?? Guid.Empty); - //var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id); - //var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty; - //var userRound = await _dutyTimeRepository.GetByIdAsync(roundId); + var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id); + var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty; + var userRound = await _dutyTimeRepository.GetByIdAsync(roundId); var checkInData = await _userTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate); - //var duty = userRound ?? getDefaultRound; + var duty = userRound ?? getDefaultRound; - var duty = getDefaultRound; + //var duty = getDefaultRound; // create result object to return var resObj = new GetAdditionalCheckRequestDto diff --git a/BMA.EHR.Leave/appsettings.json b/BMA.EHR.Leave/appsettings.json index 8ccbdf28..e5591a00 100644 --- a/BMA.EHR.Leave/appsettings.json +++ b/BMA.EHR.Leave/appsettings.json @@ -13,18 +13,19 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB", - //"DefaultConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4061;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - //"DefaultConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4063;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - //"LeaveConnection": "server=192.168.4.11;user=root;password=P@ssw0rd;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" "LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - //"LeaveConnection": "server=192.168.1.81;user=root;password=adminVM123;port=4063;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" + + //"DefaultConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + //"ExamConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + //"LeaveConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI", - "Issuer": "https://id.frappet.synology.me/realms/hrms" + "Issuer": "https://id.frappet.synology.me/realms/hrms", + //"Key": "xY2VR-EFvvNPsMs39u8ooVBWQL6mPwrNJOh3koJFTgU", + //"Issuer": "https://hrms-id.bangkok.go.th/realms/hrms" }, "EPPlus": { "ExcelPackage": { @@ -43,6 +44,7 @@ }, "Rabbit": { "Host": "192.168.1.40", + "API": "https://bma-ehr.frappet.synology.me/api/v1", "User": "admin", "Password": "Test123456", "Queue": "bma-checkin-queue", @@ -56,5 +58,6 @@ "Port": "25" }, "API": "https://bma-ehr.frappet.synology.me/api/v1", + //"API": "https://bma-hrms.bangkok.go.th/api/v1", "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz" } \ No newline at end of file diff --git a/BMA.EHR.Leave/wwwroot/keycloak.json b/BMA.EHR.Leave/wwwroot/keycloak.json index b966b658..d1218fee 100644 --- a/BMA.EHR.Leave/wwwroot/keycloak.json +++ b/BMA.EHR.Leave/wwwroot/keycloak.json @@ -1,7 +1,9 @@ { - "realm": "hrms", - "auth-server-url": "https://id.frappet.synology.me", - "ssl-required": "external", - "resource": "bma-ehr", - "public-client": true + "realm": "hrms", + "auth-server-url": "https://id.frappet.synology.me", + //"auth-server-url": "https://hrms-id.bangkok.go.th", + "ssl-required": "external", + "resource": "bma-ehr", + //"resource": "hrms", + "public-client": true } \ No newline at end of file