แก้ไข
- format response - ส่ง noti โดยมีการแนบลิงค์
This commit is contained in:
parent
19c30e69df
commit
92847e6be2
6 changed files with 211 additions and 21 deletions
|
|
@ -22,4 +22,12 @@
|
||||||
**/secrets.dev.yaml
|
**/secrets.dev.yaml
|
||||||
**/values.dev.yaml
|
**/values.dev.yaml
|
||||||
LICENSE
|
LICENSE
|
||||||
README.md
|
README.md
|
||||||
|
.git
|
||||||
|
**/bin/
|
||||||
|
**/obj/
|
||||||
|
.vscode/
|
||||||
|
.dockerignore
|
||||||
|
.gitignore
|
||||||
|
README.md
|
||||||
|
*.md
|
||||||
|
|
@ -57,6 +57,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
public async Task<List<LeaveBeginning>> GetAllByYearAsync(int year)
|
public async Task<List<LeaveBeginning>> GetAllByYearAsync(int year)
|
||||||
{
|
{
|
||||||
return await _dbContext.Set<LeaveBeginning>()
|
return await _dbContext.Set<LeaveBeginning>()
|
||||||
|
.Include(x => x.LeaveType)
|
||||||
.Where(x => x.LeaveYear == year)
|
.Where(x => x.LeaveYear == year)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
|
|
||||||
private readonly IApplicationDBContext _appDbContext;
|
private readonly IApplicationDBContext _appDbContext;
|
||||||
|
|
||||||
|
private readonly string URL = string.Empty;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region " Constructor and Destuctor "
|
#region " Constructor and Destuctor "
|
||||||
|
|
@ -47,6 +49,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
_emailSenderService = emailSenderService;
|
_emailSenderService = emailSenderService;
|
||||||
_appDbContext = appDbContext;
|
_appDbContext = appDbContext;
|
||||||
|
|
||||||
|
URL = (_configuration["API"]).Replace("/api/v1", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
@ -506,6 +510,22 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
rawData.ApproveStep = "st2";
|
rawData.ApproveStep = "st2";
|
||||||
|
|
||||||
await UpdateAsync(rawData);
|
await UpdateAsync(rawData);
|
||||||
|
|
||||||
|
// TODO: Send notification to 1st Commander
|
||||||
|
var firstCommander = rawData.Approvers
|
||||||
|
.Where(x => x.ApproveType!.ToUpper() == "COMMANDER")
|
||||||
|
.OrderBy(x => x.Seq)
|
||||||
|
.FirstOrDefault();
|
||||||
|
// Send Notification
|
||||||
|
var noti1 = new Notification
|
||||||
|
{
|
||||||
|
Body = $"การขอลาของคุณ {rawData.FirstName} {rawData.LastName} รอรับการอนุมัติจากคุณ",
|
||||||
|
ReceiverUserId = firstCommander!.ProfileId,
|
||||||
|
Type = "",
|
||||||
|
Payload = $"{URL}/leave/detail/{id}",
|
||||||
|
};
|
||||||
|
_appDbContext.Set<Notification>().Add(noti1);
|
||||||
|
await _appDbContext.SaveChangesAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task CommanderApproveLeaveRequest(Guid id, string reason)
|
public async Task CommanderApproveLeaveRequest(Guid id, string reason)
|
||||||
|
|
@ -527,7 +547,6 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
|
|
||||||
// check commander approve
|
// check commander approve
|
||||||
var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "COMMANDER").OrderBy(x => x.Seq).ToList();
|
var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "COMMANDER").OrderBy(x => x.Seq).ToList();
|
||||||
var maxSeq = approvers.Max(x => x.Seq);
|
|
||||||
|
|
||||||
var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
|
var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
|
||||||
if (approver == null)
|
if (approver == null)
|
||||||
|
|
@ -535,21 +554,34 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาในขั้นตอนนี้");
|
throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาในขั้นตอนนี้");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check prev approver มี action แล้วหรือไม่?
|
||||||
|
var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
|
||||||
|
|
||||||
|
if (prevApprover != null)
|
||||||
|
{
|
||||||
|
if (prevApprover.ApproveStatus == "PENDING")
|
||||||
|
{
|
||||||
|
throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var maxSeq = approvers.Max(x => x.Seq);
|
||||||
|
|
||||||
approver.ApproveStatus = "APPROVE";
|
approver.ApproveStatus = "APPROVE";
|
||||||
approver.Comment = reason;
|
approver.Comment = reason;
|
||||||
|
|
||||||
if (approver.Seq != maxSeq)
|
if (approver.Seq != maxSeq)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
|
var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
|
||||||
|
|
||||||
// Send Noti
|
// Send Noti
|
||||||
var noti = new Notification
|
var noti = new Notification
|
||||||
{
|
{
|
||||||
Body = $"การขอลาของคุณ {rawData.FirstName} {rawData.LastName} รอรับการอนุมัติจากคุณ",
|
Body = $"การขอลาของคุณ {rawData.FirstName} {rawData.LastName} รอรับการอนุมัติจากคุณ",
|
||||||
ReceiverUserId = nextApprover!.ProfileId,
|
ReceiverUserId = nextApprover!.ProfileId,
|
||||||
Type = "",
|
Type = "",
|
||||||
Payload = "",
|
Payload = $"{URL}/leave/detail/{id}",
|
||||||
};
|
};
|
||||||
_appDbContext.Set<Notification>().Add(noti);
|
_appDbContext.Set<Notification>().Add(noti);
|
||||||
await _appDbContext.SaveChangesAsync();
|
await _appDbContext.SaveChangesAsync();
|
||||||
|
|
@ -564,6 +596,22 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
rawData.ApproveStep = "st3";
|
rawData.ApproveStep = "st3";
|
||||||
|
|
||||||
await UpdateAsync(rawData);
|
await UpdateAsync(rawData);
|
||||||
|
|
||||||
|
// TODO: Send notification to 1st Approver
|
||||||
|
var firstCommander = rawData.Approvers
|
||||||
|
.Where(x => x.ApproveType!.ToUpper() == "APPROVER")
|
||||||
|
.OrderBy(x => x.Seq)
|
||||||
|
.FirstOrDefault();
|
||||||
|
// Send Notification
|
||||||
|
var noti1 = new Notification
|
||||||
|
{
|
||||||
|
Body = $"การขอลาของคุณ {rawData.FirstName} {rawData.LastName} รอรับการอนุมัติจากคุณ",
|
||||||
|
ReceiverUserId = firstCommander!.ProfileId,
|
||||||
|
Type = "",
|
||||||
|
Payload = $"{URL}/leave/detail/{id}",
|
||||||
|
};
|
||||||
|
_appDbContext.Set<Notification>().Add(noti1);
|
||||||
|
await _appDbContext.SaveChangesAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -587,7 +635,6 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
|
|
||||||
// check commander approve
|
// check commander approve
|
||||||
var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "COMMANDER").OrderBy(x => x.Seq).ToList();
|
var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "COMMANDER").OrderBy(x => x.Seq).ToList();
|
||||||
var maxSeq = approvers.Max(x => x.Seq);
|
|
||||||
|
|
||||||
var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
|
var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
|
||||||
if (approver == null)
|
if (approver == null)
|
||||||
|
|
@ -595,6 +642,20 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาในขั้นตอนนี้");
|
throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาในขั้นตอนนี้");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check prev approver มี action แล้วหรือไม่?
|
||||||
|
var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
|
||||||
|
|
||||||
|
if (prevApprover != null)
|
||||||
|
{
|
||||||
|
if (prevApprover.ApproveStatus == "PENDING")
|
||||||
|
{
|
||||||
|
throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
var maxSeq = approvers.Max(x => x.Seq);
|
||||||
|
|
||||||
approver.ApproveStatus = "REJECT";
|
approver.ApproveStatus = "REJECT";
|
||||||
approver.Comment = reason;
|
approver.Comment = reason;
|
||||||
|
|
||||||
|
|
@ -609,7 +670,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
Body = $"การขอลาของคุณ {rawData.FirstName} {rawData.LastName} รอรับการอนุมัติจากคุณ",
|
Body = $"การขอลาของคุณ {rawData.FirstName} {rawData.LastName} รอรับการอนุมัติจากคุณ",
|
||||||
ReceiverUserId = nextApprover!.ProfileId,
|
ReceiverUserId = nextApprover!.ProfileId,
|
||||||
Type = "",
|
Type = "",
|
||||||
Payload = "",
|
Payload = $"{URL}/leave/detail/{id}",
|
||||||
};
|
};
|
||||||
_appDbContext.Set<Notification>().Add(noti);
|
_appDbContext.Set<Notification>().Add(noti);
|
||||||
await _appDbContext.SaveChangesAsync();
|
await _appDbContext.SaveChangesAsync();
|
||||||
|
|
@ -624,6 +685,22 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
rawData.ApproveStep = "st3";
|
rawData.ApproveStep = "st3";
|
||||||
|
|
||||||
await UpdateAsync(rawData);
|
await UpdateAsync(rawData);
|
||||||
|
|
||||||
|
// TODO: Send notification to 1st Approver
|
||||||
|
var firstCommander = rawData.Approvers
|
||||||
|
.Where(x => x.ApproveType!.ToUpper() == "APPROVER")
|
||||||
|
.OrderBy(x => x.Seq)
|
||||||
|
.FirstOrDefault();
|
||||||
|
// Send Notification
|
||||||
|
var noti1 = new Notification
|
||||||
|
{
|
||||||
|
Body = $"การขอลาของคุณ {rawData.FirstName} {rawData.LastName} รอรับการอนุมัติจากคุณ",
|
||||||
|
ReceiverUserId = firstCommander!.ProfileId,
|
||||||
|
Type = "",
|
||||||
|
Payload = $"{URL}/leave/detail/{id}",
|
||||||
|
};
|
||||||
|
_appDbContext.Set<Notification>().Add(noti1);
|
||||||
|
await _appDbContext.SaveChangesAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -646,7 +723,6 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
|
|
||||||
// check commander approve
|
// check commander approve
|
||||||
var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "APPROVER").OrderBy(x => x.Seq).ToList();
|
var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "APPROVER").OrderBy(x => x.Seq).ToList();
|
||||||
var maxSeq = approvers.Max(x => x.Seq);
|
|
||||||
|
|
||||||
var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
|
var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
|
||||||
if (approver == null)
|
if (approver == null)
|
||||||
|
|
@ -654,6 +730,20 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาในขั้นตอนนี้");
|
throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาในขั้นตอนนี้");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check prev approver มี action แล้วหรือไม่?
|
||||||
|
var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
|
||||||
|
|
||||||
|
if (prevApprover != null)
|
||||||
|
{
|
||||||
|
if (prevApprover.ApproveStatus == "PENDING")
|
||||||
|
{
|
||||||
|
throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
var maxSeq = approvers.Max(x => x.Seq);
|
||||||
|
|
||||||
approver.ApproveStatus = "APPROVE";
|
approver.ApproveStatus = "APPROVE";
|
||||||
approver.Comment = reason;
|
approver.Comment = reason;
|
||||||
|
|
||||||
|
|
@ -773,7 +863,6 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
|
|
||||||
// check commander approve
|
// check commander approve
|
||||||
var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "APPROVER").OrderBy(x => x.Seq).ToList();
|
var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "APPROVER").OrderBy(x => x.Seq).ToList();
|
||||||
var maxSeq = approvers.Max(x => x.Seq);
|
|
||||||
|
|
||||||
var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
|
var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
|
||||||
if (approver == null)
|
if (approver == null)
|
||||||
|
|
@ -781,6 +870,20 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาในขั้นตอนนี้");
|
throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาในขั้นตอนนี้");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check prev approver มี action แล้วหรือไม่?
|
||||||
|
var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
|
||||||
|
|
||||||
|
if (prevApprover != null)
|
||||||
|
{
|
||||||
|
if (prevApprover.ApproveStatus == "PENDING")
|
||||||
|
{
|
||||||
|
throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
var maxSeq = approvers.Max(x => x.Seq);
|
||||||
|
|
||||||
approver.ApproveStatus = "REJECT";
|
approver.ApproveStatus = "REJECT";
|
||||||
approver.Comment = reason;
|
approver.Comment = reason;
|
||||||
|
|
||||||
|
|
@ -824,7 +927,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
|
||||||
};
|
};
|
||||||
_appDbContext.Set<Notification>().Add(noti);
|
_appDbContext.Set<Notification>().Add(noti);
|
||||||
await _appDbContext.SaveChangesAsync();
|
await _appDbContext.SaveChangesAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<GetSumApproveLeaveByTypeDto>> GetSumSendLeaveAsync(int year)
|
public async Task<List<GetSumApproveLeaveByTypeDto>> GetSumSendLeaveAsync(int year)
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
|
using OfficeOpenXml.ConditionalFormatting;
|
||||||
using Swashbuckle.AspNetCore.Annotations;
|
using Swashbuckle.AspNetCore.Annotations;
|
||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
|
|
||||||
|
|
@ -102,15 +103,40 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = await _leaveBeginningRepository.GetAllByYearAsync(req.Year);
|
var resData = await _leaveBeginningRepository.GetAllByYearAsync(req.Year);
|
||||||
|
|
||||||
if (req.Type != Guid.Empty)
|
if (req.Type != Guid.Empty)
|
||||||
result = result.Where(x => x.LeaveTypeId == req.Type).ToList();
|
resData = resData.Where(x => x.LeaveTypeId == req.Type).ToList();
|
||||||
|
|
||||||
if (req.Keyword != "")
|
if (req.Keyword != "")
|
||||||
result = result.Where(x => x.FirstName!.Contains(req.Keyword) || x.LastName!.Contains(req.Keyword)).ToList();
|
resData = resData.Where(x => x.FirstName!.Contains(req.Keyword) || x.LastName!.Contains(req.Keyword)).ToList();
|
||||||
|
|
||||||
|
var result = new List<object>();
|
||||||
|
|
||||||
|
foreach (var item in resData)
|
||||||
|
{
|
||||||
|
result.Add(new
|
||||||
|
{
|
||||||
|
item.Id,
|
||||||
|
item.ProfileId,
|
||||||
|
item.Prefix,
|
||||||
|
item.FirstName,
|
||||||
|
item.LastName,
|
||||||
|
item.LeaveTypeId,
|
||||||
|
LeaveTypeCode = item.LeaveType?.Code,
|
||||||
|
LeaveType = item.LeaveType?.Name,
|
||||||
|
item.LeaveYear,
|
||||||
|
item.LeaveDays,
|
||||||
|
item.LeaveDaysUsed,
|
||||||
|
item.CreatedAt,
|
||||||
|
item.CreatedFullName,
|
||||||
|
item.LastUpdatedAt,
|
||||||
|
item.LastUpdateFullName
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
var pageResult = result.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
|
var pageResult = result.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
|
||||||
|
|
||||||
return Success(new { data = pageResult, total = result.Count });
|
return Success(new { data = pageResult, total = result.Count });
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|
@ -212,9 +238,9 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
|
|
||||||
|
|
||||||
var profile = await _userProfileRepository.GetProfileByProfileIdAsync(req.ProfileId, AccessToken);
|
var profile = await _userProfileRepository.GetProfileByProfileIdAsync(req.ProfileId, AccessToken);
|
||||||
if(profile == null)
|
if (profile == null)
|
||||||
{
|
{
|
||||||
return Error("ไม่พบข้อมูลข้าราชการหรือลูกจ้าง", StatusCodes.Status404NotFound);
|
return Error("ไม่พบข้อมูลข้าราชการหรือลูกจ้าง", StatusCodes.Status404NotFound);
|
||||||
}
|
}
|
||||||
|
|
||||||
leaveBeginning.LeaveTypeId = req.LeaveTypeId;
|
leaveBeginning.LeaveTypeId = req.LeaveTypeId;
|
||||||
|
|
@ -288,7 +314,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
return Success();
|
return Success();
|
||||||
|
|
||||||
}
|
}
|
||||||
catch(Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
return Error(ex);
|
return Error(ex);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,43 @@
|
||||||
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
|
##See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
|
||||||
|
#
|
||||||
|
#FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
|
||||||
|
#
|
||||||
|
## ตั้งค่า TimeZone ใน Container
|
||||||
|
#ENV TZ=Asia/Bangkok
|
||||||
|
#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
#
|
||||||
|
#WORKDIR /app
|
||||||
|
#EXPOSE 80
|
||||||
|
#EXPOSE 443
|
||||||
|
#
|
||||||
|
#FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
|
||||||
|
#WORKDIR /src
|
||||||
|
#
|
||||||
|
#COPY ["BMA.EHR.Domain/BMA.EHR.Domain.csproj", "BMA.EHR.Domain/"]
|
||||||
|
#COPY ["BMA.EHR.Application/BMA.EHR.Application.csproj", "BMA.EHR.Application/"]
|
||||||
|
#COPY ["BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj", "BMA.EHR.Infrastructure/"]
|
||||||
|
#COPY ["BMA.EHR.Leave/BMA.EHR.Leave.csproj", "BMA.EHR.Leave/"]
|
||||||
|
#
|
||||||
|
#RUN dotnet restore "BMA.EHR.Leave/BMA.EHR.Leave.csproj"
|
||||||
|
#COPY . .
|
||||||
|
#WORKDIR "/src/BMA.EHR.Leave"
|
||||||
|
#RUN dotnet build "BMA.EHR.Leave.csproj" -c Release -o /app/build
|
||||||
|
#
|
||||||
|
#FROM build AS publish
|
||||||
|
#RUN dotnet publish "BMA.EHR.Leave.csproj" -c Release -o /app/publish /p:UseAppHost=false
|
||||||
|
#
|
||||||
|
#FROM base AS final
|
||||||
|
#WORKDIR /app
|
||||||
|
#COPY --from=publish /app/publish .
|
||||||
|
#ENTRYPOINT ["dotnet", "BMA.EHR.Leave.dll"]
|
||||||
|
#
|
||||||
|
|
||||||
|
# ---------------------------
|
||||||
|
# Base image สำหรับ runtime
|
||||||
|
# ---------------------------
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
|
||||||
|
|
||||||
# ตั้งค่า TimeZone ใน Container
|
# ตั้งค่า TimeZone
|
||||||
ENV TZ=Asia/Bangkok
|
ENV TZ=Asia/Bangkok
|
||||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
|
||||||
|
|
@ -10,23 +45,40 @@ WORKDIR /app
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
EXPOSE 443
|
EXPOSE 443
|
||||||
|
|
||||||
|
# ---------------------------
|
||||||
|
# Build stage
|
||||||
|
# ---------------------------
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
|
# 1. Copy เฉพาะ .csproj ไฟล์และ restore เพื่อใช้ cache ได้
|
||||||
COPY ["BMA.EHR.Domain/BMA.EHR.Domain.csproj", "BMA.EHR.Domain/"]
|
COPY ["BMA.EHR.Domain/BMA.EHR.Domain.csproj", "BMA.EHR.Domain/"]
|
||||||
COPY ["BMA.EHR.Application/BMA.EHR.Application.csproj", "BMA.EHR.Application/"]
|
COPY ["BMA.EHR.Application/BMA.EHR.Application.csproj", "BMA.EHR.Application/"]
|
||||||
COPY ["BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj", "BMA.EHR.Infrastructure/"]
|
COPY ["BMA.EHR.Infrastructure/BMA.EHR.Infrastructure.csproj", "BMA.EHR.Infrastructure/"]
|
||||||
COPY ["BMA.EHR.Leave/BMA.EHR.Leave.csproj", "BMA.EHR.Leave/"]
|
COPY ["BMA.EHR.Leave/BMA.EHR.Leave.csproj", "BMA.EHR.Leave/"]
|
||||||
|
|
||||||
RUN dotnet restore "BMA.EHR.Leave/BMA.EHR.Leave.csproj"
|
RUN dotnet restore "BMA.EHR.Leave/BMA.EHR.Leave.csproj"
|
||||||
|
|
||||||
|
# 2. Copy source code ทั้งหมดหลัง restore เพื่อไม่ให้ cache พังง่าย
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
WORKDIR "/src/BMA.EHR.Leave"
|
WORKDIR "/src/BMA.EHR.Leave"
|
||||||
RUN dotnet build "BMA.EHR.Leave.csproj" -c Release -o /app/build
|
|
||||||
|
|
||||||
|
# 3. Build แบบ Release
|
||||||
|
RUN dotnet build "BMA.EHR.Leave.csproj" -c Release -warnaslevel:0 -o /app/build
|
||||||
|
|
||||||
|
# ---------------------------
|
||||||
|
# Publish stage
|
||||||
|
# ---------------------------
|
||||||
FROM build AS publish
|
FROM build AS publish
|
||||||
RUN dotnet publish "BMA.EHR.Leave.csproj" -c Release -o /app/publish /p:UseAppHost=false
|
RUN dotnet publish "BMA.EHR.Leave.csproj" -c Release -warnaslevel:0 -o /app/publish /p:UseAppHost=false
|
||||||
|
|
||||||
|
# ---------------------------
|
||||||
|
# Final runtime image
|
||||||
|
# ---------------------------
|
||||||
FROM base AS final
|
FROM base AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY --from=publish /app/publish .
|
COPY --from=publish /app/publish .
|
||||||
|
|
||||||
ENTRYPOINT ["dotnet", "BMA.EHR.Leave.dll"]
|
ENTRYPOINT ["dotnet", "BMA.EHR.Leave.dll"]
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=hrms;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;",
|
"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.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.80;user=root;password=adminVM123;port=3306;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;",
|
//"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;",
|
//"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;",
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
},
|
},
|
||||||
"Jwt": {
|
"Jwt": {
|
||||||
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
|
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
|
||||||
"Issuer": "https://id.frappet.synology.me/realms/hrms",
|
"Issuer": "https://id.frappet.synology.me/realms/hrms"
|
||||||
//"Key": "xY2VR-EFvvNPsMs39u8ooVBWQL6mPwrNJOh3koJFTgU",
|
//"Key": "xY2VR-EFvvNPsMs39u8ooVBWQL6mPwrNJOh3koJFTgU",
|
||||||
//"Issuer": "https://hrms-id.bangkok.go.th/realms/hrms"
|
//"Issuer": "https://hrms-id.bangkok.go.th/realms/hrms"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue