refactor: 将 DTO 文件从 internal/model 移动到 internal/model/dto 目录
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 4m22s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 4m22s
- 移动 17 个 DTO 文件到 internal/model/dto/ 目录 - 更新所有 DTO 文件的 package 声明从 model 改为 dto - 更新所有引用文件的 import 和类型引用 - Handler 层:admin 和 h5 所有处理器 - Service 层:所有业务服务 - Routes 层:所有路由定义 - Tests 层:单元测试和集成测试 - 清理未使用的 import 语句 - 验证:项目构建成功,测试编译通过,LSP 无错误
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||||
"github.com/break/junhong_cmp_fiber/internal/service/enterprise"
|
||||
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
@@ -34,7 +35,7 @@ func TestEnterpriseService_Create(t *testing.T) {
|
||||
t.Run("创建企业-含账号创建", func(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
req := &model.CreateEnterpriseReq{
|
||||
req := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "测试企业",
|
||||
EnterpriseCode: "ENT_TEST_001",
|
||||
ContactName: "测试联系人",
|
||||
@@ -55,7 +56,7 @@ func TestEnterpriseService_Create(t *testing.T) {
|
||||
t.Run("创建企业-企业编号已存在应失败", func(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
req1 := &model.CreateEnterpriseReq{
|
||||
req1 := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "企业一",
|
||||
EnterpriseCode: "ENT_DUP_001",
|
||||
ContactName: "联系人一",
|
||||
@@ -66,7 +67,7 @@ func TestEnterpriseService_Create(t *testing.T) {
|
||||
_, err := service.Create(ctx, req1)
|
||||
require.NoError(t, err)
|
||||
|
||||
req2 := &model.CreateEnterpriseReq{
|
||||
req2 := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "企业二",
|
||||
EnterpriseCode: "ENT_DUP_001",
|
||||
ContactName: "联系人二",
|
||||
@@ -81,7 +82,7 @@ func TestEnterpriseService_Create(t *testing.T) {
|
||||
t.Run("创建企业-手机号已存在应失败", func(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
req1 := &model.CreateEnterpriseReq{
|
||||
req1 := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "企业三",
|
||||
EnterpriseCode: "ENT_PHONE_001",
|
||||
ContactName: "联系人三",
|
||||
@@ -92,7 +93,7 @@ func TestEnterpriseService_Create(t *testing.T) {
|
||||
_, err := service.Create(ctx, req1)
|
||||
require.NoError(t, err)
|
||||
|
||||
req2 := &model.CreateEnterpriseReq{
|
||||
req2 := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "企业四",
|
||||
EnterpriseCode: "ENT_PHONE_002",
|
||||
ContactName: "联系人四",
|
||||
@@ -107,7 +108,7 @@ func TestEnterpriseService_Create(t *testing.T) {
|
||||
t.Run("创建企业-未授权用户应失败", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
req := &model.CreateEnterpriseReq{
|
||||
req := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "未授权企业",
|
||||
EnterpriseCode: "ENT_UNAUTH_001",
|
||||
ContactName: "联系人",
|
||||
@@ -134,7 +135,7 @@ func TestEnterpriseService_Update(t *testing.T) {
|
||||
t.Run("编辑企业", func(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
createReq := &model.CreateEnterpriseReq{
|
||||
createReq := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "待编辑企业",
|
||||
EnterpriseCode: "ENT_EDIT_001",
|
||||
ContactName: "原联系人",
|
||||
@@ -147,7 +148,7 @@ func TestEnterpriseService_Update(t *testing.T) {
|
||||
|
||||
newName := "编辑后企业"
|
||||
newContact := "新联系人"
|
||||
updateReq := &model.UpdateEnterpriseRequest{
|
||||
updateReq := &dto.UpdateEnterpriseRequest{
|
||||
EnterpriseName: &newName,
|
||||
ContactName: &newContact,
|
||||
}
|
||||
@@ -162,7 +163,7 @@ func TestEnterpriseService_Update(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
newName := "不存在企业"
|
||||
updateReq := &model.UpdateEnterpriseRequest{
|
||||
updateReq := &dto.UpdateEnterpriseRequest{
|
||||
EnterpriseName: &newName,
|
||||
}
|
||||
|
||||
@@ -184,7 +185,7 @@ func TestEnterpriseService_UpdateStatus(t *testing.T) {
|
||||
t.Run("禁用企业-账号同步禁用", func(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
createReq := &model.CreateEnterpriseReq{
|
||||
createReq := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "待禁用企业",
|
||||
EnterpriseCode: "ENT_STATUS_001",
|
||||
ContactName: "联系人",
|
||||
@@ -211,7 +212,7 @@ func TestEnterpriseService_UpdateStatus(t *testing.T) {
|
||||
t.Run("启用企业-账号同步启用", func(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
createReq := &model.CreateEnterpriseReq{
|
||||
createReq := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "待启用企业",
|
||||
EnterpriseCode: "ENT_STATUS_002",
|
||||
ContactName: "联系人",
|
||||
@@ -259,7 +260,7 @@ func TestEnterpriseService_UpdatePassword(t *testing.T) {
|
||||
t.Run("修改企业账号密码", func(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
createReq := &model.CreateEnterpriseReq{
|
||||
createReq := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "密码测试企业",
|
||||
EnterpriseCode: "ENT_PWD_001",
|
||||
ContactName: "联系人",
|
||||
@@ -301,7 +302,7 @@ func TestEnterpriseService_List(t *testing.T) {
|
||||
t.Run("查询企业列表-空结果", func(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
req := &model.EnterpriseListReq{
|
||||
req := &dto.EnterpriseListReq{
|
||||
Page: 1,
|
||||
PageSize: 20,
|
||||
}
|
||||
@@ -316,7 +317,7 @@ func TestEnterpriseService_List(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
for i := 0; i < 3; i++ {
|
||||
createReq := &model.CreateEnterpriseReq{
|
||||
createReq := &dto.CreateEnterpriseReq{
|
||||
EnterpriseName: "列表测试企业",
|
||||
EnterpriseCode: "ENT_LIST_" + string(rune('A'+i)),
|
||||
ContactName: "联系人",
|
||||
@@ -328,7 +329,7 @@ func TestEnterpriseService_List(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
req := &model.EnterpriseListReq{
|
||||
req := &dto.EnterpriseListReq{
|
||||
Page: 1,
|
||||
PageSize: 20,
|
||||
EnterpriseName: "列表测试",
|
||||
@@ -344,7 +345,7 @@ func TestEnterpriseService_List(t *testing.T) {
|
||||
ctx := createEnterpriseTestContext(1)
|
||||
|
||||
status := constants.StatusEnabled
|
||||
req := &model.EnterpriseListReq{
|
||||
req := &dto.EnterpriseListReq{
|
||||
Page: 1,
|
||||
PageSize: 20,
|
||||
Status: &status,
|
||||
|
||||
Reference in New Issue
Block a user