feat (adime,soapi,sbar): no longer get employee id, use employee id from authinfo
This commit is contained in:
@@ -5,9 +5,6 @@ import (
|
||||
"strconv"
|
||||
|
||||
e "simrs-vx/internal/domain/main-entities/adime"
|
||||
ee "simrs-vx/internal/domain/main-entities/employee"
|
||||
|
||||
ue "simrs-vx/internal/use-case/main-use-case/employee"
|
||||
|
||||
dg "github.com/karincake/apem/db-gorm-pg"
|
||||
d "github.com/karincake/dodol"
|
||||
@@ -49,11 +46,13 @@ func Create(input e.CreateDto) (*d.Data, error) {
|
||||
return pl.SetLogError(&event, input)
|
||||
}
|
||||
|
||||
employee, err := ue.ReadDetailData(ee.ReadDetailDto{User_Id: &input.AuthInfo.User_Id}, &event, tx)
|
||||
if err != nil {
|
||||
return err
|
||||
if input.AuthInfo.Employee_Id != nil {
|
||||
v := uint(*input.AuthInfo.Employee_Id)
|
||||
input.Employee_Id = &v
|
||||
} else {
|
||||
input.Employee_Id = nil
|
||||
}
|
||||
input.Employee_Id = &employee.Id
|
||||
|
||||
if resData, err := CreateData(input, &event, tx); err != nil {
|
||||
return err
|
||||
} else {
|
||||
|
||||
@@ -315,6 +315,7 @@ func ExtractToken(r *http.Request, tokenType TokenType) (data *pa.AuthInfo, err
|
||||
data.Laborant_Id = checkIntPtrClaims(claims, "laborant_id")
|
||||
data.Pharmachist_Id = checkIntPtrClaims(claims, "pharmachist_id")
|
||||
data.Intern_Position_Code = checkStrPtrClaims(claims, "intern_position_code")
|
||||
data.Employee_Id = checkIntPtrClaims(claims, "employee_id")
|
||||
return
|
||||
}
|
||||
return nil, d.FieldError{Code: "token", Message: "token-invalid"}
|
||||
|
||||
@@ -4,11 +4,8 @@ import (
|
||||
"errors"
|
||||
"strconv"
|
||||
|
||||
ee "simrs-vx/internal/domain/main-entities/employee"
|
||||
e "simrs-vx/internal/domain/main-entities/sbar"
|
||||
|
||||
ue "simrs-vx/internal/use-case/main-use-case/employee"
|
||||
|
||||
dg "github.com/karincake/apem/db-gorm-pg"
|
||||
d "github.com/karincake/dodol"
|
||||
|
||||
@@ -49,11 +46,13 @@ func Create(input e.CreateDto) (*d.Data, error) {
|
||||
return pl.SetLogError(&event, input)
|
||||
}
|
||||
|
||||
employee, err := ue.ReadDetailData(ee.ReadDetailDto{User_Id: &input.AuthInfo.User_Id}, &event, tx)
|
||||
if err != nil {
|
||||
return err
|
||||
if input.AuthInfo.Employee_Id != nil {
|
||||
v := uint(*input.AuthInfo.Employee_Id)
|
||||
input.Employee_Id = &v
|
||||
} else {
|
||||
input.Employee_Id = nil
|
||||
}
|
||||
input.Employee_Id = &employee.Id
|
||||
|
||||
if resData, err := CreateData(input, &event, tx); err != nil {
|
||||
return err
|
||||
} else {
|
||||
|
||||
@@ -4,11 +4,8 @@ import (
|
||||
"errors"
|
||||
"strconv"
|
||||
|
||||
ee "simrs-vx/internal/domain/main-entities/employee"
|
||||
e "simrs-vx/internal/domain/main-entities/soapi"
|
||||
|
||||
ue "simrs-vx/internal/use-case/main-use-case/employee"
|
||||
|
||||
dg "github.com/karincake/apem/db-gorm-pg"
|
||||
d "github.com/karincake/dodol"
|
||||
|
||||
@@ -49,11 +46,13 @@ func Create(input e.CreateDto) (*d.Data, error) {
|
||||
return pl.SetLogError(&event, input)
|
||||
}
|
||||
|
||||
employee, err := ue.ReadDetailData(ee.ReadDetailDto{User_Id: &input.AuthInfo.User_Id}, &event, tx)
|
||||
if err != nil {
|
||||
return err
|
||||
if input.AuthInfo.Employee_Id != nil {
|
||||
v := uint(*input.AuthInfo.Employee_Id)
|
||||
input.Employee_Id = &v
|
||||
} else {
|
||||
input.Employee_Id = nil
|
||||
}
|
||||
input.Employee_Id = &employee.Id
|
||||
|
||||
if resData, err := CreateData(input, &event, tx); err != nil {
|
||||
return err
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user