bugfixed

admin/logout.go

@@ -3,6 +3,7 @@ package admin
 import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
+	"github.com/god-jason/bucket/api"
 )
 
 func logout(ctx *gin.Context) {

export/export.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/god-jason/bucket/api"
 	"github.com/god-jason/bucket/mongodb"
 	"go.mongodb.org/mongo-driver/bson"
 )
@@ -18,7 +19,7 @@ func ApiExport(table, filename string) gin.HandlerFunc {
 
 		err := mongodb.Find(table, bson.D{{Key: "_id", Value: bson.E{Key: "$in", Value: ids}}}, nil, 0, 0, &datum)
 		if err != nil {
-			Error(ctx, err)
+			api.Error(ctx, err)
 			return
 		}
 

export/import.go

@@ -4,6 +4,7 @@ import (
 	"archive/zip"
 	"encoding/json"
 	"github.com/gin-gonic/gin"
+	"github.com/god-jason/bucket/api"
 	"github.com/god-jason/bucket/mongodb"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"io"
@@ -13,20 +14,20 @@ func ApiImport(table string) gin.HandlerFunc {
 	return func(ctx *gin.Context) {
 		formFile, err := ctx.FormFile("file")
 		if err != nil {
-			Error(ctx, err)
+			api.Error(ctx, err)
 			return
 		}
 
 		file, err := formFile.Open()
 		if err != nil {
-			Error(ctx, err)
+			api.Error(ctx, err)
 			return
 		}
 		defer file.Close()
 
 		reader, err := zip.NewReader(file, formFile.Size)
 		if err != nil {
-			Error(ctx, err)
+			api.Error(ctx, err)
 			return
 		}
 
@@ -40,26 +41,26 @@ func ApiImport(table string) gin.HandlerFunc {
 			reader, err := file.Open()
 			buf, err := io.ReadAll(reader)
 			if err != nil {
-				Error(ctx, err)
+				api.Error(ctx, err)
 				return
 			}
 
 			var data []any
 			err = json.Unmarshal(buf, &data)
 			if err != nil {
-				Error(ctx, err)
+				api.Error(ctx, err)
 				return
 			}
 
 			ids, err := mongodb.InsertMany(table, data)
 			if err != nil {
-				Error(ctx, err)
+				api.Error(ctx, err)
 				return
 			}
 
 			idss = append(idss, ids...)
 		}
 
-		OK(ctx, idss)
+		api.OK(ctx, idss)
 	}
 }