refactor: refactor channel.go response

controller/api.go

@@ -0,0 +1,27 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func Success(c *gin.Context, data interface{}) {
+	c.JSON(http.StatusOK, gin.H{
+		"message": "",
+		"success": true,
+		"data":    data,
+	})
+}
+
+func Err(c *gin.Context, err error) {
+	c.JSON(http.StatusOK, gin.H{
+		"success": false,
+		"message": err.Error(),
+	})
+}
+
+func OpenAiErr(c *gin.Context, err OpenAIError) {
+	c.JSON(http.StatusOK, gin.H{
+		"error": err,
+	})
+}

controller/channel.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"net/http"
 	"one-api/common"
 	"one-api/model"
 	"strconv"
@@ -16,71 +15,41 @@ func GetAllChannels(c *gin.Context) {
 	}
 	channels, err := model.GetAllChannels(p*common.ItemsPerPage, common.ItemsPerPage, false)
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{
+	Success(c, channels)
-		"success": true,
-		"message": "",
-		"data":    channels,
-	})
-	return
 }
 
 func SearchChannels(c *gin.Context) {
 	keyword := c.Query("keyword")
 	channels, err := model.SearchChannels(keyword)
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{
+	Success(c, channels)
-		"success": true,
-		"message": "",
-		"data":    channels,
-	})
-	return
 }
 
 func GetChannel(c *gin.Context) {
 	id, err := strconv.Atoi(c.Param("id"))
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
 	channel, err := model.GetChannelById(id, false)
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{
+	Success(c, channel)
-		"success": true,
-		"message": "",
-		"data":    channel,
-	})
-	return
 }
 
 func AddChannel(c *gin.Context) {
 	channel := model.Channel{}
 	err := c.ShouldBindJSON(&channel)
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
 	channel.CreatedTime = common.GetTimestamp()
@@ -96,17 +65,10 @@ func AddChannel(c *gin.Context) {
 	}
 	err = model.BatchInsertChannels(channels)
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{
+	Success(c, channel)
-		"success": true,
-		"message": "",
-	})
-	return
 }
 
 func DeleteChannel(c *gin.Context) {
@@ -114,58 +76,32 @@ func DeleteChannel(c *gin.Context) {
 	channel := model.Channel{Id: id}
 	err := channel.Delete()
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{
+	Success(c, channel)
-		"success": true,
-		"message": "",
-	})
-	return
 }
 
 func DeleteDisabledChannel(c *gin.Context) {
 	rows, err := model.DeleteDisabledChannel()
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{
+	Success(c, rows)
-		"success": true,
-		"message": "",
-		"data":    rows,
-	})
-	return
 }
 
 func UpdateChannel(c *gin.Context) {
 	channel := model.Channel{}
 	err := c.ShouldBindJSON(&channel)
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
 	err = channel.Update()
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
+		Err(c, err)
-			"success": false,
-			"message": err.Error(),
-		})
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{
+	Success(c, channel)
-		"success": true,
-		"message": "",
-		"data":    channel,
-	})
-	return
 }