moved to mapper

Author: jschoedt

api.go

@@ -72,7 +72,7 @@ func (fsc *FSClient) getEntities(ctx context.Context, req *Request, sliceVal ref
 
 		for i, v := range res {
 			if len(v) > 0 {
-				fsc.MapFromDB.MapTo(v, slice.Index(i).Interface())
+				fsc.MapFromDB.MapToStruct(v, slice.Index(i).Interface())
 				result = append(result, slice.Index(i).Interface())
 			}
 		}
@@ -155,7 +155,7 @@ func (fsc *FSClient) queryEntities(ctx context.Context, req *Request, p firestor
 
 func (fsc *FSClient) createEntity(ctx context.Context, req *Request, entity interface{}) FutureFunc {
 	asyncFunc := func() error {
-		m, err := fsc.MapToDB.MapStructToMap(entity)
+		m, err := fsc.MapToDB.StructToMap(entity)
 		if err != nil {
 			return err
 		}
@@ -207,7 +207,7 @@ func (fsc *FSClient) createEntities(ctx context.Context, req *Request, sliceVal
 
 func (fsc *FSClient) updateEntity(ctx context.Context, req *Request, entity interface{}) FutureFunc {
 	asyncFunc := func() error {
-		m, err := fsc.MapToDB.MapStructToMap(entity)
+		m, err := fsc.MapToDB.StructToMap(entity)
 		if err != nil {
 			return err
 		}

go.mod

@@ -4,6 +4,7 @@ require (
 	cloud.google.com/go v0.39.0
 	firebase.google.com/go v3.7.0+incompatible
 	github.com/google/go-cmp v0.3.1
+	github.com/jschoedt/go-structmapper v0.0.0-20211203110202-913cb0ae78a5
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468 // indirect
 	google.golang.org/api v0.5.0

go.sum

@@ -23,6 +23,8 @@ github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/jschoedt/go-structmapper v0.0.0-20211203110202-913cb0ae78a5 h1:V/F23HbFY5nGfHEZ8e3hJdW0GHZ0wh08zLLv8uEJFIM=
+github.com/jschoedt/go-structmapper v0.0.0-20211203110202-913cb0ae78a5/go.mod h1:x12mRCBeG7r+5pWtMUyfJYX4VXHGoAwMdvkatcx07Oo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=

main.go

@@ -3,7 +3,7 @@ package firestorm
 import (
 	"cloud.google.com/go/firestore"
 	"context"
-	"github.com/jschoedt/go-firestorm/mapper"
+	mapper "github.com/jschoedt/go-structmapper"
 	"strings"
 )
 
@@ -33,9 +33,9 @@ func New(client *firestore.Client, id, parent string) *FSClient {
 	c := &FSClient{}
 	c.Client = client
 	c.MapToDB = mapper.New()
-	c.MapToDB.MapperFunc = c.DefaultToDBMapperFunc
+	c.MapToDB.MapFunc = c.DefaultToDBMapperFunc
 	c.MapFromDB = mapper.New()
-	c.MapFromDB.MapperFunc = c.DefaultFromDBMapperFunc
+	c.MapFromDB.MapFunc = c.DefaultFromDBMapperFunc
 	c.IDKey = strings.ToLower(id)
 	c.ParentKey = strings.ToLower(parent)
 	c.Cache = newCacheWrapper(client, newDefaultCache(), nil)