DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

upd(crm): fix tests, fix issue in sql limit

Browse Source
This commit is contained in:
Tit Petric 2018-11-09 17:56:55 +01:00
parent a39d2866ed
commit 5f9136bd67
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crm/repository/content.go
View File

@ -96,7 +96,7 @@ func (r *content) Find(moduleID uint64, query string, page int, perPage int) (*F
sqlWhere := "WHERE module_id=? and deleted_at IS NULL"
sqlOrder := "ORDER BY id DESC"
sqlLimit := fmt.Sprintf("DESC LIMIT %d, %d", page, perPage)
sqlLimit := fmt.Sprintf("LIMIT %d, %d", page, perPage)
switch true {
case query != "":

29
crm/repository/content_test.go
View File

@ -114,10 +114,29 @@ func TestContent(t *testing.T) {
// fetch all contents
{
ms, err := repository.Find(module.ID, 0, 20)
mr, err := repository.Find(module.ID, "", 0, 20)
assert(t, err == nil, "Error when retrieving contents: %+v", err)
assert(t, len(ms) == 1, "Expected one content, got %d", len(ms))
assert(t, ms[0].ModuleID == m.ModuleID, "Expected content module to match, %s != %s", m.ModuleID, ms[0].ModuleID)
assert(t, len(mr.Contents) == 1, "Expected one content, got %d", len(mr.Contents))
assert(t, mr.Meta.Count == 1, "Expected Meta.Count == 1, got %d", mr.Meta.Count)
assert(t, mr.Contents[0].ModuleID == m.ModuleID, "Expected content module to match, %s != %s", m.ModuleID, mr.Contents[0].ModuleID)
}
// fetch all contents by query
{
mr, err := repository.Find(module.ID, "petric", 0, 20)
assert(t, err == nil, "Error when retrieving contents: %+v", err)
assert(t, len(mr.Contents) == 1, "Expected one content, got %d", len(mr.Contents))
assert(t, mr.Meta.Count == 1, "Expected Meta.Count == 1, got %d", mr.Meta.Count)
assert(t, mr.Meta.Page == 0, "Expected Meta.Page == 0, got %d", mr.Meta.Page)
assert(t, mr.Meta.PerPage == 20, "Expected Meta.PerPage == 20, got %d", mr.Meta.PerPage)
assert(t, mr.Meta.Query == "petric", "Expected Meta.Query == petric, got '%s'", mr.Meta.Query)
}
// fetch all contents by query
{
mr, err := repository.Find(module.ID, "niall", 0, 20)
assert(t, err == nil, "Error when retrieving contents: %+v", err)
assert(t, len(mr.Contents) == 0, "Expected no contents, got %d", len(mr.Contents))
}
// re-fetch content
@ -128,9 +147,9 @@ func TestContent(t *testing.T) {
// fetch all contents
{
ms, err := repository.Find(module.ID, 0, 20)
mr, err := repository.Find(module.ID, "", 0, 20)
assert(t, err == nil, "Error when retrieving contents: %+v", err)
assert(t, len(ms) == 0, "Expected no content, got %d", len(ms))
assert(t, len(mr.Contents) == 0, "Expected no content, got %d", len(mr.Contents))
}
}