refactored and added NewObjectId func

amsokol · Feb 25, 2019 · b82e874 · b82e874
1 parent 73e23c3
commit b82e874
Show file tree

Hide file tree

Showing 13 changed files with 76 additions and 70 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -22,6 +22,7 @@
         "mongodb",
         "objectid",
         "officional",
+        "pmongo",
         "proto",
         "protobuf",
         "protoc",

diff --git a/codecs.go b/codecs.go
@@ -11,7 +11,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/bsonrw"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
-	"github.com/amsokol/mongo-go-driver-protobuf/mongodb"
+	"github.com/amsokol/mongo-go-driver-protobuf/pmongo"
 )
 
 var (
@@ -33,7 +33,7 @@ var (
 	timeType = reflect.TypeOf(time.Time{})
 
 	// ObjectId type
-	objectIDType          = reflect.TypeOf(mongodb.ObjectId{})
+	objectIDType          = reflect.TypeOf(pmongo.ObjectId{})
 	objectIDPrimitiveType = reflect.TypeOf(primitive.ObjectID{})
 
 	// Codecs
@@ -108,7 +108,7 @@ type objectIDCodec struct {
 
 // EncodeValue encodes Protobuf ObjectId value to BSON value
 func (e *objectIDCodec) EncodeValue(ectx bsoncodec.EncodeContext, vw bsonrw.ValueWriter, val reflect.Value) error {
-	v := val.Interface().(mongodb.ObjectId)
+	v := val.Interface().(pmongo.ObjectId)
 	// Create primitive.ObjectId from string
 	id, err := primitive.ObjectIDFromHex(v.Value)
 	if err != nil {
@@ -131,7 +131,7 @@ func (e *objectIDCodec) DecodeValue(ectx bsoncodec.DecodeContext, vr bsonrw.Valu
 	if err = enc.DecodeValue(ectx, vr, reflect.ValueOf(&id).Elem()); err != nil {
 		return err
 	}
-	oid := mongodb.ObjectId{Value: id.Hex()}
+	oid := *pmongo.NewObjectId(id)
 	if err != nil {
 		return err
 	}

diff --git a/codecs_test.go b/codecs_test.go
@@ -12,7 +12,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
-	"github.com/amsokol/mongo-go-driver-protobuf/mongodb"
+	"github.com/amsokol/mongo-go-driver-protobuf/pmongo"
 	"github.com/amsokol/mongo-go-driver-protobuf/test"
 )
 
@@ -32,7 +32,7 @@ func TestCodecs(t *testing.T) {
 	}
 
 	objectID := primitive.NewObjectID()
-	id := mongodb.ObjectId{Value: objectID.Hex()}
+	id := pmongo.NewObjectId(objectID)
 
 	t.Run("primitive object id", func(t *testing.T) {
 		resultID, err := id.GetObjectID()
@@ -58,7 +58,7 @@ func TestCodecs(t *testing.T) {
 		Uint32Value: &wrappers.UInt32Value{Value: 12345},
 		Uint64Value: &wrappers.UInt64Value{Value: 123456789},
 		Timestamp:   ts,
-		Id:          &id,
+		Id:          id,
 	}
 
 	t.Run("marshal/unmarshal", func(t *testing.T) {

diff --git a/examples/mongodb-rw/data.pb.go b/examples/mongodb-rw/data.pb.go
diff --git a/examples/mongodb-rw/data.proto b/examples/mongodb-rw/data.proto
@@ -5,7 +5,7 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 import "protoc-gen-gotag/tagger/tagger.proto";
 
-import "mongodb/objectid.proto";
+import "pmongo/objectid.proto";
 
 message Data{
     mongodb.ObjectId id = 1 [(tagger.tags) = "bson:\"_id,omitempty\"" ];

diff --git a/mongodb/jsonpb.go → pmongo/jsonpb.go b/mongodb/jsonpb.go → pmongo/jsonpb.go
@@ -1,4 +1,4 @@
-package mongodb
+package pmongo
 
 import (
 	"bytes"

diff --git a/mongodb/mongodb.go → pmongo/objectid.go b/mongodb/mongodb.go → pmongo/objectid.go
@@ -1,9 +1,14 @@
-package mongodb
+package pmongo
 
 import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
+// NewObjectId creates proto ObjectId from MongoDB ObjectID
+func NewObjectId(id primitive.ObjectID) *ObjectId {
+	return &ObjectId{Value: id.Hex()}
+}
+
 // GetObjectID returns MongoDB object ID
 func (o *ObjectId) GetObjectID() (primitive.ObjectID, error) {
 	return primitive.ObjectIDFromHex(o.Value)

diff --git a/mongodb/objectid.pb.go → pmongo/objectid.pb.go b/mongodb/objectid.pb.go → pmongo/objectid.pb.go
diff --git a/proto/mongodb/objectid.proto → proto/pmongo/objectid.proto b/proto/mongodb/objectid.proto → proto/pmongo/objectid.proto
@@ -1,7 +1,7 @@
 syntax="proto3";
 package mongodb;
 
-option go_package = "github.com/amsokol/mongo-go-driver-protobuf/mongodb";
+option go_package = "github.com/amsokol/mongo-go-driver-protobuf/pmongo";
 
 message ObjectId{
     string value = 1;

diff --git a/proto_build.cmd b/proto_build.cmd
@@ -1,3 +1,3 @@
-@protoc --proto_path=proto/mongodb --go_out=../../../ objectid.proto
+@protoc --proto_path=proto/pmongo --go_out=../../../ objectid.proto
 
 @protoc --proto_path=test --proto_path=proto --proto_path=proto/third_party --go_out=test codecs_test.proto
diff --git a/proto_build.sh b/proto_build.sh
@@ -1,5 +1,5 @@
 #bash
 
-protoc --proto_path=proto/mongodb --go_out=../../../ objectid.proto
+protoc --proto_path=proto/pmongo --go_out=../../../ objectid.proto
 
 protoc --proto_path=test --proto_path=proto --proto_path=proto/third_party --go_out=test codecs_test.proto
diff --git a/test/codecs_test.pb.go b/test/codecs_test.pb.go
diff --git a/test/codecs_test.proto b/test/codecs_test.proto
@@ -4,7 +4,7 @@ package test;
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 
-import "mongodb/objectid.proto";
+import "pmongo/objectid.proto";
 
 message Data{
     google.protobuf.BoolValue boolValue = 1;