ruochen/ez-api
1
0
Fork 0
mirror of https://github.com/EZ-Api/ez-api.git synced 2026-01-13 17:47:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(api): add model delete, pagination, and cors config

Browse Source
This commit is contained in:
zenfun
2025-12-21 23:03:12 +08:00
parent 816ea93339
commit 73147fc55a
12 changed files with 304 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/api/admin_handler.go
View File

@@ -129,12 +129,19 @@ func toMasterView(m model.Master) MasterView {
// @Tags admin
// @Produce json
// @Security AdminAuth
// @Param page query int false "page (1-based)"
// @Param limit query int false "limit (default 50, max 200)"
// @Param search query string false "search by name/group"
// @Success 200 {array} MasterView
// @Failure 500 {object} gin.H
// @Router /admin/masters [get]
func (h *AdminHandler) ListMasters(c *gin.Context) {
var masters []model.Master
if err := h.db.Order("id desc").Find(&masters).Error; err != nil {
q := h.db.Model(&model.Master{}).Order("id desc")
query := parseListQuery(c)
q = applyListSearch(q, query.Search, "name", `"group"`)
q = applyListPagination(q, query)
if err := q.Find(&masters).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to list masters", "details": err.Error()})
return
}

9
internal/api/binding_handler.go
View File

@@ -80,12 +80,19 @@ func (h *Handler) CreateBinding(c *gin.Context) {
// @Tags admin
// @Produce json
// @Security AdminAuth
// @Param page query int false "page (1-based)"
// @Param limit query int false "limit (default 50, max 200)"
// @Param search query string false "search by namespace/public_model/route_group"
// @Success 200 {array} model.Binding
// @Failure 500 {object} gin.H
// @Router /admin/bindings [get]
func (h *Handler) ListBindings(c *gin.Context) {
var out []model.Binding
if err := h.db.Find(&out).Error; err != nil {
q := h.db.Model(&model.Binding{}).Order("id desc")
query := parseListQuery(c)
q = applyListSearch(q, query.Search, "namespace", "public_model", "route_group")
q = applyListPagination(q, query)
if err := q.Find(&out).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to list bindings", "details": err.Error()})
return
}

48
internal/api/handler.go
View File

@@ -369,12 +369,19 @@ func (h *Handler) CreateModel(c *gin.Context) {
// @Tags admin
// @Produce json
// @Security AdminAuth
// @Param page query int false "page (1-based)"
// @Param limit query int false "limit (default 50, max 200)"
// @Param search query string false "search by name/kind"
// @Success 200 {array} model.Model
// @Failure 500 {object} gin.H
// @Router /admin/models [get]
func (h *Handler) ListModels(c *gin.Context) {
var models []model.Model
if err := h.db.Find(&models).Error; err != nil {
q := h.db.Model(&model.Model{}).Order("id desc")
query := parseListQuery(c)
q = applyListSearch(q, query.Search, "name", "kind")
q = applyListPagination(q, query)
if err := q.Find(&models).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to list models", "details": err.Error()})
return
}
@@ -457,6 +464,45 @@ func (h *Handler) UpdateModel(c *gin.Context) {
c.JSON(http.StatusOK, existing)
}
// DeleteModel godoc
// @Summary Delete a model
// @Description Delete a model by id
// @Tags admin
// @Produce json
// @Security AdminAuth
// @Param id path int true "Model ID"
// @Success 200 {object} gin.H
// @Failure 400 {object} gin.H
// @Failure 404 {object} gin.H
// @Failure 500 {object} gin.H
// @Router /admin/models/{id} [delete]
func (h *Handler) DeleteModel(c *gin.Context) {
idParam := c.Param("id")
id, err := strconv.Atoi(idParam)
if err != nil || id <= 0 {
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid id"})
return
}
var existing model.Model
if err := h.db.First(&existing, id).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "model not found"})
return
}
if err := h.db.Delete(&existing).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete model", "details": err.Error()})
return
}
if err := h.sync.SyncModelDelete(&existing); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to sync model delete", "details": err.Error()})
return
}
c.JSON(http.StatusOK, gin.H{"status": "deleted"})
}
// SyncSnapshot godoc
// @Summary Force sync snapshot
// @Description Force full synchronization of DB state to Redis

88
internal/api/list_query.go Normal file
View File

@@ -0,0 +1,88 @@
package api
import (
"strconv"
"strings"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
)
type listQuery struct {
Page int
Limit int
Offset int
Search string
Enabled bool
}
func parseListQuery(c *gin.Context) listQuery {
var q listQuery
if c == nil {
return q
}
if raw := strings.TrimSpace(c.Query("search")); raw != "" {
q.Search = raw
q.Enabled = true
}
if raw := strings.TrimSpace(c.Query("page")); raw != "" {
if v, err := strconv.Atoi(raw); err == nil && v > 0 {
q.Page = v
}
q.Enabled = true
}
if raw := strings.TrimSpace(c.Query("limit")); raw != "" {
if v, err := strconv.Atoi(raw); err == nil && v > 0 {
q.Limit = v
}
q.Enabled = true
}
if q.Enabled {
if q.Limit <= 0 {
q.Limit = 50
}
if q.Limit > 200 {
q.Limit = 200
}
if q.Page <= 0 {
q.Page = 1
}
q.Offset = (q.Page - 1) * q.Limit
}
return q
}
func applyListSearch(q *gorm.DB, search string, fields ...string) *gorm.DB {
if q == nil {
return q
}
search = strings.TrimSpace(search)
if search == "" || len(fields) == 0 {
return q
}
pattern := "%" + strings.ToLower(search) + "%"
clauses := make([]string, 0, len(fields))
args := make([]any, 0, len(fields))
for _, field := range fields {
field = strings.TrimSpace(field)
if field == "" {
continue
}
clauses = append(clauses, "LOWER("+field+") LIKE ?")
args = append(args, pattern)
}
if len(clauses) == 0 {
return q
}
return q.Where(strings.Join(clauses, " OR "), args...)
}
func applyListPagination(q *gorm.DB, query listQuery) *gorm.DB {
if q == nil {
return q
}
if !query.Enabled {
return q
}
return q.Limit(query.Limit).Offset(query.Offset)
}

9
internal/api/master_handler.go
View File

@@ -215,6 +215,9 @@ func toTokenView(k model.Key) TokenView {
// @Tags master
// @Produce json
// @Security MasterAuth
// @Param page query int false "page (1-based)"
// @Param limit query int false "limit (default 50, max 200)"
// @Param search query string false "search by group/scopes/namespaces/status"
// @Success 200 {array} TokenView
// @Failure 401 {object} gin.H
// @Failure 500 {object} gin.H
@@ -228,7 +231,11 @@ func (h *MasterHandler) ListTokens(c *gin.Context) {
m := master.(*model.Master)
var keys []model.Key
if err := h.db.Where("master_id = ?", m.ID).Order("id desc").Find(&keys).Error; err != nil {
q := h.db.Model(&model.Key{}).Where("master_id = ?", m.ID).Order("id desc")
query := parseListQuery(c)
q = applyListSearch(q, query.Search, `"group"`, "scopes", "default_namespace", "namespaces", "status")
q = applyListPagination(q, query)
if err := q.Find(&keys).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to list tokens", "details": err.Error()})
return
}

44
internal/api/model_handler_test.go
View File

@@ -103,3 +103,47 @@ func TestCreateModel_InvalidKind_Returns400(t *testing.T) {
t.Fatalf("expected 400, got %d body=%s", rr.Code, rr.Body.String())
}
}
func TestDeleteModel_RemovesMeta(t *testing.T) {
h, db, mr := newTestHandlerWithRedis(t)
r := gin.New()
r.POST("/admin/models", h.CreateModel)
r.DELETE("/admin/models/:id", h.DeleteModel)
reqBody := map[string]any{
"name": "ns.del",
}
b, _ := json.Marshal(reqBody)
req := httptest.NewRequest(http.MethodPost, "/admin/models", bytes.NewReader(b))
req.Header.Set("Content-Type", "application/json")
rr := httptest.NewRecorder()
r.ServeHTTP(rr, req)
if rr.Code != http.StatusCreated {
t.Fatalf("expected 201, got %d body=%s", rr.Code, rr.Body.String())
}
var created model.Model
if err := json.Unmarshal(rr.Body.Bytes(), &created); err != nil {
t.Fatalf("unmarshal: %v", err)
}
delReq := httptest.NewRequest(http.MethodDelete, fmt.Sprintf("/admin/models/%d", created.ID), nil)
delRec := httptest.NewRecorder()
r.ServeHTTP(delRec, delReq)
if delRec.Code != http.StatusOK {
t.Fatalf("expected 200, got %d body=%s", delRec.Code, delRec.Body.String())
}
if raw := mr.HGet("meta:models", "ns.del"); raw != "" {
t.Fatalf("expected meta:models[ns.del] removed, got %q", raw)
}
var remaining int64
if err := db.Model(&model.Model{}).Where("name = ?", "ns.del").Count(&remaining).Error; err != nil {
t.Fatalf("count: %v", err)
}
if remaining != 0 {
t.Fatalf("expected model deleted, got count=%d", remaining)
}
}

9
internal/api/provider_admin_handler.go
View File

@@ -20,12 +20,19 @@ import (
// @Tags admin
// @Produce json
// @Security AdminAuth
// @Param page query int false "page (1-based)"
// @Param limit query int false "limit (default 50, max 200)"
// @Param search query string false "search by name/type/base_url/group"
// @Success 200 {array} model.Provider
// @Failure 500 {object} gin.H
// @Router /admin/providers [get]
func (h *Handler) ListProviders(c *gin.Context) {
var providers []model.Provider
if err := h.db.Order("id desc").Find(&providers).Error; err != nil {
q := h.db.Model(&model.Provider{}).Order("id desc")
query := parseListQuery(c)
q = applyListSearch(q, query.Search, "name", `"type"`, "base_url", `"group"`)
q = applyListPagination(q, query)
if err := q.Find(&providers).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to list providers", "details": err.Error()})
return
}

23
internal/config/config.go
View File

@@ -11,6 +11,7 @@ import (
type Config struct {
Server ServerConfig
CORS CORSConfig
Postgres PostgresConfig
Redis RedisConfig
Log LogConfig
@@ -24,6 +25,10 @@ type ServerConfig struct {
Port string
}
type CORSConfig struct {
AllowOrigins []string
}
type AuthConfig struct {
JWTSecret string
}
@@ -70,6 +75,7 @@ func Load() (*Config, error) {
v := viper.New()
v.SetDefault("server.port", "8080")
v.SetDefault("cors.allow_origins", "*")
v.SetDefault("postgres.dsn", "host=localhost user=postgres password=postgres dbname=ezapi port=5432 sslmode=disable")
v.SetDefault("redis.addr", "localhost:6379")
v.SetDefault("redis.password", "")
@@ -96,6 +102,7 @@ func Load() (*Config, error) {
v.AutomaticEnv()
_ = v.BindEnv("server.port", "EZ_API_PORT")
_ = v.BindEnv("cors.allow_origins", "EZ_CORS_ALLOW_ORIGINS")
_ = v.BindEnv("postgres.dsn", "EZ_PG_DSN")
_ = v.BindEnv("redis.addr", "EZ_REDIS_ADDR")
_ = v.BindEnv("redis.password", "EZ_REDIS_PASSWORD")
@@ -137,6 +144,9 @@ func Load() (*Config, error) {
Server: ServerConfig{
Port: v.GetString("server.port"),
},
CORS: CORSConfig{
AllowOrigins: splitCommaList(v.GetString("cors.allow_origins")),
},
Postgres: PostgresConfig{
DSN: v.GetString("postgres.dsn"),
},
@@ -176,3 +186,16 @@ func Load() (*Config, error) {
return cfg, nil
}
func splitCommaList(raw string) []string {
parts := strings.Split(raw, ",")
out := make([]string, 0, len(parts))
for _, part := range parts {
part = strings.TrimSpace(part)
if part == "" {
continue
}
out = append(out, part)
}
return out
}

4
internal/config/config_test.go
View File

@@ -5,6 +5,7 @@ import "testing"
func TestLoad_LogDSNOverride(t *testing.T) {
t.Setenv("EZ_LOG_PG_DSN", "host=log-db user=postgres dbname=logs")
t.Setenv("EZ_LOG_PARTITIONING", "monthly")
t.Setenv("EZ_CORS_ALLOW_ORIGINS", "https://a.example.com,https://b.example.com")
cfg, err := Load()
if err != nil {
t.Fatalf("load config: %v", err)
@@ -15,4 +16,7 @@ func TestLoad_LogDSNOverride(t *testing.T) {
if cfg.Log.Partitioning != "monthly" {
t.Fatalf("expected log partitioning to be set, got %q", cfg.Log.Partitioning)
}
if len(cfg.CORS.AllowOrigins) != 2 {
t.Fatalf("expected cors allow origins, got %v", cfg.CORS.AllowOrigins)
}
}

19
internal/service/sync.go
View File

@@ -176,6 +176,25 @@ func (s *SyncService) SyncModel(m *model.Model) error {
return nil
}
// SyncModelDelete removes model metadata from Redis and refreshes meta:models_meta.
func (s *SyncService) SyncModelDelete(m *model.Model) error {
if m == nil {
return fmt.Errorf("model required")
}
name := strings.TrimSpace(m.Name)
if name == "" {
return fmt.Errorf("model name required")
}
ctx := context.Background()
if err := s.rdb.HDel(ctx, "meta:models", name).Err(); err != nil {
return fmt.Errorf("delete meta:models: %w", err)
}
if err := s.refreshModelsMetaFromRedis(ctx, "db"); err != nil {
return err
}
return nil
}
type providerSnapshot struct {
ID uint `json:"id"`
Name string `json:"name"`

20
internal/service/sync_test.go
View File

@@ -93,6 +93,26 @@ func TestSyncKey_WritesTokenID(t *testing.T) {
}
}
func TestSyncModelDelete_RemovesMeta(t *testing.T) {
mr := miniredis.RunT(t)
rdb := redis.NewClient(&redis.Options{Addr: mr.Addr()})
svc := NewSyncService(rdb)
mr.HSet("meta:models", "ns.m", `{"name":"ns.m"}`)
m := &model.Model{Name: "ns.m"}
if err := svc.SyncModelDelete(m); err != nil {
t.Fatalf("SyncModelDelete: %v", err)
}
if got := mr.HGet("meta:models", "ns.m"); got != "" {
t.Fatalf("expected meta:models entry removed, got %q", got)
}
if v := mr.HGet("meta:models_meta", "version"); v == "" {
t.Fatalf("expected meta:models_meta.version to be set")
}
}
func TestSyncProviderDelete_RemovesSnapshotAndRouting(t *testing.T) {
mr := miniredis.RunT(t)
rdb := redis.NewClient(&redis.Options{Addr: mr.Addr()})