Refactor code

Author: minhduc140583

loader.go

@@ -8,13 +8,13 @@ import (
 	"strings"
 )
 
-func InitFields(modelType reflect.Type, table string) (map[string]int, string, error) {
+func InitFields(modelType reflect.Type) (map[string]int, string, error) {
 	fieldsIndex, err := GetColumnIndexes(modelType)
 	if err != nil {
 		return nil, "", err
 	}
-	query := BuildQuery(table, modelType)
-	return fieldsIndex, query, nil
+	fields := BuildFields(modelType)
+	return fieldsIndex, fields, nil
 }
 type Loader struct {
 	DB                *gocql.ClusterConfig

util.go

@@ -40,6 +40,13 @@ type Schema struct {
 	Fields   map[string]*FieldDB
 }
 
+func BuildFieldsBySchema(schema *Schema) string {
+	columns := make([]string, 0)
+	for _, s := range schema.SColumns {
+		columns = append(columns, s)
+	}
+	return strings.Join(columns, ",")
+}
 func BuildQueryBySchema(table string, schema *Schema) string {
 	columns := make([]string, 0)
 	for _, s := range schema.SColumns {
@@ -49,7 +56,7 @@ func BuildQueryBySchema(table string, schema *Schema) string {
 }
 func BuildFields(modelType reflect.Type) string {
 	columns := GetFields(modelType)
-	return " " + strings.Join(columns, ",") + " "
+	return strings.Join(columns, ",")
 }
 func GetFields(modelType reflect.Type) []string {
 	m := modelType

writer.go

@@ -9,16 +9,16 @@ import (
 	"strings"
 )
 
-func Init(modelType reflect.Type, table string) (map[string]int, *Schema, map[string]string, []string, []string, string, error) {
+func Init(modelType reflect.Type) (map[string]int, *Schema, map[string]string, []string, []string, string, error) {
 	fieldsIndex, err := GetColumnIndexes(modelType)
 	if err != nil {
 		return nil, nil, nil, nil, nil, "", err
 	}
 	schema := CreateSchema(modelType)
-	query := BuildQueryBySchema(table, schema)
+	fields := BuildFieldsBySchema(schema)
 	jsonColumnMap := MakeJsonColumnMap(modelType)
 	keys, arr := FindPrimaryKeys(modelType)
-	return fieldsIndex, schema, jsonColumnMap, keys, arr, query, nil
+	return fieldsIndex, schema, jsonColumnMap, keys, arr, fields, nil
 }
 
 type Writer struct {