Pārlūkot izejas kodu

fix(config): integrate SyncNodeIds and SyncOverwrite into Config struct

Jacky 3 mēneši atpakaļ
vecāks
revīzija
b84c444c55
3 mainītis faili ar 13 papildinājumiem un 17 dzēšanām
  1. 9 17
      api/config/get.go
  2. 2 0
      api/config/modify.go
  3. 2 0
      internal/config/config.go

+ 9 - 17
api/config/get.go

@@ -15,12 +15,6 @@ import (
 	"github.com/uozi-tech/cosy"
 )
 
-type APIConfigResp struct {
-	config.Config
-	SyncNodeIds   []uint64 `json:"sync_node_ids" gorm:"serializer:json"`
-	SyncOverwrite bool     `json:"sync_overwrite"`
-}
-
 func GetConfig(c *gin.Context) {
 	relativePath := c.Param("path")
 
@@ -74,16 +68,14 @@ func GetConfig(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, APIConfigResp{
-		Config: config.Config{
-			Name:            stat.Name(),
-			Content:         string(content),
-			ChatGPTMessages: chatgpt.Content,
-			FilePath:        absPath,
-			ModifiedAt:      stat.ModTime(),
-			Dir:             filepath.Dir(relativePath),
-		},
-		SyncNodeIds:   cfg.SyncNodeIds,
-		SyncOverwrite: cfg.SyncOverwrite,
+	c.JSON(http.StatusOK, config.Config{
+		Name:            stat.Name(),
+		Content:         string(content),
+		ChatGPTMessages: chatgpt.Content,
+		FilePath:        absPath,
+		ModifiedAt:      stat.ModTime(),
+		Dir:             filepath.Dir(relativePath),
+		SyncNodeIds:     cfg.SyncNodeIds,
+		SyncOverwrite:   cfg.SyncOverwrite,
 	})
 }

+ 2 - 0
api/config/modify.go

@@ -101,5 +101,7 @@ func EditConfig(c *gin.Context) {
 		FilePath:        absPath,
 		ModifiedAt:      time.Now(),
 		Dir:             filepath.Dir(relativePath),
+		SyncNodeIds:     cfg.SyncNodeIds,
+		SyncOverwrite:   cfg.SyncOverwrite,
 	})
 }

+ 2 - 0
internal/config/config.go

@@ -28,4 +28,6 @@ type Config struct {
 	Status          ConfigStatus                   `json:"status"`
 	Dir             string                         `json:"dir"`
 	Urls            []string                       `json:"urls,omitempty"`
+	SyncNodeIds     []uint64                       `json:"sync_node_ids,omitempty"`
+	SyncOverwrite   bool                           `json:"sync_overwrite"`
 }