feat: 实现门店套餐分配功能并统一测试基础设施
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 5m30s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 5m30s
新增功能: - 门店套餐分配管理(shop_package_allocation):支持门店套餐库存管理 - 门店套餐系列分配管理(shop_series_allocation):支持套餐系列分配和佣金层级设置 - 我的套餐查询(my_package):支持门店查询自己的套餐分配情况 测试改进: - 统一集成测试基础设施,新增 testutils.NewIntegrationTestEnv - 重构所有集成测试使用新的测试环境设置 - 移除旧的测试辅助函数和冗余测试文件 - 新增 test_helpers_test.go 统一任务测试辅助 技术细节: - 新增数据库迁移 000025_create_shop_allocation_tables - 新增 3 个 Handler、Service、Store 和对应的单元测试 - 更新 OpenAPI 文档和文档生成器 - 测试覆盖率:Service 层 > 90% Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,138 +1,25 @@
|
||||
package integration
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/bootstrap"
|
||||
internalMiddleware "github.com/break/junhong_cmp_fiber/internal/middleware"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/internal/routes"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/auth"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/config"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
pkgGorm "github.com/break/junhong_cmp_fiber/pkg/gorm"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/queue"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/response"
|
||||
"github.com/break/junhong_cmp_fiber/tests/testutil"
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"github.com/break/junhong_cmp_fiber/tests/testutils/integ"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
"go.uber.org/zap"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
type packageTestEnv struct {
|
||||
db *gorm.DB
|
||||
rdb *redis.Client
|
||||
tokenManager *auth.TokenManager
|
||||
app *fiber.App
|
||||
adminToken string
|
||||
t *testing.T
|
||||
}
|
||||
|
||||
func setupPackageTestEnv(t *testing.T) *packageTestEnv {
|
||||
t.Helper()
|
||||
|
||||
t.Setenv("JUNHONG_DATABASE_HOST", "cxd.whcxd.cn")
|
||||
t.Setenv("JUNHONG_DATABASE_PORT", "16159")
|
||||
t.Setenv("JUNHONG_DATABASE_USER", "erp_pgsql")
|
||||
t.Setenv("JUNHONG_DATABASE_PASSWORD", "erp_2025")
|
||||
t.Setenv("JUNHONG_DATABASE_DBNAME", "junhong_cmp_test")
|
||||
t.Setenv("JUNHONG_REDIS_ADDRESS", "cxd.whcxd.cn")
|
||||
t.Setenv("JUNHONG_REDIS_PORT", "16299")
|
||||
t.Setenv("JUNHONG_REDIS_PASSWORD", "cpNbWtAaqgo1YJmbMp3h")
|
||||
t.Setenv("JUNHONG_JWT_SECRET_KEY", "test_secret_key_for_integration_tests")
|
||||
|
||||
cfg, err := config.Load()
|
||||
require.NoError(t, err)
|
||||
err = config.Set(cfg)
|
||||
require.NoError(t, err)
|
||||
|
||||
zapLogger, _ := zap.NewDevelopment()
|
||||
|
||||
dsn := "host=cxd.whcxd.cn port=16159 user=erp_pgsql password=erp_2025 dbname=junhong_cmp_test sslmode=disable TimeZone=Asia/Shanghai"
|
||||
db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
|
||||
Logger: logger.Default.LogMode(logger.Silent),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
rdb := redis.NewClient(&redis.Options{
|
||||
Addr: "cxd.whcxd.cn:16299",
|
||||
Password: "cpNbWtAaqgo1YJmbMp3h",
|
||||
DB: 15,
|
||||
})
|
||||
|
||||
ctx := context.Background()
|
||||
err = rdb.Ping(ctx).Err()
|
||||
require.NoError(t, err)
|
||||
|
||||
testPrefix := fmt.Sprintf("test:%s:", t.Name())
|
||||
keys, _ := rdb.Keys(ctx, testPrefix+"*").Result()
|
||||
if len(keys) > 0 {
|
||||
rdb.Del(ctx, keys...)
|
||||
}
|
||||
|
||||
tokenManager := auth.NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour)
|
||||
superAdmin := testutil.CreateSuperAdmin(t, db)
|
||||
adminToken, _ := testutil.GenerateTestToken(t, rdb, superAdmin, "web")
|
||||
|
||||
queueClient := queue.NewClient(rdb, zapLogger)
|
||||
|
||||
deps := &bootstrap.Dependencies{
|
||||
DB: db,
|
||||
Redis: rdb,
|
||||
Logger: zapLogger,
|
||||
TokenManager: tokenManager,
|
||||
QueueClient: queueClient,
|
||||
}
|
||||
|
||||
result, err := bootstrap.Bootstrap(deps)
|
||||
require.NoError(t, err)
|
||||
|
||||
app := fiber.New(fiber.Config{
|
||||
ErrorHandler: internalMiddleware.ErrorHandler(zapLogger),
|
||||
})
|
||||
|
||||
routes.RegisterRoutes(app, result.Handlers, result.Middlewares)
|
||||
|
||||
return &packageTestEnv{
|
||||
db: db,
|
||||
rdb: rdb,
|
||||
tokenManager: tokenManager,
|
||||
app: app,
|
||||
adminToken: adminToken,
|
||||
t: t,
|
||||
}
|
||||
}
|
||||
|
||||
func (e *packageTestEnv) teardown() {
|
||||
e.db.Exec("DELETE FROM tb_package WHERE package_code LIKE 'TEST%'")
|
||||
e.db.Exec("DELETE FROM tb_package_series WHERE series_code LIKE 'TEST%'")
|
||||
|
||||
ctx := context.Background()
|
||||
testPrefix := fmt.Sprintf("test:%s:", e.t.Name())
|
||||
keys, _ := e.rdb.Keys(ctx, testPrefix+"*").Result()
|
||||
if len(keys) > 0 {
|
||||
e.rdb.Del(ctx, keys...)
|
||||
}
|
||||
|
||||
e.rdb.Close()
|
||||
}
|
||||
|
||||
// ==================== Part 1: 套餐系列 API 测试 ====================
|
||||
|
||||
func TestPackageSeriesAPI_Create(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp)
|
||||
@@ -144,11 +31,7 @@ func TestPackageSeriesAPI_Create(t *testing.T) {
|
||||
}
|
||||
jsonBody, _ := json.Marshal(body)
|
||||
|
||||
req := httptest.NewRequest("POST", "/api/admin/package-series", bytes.NewReader(jsonBody))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/package-series", jsonBody)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -169,8 +52,7 @@ func TestPackageSeriesAPI_Create(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageSeriesAPI_Get(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp)
|
||||
@@ -184,13 +66,10 @@ func TestPackageSeriesAPI_Get(t *testing.T) {
|
||||
Creator: 1,
|
||||
},
|
||||
}
|
||||
require.NoError(t, env.db.Create(series).Error)
|
||||
require.NoError(t, env.TX.Create(series).Error)
|
||||
|
||||
url := fmt.Sprintf("/api/admin/package-series/%d", series.ID)
|
||||
req := httptest.NewRequest("GET", url, nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("GET", url, nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -207,8 +86,7 @@ func TestPackageSeriesAPI_Get(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageSeriesAPI_List(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
seriesList := []*model.PackageSeries{
|
||||
@@ -226,13 +104,10 @@ func TestPackageSeriesAPI_List(t *testing.T) {
|
||||
},
|
||||
}
|
||||
for _, s := range seriesList {
|
||||
require.NoError(t, env.db.Create(s).Error)
|
||||
require.NoError(t, env.TX.Create(s).Error)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest("GET", "/api/admin/package-series?page=1&page_size=20", nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/package-series?page=1&page_size=20", nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -245,8 +120,7 @@ func TestPackageSeriesAPI_List(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageSeriesAPI_Update(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp)
|
||||
@@ -260,7 +134,7 @@ func TestPackageSeriesAPI_Update(t *testing.T) {
|
||||
Creator: 1,
|
||||
},
|
||||
}
|
||||
require.NoError(t, env.db.Create(series).Error)
|
||||
require.NoError(t, env.TX.Create(series).Error)
|
||||
|
||||
body := map[string]interface{}{
|
||||
"series_name": "更新后的系列名称",
|
||||
@@ -269,11 +143,7 @@ func TestPackageSeriesAPI_Update(t *testing.T) {
|
||||
jsonBody, _ := json.Marshal(body)
|
||||
|
||||
url := fmt.Sprintf("/api/admin/package-series/%d", series.ID)
|
||||
req := httptest.NewRequest("PUT", url, bytes.NewReader(jsonBody))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("PUT", url, jsonBody)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -290,8 +160,7 @@ func TestPackageSeriesAPI_Update(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageSeriesAPI_UpdateStatus(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp)
|
||||
@@ -304,7 +173,7 @@ func TestPackageSeriesAPI_UpdateStatus(t *testing.T) {
|
||||
Creator: 1,
|
||||
},
|
||||
}
|
||||
require.NoError(t, env.db.Create(series).Error)
|
||||
require.NoError(t, env.TX.Create(series).Error)
|
||||
|
||||
body := map[string]interface{}{
|
||||
"status": constants.StatusDisabled,
|
||||
@@ -312,11 +181,7 @@ func TestPackageSeriesAPI_UpdateStatus(t *testing.T) {
|
||||
jsonBody, _ := json.Marshal(body)
|
||||
|
||||
url := fmt.Sprintf("/api/admin/package-series/%d/status", series.ID)
|
||||
req := httptest.NewRequest("PATCH", url, bytes.NewReader(jsonBody))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("PATCH", url, jsonBody)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -328,13 +193,12 @@ func TestPackageSeriesAPI_UpdateStatus(t *testing.T) {
|
||||
assert.Equal(t, 0, result.Code)
|
||||
|
||||
var updatedSeries model.PackageSeries
|
||||
env.db.First(&updatedSeries, series.ID)
|
||||
env.RawDB().First(&updatedSeries, series.ID)
|
||||
assert.Equal(t, constants.StatusDisabled, updatedSeries.Status)
|
||||
}
|
||||
|
||||
func TestPackageSeriesAPI_Delete(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp)
|
||||
@@ -347,13 +211,10 @@ func TestPackageSeriesAPI_Delete(t *testing.T) {
|
||||
Creator: 1,
|
||||
},
|
||||
}
|
||||
require.NoError(t, env.db.Create(series).Error)
|
||||
require.NoError(t, env.TX.Create(series).Error)
|
||||
|
||||
url := fmt.Sprintf("/api/admin/package-series/%d", series.ID)
|
||||
req := httptest.NewRequest("DELETE", url, nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("DELETE", url, nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -365,15 +226,14 @@ func TestPackageSeriesAPI_Delete(t *testing.T) {
|
||||
assert.Equal(t, 0, result.Code)
|
||||
|
||||
var deletedSeries model.PackageSeries
|
||||
err = env.db.First(&deletedSeries, series.ID).Error
|
||||
err = env.RawDB().First(&deletedSeries, series.ID).Error
|
||||
assert.Error(t, err, "删除后应查不到套餐系列")
|
||||
}
|
||||
|
||||
// ==================== Part 2: 套餐 API 测试 ====================
|
||||
|
||||
func TestPackageAPI_Create(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp)
|
||||
@@ -389,11 +249,7 @@ func TestPackageAPI_Create(t *testing.T) {
|
||||
}
|
||||
jsonBody, _ := json.Marshal(body)
|
||||
|
||||
req := httptest.NewRequest("POST", "/api/admin/packages", bytes.NewReader(jsonBody))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/packages", jsonBody)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -415,8 +271,7 @@ func TestPackageAPI_Create(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageAPI_UpdateStatus_DisableForceOffShelf(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp)
|
||||
@@ -431,11 +286,7 @@ func TestPackageAPI_UpdateStatus_DisableForceOffShelf(t *testing.T) {
|
||||
}
|
||||
jsonBody, _ := json.Marshal(createBody)
|
||||
|
||||
createReq := httptest.NewRequest("POST", "/api/admin/packages", bytes.NewReader(jsonBody))
|
||||
createReq.Header.Set("Content-Type", "application/json")
|
||||
createReq.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
createResp, err := env.app.Test(createReq, -1)
|
||||
createResp, err := env.AsSuperAdmin().Request("POST", "/api/admin/packages", jsonBody)
|
||||
require.NoError(t, err)
|
||||
defer createResp.Body.Close()
|
||||
|
||||
@@ -453,11 +304,7 @@ func TestPackageAPI_UpdateStatus_DisableForceOffShelf(t *testing.T) {
|
||||
}
|
||||
shelfJsonBody, _ := json.Marshal(shelfBody)
|
||||
|
||||
shelfReq := httptest.NewRequest("PATCH", fmt.Sprintf("/api/admin/packages/%d/shelf", pkgID), bytes.NewReader(shelfJsonBody))
|
||||
shelfReq.Header.Set("Content-Type", "application/json")
|
||||
shelfReq.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
shelfResp, err := env.app.Test(shelfReq, -1)
|
||||
shelfResp, err := env.AsSuperAdmin().Request("PATCH", fmt.Sprintf("/api/admin/packages/%d/shelf", pkgID), shelfJsonBody)
|
||||
require.NoError(t, err)
|
||||
defer shelfResp.Body.Close()
|
||||
|
||||
@@ -467,11 +314,7 @@ func TestPackageAPI_UpdateStatus_DisableForceOffShelf(t *testing.T) {
|
||||
}
|
||||
disableJsonBody, _ := json.Marshal(disableBody)
|
||||
|
||||
disableReq := httptest.NewRequest("PATCH", fmt.Sprintf("/api/admin/packages/%d/status", pkgID), bytes.NewReader(disableJsonBody))
|
||||
disableReq.Header.Set("Content-Type", "application/json")
|
||||
disableReq.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
disableResp, err := env.app.Test(disableReq, -1)
|
||||
disableResp, err := env.AsSuperAdmin().Request("PATCH", fmt.Sprintf("/api/admin/packages/%d/status", pkgID), disableJsonBody)
|
||||
require.NoError(t, err)
|
||||
defer disableResp.Body.Close()
|
||||
|
||||
@@ -485,7 +328,7 @@ func TestPackageAPI_UpdateStatus_DisableForceOffShelf(t *testing.T) {
|
||||
// 验证禁用后自动下架
|
||||
var updatedPkg model.Package
|
||||
ctx := pkgGorm.SkipDataPermission(context.Background())
|
||||
require.NoError(t, env.db.WithContext(ctx).First(&updatedPkg, pkgID).Error)
|
||||
require.NoError(t, env.RawDB().WithContext(ctx).First(&updatedPkg, pkgID).Error)
|
||||
assert.Equal(t, constants.StatusDisabled, updatedPkg.Status, "套餐应该被禁用")
|
||||
assert.Equal(t, 2, updatedPkg.ShelfStatus, "禁用时应该强制下架")
|
||||
|
||||
@@ -493,8 +336,7 @@ func TestPackageAPI_UpdateStatus_DisableForceOffShelf(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageAPI_UpdateShelfStatus_DisabledCannotOnShelf(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp)
|
||||
@@ -509,11 +351,7 @@ func TestPackageAPI_UpdateShelfStatus_DisabledCannotOnShelf(t *testing.T) {
|
||||
}
|
||||
jsonBody, _ := json.Marshal(createBody)
|
||||
|
||||
createReq := httptest.NewRequest("POST", "/api/admin/packages", bytes.NewReader(jsonBody))
|
||||
createReq.Header.Set("Content-Type", "application/json")
|
||||
createReq.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
createResp, err := env.app.Test(createReq, -1)
|
||||
createResp, err := env.AsSuperAdmin().Request("POST", "/api/admin/packages", jsonBody)
|
||||
require.NoError(t, err)
|
||||
defer createResp.Body.Close()
|
||||
|
||||
@@ -531,11 +369,7 @@ func TestPackageAPI_UpdateShelfStatus_DisabledCannotOnShelf(t *testing.T) {
|
||||
}
|
||||
disableJsonBody, _ := json.Marshal(disableBody)
|
||||
|
||||
disableReq := httptest.NewRequest("PATCH", fmt.Sprintf("/api/admin/packages/%d/status", pkgID), bytes.NewReader(disableJsonBody))
|
||||
disableReq.Header.Set("Content-Type", "application/json")
|
||||
disableReq.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
disableResp, err := env.app.Test(disableReq, -1)
|
||||
disableResp, err := env.AsSuperAdmin().Request("PATCH", fmt.Sprintf("/api/admin/packages/%d/status", pkgID), disableJsonBody)
|
||||
require.NoError(t, err)
|
||||
defer disableResp.Body.Close()
|
||||
|
||||
@@ -552,11 +386,7 @@ func TestPackageAPI_UpdateShelfStatus_DisabledCannotOnShelf(t *testing.T) {
|
||||
}
|
||||
shelfJsonBody, _ := json.Marshal(shelfBody)
|
||||
|
||||
shelfReq := httptest.NewRequest("PATCH", fmt.Sprintf("/api/admin/packages/%d/shelf", pkgID), bytes.NewReader(shelfJsonBody))
|
||||
shelfReq.Header.Set("Content-Type", "application/json")
|
||||
shelfReq.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
shelfResp, err := env.app.Test(shelfReq, -1)
|
||||
shelfResp, err := env.AsSuperAdmin().Request("PATCH", fmt.Sprintf("/api/admin/packages/%d/shelf", pkgID), shelfJsonBody)
|
||||
require.NoError(t, err)
|
||||
defer shelfResp.Body.Close()
|
||||
|
||||
@@ -569,15 +399,14 @@ func TestPackageAPI_UpdateShelfStatus_DisabledCannotOnShelf(t *testing.T) {
|
||||
// 验证套餐仍然是下架状态
|
||||
var unchangedPkg model.Package
|
||||
ctx := pkgGorm.SkipDataPermission(context.Background())
|
||||
require.NoError(t, env.db.WithContext(ctx).First(&unchangedPkg, pkgID).Error)
|
||||
require.NoError(t, env.RawDB().WithContext(ctx).First(&unchangedPkg, pkgID).Error)
|
||||
assert.Equal(t, 2, unchangedPkg.ShelfStatus, "禁用的套餐应该保持下架状态")
|
||||
|
||||
t.Logf("尝试上架禁用套餐失败,错误码: %d, 消息: %s", result.Code, result.Message)
|
||||
}
|
||||
|
||||
func TestPackageAPI_Get(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp)
|
||||
@@ -594,13 +423,10 @@ func TestPackageAPI_Get(t *testing.T) {
|
||||
Creator: 1,
|
||||
},
|
||||
}
|
||||
require.NoError(t, env.db.Create(pkg).Error)
|
||||
require.NoError(t, env.TX.Create(pkg).Error)
|
||||
|
||||
url := fmt.Sprintf("/api/admin/packages/%d", pkg.ID)
|
||||
req := httptest.NewRequest("GET", url, nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("GET", url, nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -617,8 +443,7 @@ func TestPackageAPI_Get(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageAPI_List(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
pkgList := []*model.Package{
|
||||
@@ -644,13 +469,10 @@ func TestPackageAPI_List(t *testing.T) {
|
||||
},
|
||||
}
|
||||
for _, p := range pkgList {
|
||||
require.NoError(t, env.db.Create(p).Error)
|
||||
require.NoError(t, env.TX.Create(p).Error)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest("GET", "/api/admin/packages?page=1&page_size=20", nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/packages?page=1&page_size=20", nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -663,8 +485,7 @@ func TestPackageAPI_List(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageAPI_Update(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp)
|
||||
@@ -681,7 +502,7 @@ func TestPackageAPI_Update(t *testing.T) {
|
||||
Creator: 1,
|
||||
},
|
||||
}
|
||||
require.NoError(t, env.db.Create(pkg).Error)
|
||||
require.NoError(t, env.TX.Create(pkg).Error)
|
||||
|
||||
body := map[string]interface{}{
|
||||
"package_name": "更新后的套餐名称",
|
||||
@@ -690,11 +511,7 @@ func TestPackageAPI_Update(t *testing.T) {
|
||||
jsonBody, _ := json.Marshal(body)
|
||||
|
||||
url := fmt.Sprintf("/api/admin/packages/%d", pkg.ID)
|
||||
req := httptest.NewRequest("PUT", url, bytes.NewReader(jsonBody))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("PUT", url, jsonBody)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -711,8 +528,7 @@ func TestPackageAPI_Update(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestPackageAPI_Delete(t *testing.T) {
|
||||
env := setupPackageTestEnv(t)
|
||||
defer env.teardown()
|
||||
env := integ.NewIntegrationTestEnv(t)
|
||||
|
||||
timestamp := time.Now().Unix()
|
||||
packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp)
|
||||
@@ -729,13 +545,10 @@ func TestPackageAPI_Delete(t *testing.T) {
|
||||
Creator: 1,
|
||||
},
|
||||
}
|
||||
require.NoError(t, env.db.Create(pkg).Error)
|
||||
require.NoError(t, env.TX.Create(pkg).Error)
|
||||
|
||||
url := fmt.Sprintf("/api/admin/packages/%d", pkg.ID)
|
||||
req := httptest.NewRequest("DELETE", url, nil)
|
||||
req.Header.Set("Authorization", "Bearer "+env.adminToken)
|
||||
|
||||
resp, err := env.app.Test(req, -1)
|
||||
resp, err := env.AsSuperAdmin().Request("DELETE", url, nil)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
@@ -747,6 +560,6 @@ func TestPackageAPI_Delete(t *testing.T) {
|
||||
assert.Equal(t, 0, result.Code)
|
||||
|
||||
var deletedPkg model.Package
|
||||
err = env.db.First(&deletedPkg, pkg.ID).Error
|
||||
err = env.RawDB().First(&deletedPkg, pkg.ID).Error
|
||||
assert.Error(t, err, "删除后应查不到套餐")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user