Use utils.HttpResponse/Abort to replace c.JSON/Abort

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

service/event/checkin.go

@@ -2,6 +2,8 @@ package event
 
 import (
 	"nixcn-cms/data"
+	"nixcn-cms/utils"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
@@ -11,35 +13,38 @@ func Checkin(c *gin.Context) {
 	data := new(data.Attendance)
 	userIdOrig, ok := c.Get("user_id")
 	if !ok {
-		c.JSON(403, gin.H{"status": "userid error"})
+		utils.HttpResponse(c, 403, "", "userid error")
 		return
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
 	if err != nil {
-		c.JSON(500, gin.H{"status": "failed to parse uuid"})
+		utils.HttpResponse(c, 500, "", "failed to parse uuid")
 	}
 
 	// Get event id from query
 	eventIdOrig, ok := c.GetQuery("event_id")
 	if !ok {
-		c.JSON(400, gin.H{"status": "undefinded event id"})
+		utils.HttpResponse(c, 400, "", "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"})
+		utils.HttpResponse(c, 500, "", "error parsing string to uuid")
 		return
 	}
 	data.UserId = userId
 	code, err := data.GenCheckinCode(eventId)
 	if err != nil {
-		c.JSON(500, gin.H{"status": "error generating code"})
+		utils.HttpResponse(c, 500, "", "error generating code")
 		return
 	}
 
-	c.JSON(200, gin.H{"checkin_code": code})
+	checkinCodeResp := struct {
+		CheckinCode *string `json:"checkin_code"`
+	}{code}
+	utils.HttpResponse(c, 200, "", "success", checkinCodeResp)
 }
 
 func CheckinSubmit(c *gin.Context) {
@@ -51,49 +56,53 @@ func CheckinSubmit(c *gin.Context) {
 	attendanceData := new(data.Attendance)
 	err := attendanceData.VerifyCheckinCode(req.ChekinCode)
 	if err != nil {
-		c.JSON(400, gin.H{"status": "error verify checkin code"})
+		utils.HttpResponse(c, 400, "", "error verify checkin code")
 		return
 	}
 
-	c.JSON(200, gin.H{"status": "success"})
+	utils.HttpResponse(c, 200, "", "success")
 }
 
 func CheckinQuery(c *gin.Context) {
 	userIdOrig, ok := c.Get("user_id")
 	if !ok {
-		c.JSON(403, gin.H{"status": "userid error"})
+		utils.HttpResponse(c, 400, "", "userid error")
 		return
 	}
 	userId, err := uuid.Parse(userIdOrig.(string))
 	if err != nil {
-		c.JSON(500, gin.H{
-			"status": "failed to parse uuid",
-		})
+		utils.HttpResponse(c, 500, "", "failed to parse uuid")
+		return
 	}
 
 	eventIdOrig, ok := c.GetQuery("event_id")
 	if !ok {
-		c.JSON(400, gin.H{"status": "could not found event_id"})
+		utils.HttpResponse(c, 400, "", "could not found event_id")
 		return
 	}
 	eventId, err := uuid.Parse(eventIdOrig)
 	if err != nil {
-		c.JSON(400, gin.H{"status": "event_id is not valid"})
+		utils.HttpResponse(c, 400, "", "event_id is not valid")
 		return
 	}
 
 	attendanceData := new(data.Attendance)
 	attendance, err := attendanceData.GetAttendance(userId, eventId)
+
 	if err != nil {
-		c.JSON(500, gin.H{"status": "database error"})
+		utils.HttpResponse(c, 500, "", "database error")
 		return
 	} else if attendance == nil {
-		c.JSON(404, gin.H{"status": "event checkin record not found"})
+		utils.HttpResponse(c, 404, "", "event checkin record not found")
 		return
 	} else if attendance.CheckinAt.IsZero() {
-		c.JSON(200, gin.H{"checkin_at": nil})
+		utils.HttpResponse(c, 200, "", "success", gin.H{"checkin_at": nil})
 		return
 	}
 
-	c.JSON(200, gin.H{"checkin_at": attendance.CheckinAt})
+	checkInAtResp := struct {
+		CheckinAt time.Time `json:"checkin_at"`
+	}{attendance.CheckinAt}
+
+	utils.HttpResponse(c, 200, "", "success", checkInAtResp)
 }