admin/astra-events
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logs fix

Browse Source
This commit is contained in:
kandrusyak
2023-09-25 22:53:26 +03:00
parent 20f69b4378
commit 48d7206356
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
handler/event.go
View File

@@ -73,7 +73,7 @@ func (h *Handler) CreateEvent(c echo.Context) (err error) {
newEvent.MedicId = event.MedicId newEvent.MedicId = event.MedicId
newEvent.AuthorId = authorId newEvent.AuthorId = authorId
newEvent.PersonId = person.ID newEvent.PersonId = person.ID
newEvent.Person = person newEvent.Person = *person
tx := h.DB.Create(&newEvent) tx := h.DB.Create(&newEvent)

20
model/event.go
View File

@@ -9,16 +9,16 @@ import (
// swagger:model Event // swagger:model Event
type Event struct { type Event struct {
gorm.Model `json:"meta"` gorm.Model `json:"meta"`
ID uuid.UUID `json:"id" gorm:"type:uuid;default:gen_random_uuid();primarykey"` ID uuid.UUID `json:"id" gorm:"type:uuid;default:gen_random_uuid();primarykey"`
Start time.Time `json:"start"` Start time.Time `json:"start"`
End time.Time `json:"end"` End time.Time `json:"end"`
Author User `json:"author" gorm:"-"` Author User `json:"author" gorm:"-"`
AuthorId uuid.UUID `json:"-"` AuthorId uuid.UUID `json:"-"`
Medic User `json:"medic" gorm:"-"` Medic User `json:"medic" gorm:"-"`
MedicId uuid.UUID `json:"-"` MedicId uuid.UUID `json:"-"`
Person *PersonalInformationApi `json:"person" gorm:"-"` Person PersonalInformationApi `json:"person" gorm:"-"`
PersonId uuid.UUID `json:"-"` PersonId uuid.UUID `json:"-"`
OrgId uuid.UUID `json:"-"` OrgId uuid.UUID `json:"-"`
} }
// swagger:model CreateEvent // swagger:model CreateEvent

6
services/personal-information.go
View File

@@ -53,9 +53,9 @@ func CreatePerson(person model.PersonalInformationApi, header http.Header, c ech
return pi, nil return pi, nil
} }
func GetPersons(ids []uuid.UUID, header http.Header, c echo.Context) (map[uuid.UUID]*model.PersonalInformationApi, error) { func GetPersons(ids []uuid.UUID, header http.Header, c echo.Context) (map[uuid.UUID]model.PersonalInformationApi, error) {
var persons []model.PersonalInformationApi var persons []model.PersonalInformationApi
personsMap := make(map[uuid.UUID]*model.PersonalInformationApi) personsMap := make(map[uuid.UUID]model.PersonalInformationApi)
data, err, req := api.PostRequest( data, err, req := api.PostRequest(
config.Env.MSHosts.PersonsHost+"/persons/batch/", config.Env.MSHosts.PersonsHost+"/persons/batch/",
@@ -75,7 +75,7 @@ func GetPersons(ids []uuid.UUID, header http.Header, c echo.Context) (map[uuid.U
} }
for _, person := range persons { for _, person := range persons {
personsMap[person.ID] = &person personsMap[person.ID] = person
} }
return personsMap, nil return personsMap, nil