DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Make repository code consistant (use r.db())

Browse Source
This commit is contained in:
Denis Arh
2018-08-03 16:48:26 +02:00
parent 8abe6b227f
commit 01d8ba54a4
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sam/repository/message.go
View File

@@ -71,13 +71,13 @@ func (r *repository) CreateMessage(mod *types.Message) (*types.Message, error) {
mod.ID = factory.Sonyflake.NextID()
mod.CreatedAt = time.Now()
return mod, r.db().With(r.ctx).Insert("messages", mod)
return mod, r.db().Insert("messages", mod)
}
func (r *repository) UpdateMessage(mod *types.Message) (*types.Message, error) {
mod.UpdatedAt = timeNowPtr()
return mod, r.db().With(r.ctx).Replace("messages", mod)
return mod, r.db().Replace("messages", mod)
}
func (r *repository) DeleteMessageByID(id uint64) error {

10
sam/repository/organisation.go
View File

@@ -25,15 +25,13 @@ const (
)
func (r *repository) FindOrganisationByID(id uint64) (*types.Organisation, error) {
db := factory.Database.MustGet()
sql := "SELECT * FROM organisations WHERE id = ? AND " + sqlOrganisationScope
mod := &types.Organisation{}
return mod, isFound(db.Get(mod, sql, id), mod.ID > 0, ErrOrganisationNotFound)
return mod, isFound(r.db().Get(mod, sql, id), mod.ID > 0, ErrOrganisationNotFound)
}
func (r *repository) FindOrganisations(filter *types.OrganisationFilter) ([]*types.Organisation, error) {
db := factory.Database.MustGet()
rval := make([]*types.Organisation, 0)
params := make([]interface{}, 0)
sql := "SELECT * FROM organisations WHERE " + sqlOrganisationScope
@@ -47,20 +45,20 @@ func (r *repository) FindOrganisations(filter *types.OrganisationFilter) ([]*typ
sql += " ORDER BY name ASC"
return rval, db.With(r.ctx).Select(&rval, sql, params...)
return rval, r.db().Select(&rval, sql, params...)
}
func (r *repository) CreateOrganisation(mod *types.Organisation) (*types.Organisation, error) {
mod.ID = factory.Sonyflake.NextID()
mod.CreatedAt = time.Now()
return mod, factory.Database.MustGet().With(r.ctx).Insert("organisations", mod)
return mod, r.db().Insert("organisations", mod)
}
func (r *repository) UpdateOrganisation(mod *types.Organisation) (*types.Organisation, error) {
mod.UpdatedAt = timeNowPtr()
return mod, factory.Database.MustGet().With(r.ctx).Replace("organisations", mod)
return mod, r.db().Replace("organisations", mod)
}
func (r *repository) ArchiveOrganisationByID(id uint64) error {