@@ -2,14 +2,13 @@ package user
|
||||
|
||||
import (
|
||||
"nixcn-cms/data"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
func Info(c *gin.Context) {
|
||||
data := new(data.User)
|
||||
userData := new(data.User)
|
||||
userId, ok := c.Get("user_id")
|
||||
if !ok {
|
||||
c.JSON(404, gin.H{
|
||||
@@ -19,7 +18,7 @@ func Info(c *gin.Context) {
|
||||
}
|
||||
|
||||
// Get user from database
|
||||
err := data.GetByUserId(userId.(uuid.UUID))
|
||||
user, err := userData.GetByUserId(userId.(uuid.UUID))
|
||||
if err != nil {
|
||||
c.JSON(404, gin.H{
|
||||
"status": "user not found",
|
||||
@@ -27,21 +26,13 @@ func Info(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// Set time nil if time is zero
|
||||
for k, v := range data.Checkin {
|
||||
if t, ok := v.(time.Time); ok && t.IsZero() {
|
||||
data.Checkin[k] = nil
|
||||
}
|
||||
}
|
||||
|
||||
c.JSON(200, gin.H{
|
||||
"user_id": data.UserId,
|
||||
"email": data.Email,
|
||||
"type": data.Type,
|
||||
"nickname": data.Nickname,
|
||||
"subtitle": data.Subtitle,
|
||||
"avatar": data.Avatar,
|
||||
"checkin": data.Checkin,
|
||||
"permission_level": data.PermissionLevel,
|
||||
"user_id": user.UserId,
|
||||
"email": user.Email,
|
||||
"type": user.Type,
|
||||
"nickname": user.Nickname,
|
||||
"subtitle": user.Subtitle,
|
||||
"avatar": user.Avatar,
|
||||
"permission_level": user.PermissionLevel,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user