From 93ab4132fee7dc29563e1f47f8fbf5f01a5a2284 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sat, 11 Jan 2020 14:34:33 -0500 Subject: [PATCH] Move mapping functions to db_ledis, where it is used --- persistence/db_ledis/ledis_repository.go | 6 +++--- {utils => persistence/db_ledis}/mapping.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename {utils => persistence/db_ledis}/mapping.go (73%) diff --git a/persistence/db_ledis/ledis_repository.go b/persistence/db_ledis/ledis_repository.go index 2000ea144..c44c1fe99 100644 --- a/persistence/db_ledis/ledis_repository.go +++ b/persistence/db_ledis/ledis_repository.go @@ -26,7 +26,7 @@ func (r *ledisRepository) init(table string, entity interface{}) { r.table = table r.entityType = reflect.TypeOf(entity).Elem() - h, _ := utils.ToMap(entity) + h, _ := toMap(entity) r.fieldNames = make([]string, len(h)) i := 0 for k := range h { @@ -160,7 +160,7 @@ func (r *ledisRepository) saveOrUpdate(id string, entity interface{}) error { recordPrefix := fmt.Sprintf("%s:%s:", r.table, id) allKey := r.table + "s:all" - h, err := utils.ToMap(entity) + h, err := toMap(entity) if err != nil { return err } @@ -274,7 +274,7 @@ func (r *ledisRepository) toEntity(response [][]byte, entity interface{}) error } } - return utils.ToStruct(record, entity) + return toStruct(record, entity) } func (r *ledisRepository) loadRange(idxName string, min interface{}, max interface{}, entities interface{}, qo ...domain.QueryOptions) error { diff --git a/utils/mapping.go b/persistence/db_ledis/mapping.go similarity index 73% rename from utils/mapping.go rename to persistence/db_ledis/mapping.go index 5cf45b99b..2af74a2d5 100644 --- a/utils/mapping.go +++ b/persistence/db_ledis/mapping.go @@ -1,10 +1,10 @@ -package utils +package db_ledis import ( "encoding/json" ) -func ToMap(rec interface{}) (map[string]interface{}, error) { +func toMap(rec interface{}) (map[string]interface{}, error) { // Convert to JSON... b, err := json.Marshal(rec) if err != nil { @@ -17,7 +17,7 @@ func ToMap(rec interface{}) (map[string]interface{}, error) { return m, err } -func ToStruct(m map[string]interface{}, rec interface{}) error { +func toStruct(m map[string]interface{}, rec interface{}) error { // Convert to JSON... b, err := json.Marshal(m) if err != nil {