adjust adime and sbar case
This commit is contained in:
No files matched your search
@@ -4,14 +4,18 @@ import (
|
|||||||
ecore "simrs-vx/internal/domain/base-entities/core"
|
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||||
eem "simrs-vx/internal/domain/main-entities/employee"
|
eem "simrs-vx/internal/domain/main-entities/employee"
|
||||||
ee "simrs-vx/internal/domain/main-entities/encounter"
|
ee "simrs-vx/internal/domain/main-entities/encounter"
|
||||||
|
|
||||||
|
pa "simrs-vx/pkg/auth-helper"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type CreateDto struct {
|
type CreateDto struct {
|
||||||
Encounter_Id *uint `json:"encounter_id"`
|
Encounter_Id *uint `json:"encounter_id"`
|
||||||
Employee_Id *uint `json:"employee_id"`
|
Employee_Id *uint `json:"-"`
|
||||||
Time *time.Time `json:"time"`
|
Time *time.Time `json:"time"`
|
||||||
Value *string `json:"value"`
|
Value *string `json:"value"`
|
||||||
|
|
||||||
|
pa.AuthInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
type ReadListDto struct {
|
type ReadListDto struct {
|
||||||
|
|||||||
@@ -4,14 +4,18 @@ import (
|
|||||||
ecore "simrs-vx/internal/domain/base-entities/core"
|
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||||
eem "simrs-vx/internal/domain/main-entities/employee"
|
eem "simrs-vx/internal/domain/main-entities/employee"
|
||||||
ee "simrs-vx/internal/domain/main-entities/encounter"
|
ee "simrs-vx/internal/domain/main-entities/encounter"
|
||||||
|
|
||||||
|
pa "simrs-vx/pkg/auth-helper"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type CreateDto struct {
|
type CreateDto struct {
|
||||||
Encounter_Id *uint `json:"encounter_id"`
|
Encounter_Id *uint `json:"encounter_id"`
|
||||||
Employee_Id *uint `json:"employee_id"`
|
Employee_Id *uint `json:"-"`
|
||||||
Time *time.Time `json:"time"`
|
Time *time.Time `json:"time"`
|
||||||
Value *string `json:"value"`
|
Value *string `json:"value"`
|
||||||
|
|
||||||
|
pa.AuthInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
type ReadListDto struct {
|
type ReadListDto struct {
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ import (
|
|||||||
|
|
||||||
e "simrs-vx/internal/domain/main-entities/adime"
|
e "simrs-vx/internal/domain/main-entities/adime"
|
||||||
u "simrs-vx/internal/use-case/main-use-case/adime"
|
u "simrs-vx/internal/use-case/main-use-case/adime"
|
||||||
|
|
||||||
|
pa "simrs-vx/pkg/auth-helper"
|
||||||
|
|
||||||
|
d "github.com/karincake/dodol"
|
||||||
)
|
)
|
||||||
|
|
||||||
type myBase struct{}
|
type myBase struct{}
|
||||||
@@ -17,10 +21,15 @@ type myBase struct{}
|
|||||||
var O myBase
|
var O myBase
|
||||||
|
|
||||||
func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
|
func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
|
||||||
|
authInfo, err := pa.GetAuthInfo(r)
|
||||||
|
if err != nil {
|
||||||
|
rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
|
||||||
|
}
|
||||||
dto := e.CreateDto{}
|
dto := e.CreateDto{}
|
||||||
if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
|
if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
dto.AuthInfo = *authInfo
|
||||||
res, err := u.Create(dto)
|
res, err := u.Create(dto)
|
||||||
rw.DataResponse(w, res, err)
|
rw.DataResponse(w, res, err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ import (
|
|||||||
|
|
||||||
e "simrs-vx/internal/domain/main-entities/sbar"
|
e "simrs-vx/internal/domain/main-entities/sbar"
|
||||||
u "simrs-vx/internal/use-case/main-use-case/sbar"
|
u "simrs-vx/internal/use-case/main-use-case/sbar"
|
||||||
|
|
||||||
|
pa "simrs-vx/pkg/auth-helper"
|
||||||
|
|
||||||
|
d "github.com/karincake/dodol"
|
||||||
)
|
)
|
||||||
|
|
||||||
type myBase struct{}
|
type myBase struct{}
|
||||||
@@ -17,10 +21,15 @@ type myBase struct{}
|
|||||||
var O myBase
|
var O myBase
|
||||||
|
|
||||||
func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
|
func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
|
||||||
|
authInfo, err := pa.GetAuthInfo(r)
|
||||||
|
if err != nil {
|
||||||
|
rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
|
||||||
|
}
|
||||||
dto := e.CreateDto{}
|
dto := e.CreateDto{}
|
||||||
if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
|
if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
dto.AuthInfo = *authInfo
|
||||||
res, err := u.Create(dto)
|
res, err := u.Create(dto)
|
||||||
rw.DataResponse(w, res, err)
|
rw.DataResponse(w, res, err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,14 @@
|
|||||||
package adime
|
package adime
|
||||||
|
|
||||||
import (
|
import (
|
||||||
e "simrs-vx/internal/domain/main-entities/adime"
|
"errors"
|
||||||
"strconv"
|
"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"
|
dg "github.com/karincake/apem/db-gorm-pg"
|
||||||
d "github.com/karincake/dodol"
|
d "github.com/karincake/dodol"
|
||||||
|
|
||||||
@@ -34,6 +39,21 @@ func Create(input e.CreateDto) (*d.Data, error) {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !input.AuthInfo.IsDoctor() && !input.AuthInfo.IsNurse() {
|
||||||
|
event.Status = "failed"
|
||||||
|
event.ErrInfo = pl.ErrorInfo{
|
||||||
|
Code: "auth-forbidden",
|
||||||
|
Detail: "user position is not allowed",
|
||||||
|
Raw: errors.New("authentication failed"),
|
||||||
|
}
|
||||||
|
return pl.SetLogError(&event, input)
|
||||||
|
}
|
||||||
|
|
||||||
|
employee, err := ue.ReadDetailData(ee.ReadDetailDto{User_Id: &input.AuthInfo.User_Id}, &event, tx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
input.Employee_Id = &employee.Id
|
||||||
if resData, err := CreateData(input, &event, tx); err != nil {
|
if resData, err := CreateData(input, &event, tx); err != nil {
|
||||||
return err
|
return err
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,9 +1,14 @@
|
|||||||
package sbar
|
package sbar
|
||||||
|
|
||||||
import (
|
import (
|
||||||
e "simrs-vx/internal/domain/main-entities/sbar"
|
"errors"
|
||||||
"strconv"
|
"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"
|
dg "github.com/karincake/apem/db-gorm-pg"
|
||||||
d "github.com/karincake/dodol"
|
d "github.com/karincake/dodol"
|
||||||
|
|
||||||
@@ -34,6 +39,21 @@ func Create(input e.CreateDto) (*d.Data, error) {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !input.AuthInfo.IsDoctor() && !input.AuthInfo.IsNurse() {
|
||||||
|
event.Status = "failed"
|
||||||
|
event.ErrInfo = pl.ErrorInfo{
|
||||||
|
Code: "auth-forbidden",
|
||||||
|
Detail: "user position is not allowed",
|
||||||
|
Raw: errors.New("authentication failed"),
|
||||||
|
}
|
||||||
|
return pl.SetLogError(&event, input)
|
||||||
|
}
|
||||||
|
|
||||||
|
employee, err := ue.ReadDetailData(ee.ReadDetailDto{User_Id: &input.AuthInfo.User_Id}, &event, tx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
input.Employee_Id = &employee.Id
|
||||||
if resData, err := CreateData(input, &event, tx); err != nil {
|
if resData, err := CreateData(input, &event, tx); err != nil {
|
||||||
return err
|
return err
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user