From d20f3eb039a5015dc91e5aa0a4232e6311d4a60f Mon Sep 17 00:00:00 2001 From: June <55494127+notdu@users.noreply.github.com> Date: Fri, 19 May 2023 20:46:44 +0700 Subject: [PATCH] feat: support get user by userId and owner (#1870) * feat: support get user by userId and owner * Update user.go --------- Co-authored-by: hsluoyz --- controllers/user.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/controllers/user.go b/controllers/user.go index 32a722d5..81083284 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -80,7 +80,7 @@ func (c *ApiController) GetUsers() { // @Title GetUser // @Tag User API // @Description get user -// @Param id query string true "The id ( owner/name ) of the user" +// @Param id query string false "The id ( owner/name ) of the user" // @Param owner query string false "The owner of the user" // @Param email query string false "The email of the user" // @Param phone query string false "The phone of the user" @@ -92,8 +92,14 @@ func (c *ApiController) GetUser() { email := c.Input().Get("email") phone := c.Input().Get("phone") userId := c.Input().Get("userId") - owner := c.Input().Get("owner") + + var userFromUserId *object.User + if userId != "" && owner != "" { + userFromUserId = object.GetUserByUserId(owner, userId) + id = util.GetId(userFromUserId.Owner, userFromUserId.Name) + } + if owner == "" { owner = util.GetOwnerFromId(id) } @@ -115,7 +121,7 @@ func (c *ApiController) GetUser() { case phone != "": user = object.GetUserByPhone(owner, phone) case userId != "": - user = object.GetUserByUserId(owner, userId) + user = userFromUserId default: user = object.GetUser(id) }