Merge pull request #189 from huhaiqwer/master

elenz97 · web-flow · commit 4ef80a207e45 · 2024-06-19T13:24:04.000+02:00
Update user.go
diff --git a/apiv2/pkg/clients/user/user.go b/apiv2/pkg/clients/user/user.go
@@ -111,7 +111,11 @@ func (c *RESTClient) GetUserByID(ctx context.Context, id int64) (*model.UserResp
 	params.WithTimeout(c.Options.Timeout)
 
 	resp, err := c.V2Client.User.GetUser(params, c.AuthInfo)
-
+	
+        if err != nil {
+		return nil, handleSwaggerUserErrors(err)
+	}
+	
 	if resp.Payload == nil {
 		return nil, &clienterrors.ErrUserNotFound{}
 	}
@@ -120,9 +124,6 @@ func (c *RESTClient) GetUserByID(ctx context.Context, id int64) (*model.UserResp
 		return nil, &clienterrors.ErrUserInvalidID{}
 	}
 
-	if err != nil {
-		return nil, handleSwaggerUserErrors(err)
-	}
 
 	return resp.Payload, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,11 @@ func (c RESTClient) GetUserByID(ctx context.Context, id int64) (model.UserResp`
`111`	`111`	`params.WithTimeout(c.Options.Timeout)`
`112`	`112`
`113`	`113`	`resp, err := c.V2Client.User.GetUser(params, c.AuthInfo)`
`114`		`-`
	`114`	`+`
	`115`	`+ if err != nil {`
	`116`	`+ return nil, handleSwaggerUserErrors(err)`
	`117`	`+ }`
	`118`	`+`
`115`	`119`	`if resp.Payload == nil {`
`116`	`120`	`return nil, &clienterrors.ErrUserNotFound{}`
`117`	`121`	`}`
`@@ -120,9 +124,6 @@ func (c RESTClient) GetUserByID(ctx context.Context, id int64) (model.UserResp`
`120`	`124`	`return nil, &clienterrors.ErrUserInvalidID{}`
`121`	`125`	`}`
`122`	`126`
`123`		`- if err != nil {`
`124`		`- return nil, handleSwaggerUserErrors(err)`
`125`		`- }`
`126`	`127`
`127`	`128`	`return resp.Payload, nil`
`128`	`129`	`}`