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

replace id type

Browse Source
This commit is contained in:
kandrusyak
2023-07-18 01:16:04 +03:00
parent b74291f449
commit 03cb8c3e38
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
handler/event.go
View File

@@ -4,6 +4,7 @@ import (
"astra-events/model"
"astra-events/pkg/utils"
"astra-events/services"
"github.com/google/uuid"
"github.com/hashicorp/go-set"
"github.com/labstack/echo/v4"
"net/http"
@@ -12,8 +13,8 @@ import (
func (h *Handler) CreateEvent(c echo.Context) (err error) {
event := new(model.CreateEvent)
authorId, err := strconv.Atoi(c.Request().Header.Get("UserId"))
orgId, err := strconv.Atoi(c.Request().Header.Get("UserOrganizationId"))
authorId, err := uuid.Parse(c.Request().Header.Get("UserId"))
orgId, err := uuid.Parse(c.Request().Header.Get("UserOrganizationId"))
if err != nil {
return c.NoContent(http.StatusUnauthorized)
@@ -23,19 +24,19 @@ func (h *Handler) CreateEvent(c echo.Context) (err error) {
return c.NoContent(http.StatusBadRequest)
}
usersMap, err := services.GetUsers([]uint{event.EmployeeId, uint(authorId)}, c.Request().Header)
usersMap, err := services.GetUsers([]uuid.UUID{event.EmployeeId, authorId}, c.Request().Header)
if err != nil {
return c.HTML(http.StatusBadGateway, err.Error())
}
employee := usersMap[event.EmployeeId]
author := usersMap[uint(authorId)]
author := usersMap[authorId]
newEvent, err := utils.TypeConverter[model.Event](event)
newEvent.OrgId = uint(orgId)
newEvent.AuthorId = uint(authorId)
newEvent.OrgId = orgId
newEvent.AuthorId = authorId
tx := h.DB.Create(&newEvent)
@@ -53,7 +54,7 @@ func (h *Handler) GetEvents(c echo.Context) (err error) {
var events []model.Event
query := c.Request().URL.Query()
_, _, filterMap := utils.GetFilterParams(query)
orgId, err := strconv.Atoi(c.Request().Header.Get("UserOrganizationId"))
orgId, err := uuid.Parse(c.Request().Header.Get("UserOrganizationId"))
if err != nil {
return c.NoContent(http.StatusUnauthorized)
@@ -67,7 +68,7 @@ func (h *Handler) GetEvents(c echo.Context) (err error) {
tx.Find(&events)
ids := set.New[uint](len(events) * 2)
ids := set.New[uuid.UUID](len(events) * 2)
for _, event := range events {
ids.Insert(event.EmployeeId)
@@ -102,7 +103,7 @@ func (h *Handler) GetEvent(c echo.Context) error {
return c.NoContent(http.StatusNotFound)
}
usersMap, err := services.GetUsers([]uint{event.EmployeeId, event.AuthorId}, c.Request().Header)
usersMap, err := services.GetUsers([]uuid.UUID{event.EmployeeId, event.AuthorId}, c.Request().Header)
if err != nil {
return c.HTML(http.StatusBadGateway, err.Error())