Auto reg user, event map

Signed-off-by: Asai Neko <sugar@sne.moe>

service/user/checkin.go

@@ -1,7 +1,6 @@
 package user
 
 import (
-	"net/http"
 	"nixcn-cms/data"
 	"time"
 
@@ -9,17 +8,34 @@ import (
 	"github.com/google/uuid"
 )
 
-func Checkin(ctx *gin.Context) {
+func Checkin(c *gin.Context) {
 	data := new(data.User)
-	userId, ok := ctx.Get("user_id")
+	userId, ok := c.Get("user_id")
 	if !ok {
-		ctx.JSON(http.StatusUnauthorized, gin.H{
+		c.JSON(401, gin.H{
 			"status": "unauthorized",
 		})
 		return
 	}
-	data.UpdateCheckin(userId.(uuid.UUID), time.Now())
-	ctx.JSON(http.StatusOK, gin.H{
+
+	// Get event id from query
+	eventIdOrig, ok := c.GetQuery("event_id")
+	if !ok {
+		c.JSON(403, gin.H{
+			"status": "undefinded event id",
+		})
+		return
+	}
+
+	// Parse event id to uuid
+	eventId, err := uuid.Parse(eventIdOrig)
+	if err != nil {
+		c.JSON(500, gin.H{
+			"status": "error parsing string to uuid",
+		})
+	}
+	data.UpdateCheckin(userId.(uuid.UUID), eventId, time.Now())
+	c.JSON(200, gin.H{
 		"status": "success",
 	})
 }

service/user/info.go

@@ -1,8 +1,8 @@
 package user
 
 import (
-	"net/http"
 	"nixcn-cms/data"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
@@ -12,30 +12,35 @@ func Info(c *gin.Context) {
 	data := new(data.User)
 	userId, ok := c.Get("user_id")
 	if !ok {
-		c.JSON(http.StatusUnauthorized, gin.H{
+		c.JSON(403, gin.H{
 			"status": "user not found",
 		})
 		return
 	}
 	err := data.GetByUserId(userId.(uuid.UUID))
 	if err != nil {
-		c.JSON(http.StatusUnauthorized, gin.H{
+		c.JSON(403, gin.H{
 			"status": "user not found",
 		})
 		return
 	}
-	var checkinTime any = nil
-	if !data.Checkin.IsZero() {
-		checkinTime = data.Checkin
+
+	// 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(http.StatusOK, gin.H{
+
+	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":          checkinTime,
+		"checkin":          data.Checkin,
+		"joined_event":     data.JoinedEvent,
 		"permission_level": data.PermissionLevel,
 	})
 }

service/user/update.go

@@ -1,7 +1,6 @@
 package user
 
 import (
-	"net/http"
 	"nixcn-cms/data"
 
 	"github.com/gin-gonic/gin"
@@ -16,7 +15,7 @@ func Update(c *gin.Context) {
 	user := new(data.User)
 	userId, ok := c.Get("user_id")
 	if !ok {
-		c.JSON(http.StatusUnauthorized, gin.H{
+		c.JSON(403, gin.H{
 			"status": "can not found user id",
 		})
 		return
@@ -27,7 +26,7 @@ func Update(c *gin.Context) {
 
 	// Reject permission 0 user
 	if user.PermissionLevel == 0 {
-		c.JSON(http.StatusForbidden, gin.H{
+		c.JSON(403, gin.H{
 			"status": "premission denied",
 		})
 		return
@@ -41,7 +40,7 @@ func Update(c *gin.Context) {
 	// Update user info
 	user.UpdateByUserID(userId.(uuid.UUID), &ReqInfo)
 
-	c.JSON(http.StatusOK, gin.H{
+	c.JSON(200, gin.H{
 		"status": "success",
 	})
 }