Merge branch 'migration-vanilia' of https://github.com/dikstub-rssa/simrs-be into feat/encounter-adjustment-142

# Conflicts:
#	internal/domain/main-entities/rehab/dto.go
#	internal/use-case/main-use-case/encounter/lib.go
This commit is contained in:
vanilia
2025-11-10 08:27:55 +07:00
236 changed files with 3395 additions and 2661 deletions

No files matched your search

@@ -9,28 +9,28 @@ import (
"github.com/golang-jwt/jwt"
"github.com/google/uuid"
"simrs-vx/internal/domain/main-entities/intern"
eu "simrs-vx/internal/domain/main-entities/user"
pa "simrs-vx/internal/lib/auth"
el "simrs-vx/pkg/logger"
p "simrs-vx/pkg/password"
ed "simrs-vx/internal/domain/main-entities/doctor"
ee "simrs-vx/internal/domain/main-entities/employee"
em "simrs-vx/internal/domain/main-entities/midwife"
en "simrs-vx/internal/domain/main-entities/nurse"
erc "simrs-vx/internal/domain/references/common"
erg "simrs-vx/internal/domain/references/organization"
a "github.com/karincake/apem"
dg "github.com/karincake/apem/db-gorm-pg"
ms "github.com/karincake/apem/ms-redis"
d "github.com/karincake/dodol"
l "github.com/karincake/lepet"
pa "simrs-vx/internal/lib/auth"
pl "simrs-vx/pkg/logger"
p "simrs-vx/pkg/password"
ed "simrs-vx/internal/domain/main-entities/doctor"
ee "simrs-vx/internal/domain/main-entities/employee"
"simrs-vx/internal/domain/main-entities/intern"
em "simrs-vx/internal/domain/main-entities/midwife"
en "simrs-vx/internal/domain/main-entities/nurse"
eu "simrs-vx/internal/domain/main-entities/user"
erc "simrs-vx/internal/domain/references/common"
erg "simrs-vx/internal/domain/references/organization"
)
const source = "authentication"
var authCfg AuthCfg
func init() {
@@ -40,13 +40,18 @@ func init() {
// Generates token and store in redis at one place
// just return the error code
func GenToken(input eu.LoginDto) (*d.Data, error) {
event := pl.Event{
Feature: "Create",
Source: source,
}
// Get User
user := &eu.User{Name: input.Name}
// if input.Position_Code != "" {
// user.Position_Code = input.Position_Code
// }
if errCode := getAndCheck(user, user); errCode != "" {
return nil, d.FieldErrors{"authentication": d.FieldError{Code: errCode, Message: el.GenMessage(errCode)}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: errCode, Message: pl.GenMessage(errCode)}}
}
if user.LoginAttemptCount > 5 {
@@ -54,7 +59,7 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
now := time.Now()
lastAllowdLogin := user.LastAllowdLogin
if lastAllowdLogin.After(now.Add(-time.Hour * 1)) {
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-tooMany", Message: el.GenMessage("auth-login-tooMany")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-tooMany", Message: pl.GenMessage("auth-login-tooMany")}}
} else {
tn := time.Now()
user.LastAllowdLogin = &tn
@@ -65,18 +70,18 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
tn := time.Now()
user.LastAllowdLogin = &tn
dg.I.Save(&user)
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-tooMany", Message: el.GenMessage("auth-login-tooMany")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-tooMany", Message: pl.GenMessage("auth-login-tooMany")}}
}
}
if !p.Check(input.Password, user.Password) {
user.LoginAttemptCount++
dg.I.Save(&user)
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-incorrect", Message: el.GenMessage("auth-login-incorrect")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-incorrect", Message: pl.GenMessage("auth-login-incorrect")}}
} else if user.Status_Code == erc.USCBlocked {
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-blocked", Message: el.GenMessage("auth-login-blocked")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-blocked", Message: pl.GenMessage("auth-login-blocked")}}
} else if user.Status_Code == erc.USCNew {
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-unverified", Message: el.GenMessage("auth-login-unverified")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-unverified", Message: pl.GenMessage("auth-login-unverified")}}
}
// Access token prep
@@ -115,7 +120,7 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
employee := ee.Employee{}
dg.I.Where("\"User_Id\" = ?", user.Id).First(&employee)
if employee.Id == 0 {
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noEmployee", Message: el.GenMessage("auth-noEmployee")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noEmployee", Message: pl.GenMessage("auth-noEmployee")}}
}
atClaims["employee_id"] = employee.Id
outputData["employee_id"] = employee.Id
@@ -134,66 +139,66 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
doctor := ed.Doctor{}
dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&doctor)
if doctor.Id == 0 {
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noDoctor", Message: el.GenMessage("auth-noDoctor")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noDoctor", Message: pl.GenMessage("auth-noDoctor")}}
}
atClaims["doctor_id"] = doctor.Id
outputData["doctor_id"] = doctor.Id
atClaims["doctor_code"] = doctor.Code
outputData["doctor_code"] = doctor.Code
// specialist
if doctor.Specialist_Id != nil {
atClaims["specialist_id"] = doctor.Specialist_Id
outputData["specialist_id"] = doctor.Specialist_Id
if doctor.Specialist_Code != nil {
atClaims["specialist_code"] = doctor.Specialist_Code
outputData["specialist_code"] = doctor.Specialist_Code
}
if doctor.Subspecialist_Id != nil {
atClaims["subspecialist_id"] = doctor.Subspecialist_Id
outputData["subspecialist_id"] = doctor.Subspecialist_Id
if doctor.Subspecialist_Code != nil {
atClaims["subspecialist_code"] = doctor.Subspecialist_Code
outputData["subspecialist_code"] = doctor.Subspecialist_Code
}
case erg.EPCNur:
empData := en.Nurse{}
dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&empData)
if empData.Id == 0 {
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noNurse", Message: el.GenMessage("auth-noNurse")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noNurse", Message: pl.GenMessage("auth-noNurse")}}
}
atClaims["nurse_id"] = empData.Id
outputData["nurse_id"] = empData.Id
atClaims["nurse_code"] = empData.Code
outputData["nurse_code"] = empData.Code
case erg.EPCMwi:
empData := em.Midwife{}
dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&empData)
if empData.Id == 0 {
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noNurse", Message: el.GenMessage("auth-noNurse")}}
return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noMidwife", Message: pl.GenMessage("auth-noMidwife")}}
}
atClaims["nurse_id"] = empData.Id
outputData["nurse_id"] = empData.Id
atClaims["midwife_code"] = empData.Code
outputData["midwife_code"] = empData.Code
}
errorGetPosition := d.FieldErrors{"authentication": d.FieldError{Code: "auth-getData-failed", Message: el.GenMessage("auth-getData-failed")}}
errorGetPosition := d.FieldErrors{"authentication": d.FieldError{Code: "auth-getData-failed", Message: pl.GenMessage("auth-getData-failed")}}
// division position
divisionPositions, err := getDivisionPosition(employee.Id)
divisionPositions, err := getDivisionPosition(employee.Id, &event)
if err != nil {
return nil, errorGetPosition
}
// installation position
installationPositions, err := getInstallationPosition(employee.Id)
installationPositions, err := getInstallationPosition(employee.Id, &event)
if err != nil {
return nil, errorGetPosition
}
// unit position
unitPositions, err := getUnitPosition(employee.Id)
unitPositions, err := getUnitPosition(employee.Id, &event)
if err != nil {
return nil, errorGetPosition
}
// specialist position
specialistPositions, err := getSpecialistPosition(employee.Id)
specialistPositions, err := getSpecialistPosition(employee.Id, &event)
if err != nil {
return nil, errorGetPosition
}
// subspecialist position
subspecialistPositions, err := getSubspecialistPosition(employee.Id)
subspecialistPositions, err := getSubspecialistPosition(employee.Id, &event)
if err != nil {
return nil, errorGetPosition
}
@@ -220,7 +225,7 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
at := jwt.NewWithClaims(jwt.SigningMethodHS256, atClaims)
ats, err := at.SignedString([]byte(atSecretKey))
if err != nil {
return nil, d.FieldErrors{"user": d.FieldError{Code: "token-sign-err", Message: el.GenMessage("token-sign-err")}}
return nil, d.FieldErrors{"user": d.FieldError{Code: "token-sign-err", Message: pl.GenMessage("token-sign-err")}}
}
outputData["accessToken"] = ats
@@ -283,21 +288,21 @@ func VerifyToken(r *http.Request, tokenType TokenType) (data *jwt.Token, errCode
func ExtractToken(r *http.Request, tokenType TokenType) (data *pa.AuthInfo, err error) {
token, errCode, errDetail := VerifyToken(r, tokenType)
if errCode != "" {
return nil, d.FieldError{Code: errCode, Message: el.GenMessage(errCode, errDetail)}
return nil, d.FieldError{Code: errCode, Message: pl.GenMessage(errCode, errDetail)}
}
claims, ok := token.Claims.(jwt.MapClaims)
if ok && token.Valid {
accessUuid, ok := claims["uuid"].(string)
if !ok {
return nil, d.FieldError{Code: "token-invalid", Message: el.GenMessage("token-invalid", "uuid not available")}
return nil, d.FieldError{Code: "token-invalid", Message: pl.GenMessage("token-invalid", "uuid not available")}
}
user_id, myErr := strconv.ParseInt(fmt.Sprintf("%.f", claims["user_id"]), 10, 64)
if myErr != nil {
return nil, d.FieldError{Code: "token-invalid", Message: el.GenMessage("token-invalid", "uuid is not available")}
return nil, d.FieldError{Code: "token-invalid", Message: pl.GenMessage("token-invalid", "uuid is not available")}
}
accessUuidRedis := ms.I.Get(accessUuid)
if accessUuidRedis.String() == "" {
return nil, d.FieldError{Code: "token-unidentified", Message: el.GenMessage("token-unidentified")}
return nil, d.FieldError{Code: "token-unidentified", Message: pl.GenMessage("token-unidentified")}
}
data = &pa.AuthInfo{
@@ -308,12 +313,12 @@ func ExtractToken(r *http.Request, tokenType TokenType) (data *pa.AuthInfo, err
data.User_ContractPosition_code = checkStrClaims(claims, "contractPosition_code")
data.Employee_Position_Code = checkStrPtrClaims(claims, "employee_position_code")
data.Doctor_Id = checkUntPtrClaims(claims, "doctor_id")
data.Nurse_Id = checkUntPtrClaims(claims, "nurse_id")
data.Midwife_Id = checkUntPtrClaims(claims, "midwife_id")
data.Nutritionist_Id = checkUntPtrClaims(claims, "nutritionist_id")
data.Laborant_Id = checkUntPtrClaims(claims, "laborant_id")
data.Pharmachist_Id = checkUntPtrClaims(claims, "pharmachist_id")
data.Doctor_Code = checkStrPtrClaims(claims, "doctor_string")
data.Nurse_Code = checkStrPtrClaims(claims, "nurse_string")
data.Midwife_Code = checkStrPtrClaims(claims, "midwife_string")
data.Nutritionist_Code = checkStrPtrClaims(claims, "nutritionist_string")
data.Laborant_Code = checkStrPtrClaims(claims, "laborant_string")
data.Pharmachist_Code = checkStrPtrClaims(claims, "pharmachist_string")
data.Intern_Position_Code = checkStrPtrClaims(claims, "intern_position_code")
data.Employee_Id = checkUntPtrClaims(claims, "employee_id")
return
@@ -324,41 +329,3 @@ func ExtractToken(r *http.Request, tokenType TokenType) (data *pa.AuthInfo, err
func GetConfig() {
a.ParseCfg(&authCfg)
}
func checkStrClaims(claim map[string]interface{}, key string) string {
if v, exist := claim[key]; exist && v != nil {
return v.(string)
}
return ""
}
func checkStrPtrClaims(claim map[string]interface{}, key string) *string {
if v, exist := claim[key]; exist && v != nil {
val := v.(string)
return &val
}
return nil
}
func checkIntClaims(claim map[string]interface{}, key string) int {
if v, exist := claim[key]; exist && v != nil {
return v.(int)
}
return 0
}
func checkIntPtrClaims(claim map[string]interface{}, key string) *int {
if v, exist := claim[key]; exist && v != nil {
val := int(v.(float64))
return &val
}
return nil
}
func checkUntPtrClaims(claim map[string]interface{}, key string) *uint {
if v, exist := claim[key]; exist && v != nil {
val := uint(v.(float64))
return &val
}
return nil
}
@@ -1,6 +1,10 @@
package authentication
import (
dg "github.com/karincake/apem/db-gorm-pg"
pl "simrs-vx/pkg/logger"
edp "simrs-vx/internal/domain/main-entities/division-position"
eip "simrs-vx/internal/domain/main-entities/installation-position"
esp "simrs-vx/internal/domain/main-entities/specialist-position"
@@ -12,8 +16,6 @@ import (
usp "simrs-vx/internal/use-case/main-use-case/specialist-position"
ussp "simrs-vx/internal/use-case/main-use-case/subspecialist-position"
uup "simrs-vx/internal/use-case/main-use-case/unit-position"
dg "github.com/karincake/apem/db-gorm-pg"
)
// just return the error code
@@ -28,43 +30,21 @@ func getAndCheck(input, condition any) (eCode string) {
return ""
}
func getDivisionPosition(employee_id uint) ([]string, error) {
func getDivisionPosition(employee_id uint, event *pl.Event) ([]string, error) {
var result []string
// var employee ee.Employee
// if err := dg.I.Where("\"Employee_Id\" = ?", employee_id).First(&employee).Error; err != nil {
// if err == gorm.ErrRecordNotFound {
// return result, nil
// }
// return result, errors.New("no employee found")
// }
//var divisionPositions []edp.DivisionPosition
//err := dg.I.
// Preload("Division").
// Where("\"Employee_Id\" = ?", employee_id).
// Find(&divisionPositions).Error
//if err != nil {
// if err == gorm.ErrRecordNotFound {
// return result, nil
// }
// return result, err
//}
// get data division_position based on employee_id
dataDivisionPosition, err := udp.ReadList(edp.ReadListDto{
data, _, err := udp.ReadListData(edp.ReadListDto{
FilterDto: edp.FilterDto{Employee_Id: &employee_id},
Includes: "division"})
Includes: "Division"}, event)
if err != nil {
return nil, err
}
if list, ok := dataDivisionPosition.Data.([]edp.ResponseDto); ok {
if len(list) > 0 {
for _, dp := range list {
if dp.Division != nil {
result = append(result, "div-"+dp.Division.Code+"-"+dp.Code)
}
if len(data) > 0 {
for _, dp := range data {
if dp.Division != nil {
result = append(result, "div-"+dp.Division.Code+"-"+dp.Code)
}
}
}
@@ -72,23 +52,21 @@ func getDivisionPosition(employee_id uint) ([]string, error) {
return result, nil
}
func getInstallationPosition(employeeId uint) ([]string, error) {
func getInstallationPosition(employeeId uint, event *pl.Event) ([]string, error) {
var result []string
// get data unit_position based on employee_id
dataInstallationPosition, err := uip.ReadList(eip.ReadListDto{
data, _, err := uip.ReadListData(eip.ReadListDto{
FilterDto: eip.FilterDto{Employee_Id: &employeeId},
Includes: "installation"})
Includes: "installation"}, event)
if err != nil {
return nil, err
}
if list, ok := dataInstallationPosition.Data.([]eip.ResponseDto); ok {
if len(list) > 0 {
for _, dp := range list {
if dp.Installation != nil {
result = append(result, "inst-"+dp.Installation.Code+"-"+dp.Code)
}
if len(data) > 0 {
for _, dp := range data {
if dp.Installation != nil {
result = append(result, "inst-"+dp.Installation.Code+"-"+dp.Code)
}
}
}
@@ -96,23 +74,21 @@ func getInstallationPosition(employeeId uint) ([]string, error) {
return result, nil
}
func getUnitPosition(employeeId uint) ([]string, error) {
func getUnitPosition(employeeId uint, event *pl.Event) ([]string, error) {
var result []string
// get data unit_position based on employee_id
dataUnitPosition, err := uup.ReadList(eup.ReadListDto{
data, _, err := uup.ReadListData(eup.ReadListDto{
FilterDto: eup.FilterDto{Employee_Id: &employeeId},
Includes: "unit"})
Includes: "unit"}, event)
if err != nil {
return nil, err
}
if list, ok := dataUnitPosition.Data.([]eup.ResponseDto); ok {
if len(list) > 0 {
for _, dp := range list {
if dp.Unit != nil {
result = append(result, "unit-"+dp.Unit.Code+"-"+dp.Code)
}
if len(data) > 0 {
for _, dp := range data {
if dp.Unit != nil {
result = append(result, "unit-"+dp.Unit.Code+"-"+dp.Code)
}
}
}
@@ -120,23 +96,21 @@ func getUnitPosition(employeeId uint) ([]string, error) {
return result, nil
}
func getSpecialistPosition(employeeId uint) ([]string, error) {
func getSpecialistPosition(employeeId uint, event *pl.Event) ([]string, error) {
var result []string
// get data unit_position based on employee_id
dataSpecialistPosition, err := usp.ReadList(esp.ReadListDto{
data, _, err := usp.ReadListData(esp.ReadListDto{
FilterDto: esp.FilterDto{Employee_Id: &employeeId},
Includes: "specialist"})
Includes: "specialist"}, event)
if err != nil {
return nil, err
}
if list, ok := dataSpecialistPosition.Data.([]esp.ResponseDto); ok {
if len(list) > 0 {
for _, dp := range list {
if dp.Specialist != nil {
result = append(result, "spec-"+dp.Specialist.Code+"-"+dp.Code)
}
if len(data) > 0 {
for _, dp := range data {
if dp.Specialist != nil {
result = append(result, "spec-"+dp.Specialist.Code+"-"+dp.Code)
}
}
}
@@ -144,26 +118,47 @@ func getSpecialistPosition(employeeId uint) ([]string, error) {
return result, nil
}
func getSubspecialistPosition(employeeId uint) ([]string, error) {
func getSubspecialistPosition(employeeId uint, event *pl.Event) ([]string, error) {
var result []string
// get data unit_position based on employee_id
dataSubspecialistPosition, err := ussp.ReadList(essp.ReadListDto{
data, _, err := ussp.ReadListData(essp.ReadListDto{
FilterDto: essp.FilterDto{Employee_Id: &employeeId},
Includes: "subspecialist"})
Includes: "subspecialist"}, event)
if err != nil {
return nil, err
}
if list, ok := dataSubspecialistPosition.Data.([]essp.ResponseDto); ok {
if len(list) > 0 {
for _, dp := range list {
if dp.Subspecialist != nil {
result = append(result, "subspec-"+dp.Subspecialist.Code+"-"+dp.Code)
}
if len(data) > 0 {
for _, dp := range data {
if dp.Subspecialist != nil {
result = append(result, "subspec-"+dp.Subspecialist.Code+"-"+dp.Code)
}
}
}
return result, nil
}
func checkStrClaims(claim map[string]interface{}, key string) string {
if v, exist := claim[key]; exist && v != nil {
return v.(string)
}
return ""
}
func checkStrPtrClaims(claim map[string]interface{}, key string) *string {
if v, exist := claim[key]; exist && v != nil {
val := v.(string)
return &val
}
return nil
}
func checkUntPtrClaims(claim map[string]interface{}, key string) *uint {
if v, exist := claim[key]; exist && v != nil {
val := uint(v.(float64))
return &val
}
return nil
}
@@ -169,7 +169,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.Device
var err error
@@ -225,7 +225,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.Device
var err error
@@ -30,8 +30,8 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Device) {
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.Uom_Code = inputSrc.Uom_Code
data.Item_Id = inputSrc.Item_Id
data.Infra_Id = inputSrc.Infra_Id
data.Item_Code = inputSrc.Item_Code
data.Infra_Code = inputSrc.Infra_Code
}
func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
@@ -40,13 +40,13 @@ func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
Name: input.Name,
ItemGroup_Code: ero.ITGCDevice,
Uom_Code: &input.Uom_Code,
Infra_Id: input.Infra_Id,
Infra_Code: input.Infra_Code,
}
item, err := ui.CreateData(itemCreate, event, tx)
if err != nil {
return err
}
input.Item_Id = &item.Id
input.Item_Code = &item.Code
return nil
}
@@ -81,6 +81,13 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = dg.I
}
if input.Code != nil {
tx = tx.Where("\"Code\" = ?", *input.Code)
}
if input.Id != nil {
tx = tx.Where("\"Id\" = ?", *input.Id)
}
if err := tx.First(&data, input.Id).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
@@ -166,7 +166,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.DivisionPosition
var err error
@@ -222,7 +222,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.DivisionPosition
var err error
@@ -17,7 +17,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.DivisionPosition) {
inputSrc = &inputTemp.CreateDto
}
data.Division_Id = inputSrc.Division_Id
data.Division_Code = inputSrc.Division_Code
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.HeadStatus = inputSrc.HeadStatus
@@ -81,7 +81,14 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = dg.I
}
if err := tx.First(&data, input.Id).Error; err != nil {
if input.Code != nil {
tx = tx.Where("\"Code\" = ?", *input.Code)
}
if input.Id != nil {
tx = tx.Where("\"Id\" = ?", input.Id)
}
if err := tx.First(&data).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
@@ -166,7 +166,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.Division
var err error
@@ -222,7 +222,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.Division
var err error
@@ -19,5 +19,5 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Division) {
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.Parent_Id = inputSrc.Parent_Id
data.Parent_Code = inputSrc.Parent_Code
}
@@ -52,7 +52,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
EXISTS (
SELECT 1
FROM "Division" c
WHERE c."Parent_Id" = "Division"."Id"
WHERE c."Parent_Code" = "Division"."Code"
)
`)
}
@@ -91,9 +91,16 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = dg.I
}
if input.Code != nil {
tx = tx.Where("\"Code\" = ?", *input.Code)
}
if input.Id != nil {
tx = tx.Where("\"Id\" = ?", input.Id)
}
if err := tx.
Scopes(gh.Preload(input.Includes)).
First(&data, input.Id).Error; err != nil {
First(&data).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
@@ -21,7 +21,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Doctor) {
data.Employee_Id = inputSrc.Employee_Id
data.IHS_Number = inputSrc.IHS_Number
data.SIP_Number = inputSrc.SIP_Number
data.Unit_Id = inputSrc.Unit_Id
data.Specialist_Id = inputSrc.Specialist_Id
data.Subspecialist_Id = inputSrc.Subspecialist_Id
data.Unit_Code = inputSrc.Unit_Code
data.Specialist_Code = inputSrc.Code
data.Subspecialist_Code = inputSrc.Code
}
@@ -8,6 +8,7 @@ import (
dg "github.com/karincake/apem/db-gorm-pg"
gh "github.com/karincake/getuk"
"gorm.io/gorm"
// pkg
plh "simrs-vx/pkg/lib-helper"
pl "simrs-vx/pkg/logger"
@@ -61,8 +62,8 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.En
}
tx = tx.Model(&e.Encounter{})
if input.AuthInfo.Doctor_Id != nil {
tx.Where("\"Responsible_Doctor_Id\" = ?", *input.AuthInfo.Doctor_Id)
if input.AuthInfo.Doctor_Code != nil {
tx.Where("\"Responsible_Doctor_Id\" = ?", *input.AuthInfo.Doctor_Code) // TODO: fix this
}
tx.Scopes(gh.Preload(input.Includes)).
@@ -38,12 +38,12 @@ func Create(input e.CreateDto) (*d.Data, error) {
}
if input.InfraGroup_Code == ero.IFGCRoom {
if input.Parent_Id == nil {
if input.Parent_Code == nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "data-create-fail",
Detail: "parent_id is required",
Raw: errors.New("parent_id is required"),
Detail: "parent_code is required",
Raw: errors.New("parent_code is required"),
}
return pl.SetLogError(&event, input)
@@ -59,7 +59,7 @@ func Create(input e.CreateDto) (*d.Data, error) {
}
if input.InfraGroup_Code == ero.IFGCRoom {
input.Infra_Id = &data.Id
input.Infra_Code = &data.Code
if err := createRoom(&input, &event, tx); err != nil {
return err
}
@@ -29,8 +29,8 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Infra) {
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.InfraGroup_Code = inputSrc.InfraGroup_Code
data.Parent_Id = inputSrc.Parent_Id
data.Item_Id = inputSrc.Item_Id
data.Parent_Code = inputSrc.Parent_Code
data.Item_Code = inputSrc.Item_Code
}
func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
@@ -42,23 +42,23 @@ func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
tmp := "unit"
return &tmp
}(),
Infra_Id: input.Parent_Id,
Infra_Code: input.Parent_Code,
}
item, err := ui.CreateData(itemCreate, event, tx)
if err != nil {
return err
}
input.Item_Id = &item.Id
input.Item_Code = &item.Code
return nil
}
func createRoom(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
roomCreate := er.CreateDto{
Infra_Id: input.Infra_Id,
Unit_Id: input.Unit_Id,
Specialist_Id: input.Specialist_Id,
Subspecialist_Id: input.Subspecialist_Id,
Infra_Code: input.Infra_Code,
Unit_Code: input.Unit_Code,
Specialist_Code: input.Specialist_Code,
Subspecialist_Code: input.Subspecialist_Code,
}
_, err := ur.CreateData(roomCreate, event, tx)
if err != nil {
+10 -3
View File
@@ -52,7 +52,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In
EXISTS (
SELECT 1
FROM "Infra" c
WHERE c."Parent_Id" = "Infra"."Id"
WHERE c."Parent_Code" = "Infra"."Code"
)
`)
}
@@ -91,6 +91,13 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = dg.I
}
if input.Code != nil {
tx = tx.Where("\"Code\" = ?", *input.Code)
}
if input.Id != nil {
tx = tx.Where("\"Id\" = ?", *input.Id)
}
tx = tx.Preload("Parent").
Preload("Childrens").
Preload("Item").
@@ -99,7 +106,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
Preload("Rooms.Subspecialist").
Preload("Rooms.Unit")
if err := tx.First(&data, input.Id).Error; err != nil {
if err := tx.First(&data).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
@@ -119,7 +126,7 @@ func UpdateData(input e.UpdateDto, data *e.Infra, event *pl.Event, dbx ...*gorm.
} else {
tx = dg.I
}
data.Parent = nil
// data.Parent = nil
data.Childrens = nil
data.Item = nil
data.Rooms = nil
@@ -175,7 +175,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.InstallationPosition
var err error
@@ -235,7 +235,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.InstallationPosition
var err error
@@ -290,7 +290,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
func validateForeignKey(input e.CreateDto) error {
// validate installation_id
if _, err := ui.ReadDetail(ei.ReadDetailDto{Id: *input.Installation_Id}); err != nil {
if _, err := ui.ReadDetail(ei.ReadDetailDto{Code: input.Installation_Code}); err != nil {
return err
}
@@ -17,7 +17,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.InstallationPositio
inputSrc = &inputTemp.CreateDto
}
data.Installation_Id = inputSrc.Installation_Id
data.Installation_Code = inputSrc.Installation_Code
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.HeadStatus = inputSrc.HeadStatus
@@ -83,10 +83,10 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
}
switch {
case input.Id != 0:
case input.Id != nil:
getData = tx.First(&data, input.Id)
case input.Code != nil && *input.Code != "":
getData = tx.Where("code = ?", *input.Code).First(&data)
getData = tx.Where("\"Code\" = ?", *input.Code).First(&data)
default:
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
+2 -2
View File
@@ -166,7 +166,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.Item
var err error
@@ -222,7 +222,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.Item
var err error
@@ -21,6 +21,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Item) {
data.Name = inputSrc.Name
data.ItemGroup_Code = inputSrc.ItemGroup_Code
data.Uom_Code = inputSrc.Uom_Code
data.Infra_Id = inputSrc.Infra_Id
data.Infra_Code = inputSrc.Infra_Code
data.Stock = inputSrc.Stock
}
@@ -169,7 +169,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.Material
var err error
@@ -225,7 +225,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.Material
var err error
@@ -30,8 +30,8 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Material) {
data.Name = inputSrc.Name
data.Uom_Code = inputSrc.Uom_Code
data.Stock = inputSrc.Stock
data.Item_Id = inputSrc.Item_Id
data.Infra_Id = inputSrc.Infra_Id
data.Item_Code = inputSrc.Item_Code
data.Infra_Code = inputSrc.Infra_Code
}
func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
@@ -40,7 +40,7 @@ func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
Name: input.Name,
ItemGroup_Code: ero.ITGCMaterial,
Uom_Code: &input.Uom_Code,
Infra_Id: input.Infra_Id,
Infra_Code: input.Infra_Code,
Stock: input.Stock,
}
item, err := ui.CreateData(itemCreate, event, tx)
@@ -48,6 +48,6 @@ func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
return err
}
input.Item_Id = &item.Id
input.Item_Code = &item.Code
return nil
}
@@ -28,4 +28,5 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.McuOrder) {
data.Temperature = inputSrc.Temperature
data.UrgencyLevel_Code = inputSrc.UrgencyLevel_Code
data.Doctor_Id = inputSrc.Doctor_Id
data.Scope_Code = inputSrc.Scope_Code
}
@@ -169,7 +169,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.Medicine
var err error
@@ -225,7 +225,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.Medicine
var err error
@@ -33,9 +33,9 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Medicine) {
data.MedicineMethod_Code = inputSrc.MedicineMethod_Code
data.Uom_Code = inputSrc.Uom_Code
data.Dose = inputSrc.Dose
data.Infra_Id = inputSrc.Infra_Id
data.Infra_Code = inputSrc.Infra_Code
data.Stock = inputSrc.Stock
data.Item_Id = inputSrc.Item_Id
data.Item_Code = inputSrc.Item_Code
}
func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
@@ -44,7 +44,7 @@ func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
Name: input.Name,
ItemGroup_Code: ero.ITGCMedicine,
Uom_Code: input.Uom_Code,
Infra_Id: input.Infra_Id,
Infra_Code: input.Infra_Code,
Stock: input.Stock,
}
item, err := ui.CreateData(itemCreate, event, tx)
@@ -52,6 +52,6 @@ func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
return err
}
input.Item_Id = &item.Id
input.Item_Code = &item.Code
return nil
}
@@ -81,8 +81,15 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = dg.I
}
if input.Code != nil {
tx = tx.Where("\"Code\" = ?", *input.Code)
}
if input.Id != nil {
tx = tx.Where("\"Id\" = ?", *input.Id)
}
tx = tx.Preload("Item")
if err := tx.First(&data, input.Id).Error; err != nil {
if err := tx.First(&data).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
@@ -20,6 +20,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Nurse) {
data.Code = inputSrc.Code
data.Employee_Id = inputSrc.Employee_Id
data.IHS_Number = inputSrc.IHS_Number
data.Unit_Id = inputSrc.Unit_Id
data.Infra_Id = inputSrc.Infra_Id
data.Unit_Code = inputSrc.Unit_Code
data.Infra_Code = inputSrc.Infra_Code
}
@@ -37,7 +37,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Prescription) {
}
data.Encounter_Id = inputSrc.Encounter_Id
data.Doctor_Id = inputSrc.Doctor_Id
data.Doctor_Code = inputSrc.AuthInfo.Doctor_Code
data.IssuedAt = inputSrc.IssuedAt
}
@@ -17,8 +17,8 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Room) {
inputSrc = &inputTemp.CreateDto
}
data.Infra_Id = inputSrc.Infra_Id
data.Unit_Id = inputSrc.Unit_Id
data.Specialist_Id = inputSrc.Specialist_Id
data.Subspecialist_Id = inputSrc.Subspecialist_Id
data.Infra_Code = inputSrc.Infra_Code
data.Unit_Code = inputSrc.Unit_Code
data.Specialist_Code = inputSrc.Specialist_Code
data.Subspecialist_Code = inputSrc.Subspecialist_Code
}
@@ -18,7 +18,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.SpecialistIntern) {
}
data.Person_Id = inputSrc.Person_Id
data.Specialist_Id = inputSrc.Specialist_Id
data.Subspecialist_Id = inputSrc.Subspecialist_Id
data.Specialist_Code = inputSrc.Specialist_Code
data.Subspecialist_Code = inputSrc.Subspecialist_Code
data.User_Id = inputSrc.User_Id
}
@@ -290,7 +290,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
func validateForeignKey(input e.CreateDto) error {
// validate installation_id
if _, err := us.ReadDetail(es.ReadDetailDto{Id: *input.Specialist_Id}); err != nil {
if _, err := us.ReadDetail(es.ReadDetailDto{Code: input.Specialist_Code}); err != nil {
return err
}
@@ -17,7 +17,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.SpecialistPosition)
inputSrc = &inputTemp.CreateDto
}
data.Specialist_Id = inputSrc.Specialist_Id
data.Specialist_Code = inputSrc.Specialist_Code
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.HeadStatus = inputSrc.HeadStatus
@@ -83,7 +83,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
}
switch {
case input.Id != 0:
case input.Id != nil:
getData = tx.First(&data, input.Id)
case input.Code != nil && *input.Code != "":
getData = tx.Where("code = ?", *input.Code).First(&data)
@@ -166,7 +166,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.Specialist
var err error
@@ -222,7 +222,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.Specialist
var err error
@@ -19,5 +19,5 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Specialist) {
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.Unit_Id = inputSrc.Unit_Id
data.Unit_Code = inputSrc.Unit_Code
}
@@ -81,9 +81,16 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = dg.I
}
if input.Code != nil {
tx = tx.Where("\"Code\" = ?", *input.Code)
}
if input.Id != nil {
tx = tx.Where("\"Id\" = ?", input.Id)
}
if err := tx.
Scopes(gh.Preload(input.Includes)).
First(&data, input.Id).Error; err != nil {
First(&data).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
@@ -175,7 +175,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.SubspecialistPosition
var err error
@@ -235,7 +235,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.SubspecialistPosition
var err error
@@ -290,7 +290,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
func validateForeignKey(input e.CreateDto) error {
// validate installation_id
if _, err := us.ReadDetail(es.ReadDetailDto{Id: *input.Subspecialist_Id}); err != nil {
if _, err := us.ReadDetail(es.ReadDetailDto{Code: input.Subspecialist_Code}); err != nil {
return err
}
@@ -17,7 +17,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.SubspecialistPositi
inputSrc = &inputTemp.CreateDto
}
data.Subspecialist_Id = inputSrc.Subspecialist_Id
data.Subspecialist_Code = inputSrc.Subspecialist_Code
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.HeadStatus = inputSrc.HeadStatus
@@ -83,10 +83,10 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
}
switch {
case input.Id != 0:
case input.Id != nil:
getData = tx.First(&data, input.Id)
case input.Code != nil && *input.Code != "":
getData = tx.Where("code = ?", *input.Code).First(&data)
getData = tx.Where("\"Code\" = ?", *input.Code).First(&data)
default:
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
@@ -166,7 +166,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.Subspecialist
var err error
@@ -222,7 +222,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.Subspecialist
var err error
@@ -19,5 +19,5 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Subspecialist) {
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.Specialist_Id = inputSrc.Specialist_Id
data.Specialist_Code = inputSrc.Specialist_Code
}
@@ -81,6 +81,13 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = dg.I
}
if input.Code != nil {
tx = tx.Where("\"Code\" = ?", *input.Code)
}
if input.Id != nil {
tx = tx.Where("\"Id\" = ?", input.Id)
}
if err := tx.
Scopes(gh.Preload(input.Includes)).
First(&data, input.Id).Error; err != nil {
@@ -175,7 +175,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.UnitPosition
var err error
@@ -235,7 +235,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.UnitPosition
var err error
@@ -290,7 +290,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
func validateForeignKey(input e.CreateDto) error {
// validate installation_id
if _, err := uu.ReadDetail(eu.ReadDetailDto{Id: *input.Unit_Id}); err != nil {
if _, err := uu.ReadDetail(eu.ReadDetailDto{Code: &input.Code}); err != nil {
return err
}
@@ -17,7 +17,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.UnitPosition) {
inputSrc = &inputTemp.CreateDto
}
data.Unit_Id = inputSrc.Unit_Id
data.Unit_Code = inputSrc.Unit_Code
data.Code = inputSrc.Code
data.Name = inputSrc.Name
data.HeadStatus = inputSrc.HeadStatus
@@ -83,7 +83,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
}
switch {
case input.Id != 0:
case input.Id != nil:
getData = tx.First(&data, input.Id)
case input.Code != nil && *input.Code != "":
getData = tx.Where("code = ?", *input.Code).First(&data)
+2 -2
View File
@@ -166,7 +166,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
}
func Update(input e.UpdateDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: &input.Code}
var data *e.Unit
var err error
@@ -222,7 +222,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
}
func Delete(input e.DeleteDto) (*d.Data, error) {
rdDto := e.ReadDetailDto{Id: input.Id}
rdDto := e.ReadDetailDto{Code: input.Code}
var data *e.Unit
var err error
@@ -17,7 +17,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Unit) {
inputSrc = &inputTemp.CreateDto
}
data.Installation_Id = inputSrc.Installation_Id
data.Installation_Code = inputSrc.Installation_Code
data.Code = inputSrc.Code
data.Name = inputSrc.Name
}
+8 -1
View File
@@ -81,9 +81,16 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = dg.I
}
if input.Code != nil {
tx = tx.Where("\"Code\" = ?", *input.Code)
}
if input.Id != nil {
tx = tx.Where("\"Id\" = ?", input.Id)
}
if err := tx.
Scopes(gh.Preload(input.Includes)).
First(&data, input.Id).Error; err != nil {
First(&data).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
+26 -22
View File
@@ -87,10 +87,10 @@ func Create(input e.CreateDto) (*d.Data, error) {
if input.ContractPosition_Code == ero.CSCInt {
createInt := esi.CreateDto{
Person_Id: input.Person_Id,
Specialist_Id: input.Specialist_Id,
Subspecialist_Id: input.Subspecialist_Id,
User_Id: &data.Id,
Person_Id: input.Person_Id,
Specialist_Code: input.Specialist_Code,
Subspecialist_Code: input.Subspecialist_Code,
User_Id: &data.Id,
}
if _, err := usi.CreateData(createInt, &event, tx); err != nil {
return err
@@ -108,13 +108,13 @@ func Create(input e.CreateDto) (*d.Data, error) {
switch input.Employee.Position_Code {
case ero.EPCDoc:
createDoc := ed.CreateDto{
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
SIP_Number: input.SIP_Number,
Unit_Id: input.Unit_Id,
Specialist_Id: input.Specialist_Id,
Subspecialist_Id: input.Subspecialist_Id,
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
SIP_Number: input.SIP_Number,
Unit_Code: input.Unit_Code,
Specialist_Code: input.Specialist_Code,
Subspecialist_Code: input.Subspecialist_Code,
}
if _, err := ud.CreateData(createDoc, &event, tx); err != nil {
return err
@@ -124,8 +124,8 @@ func Create(input e.CreateDto) (*d.Data, error) {
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
Unit_Id: input.Unit_Id,
Infra_Id: input.Infra_Id,
Unit_Code: input.Unit_Code,
Infra_Code: input.Infra_Code,
}
if _, err := un.CreateData(createNurse, &event, tx); err != nil {
return err
@@ -359,10 +359,10 @@ func Update(input e.UpdateDto) (*d.Data, error) {
return err
}
createInt := esi.CreateDto{
User_Id: &data.Id,
Person_Id: input.Person_Id,
Specialist_Id: input.Specialist_Id,
Subspecialist_Id: input.Subspecialist_Id,
User_Id: &data.Id,
Person_Id: input.Person_Id,
Specialist_Code: input.Specialist_Code,
Subspecialist_Code: input.Subspecialist_Code,
}
if readIntData != nil {
if err := usi.UpdateData(esi.UpdateDto{CreateDto: createInt}, readIntData, &event, tx); err != nil {
@@ -396,11 +396,13 @@ func Update(input e.UpdateDto) (*d.Data, error) {
return err
}
createDoc := ed.CreateDto{
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
SIP_Number: input.SIP_Number,
Unit_Id: input.Unit_Id,
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
SIP_Number: input.SIP_Number,
Unit_Code: input.Unit_Code,
Specialist_Code: input.Specialist_Code,
Subspecialist_Code: input.Subspecialist_Code,
}
if readDocData != nil {
if err := ud.UpdateData(ed.UpdateDto{CreateDto: createDoc}, readDocData, &event, tx); err != nil {
@@ -422,6 +424,8 @@ func Update(input e.UpdateDto) (*d.Data, error) {
Code: input.Code,
Employee_Id: &employeeData.Id,
IHS_Number: input.IHS_Number,
Unit_Code: input.Unit_Code,
Infra_Code: input.Infra_Code,
}
if readNurData != nil {
if err := un.UpdateData(en.UpdateDto{CreateDto: createNur}, readNurData, &event, tx); err != nil {