From db42cfcda3b6e883279a7cc7b156987a643afb17 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 2 Jan 2023 22:27:09 +0100 Subject: [PATCH] return url when updating the avatar --- modules/structs/user.go | 5 +++++ routers/routes/v1/user/useravatar.go | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/structs/user.go b/modules/structs/user.go index 22973bb..bb203fe 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -45,3 +45,8 @@ type UserSession struct { LastUsed int64 CreatedAt int64 } + +// swagger:model UpdateUserAvatarResponse +type UpdateUserAvatarResponse struct { + AvatarUrl string +} diff --git a/routers/routes/v1/user/useravatar.go b/routers/routes/v1/user/useravatar.go index 40e94f3..0657371 100644 --- a/routers/routes/v1/user/useravatar.go +++ b/routers/routes/v1/user/useravatar.go @@ -60,8 +60,6 @@ func UpdateAvatar(c *fiber.Ctx) error { return c.SendStatus(fiber.StatusBadRequest) } - logrus.Println("size", file.Size, "header", file.Header, "filename", file.Filename) - if file.Size > image.MaxAvatarSize { return c.SendStatus(fiber.StatusRequestEntityTooLarge) } @@ -80,7 +78,8 @@ func UpdateAvatar(c *fiber.Ctx) error { return c.SendStatus(fiber.StatusBadRequest) } - user := structs.User{Id: foundSession.UserId, AvatarUrl: utils.GetUserAvatarUrl(foundSession.UserId, fileName)} + avatarUrl := utils.GetUserAvatarUrl(foundSession.UserId, fileName) + user := structs.User{Id: foundSession.UserId, AvatarUrl: avatarUrl} q = scylladb.Session.Query(scylladb.Users.Update("avatar_url")).BindStruct(user) @@ -89,5 +88,5 @@ func UpdateAvatar(c *fiber.Ctx) error { return c.SendStatus(fiber.StatusInternalServerError) } - return c.SendStatus(fiber.StatusOK) + return c.Status(fiber.StatusOK).JSON(structs.UpdateUserAvatarResponse{AvatarUrl: avatarUrl}) }