Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

getMeでDBを叩くように変更 #763

Open
wants to merge 10 commits into
base: v2
Choose a base branch
from
Open

getMeでDBを叩くように変更 #763

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
df7e661
get user from db when getme and create if user not exist
comavius Jun 7, 2024
1feb362
use GetUserByID
comavius Jul 9, 2024
e273805
Merge branch 'v2' of github.com:traPtitech/Jomon into getme-returns-d…
Hueter57 Nov 8, 2024
e432c1d
private variable name change to lower camel case
Hueter57 Nov 8, 2024
29fbad9
fix golangci-lint error
Hueter57 Nov 8, 2024
adee1a7
private variable name change to lower camel case part 2
Hueter57 Nov 8, 2024
0f76080
delete getting user form repository and creating new user
Hueter57 Nov 8, 2024
a0ff91a
add return err when user is not found
Hueter57 Nov 8, 2024
c83bbe0
fix test in TestHandlers_GetMe
Hueter57 Nov 14, 2024
17f5360
change 'expect return' model.User to User
Hueter57 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion router/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/labstack/echo-contrib/session"
"github.com/labstack/echo/v4"
"github.com/samber/lo"
"github.com/traPtitech/Jomon/ent"
"github.com/traPtitech/Jomon/model"
"go.uber.org/zap"
)
Expand Down Expand Up @@ -85,11 +86,20 @@ func (h Handlers) GetMe(c echo.Context) error {
h.Logger.Error("failed to get session", zap.Error(err))
return echo.NewHTTPError(http.StatusInternalServerError, err)
}
user, ok := sess.Values[sessionUserKey].(User)
userInSession, ok := sess.Values[sessionUserKey].(User)
if !ok {
h.Logger.Error("failed to parse stored session as user info")
return echo.NewHTTPError(http.StatusInternalServerError, "failed to get user info")
}

user, err := h.Repository.GetUserByID(c.Request().Context(), userInSession.ID)
if err != nil {
if ent.IsNotFound(err) {
h.Logger.Error("failed to find user from DB by ID")
return c.JSON(http.StatusNotFound, err)
}
h.Logger.Error("failed to get user by ID")
return c.JSON(http.StatusInternalServerError, err)
}
return c.JSON(http.StatusOK, user)
}
Loading