all adjustments

backend/service/endpoints.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"encoding/json"
+	"os"
 	"s-ui/database"
 	"s-ui/database/model"
 
@@ -10,24 +11,32 @@ import (
 
 type EndpointService struct{}
 
-func (o *EndpointService) GetAll() ([]*model.Endpoint, error) {
+func (o *EndpointService) GetAll() (*[]map[string]interface{}, error) {
 	db := database.GetDB()
 	endpoints := []*model.Endpoint{}
 	err := db.Model(model.Endpoint{}).Scan(&endpoints).Error
 	if err != nil {
 		return nil, err
 	}
-	return endpoints, nil
-}
-
-func (o *EndpointService) Get(id uint) (*model.Endpoint, error) {
-	db := database.GetDB()
-	endpoint := &model.Endpoint{}
-	err := db.First(endpoint, id).Error
-	if err != nil {
-		return nil, err
+	var data []map[string]interface{}
+	for _, endpoint := range endpoints {
+		epData := map[string]interface{}{
+			"id":   endpoint.Id,
+			"type": endpoint.Type,
+			"tag":  endpoint.Tag,
+		}
+		if endpoint.Options != nil {
+			var restFields map[string]json.RawMessage
+			if err := json.Unmarshal(endpoint.Options, &restFields); err != nil {
+				return nil, err
+			}
+			for k, v := range restFields {
+				epData[k] = v
+			}
+		}
+		data = append(data, epData)
 	}
-	return endpoint, nil
+	return &data, nil
 }
 
 func (o *EndpointService) GetAllConfig(db *gorm.DB) ([]json.RawMessage, error) {
@@ -46,3 +55,55 @@ func (o *EndpointService) GetAllConfig(db *gorm.DB) ([]json.RawMessage, error) {
 	}
 	return endpointsJson, nil
 }
+
+func (s *EndpointService) Save(tx *gorm.DB, action string, data json.RawMessage) error {
+	var err error
+
+	switch action {
+	case "new", "edit":
+		var endpoint model.Endpoint
+		err = endpoint.UnmarshalJSON(data)
+		if err != nil {
+			return err
+		}
+
+		if corePtr.IsRunning() {
+			configData, err := endpoint.MarshalJSON()
+			if err != nil {
+				return err
+			}
+			if action == "edit" {
+				err = corePtr.RemoveEndpoint(endpoint.Tag)
+				if err != nil && err != os.ErrInvalid {
+					return err
+				}
+			}
+			err = corePtr.AddEndpoint(configData)
+			if err != nil {
+				return err
+			}
+		}
+
+		err = tx.Save(&endpoint).Error
+		if err != nil {
+			return err
+		}
+	case "del":
+		var tag string
+		err = json.Unmarshal(data, &tag)
+		if err != nil {
+			return err
+		}
+		if corePtr.IsRunning() {
+			err = corePtr.RemoveEndpoint(tag)
+			if err != nil && err != os.ErrInvalid {
+				return err
+			}
+		}
+		err = tx.Where("tag = ?", tag).Delete(model.Endpoint{}).Error
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}