切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
陈志颖
4 years ago
提交
cb76b7cd326e8b77536fd90ad9ddeaf26fdfe2c5
1 个父辈
918abdb5
feat:修改路由
隐藏空白字符变更
内嵌
并排对比
正在显示
10 个修改的文件
包含
415 行增加
和
2 行删除
pkg/port/beego/controllers/column_setting_controller.go
pkg/port/beego/routers/column_setting_router.go
pkg/port/beego/routers/router.go
test/integration/beego/column_setting/column_setting_suite_test.go
test/integration/beego/column_setting/create_column_setting_test.go
test/integration/beego/column_setting/get_column_setting_test.go
test/integration/beego/column_setting/list_column_setting_test.go
test/integration/beego/column_setting/remove_column_setting_test.go
test/integration/beego/column_setting/reset_column_test.go
test/integration/beego/column_setting/update_column_setting_test.go
pkg/port/beego/controllers/column_setting_controller.go
0 → 100644
查看文件 @
cb76b7c
package
controllers
import
(
"encoding/json"
"github.com/astaxie/beego"
"github.com/linmadan/egglib-go/web/beego/utils"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/columnSetting/command"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/columnSetting/query"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/columnSetting/service"
)
type
ColumnSettingController
struct
{
beego
.
Controller
}
func
(
controller
*
ColumnSettingController
)
CreateColumnSetting
()
{
columnSettingService
:=
service
.
NewColumnSettingService
(
nil
)
createColumnSettingCommand
:=
&
command
.
CreateColumnSettingCommand
{}
json
.
Unmarshal
(
controller
.
Ctx
.
Input
.
GetData
(
"requestBody"
)
.
([]
byte
),
createColumnSettingCommand
)
data
,
err
:=
columnSettingService
.
CreateColumnSetting
(
createColumnSettingCommand
)
var
response
utils
.
JsonResponse
if
err
!=
nil
{
response
=
utils
.
ResponseError
(
controller
.
Ctx
,
err
)
}
else
{
response
=
utils
.
ResponseData
(
controller
.
Ctx
,
data
)
}
controller
.
Data
[
"json"
]
=
response
controller
.
ServeJSON
()
}
func
(
controller
*
ColumnSettingController
)
UpdateColumnSetting
()
{
columnSettingService
:=
service
.
NewColumnSettingService
(
nil
)
updateColumnSettingCommand
:=
&
command
.
UpdateColumnSettingCommand
{}
json
.
Unmarshal
(
controller
.
Ctx
.
Input
.
GetData
(
"requestBody"
)
.
([]
byte
),
updateColumnSettingCommand
)
columnSettingId
,
_
:=
controller
.
GetInt64
(
":columnSettingId"
)
updateColumnSettingCommand
.
ColumnSettingId
=
columnSettingId
data
,
err
:=
columnSettingService
.
UpdateColumnSetting
(
updateColumnSettingCommand
)
var
response
utils
.
JsonResponse
if
err
!=
nil
{
response
=
utils
.
ResponseError
(
controller
.
Ctx
,
err
)
}
else
{
response
=
utils
.
ResponseData
(
controller
.
Ctx
,
data
)
}
controller
.
Data
[
"json"
]
=
response
controller
.
ServeJSON
()
}
func
(
controller
*
ColumnSettingController
)
GetColumnSetting
()
{
columnSettingService
:=
service
.
NewColumnSettingService
(
nil
)
getColumnSettingQuery
:=
&
query
.
GetColumnSettingQuery
{}
columnSettingId
,
_
:=
controller
.
GetInt64
(
":columnSettingId"
)
getColumnSettingQuery
.
ColumnSettingId
=
columnSettingId
data
,
err
:=
columnSettingService
.
GetColumnSetting
(
getColumnSettingQuery
)
var
response
utils
.
JsonResponse
if
err
!=
nil
{
response
=
utils
.
ResponseError
(
controller
.
Ctx
,
err
)
}
else
{
response
=
utils
.
ResponseData
(
controller
.
Ctx
,
data
)
}
controller
.
Data
[
"json"
]
=
response
controller
.
ServeJSON
()
}
func
(
controller
*
ColumnSettingController
)
RemoveColumnSetting
()
{
columnSettingService
:=
service
.
NewColumnSettingService
(
nil
)
removeColumnSettingCommand
:=
&
command
.
RemoveColumnSettingCommand
{}
json
.
Unmarshal
(
controller
.
Ctx
.
Input
.
GetData
(
"requestBody"
)
.
([]
byte
),
removeColumnSettingCommand
)
columnSettingId
,
_
:=
controller
.
GetInt64
(
":columnSettingId"
)
removeColumnSettingCommand
.
ColumnSettingId
=
columnSettingId
data
,
err
:=
columnSettingService
.
RemoveColumnSetting
(
removeColumnSettingCommand
)
var
response
utils
.
JsonResponse
if
err
!=
nil
{
response
=
utils
.
ResponseError
(
controller
.
Ctx
,
err
)
}
else
{
response
=
utils
.
ResponseData
(
controller
.
Ctx
,
data
)
}
controller
.
Data
[
"json"
]
=
response
controller
.
ServeJSON
()
}
func
(
controller
*
ColumnSettingController
)
ResetColumn
()
{
columnSettingService
:=
service
.
NewColumnSettingService
(
nil
)
resetColumnCommand
:=
&
command
.
ResetColumnCommand
{}
json
.
Unmarshal
(
controller
.
Ctx
.
Input
.
GetData
(
"requestBody"
)
.
([]
byte
),
resetColumnCommand
)
data
,
err
:=
columnSettingService
.
ResetColumn
(
resetColumnCommand
)
var
response
utils
.
JsonResponse
if
err
!=
nil
{
response
=
utils
.
ResponseError
(
controller
.
Ctx
,
err
)
}
else
{
response
=
utils
.
ResponseData
(
controller
.
Ctx
,
data
)
}
controller
.
Data
[
"json"
]
=
response
controller
.
ServeJSON
()
}
func
(
controller
*
ColumnSettingController
)
ListColumnSetting
()
{
columnSettingService
:=
service
.
NewColumnSettingService
(
nil
)
listColumnSettingQuery
:=
&
query
.
ListColumnSettingQuery
{}
offset
,
_
:=
controller
.
GetInt
(
"offset"
)
listColumnSettingQuery
.
Offset
=
offset
limit
,
_
:=
controller
.
GetInt
(
"limit"
)
listColumnSettingQuery
.
Limit
=
limit
data
,
err
:=
columnSettingService
.
ListColumnSetting
(
listColumnSettingQuery
)
var
response
utils
.
JsonResponse
if
err
!=
nil
{
response
=
utils
.
ResponseError
(
controller
.
Ctx
,
err
)
}
else
{
response
=
utils
.
ResponseData
(
controller
.
Ctx
,
data
)
}
controller
.
Data
[
"json"
]
=
response
controller
.
ServeJSON
()
}
...
...
pkg/port/beego/routers/column_setting_router.go
0 → 100644
查看文件 @
cb76b7c
package
routers
import
(
"github.com/astaxie/beego"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/beego/controllers"
)
func
init
()
{
beego
.
Router
(
"/column-settings/"
,
&
controllers
.
ColumnSettingController
{},
"Post:CreateColumnSetting"
)
beego
.
Router
(
"/column-settings/:columnSettingId"
,
&
controllers
.
ColumnSettingController
{},
"Put:UpdateColumnSetting"
)
beego
.
Router
(
"/column-settings/:columnSettingId"
,
&
controllers
.
ColumnSettingController
{},
"Get:GetColumnSetting"
)
beego
.
Router
(
"/column-settings/:columnSettingId"
,
&
controllers
.
ColumnSettingController
{},
"Delete:RemoveColumnSetting"
)
beego
.
Router
(
"/column-settings/"
,
&
controllers
.
ColumnSettingController
{},
"Post:ResetColumn"
)
beego
.
Router
(
"/column-settings/"
,
&
controllers
.
ColumnSettingController
{},
"Get:ListColumnSetting"
)
}
...
...
pkg/port/beego/routers/router.go
查看文件 @
cb76b7c
...
...
@@ -41,8 +41,11 @@ func init() {
beego
.
NSRouter
(
"/actual/del"
,
&
controllers
.
OrderInfoController
{},
"POST:RemoveOrderReal"
),
// 删除实际订单
beego
.
NSRouter
(
"/actual/update"
,
&
controllers
.
OrderInfoController
{},
"POST:UpdateOrderReal"
),
// 新增实际订单
beego
.
NSRouter
(
"/actual/close"
,
&
controllers
.
OrderInfoController
{},
"POST:OrderDisable"
),
beego
.
NSRouter
(
"/fileImportTemplate"
,
&
controllers
.
OrderInfoController
{},
"POST:DownloadTemplate"
),
// 下载导入模板
beego
.
NSRouter
(
"/fileImport"
,
&
controllers
.
OrderInfoController
{},
"POST:ImportOrderFromExcel"
),
// 导入订单数据
beego
.
NSRouter
(
"/fileImportTemplate"
,
&
controllers
.
OrderInfoController
{},
"POST:DownloadTemplate"
),
// 下载导入模板
beego
.
NSRouter
(
"/fileImport"
,
&
controllers
.
OrderInfoController
{},
"POST:ImportOrderFromExcel"
),
// 导入订单数据
beego
.
NSRouter
(
"/actual/listColumn"
,
&
controllers
.
ColumnSettingController
{},
"POST:ListColumnSetting"
),
// 返回栏目设置列表
beego
.
NSRouter
(
"/actual/updateColumn"
,
&
controllers
.
ColumnSettingController
{},
"POST:UpdateColumnSetting"
),
// 更新栏目设置
beego
.
NSRouter
(
"/actual/resetColumn"
,
&
controllers
.
ColumnSettingController
{},
"Post:ResetColumn"
),
// 重置栏目设置
),
beego
.
NSNamespace
(
"/common"
,
beego
.
NSRouter
(
"/partner"
,
&
controllers
.
CommonController
{},
"POST:GetPartnerList"
),
...
...
test/integration/beego/column_setting/column_setting_suite_test.go
0 → 100644
查看文件 @
cb76b7c
package
column_setting
import
(
"net/http"
"net/http/httptest"
"testing"
"github.com/astaxie/beego"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/gomega"
_
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg"
_
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/port/beego"
)
func
TestColumnSetting
(
t
*
testing
.
T
)
{
RegisterFailHandler
(
Fail
)
RunSpecs
(
t
,
"Beego Port ColumnSetting Correlations Test Case Suite"
)
}
var
handler
http
.
Handler
var
server
*
httptest
.
Server
var
_
=
BeforeSuite
(
func
()
{
handler
=
beego
.
BeeApp
.
Handlers
server
=
httptest
.
NewServer
(
handler
)
})
var
_
=
AfterSuite
(
func
()
{
server
.
Close
()
})
...
...
test/integration/beego/column_setting/create_column_setting_test.go
0 → 100644
查看文件 @
cb76b7c
package
column_setting
import
(
"net/http"
"github.com/gavv/httpexpect"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/gomega"
pG
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg"
)
var
_
=
Describe
(
"创建栏目设置增删改查"
,
func
()
{
Describe
(
"提交数据创建栏目设置增删改查"
,
func
()
{
Context
(
"提交正确的新栏目设置数据"
,
func
()
{
It
(
"返回栏目设置数据"
,
func
()
{
httpExpect
:=
httpexpect
.
New
(
GinkgoT
(),
server
.
URL
)
body
:=
map
[
string
]
interface
{}{
"description"
:
"string"
,
"userName"
:
"string"
,
}
httpExpect
.
POST
(
"/column-settings/"
)
.
WithJSON
(
body
)
.
Expect
()
.
Status
(
http
.
StatusOK
)
.
JSON
()
.
Object
()
.
ContainsKey
(
"code"
)
.
ValueEqual
(
"code"
,
0
)
.
ContainsKey
(
"msg"
)
.
ValueEqual
(
"msg"
,
"ok"
)
.
ContainsKey
(
"data"
)
.
Value
(
"data"
)
.
Object
()
.
ContainsKey
(
"id"
)
.
ValueNotEqual
(
"id"
,
BeZero
())
})
})
})
AfterEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
Exec
(
"DELETE FROM column_settings WHERE true"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
})
...
...
test/integration/beego/column_setting/get_column_setting_test.go
0 → 100644
查看文件 @
cb76b7c
package
column_setting
import
(
"net/http"
"github.com/gavv/httpexpect"
"github.com/go-pg/pg"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/gomega"
pG
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg"
)
var
_
=
Describe
(
"返回栏目设置增删改查"
,
func
()
{
var
column_settingId
int64
BeforeEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
QueryOne
(
pg
.
Scan
(
&
column_settingId
),
"INSERT INTO column_settings (column_setting_id, company_id, created_at, description, key, uid, updated_at, user_name, value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id"
,
"testColumnSettingId"
,
"testCompanyId"
,
"testCreatedAt"
,
"testDescription"
,
"testKey"
,
"testUid"
,
"testUpdatedAt"
,
"testUserName"
,
"testValue"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
Describe
(
"根据column_settingId参数返回栏目设置"
,
func
()
{
Context
(
"传入有效的column_settingId"
,
func
()
{
It
(
"返回栏目设置数据"
,
func
()
{
httpExpect
:=
httpexpect
.
New
(
GinkgoT
(),
server
.
URL
)
httpExpect
.
GET
(
"/column-settings/{columnSettingId}"
)
.
Expect
()
.
Status
(
http
.
StatusOK
)
.
JSON
()
.
Object
()
.
ContainsKey
(
"code"
)
.
ValueEqual
(
"code"
,
0
)
.
ContainsKey
(
"msg"
)
.
ValueEqual
(
"msg"
,
"ok"
)
.
ContainsKey
(
"data"
)
.
Value
(
"data"
)
.
Object
()
})
})
})
AfterEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
Exec
(
"DELETE FROM column_settings WHERE true"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
})
...
...
test/integration/beego/column_setting/list_column_setting_test.go
0 → 100644
查看文件 @
cb76b7c
package
column_setting
import
(
"net/http"
"github.com/gavv/httpexpect"
"github.com/go-pg/pg"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/gomega"
pG
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg"
)
var
_
=
Describe
(
"返回栏目设置增删改查列表"
,
func
()
{
var
column_settingId
int64
BeforeEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
QueryOne
(
pg
.
Scan
(
&
column_settingId
),
"INSERT INTO column_settings (column_setting_id, company_id, created_at, description, key, uid, updated_at, user_name, value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id"
,
"testColumnSettingId"
,
"testCompanyId"
,
"testCreatedAt"
,
"testDescription"
,
"testKey"
,
"testUid"
,
"testUpdatedAt"
,
"testUserName"
,
"testValue"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
Describe
(
"根据参数返回栏目设置列表"
,
func
()
{
Context
(
"传入有效的参数"
,
func
()
{
It
(
"返回栏目设置数据列表"
,
func
()
{
httpExpect
:=
httpexpect
.
New
(
GinkgoT
(),
server
.
URL
)
httpExpect
.
GET
(
"/column-settings/"
)
.
WithQuery
(
"offset"
,
"int"
)
.
WithQuery
(
"limit"
,
"int"
)
.
Expect
()
.
Status
(
http
.
StatusOK
)
.
JSON
()
.
Object
()
.
ContainsKey
(
"code"
)
.
ValueEqual
(
"code"
,
0
)
.
ContainsKey
(
"msg"
)
.
ValueEqual
(
"msg"
,
"ok"
)
.
ContainsKey
(
"data"
)
.
Value
(
"data"
)
.
Object
()
.
ContainsKey
(
"count"
)
.
ValueEqual
(
"count"
,
1
)
.
ContainsKey
(
"column_settings"
)
.
Value
(
"column_settings"
)
.
Array
()
})
})
})
AfterEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
Exec
(
"DELETE FROM column_settings WHERE true"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
})
...
...
test/integration/beego/column_setting/remove_column_setting_test.go
0 → 100644
查看文件 @
cb76b7c
package
column_setting
import
(
"net/http"
"github.com/gavv/httpexpect"
"github.com/go-pg/pg"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/gomega"
pG
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg"
)
var
_
=
Describe
(
"移除栏目设置增删改查"
,
func
()
{
var
column_settingId
int64
BeforeEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
QueryOne
(
pg
.
Scan
(
&
column_settingId
),
"INSERT INTO column_settings (column_setting_id, company_id, created_at, description, key, uid, updated_at, user_name, value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id"
,
"testColumnSettingId"
,
"testCompanyId"
,
"testCreatedAt"
,
"testDescription"
,
"testKey"
,
"testUid"
,
"testUpdatedAt"
,
"testUserName"
,
"testValue"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
Describe
(
"根据参数移除栏目设置增删改查"
,
func
()
{
Context
(
"传入有效的column_settingId"
,
func
()
{
It
(
"返回被移除栏目设置的数据"
,
func
()
{
httpExpect
:=
httpexpect
.
New
(
GinkgoT
(),
server
.
URL
)
httpExpect
.
DELETE
(
"/column-settings/{columnSettingId}"
)
.
Expect
()
.
Status
(
http
.
StatusOK
)
.
JSON
()
.
Object
()
.
ContainsKey
(
"code"
)
.
ValueEqual
(
"code"
,
0
)
.
ContainsKey
(
"msg"
)
.
ValueEqual
(
"msg"
,
"ok"
)
.
ContainsKey
(
"data"
)
.
Value
(
"data"
)
.
Object
()
})
})
})
AfterEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
Exec
(
"DELETE FROM column_settings WHERE true"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
})
...
...
test/integration/beego/column_setting/reset_column_test.go
0 → 100644
查看文件 @
cb76b7c
package
column_setting
import
(
"net/http"
"github.com/gavv/httpexpect"
"github.com/go-pg/pg"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/gomega"
pG
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg"
)
var
_
=
Describe
(
"重置栏目设置"
,
func
()
{
var
column_settingId
int64
BeforeEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
QueryOne
(
pg
.
Scan
(
&
column_settingId
),
"INSERT INTO column_settings (column_setting_id, company_id, created_at, description, key, uid, updated_at, user_name, value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id"
,
"testColumnSettingId"
,
"testCompanyId"
,
"testCreatedAt"
,
"testDescription"
,
"testKey"
,
"testUid"
,
"testUpdatedAt"
,
"testUserName"
,
"testValue"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
Describe
(
"重置栏目设置"
,
func
()
{
Context
(
""
,
func
()
{
It
(
""
,
func
()
{
httpExpect
:=
httpexpect
.
New
(
GinkgoT
(),
server
.
URL
)
body
:=
map
[
string
]
interface
{}{}
httpExpect
.
POST
(
"/column-settings/"
)
.
WithJSON
(
body
)
.
Expect
()
.
Status
(
http
.
StatusOK
)
.
JSON
()
.
Object
()
.
ContainsKey
(
"code"
)
.
ValueEqual
(
"code"
,
0
)
.
ContainsKey
(
"msg"
)
.
ValueEqual
(
"msg"
,
"ok"
)
.
ContainsKey
(
"data"
)
.
Value
(
"data"
)
.
Object
()
})
})
})
AfterEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
Exec
(
"DELETE FROM column_settings WHERE true"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
})
...
...
test/integration/beego/column_setting/update_column_setting_test.go
0 → 100644
查看文件 @
cb76b7c
package
column_setting
import
(
"net/http"
"github.com/gavv/httpexpect"
"github.com/go-pg/pg"
.
"github.com/onsi/ginkgo"
.
"github.com/onsi/gomega"
pG
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg"
)
var
_
=
Describe
(
"更新栏目设置增删改查"
,
func
()
{
var
column_settingId
int64
BeforeEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
QueryOne
(
pg
.
Scan
(
&
column_settingId
),
"INSERT INTO column_settings (column_setting_id, company_id, created_at, description, key, uid, updated_at, user_name, value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id"
,
"testColumnSettingId"
,
"testCompanyId"
,
"testCreatedAt"
,
"testDescription"
,
"testKey"
,
"testUid"
,
"testUpdatedAt"
,
"testUserName"
,
"testValue"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
Describe
(
"提交数据更新栏目设置增删改查"
,
func
()
{
Context
(
"提交正确的栏目设置数据"
,
func
()
{
It
(
"返回更新后的栏目设置数据"
,
func
()
{
httpExpect
:=
httpexpect
.
New
(
GinkgoT
(),
server
.
URL
)
body
:=
map
[
string
]
interface
{}{}
httpExpect
.
PUT
(
"/column-settings/{columnSettingId}"
)
.
WithJSON
(
body
)
.
Expect
()
.
Status
(
http
.
StatusOK
)
.
JSON
()
.
Object
()
.
ContainsKey
(
"code"
)
.
ValueEqual
(
"code"
,
0
)
.
ContainsKey
(
"msg"
)
.
ValueEqual
(
"msg"
,
"ok"
)
.
ContainsKey
(
"data"
)
.
Value
(
"data"
)
.
Object
()
.
ContainsKey
(
"id"
)
.
ValueEqual
(
"id"
,
column_settingId
)
})
})
})
AfterEach
(
func
()
{
_
,
err
:=
pG
.
DB
.
Exec
(
"DELETE FROM column_settings WHERE true"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
})
})
...
...
请
注册
或
登录
后发表评论