Add mongo/insertopt

GODRIVER-272

Change-Id: If3308cd368fd3e9d7cf412a47de3440a8a883236

Author: rfblue2

mongo/collection.go

@@ -21,6 +21,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
 	"github.com/mongodb/mongo-go-driver/mongo/aggregateopt"
 	"github.com/mongodb/mongo-go-driver/mongo/findopt"
+	"github.com/mongodb/mongo-go-driver/mongo/insertopt"
 	"github.com/mongodb/mongo-go-driver/mongo/updateopt"
 )
 
@@ -71,7 +72,7 @@ func (coll *Collection) namespace() command.Namespace {
 // TODO(skriptble): Determine if we should unwrap the value for the
 // InsertOneResult or just return the bson.Element or a bson.Value.
 func (coll *Collection) InsertOne(ctx context.Context, document interface{},
-	opts ...option.InsertOneOptioner) (*InsertOneResult, error) {
+	opts ...insertopt.One) (*InsertOneResult, error) {
 
 	if ctx == nil {
 		ctx = context.Background()
@@ -87,16 +88,18 @@ func (coll *Collection) InsertOne(ctx context.Context, document interface{},
 		return nil, err
 	}
 
-	newOptions := make([]option.InsertOptioner, 0, len(opts))
-	for _, opt := range opts {
-		newOptions = append(newOptions, opt)
+	// convert options into []option.InsertOptioner and dedup
+	oneOpts, err := insertopt.BundleOne(opts...).Unbundle(true)
+
+	if err != nil {
+		return nil, err
 	}
 
 	oldns := coll.namespace()
 	cmd := command.Insert{
 		NS:   command.Namespace{DB: oldns.DB, Collection: oldns.Collection},
 		Docs: []*bson.Document{doc},
-		Opts: newOptions,
+		Opts: oneOpts,
 	}
 
 	res, err := dispatch.Insert(ctx, cmd, coll.client.topology, coll.writeSelector, coll.writeConcern)
@@ -118,7 +121,7 @@ func (coll *Collection) InsertOne(ctx context.Context, document interface{},
 // *bson.Document. See TransformDocument for the list of valid types for
 // documents.
 func (coll *Collection) InsertMany(ctx context.Context, documents []interface{},
-	opts ...option.InsertManyOptioner) (*InsertManyResult, error) {
+	opts ...insertopt.Many) (*InsertManyResult, error) {
 
 	if ctx == nil {
 		ctx = context.Background()
@@ -141,16 +144,18 @@ func (coll *Collection) InsertMany(ctx context.Context, documents []interface{},
 		result[i] = insertedID
 	}
 
-	newOptions := make([]option.InsertOptioner, 0, len(opts))
-	for _, opt := range opts {
-		newOptions = append(newOptions, opt)
+	// convert options into []option.InsertOptioner and dedup
+	manyOpts, err := insertopt.BundleMany(opts...).Unbundle(true)
+
+	if err != nil {
+		return nil, err
 	}
 
 	oldns := coll.namespace()
 	cmd := command.Insert{
 		NS:   command.Namespace{DB: oldns.DB, Collection: oldns.Collection},
 		Docs: docs,
-		Opts: newOptions,
+		Opts: manyOpts,
 	}
 
 	res, err := dispatch.Insert(ctx, cmd, coll.client.topology, coll.writeSelector, coll.writeConcern)

mongo/collection_internal_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/internal/testutil"
 	"github.com/mongodb/mongo-go-driver/mongo/aggregateopt"
 	"github.com/mongodb/mongo-go-driver/mongo/findopt"
+	"github.com/mongodb/mongo-go-driver/mongo/insertopt"
 	"github.com/mongodb/mongo-go-driver/mongo/updateopt"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -153,9 +154,8 @@ func TestCollection_InsertOne_WriteConcernError(t *testing.T) {
 	doc := bson.NewDocument(bson.EC.ObjectID("_id", objectid.New()))
 	coll := createTestCollection(t, nil, nil)
 
-	optwc, err := Opt.WriteConcern(writeconcern.New(writeconcern.W(25)))
-	require.NoError(t, err)
-	_, err = coll.InsertOne(context.Background(), doc, optwc)
+	optwc := insertopt.WriteConcern(writeconcern.New(writeconcern.W(25)))
+	_, err := coll.InsertOne(context.Background(), doc, optwc)
 	got, ok := err.(WriteConcernError)
 	if !ok {
 		t.Errorf("Did not receive correct type of error. got %T; want %T", err, WriteConcernError{})
@@ -254,7 +254,7 @@ func TestCollection_InsertMany_ErrorCases(t *testing.T) {
 		require.NoError(t, err)
 
 		// without option ordered
-		_, err = coll.InsertMany(context.Background(), docs, option.OptOrdered(false))
+		_, err = coll.InsertMany(context.Background(), docs, insertopt.Ordered(false))
 		got, ok := err.(BulkWriteError)
 		if !ok {
 			t.Errorf("Did not receive correct type of error. got %T; want %T", err, WriteErrors{})
@@ -301,13 +301,8 @@ func TestCollection_InsertMany_ErrorCases(t *testing.T) {
 			bson.NewDocument(bson.EC.ObjectID("_id", objectid.New())),
 		}
 
-		optwc, err := Opt.WriteConcern(writeconcern.New(writeconcern.W(42)))
-		if err != nil {
-			t.Errorf("could not create write concern: %+v", err)
-			t.FailNow()
-		}
-
-		_, err = coll.InsertMany(context.Background(), docs, optwc)
+		optwc := insertopt.WriteConcern(writeconcern.New(writeconcern.W(42)))
+		_, err := coll.InsertMany(context.Background(), docs, optwc)
 		if err == nil {
 			t.Errorf("write concern error not propagated from command: %+v", err)
 		}
@@ -338,9 +333,8 @@ func TestCollection_InsertMany_WriteConcernError(t *testing.T) {
 	}
 	coll := createTestCollection(t, nil, nil)
 
-	optwc, err := Opt.WriteConcern(writeconcern.New(writeconcern.W(25)))
-	require.NoError(t, err)
-	_, err = coll.InsertMany(context.Background(), docs, optwc)
+	optwc := insertopt.WriteConcern(writeconcern.New(writeconcern.W(25)))
+	_, err := coll.InsertMany(context.Background(), docs, optwc)
 	got, ok := err.(BulkWriteError)
 	if !ok {
 		t.Errorf("Did not receive correct type of error. got %T; want %T\nError message: %s", err, BulkWriteError{}, err)