DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

upd(crm): test friendly refactoring, gofmt

Browse Source
This commit is contained in:
Tit Petric 2018-08-15 20:31:38 +02:00
parent e7d28b005b
commit 4a40060fbe
4 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crm/repository/content.go
View File

@ -36,41 +36,29 @@ func (r *content) With(ctx context.Context) Content {
}
}
// @todo: update to accepted DeletedAt column semantics from SAM
func (r *content) FindByID(id uint64) (*types.Content, error) {
mod := &types.Content{}
if err := r.db().Get(mod, "SELECT * FROM crm_content WHERE id = ?", id); err != nil {
println(err.Error())
return nil, ErrDatabaseError
} else {
return mod, nil
}
return mod, r.db().Get(mod, "SELECT * FROM crm_module_content WHERE id=?", id)
}
func (r *content) Find() ([]*types.Content, error) {
mod := make([]*types.Content, 0)
if err := r.db().Select(&mod, "SELECT * FROM crm_content ORDER BY name ASC"); err != nil {
println(err.Error())
return nil, ErrDatabaseError
} else {
return mod, nil
}
return mod, r.db().Select(&mod, "SELECT * FROM crm_module_content ORDER BY id DESC")
}
func (r *content) Create(mod *types.Content) (*types.Content, error) {
mod.ID = factory.Sonyflake.NextID()
return mod, r.db().Insert("crm_content", mod)
return mod, r.db().Insert("crm_module_content", mod)
}
func (r *content) Update(mod *types.Content) (*types.Content, error) {
return mod, r.db().Replace("crm_content", mod)
return mod, r.db().Replace("crm_module_content", mod)
}
func (r *content) DeleteByID(id uint64) error {
if _, err := r.db().Exec("DELETE FROM crm_content WHERE ID = ?", id); err != nil {
return ErrDatabaseError
} else {
return nil
}
_, err := r.db().Exec("DELETE FROM crm_module_content WHERE id=?", id)
return err
}

23
crm/repository/module.go
View File

@ -36,25 +36,16 @@ func (r *module) With(ctx context.Context) Module {
}
}
// @todo: update to accepted DeletedAt column semantics from SAM
func (r *module) FindByID(id uint64) (*types.Module, error) {
mod := &types.Module{}
if err := r.db().Get(mod, "SELECT * FROM crm_module WHERE id = ?", id); err != nil {
println(err.Error())
return nil, ErrDatabaseError
} else {
return mod, nil
}
return mod, r.db().Get(mod, "SELECT * FROM crm_module WHERE id=?", id)
}
func (r *module) Find() ([]*types.Module, error) {
mod := make([]*types.Module, 0)
if err := r.db().Select(&mod, "SELECT * FROM crm_module ORDER BY name ASC"); err != nil {
println(err.Error())
return nil, ErrDatabaseError
} else {
return mod, nil
}
return mod, r.db().Select(&mod, "SELECT * FROM crm_module ORDER BY name ASC")
}
func (r *module) Create(mod *types.Module) (*types.Module, error) {
@ -64,13 +55,9 @@ func (r *module) Create(mod *types.Module) (*types.Module, error) {
func (r *module) Update(mod *types.Module) (*types.Module, error) {
return mod, r.db().Replace("crm_module", mod)
}
func (r *module) DeleteByID(id uint64) error {
if _, err := r.db().Exec("DELETE FROM crm_module WHERE ID = ?", id); err != nil {
return ErrDatabaseError
} else {
return nil
}
_, err := r.db().Exec("DELETE FROM crm_module WHERE id=?", id)
return err
}

2
crm/repository/repository.go
View File

@ -19,7 +19,7 @@ type (
func (r *repository) With(ctx context.Context) *repository {
return &repository{
ctx: ctx,
tx: r.db().With(r.ctx),
tx: r.db().With(r.ctx),
}
}

5
crm/types/module.go
View File

@ -9,8 +9,9 @@ import (
type (
// Modules - CRM module definitions
Module struct {
ID uint64 `db:"id"`
Name string `db:"name"`
ID uint64 `db:"id"`
Name string `db:"name"`
Fields types.JSONText `db:"json"`
}
// Modules - CRM module definitions