DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Rename content to record on database

Browse Source
This commit is contained in:
Mitja Zivkovic
2018-12-24 10:15:09 +01:00
committed by Denis Arh
parent 37eb4ceccd
commit 5584e6a2c9
7 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crm/db/mysql/statik.go
+1 -1
View File
File diff suppressed because one or more lines are too long
crm/db/schema/mysql/20181216214630.crm-content-to-record.up.sql
+9
View File
@@ -0,0 +1,9 @@
ALTER TABLE `crm_content` RENAME TO `crm_record`;
ALTER TABLE `crm_record` MODIFY COLUMN `json` json DEFAULT NULL COMMENT 'Records in JSON format.';
ALTER TABLE `crm_content_column` RENAME TO `crm_record_column`;
ALTER TABLE `crm_record_column` CHANGE COLUMN `content_id` `record_id` bigint(20);
ALTER TABLE `crm_content_links` RENAME TO `crm_record_links`;
ALTER TABLE `crm_record_links` CHANGE COLUMN `content_id` `record_id` bigint(20) unsigned;
ALTER TABLE `crm_record_links` CHANGE COLUMN `rel_content_id` `rel_record_id` bigint(20) unsigned;
crm/repository/content.go
+17 -17
View File
@@ -61,7 +61,7 @@ func (r *content) With(ctx context.Context, db *factory.DB) ContentRepository {
func (r *content) FindByID(id uint64) (*types.Content, error) {
mod := &types.Content{}
if err := r.db().Get(mod, "SELECT * FROM crm_content WHERE id=? and deleted_at IS NULL", id); err != nil {
if err := r.db().Get(mod, "SELECT * FROM crm_record WHERE id=? and deleted_at IS NULL", id); err != nil {
return nil, err
}
return mod, nil
@@ -110,8 +110,8 @@ func (r *content) Find(moduleID uint64, query string, page int, perPage int, sor
query = "%" + query + "%"
sqlSelect := "SELECT * FROM crm_content"
sqlCount := "SELECT count(*) FROM crm_content"
sqlSelect := "SELECT * FROM crm_record"
sqlCount := "SELECT count(*) FROM crm_record"
sqlWhere := "WHERE module_id=? and deleted_at IS NULL"
sqlOrder := "ORDER BY id DESC"
sqlLimit := fmt.Sprintf("LIMIT %d, %d", page*perPage, perPage)
@@ -183,20 +183,20 @@ func (r *content) Find(moduleID uint64, query string, page int, perPage int, sor
}
// One possibility to order by field value without JSON, is query written bellow with FIELD over column names and order by value:
// SELECT * FROM crm_content
// LEFT JOIN crm_content_column ON crm_content.id = crm_content_column.content_id"
// SELECT * FROM crm_record
// LEFT JOIN crm_record ON crm_record.id = crm_record_column.record_id"
// WHERE column_name in ('name', 'email')
// ORDER BY FIELD(column_name, 'email', 'name'), column_value;
// Possibility to order with JSON:
// SELECT *,
// JSON_UNQUOTE(JSON_EXTRACT(json, REPLACE(JSON_UNQUOTE(JSON_SEARCH(json, 'all', 'email')), '.name', '.value'))) as emailField
// FROM crm_content
// FROM crm_record
// ORDER by emailField asc;
switch true {
case query != "":
sqlWhere = sqlWhere + " AND id in (select distinct content_id from crm_content_column where column_value like ?)"
sqlWhere = sqlWhere + " AND id in (select distinct record_id from crm_record_column where column_value like ?)"
if err := r.db().Get(&response.Meta.Count, sqlCount+" "+sqlWhere, moduleID, query); err != nil {
return nil, err
}
@@ -225,10 +225,10 @@ func (r *content) Create(mod *types.Content) (*types.Content, error) {
return nil, errors.Wrap(err, "No content")
}
r.db().Exec("delete from crm_content_links where content_id=?", mod.ID)
r.db().Exec("delete from crm_record_links where record_id=?", mod.ID)
for _, v := range fields {
v.ContentID = mod.ID
if err := r.db().Replace("crm_content_column", v); err != nil {
if err := r.db().Replace("crm_record_column", v); err != nil {
return nil, errors.Wrap(err, "Error adding columns")
}
for _, related := range v.Related {
@@ -237,13 +237,13 @@ func (r *content) Create(mod *types.Content) (*types.Content, error) {
Name: v.Name,
RelatedContentID: related,
}
if err := r.db().Replace("crm_content_links", row); err != nil {
if err := r.db().Replace("crm_record_links", row); err != nil {
return nil, errors.Wrap(err, "Error adding column links")
}
}
}
if err := r.db().Insert("crm_content", mod); err != nil {
if err := r.db().Insert("crm_record", mod); err != nil {
return nil, err
}
return mod, nil
@@ -258,10 +258,10 @@ func (r *content) Update(mod *types.Content) (*types.Content, error) {
return nil, errors.Wrap(err, "Error when saving content, no content")
}
r.db().Exec("delete from crm_content_links where content_id=?", mod.ID)
r.db().Exec("delete from crm_record_links where record_id=?", mod.ID)
for _, v := range fields {
v.ContentID = mod.ID
if err := r.db().Replace("crm_content_column", v); err != nil {
if err := r.db().Replace("crm_record_column", v); err != nil {
return nil, errors.Wrap(err, "Error adding columns to database")
}
for _, related := range v.Related {
@@ -270,17 +270,17 @@ func (r *content) Update(mod *types.Content) (*types.Content, error) {
Name: v.Name,
RelatedContentID: related,
}
if err := r.db().Replace("crm_content_links", row); err != nil {
if err := r.db().Replace("crm_record_links", row); err != nil {
return nil, errors.Wrap(err, "Error adding column links")
}
}
}
return mod, r.db().Replace("crm_content", mod)
return mod, r.db().Replace("crm_record", mod)
}
func (r *content) DeleteByID(id uint64) error {
_, err := r.db().Exec("update crm_content set deleted_at=? where id=?", time.Now(), id)
_, err := r.db().Exec("update crm_record set deleted_at=? where id=?", time.Now(), id)
return err
}
@@ -308,5 +308,5 @@ func (r *content) Fields(content *types.Content) ([]*types.ContentColumn, error)
for _, v := range fieldNames {
args = append(args, v)
}
return result, r.db().Select(&result, "select * FROM crm_content_column where content_id=? order by "+order, args...)
return result, r.db().Select(&result, "select * FROM crm_record_column where record_id=? order by "+order, args...)
}
crm/repository/content_report_builder.go
+2 -2
View File
@@ -96,11 +96,11 @@ func (b *contentReportBuilder) Build() (sql string, args []interface{}, err erro
report := squirrel.
Select().
Column(squirrel.Alias(squirrel.Expr("COUNT(*)"), "count")).
From("crm_content").
From("crm_record").
Where("module_id = ?", b.moduleID)
if b.params == nil {
return "", nil, errors.New("Can not generate report without parameters")
return "", nil, errors.New("can not generate report without parameters")
}
for i, m := range b.params.Metrics {
crm/rest/handlers/module.go
+1 -3
View File
@@ -17,9 +17,8 @@ package handlers
import (
"context"
"net/http"
"github.com/go-chi/chi"
"net/http"
"github.com/titpetric/factory/resputil"
@@ -46,7 +45,6 @@ type Module struct {
List func(http.ResponseWriter, *http.Request)
Create func(http.ResponseWriter, *http.Request)
Read func(http.ResponseWriter, *http.Request)
Chart func(http.ResponseWriter, *http.Request)
Edit func(http.ResponseWriter, *http.Request)
Delete func(http.ResponseWriter, *http.Request)
RecordReport func(http.ResponseWriter, *http.Request)
crm/service/main_test.go
+1 -1
View File
@@ -50,7 +50,7 @@ func TestMain(m *testing.M) {
// clean up tables
{
for _, name := range []string{"crm_module", "crm_module_form", "crm_content", "crm_content_column", "crm_page", "sys_user"} {
for _, name := range []string{"crm_module", "crm_module_form", "crm_record", "crm_record_column", "crm_page", "sys_user"} {
_, err := db.Exec("truncate " + name)
if err != nil {
panic("Error when clearing " + name + ": " + err.Error())
crm/types/types.go
+5 -5
View File
@@ -12,7 +12,7 @@ import (
)
type (
// Content is a stored row in the `content` table
// Content is a stored row in the `record` table
Content struct {
ID uint64 `json:"contentID,string" db:"id"`
ModuleID uint64 `json:"moduleID,string" db:"module_id"`
@@ -29,20 +29,20 @@ type (
DeletedAt *time.Time `db:"deleted_at" json:"deletedAt,omitempty"`
}
// ContentColumn is a stored row in the `content_column` table
// ContentColumn is a stored row in the `record_column` table
ContentColumn struct {
ContentID uint64 `json:"-" db:"content_id"`
ContentID uint64 `json:"-" db:"record_id"`
Name string `json:"name" db:"column_name"`
Value string `json:"value" db:"column_value"`
Related []string `json:"related" db:"-"`
}
Related struct {
ContentID uint64 `json:"-" db:"content_id"`
ContentID uint64 `json:"-" db:"record_id"`
Name string `json:"-" db:"column_name"`
// RelatedContentID isn't necessarily a content ID (multiple-select anything goes options)
RelatedContentID string `json:"-" db:"rel_content_id"`
RelatedContentID string `json:"-" db:"rel_record_id"`
}
// Field - CRM input field definitions