DOCSP-46724: arrayfilters removal (#418)

* DOCSP-46724: arrayfilters removal

* wip

Author: rustagir

source/fundamentals/crud/write-operations.txt

@@ -13,7 +13,7 @@ Write Operations
    Insert </fundamentals/crud/write-operations/insert>
    Delete </fundamentals/crud/write-operations/delete>
    Modify </fundamentals/crud/write-operations/modify>
-   Update </fundamentals/crud/write-operations/embedded-arrays>
+   Update Arrays </fundamentals/crud/write-operations/embedded-arrays>
    Upsert </fundamentals/crud/write-operations/upsert>
    Bulk Operations </fundamentals/crud/write-operations/bulk>
 

source/fundamentals/crud/write-operations/embedded-arrays.txt

@@ -4,8 +4,6 @@
 Update Arrays in a Document
 ===========================
 
-.. default-domain:: mongodb
-
 .. contents:: On this page
    :local:
    :backlinks: none
@@ -88,27 +86,17 @@ This example performs the following actions:
 
 - Matches array elements in ``sizes`` where the value is less than or
   equal to ``16``.
-- Decrements the first array value matched by ``2``.
+- Decrements the first matching array value by ``2``.
 
 .. io-code-block::
-   :copyable: true
+   :copyable:
 
-   .. input::
+   .. input:: /includes/fundamentals/code-snippets/CRUD/updateArray.go
+      :start-after: begin positional
+      :end-before: end positional
+      :emphasize-lines: 2
       :language: go
-
-      filter := bson.D{{"sizes", bson.D{{"$lte", 16}}}}
-      update := bson.D{{"$inc", bson.D{{"sizes.$", -2}}}}
-      opts := options.FindOneAndUpdate().
-          SetReturnDocument(options.After)
-      
-      var updatedDoc Drink
-      err := coll.FindOneAndUpdate(context.TODO(), filter, update, opts).Decode(&updatedDoc)
-      if err != nil {
-          panic(err)
-      }
-      
-      res, _ := bson.MarshalExtJSON(updatedDoc, false, false)
-      fmt.Println(string(res))
+      :dedent:
 
    .. output::
       :language: none
@@ -118,8 +106,9 @@ This example performs the following actions:
 
 .. note::
 
-   The query filter matches the values ``12`` and ``16``. Since the
-   operation matches ``12`` first, it is decremented. If you want to update
+   In the preceding example, the query filter matches the values ``12``
+   and ``16``. Because the operation matches ``12`` first, it is
+   the target of the update. To learn how to to update 
    both matched values, see :ref:`golang-multiple-elements`.
 
 .. _golang-multiple-elements:
@@ -142,30 +131,21 @@ Example
 This example performs the following actions:
 
 - Creates an array filter with an identifier called ``hotOptions`` to match
-  array elements that contain "hot".
-- Applies the array filter using the ``SetArrayFilters()`` method.
-- Removes these array elements.
+  array elements that contain the string ``"hot"``.
+- Applies the array filter by using the ``SetArrayFilters()`` method
+  when creating a ``FindOneAndUpdateOptions`` instance.
+- Removes the values of these array elements by using the
+  ``FindOneAndUpdate()`` method.
 
 .. io-code-block::
    :copyable: true
 
-   .. input::
+   .. input:: /includes/fundamentals/code-snippets/CRUD/updateArray.go
+      :start-after: begin filtered positional
+      :end-before: end filtered positional
+      :emphasize-lines: 2, 4
       :language: go
-
-      identifier := []interface{}{bson.D{{"hotOptions", bson.D{{"$regex", "hot"}}}}}
-      update := bson.D{{"$unset", bson.D{{"styles.$[hotOptions]", ""}}}}
-      opts := options.FindOneAndUpdate().
-          SetArrayFilters(options.ArrayFilters{Filters: identifier}).
-          SetReturnDocument(options.After)
-      
-      var updatedDoc Drink
-      err := coll.FindOneAndUpdate(context.TODO(), bson.D{}, update, opts).Decode(&updatedDoc)
-      if err != nil {
-          panic(err)
-      }
-      
-      res, _ := bson.MarshalExtJSON(updatedDoc, false, false)
-      fmt.Println(string(res))
+      :dedent:
 
    .. output::
       :language: none
@@ -195,21 +175,12 @@ to convert from ounces to milliliters:
 .. io-code-block::
    :copyable: true
 
-   .. input::
+   .. input:: /includes/fundamentals/code-snippets/CRUD/updateArray.go
+      :start-after: begin filtered positional
+      :end-before: end filtered positional
+      :emphasize-lines: 1-2
       :language: go
-
-      update := bson.D{{"$mul", bson.D{{"sizes.$[]", 29.57}}}}
-      opts := options.FindOneAndUpdate().
-          SetReturnDocument(options.After)
-      
-      var updatedDoc Drink
-      err := coll.FindOneAndUpdate(context.TODO(), bson.D{}, update, opts).Decode(&updatedDoc)
-      if err != nil {
-          panic(err)
-      }
-      
-      res, _ := bson.MarshalExtJSON(updatedDoc, false, false)
-      fmt.Println(string(res))
+      :dedent:
 
    .. output::
       :language: none
@@ -235,9 +206,11 @@ API Documentation
 ~~~~~~~~~~~~~~~~~
 
 To learn more about any of the methods or types discussed in this
-guide, see the following API Documentation:
+guide, see the following API documentation:
 
 - `FindOneAndUpdate() <{+api+}/mongo#Collection.FindOneAndUpdate>`__
-- `FindOneAndUpdateOptions.SetReturnDocument() <{+api+}/mongo/options#FindOneAndUpdateOptions.SetReturnDocument>`__
-- `FindOneAndUpdateOptions.SetArrayFilters() <{+api+}/mongo/options#FindOneAndUpdateOptions.SetArrayFilters>`__
+- `FindOneAndUpdateOptionsBuilder.SetReturnDocument()
+  <{+api+}/mongo/options#FindOneAndUpdateOptionsBuilder.SetReturnDocument>`__
+- `FindOneAndUpdateOptionsBuilder.SetArrayFilters()
+  <{+api+}/mongo/options#FindOneAndUpdateOptionsBuilder.SetArrayFilters>`__
 - `UpdateMany() <{+api+}/mongo#Collection.UpdateMany>`__

source/includes/fundamentals/code-snippets/CRUD/updateArray.go

@@ -7,9 +7,9 @@ import (
 	"log"
 	"os"
 
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 // start-drink-struct
@@ -42,11 +42,11 @@ func main() {
 
 	// begin insertDocs
 	coll := client.Database("db").Collection("drinks")
-	docs := []interface{}{
+	docsToInsert := []interface{}{
 		Drink{Description: "Matcha Latte", Sizes: []int32{12, 16, 20}, Styles: []string{"iced", "hot", "extra hot"}},
 	}
 
-	result, err := coll.InsertMany(context.TODO(), docs)
+	result, err := coll.InsertMany(context.TODO(), docsToInsert)
 	//end insertDocs
 	if err != nil {
 		panic(err)
@@ -63,14 +63,15 @@ func main() {
 		opts := options.FindOneAndUpdate().
 			SetReturnDocument(options.After)
 
-		// Updates the first document that matches the filter and prints
-		// the updated document as a struct
+		// Updates the first document that matches the filter
 		var updatedDoc Drink
-		err := coll.FindOneAndUpdate(context.TODO(), filter, update, opts).Decode(&updatedDoc)
+		err := coll.FindOneAndUpdate(context.TODO(), filter, update, opts).
+			Decode(&updatedDoc)
 		if err != nil {
 			panic(err)
 		}
 
+		// Prints the updated document
 		res, _ := bson.MarshalExtJSON(updatedDoc, false, false)
 		fmt.Println(string(res))
 		// end positional
@@ -83,7 +84,7 @@ func main() {
 
 		_, err := coll.UpdateOne(context.TODO(), filter, update)
 		if err != nil {
-			log.Fatal(err)
+			panic(err)
 		}
 
 		fmt.Println("\nData Restored\n")
@@ -97,17 +98,18 @@ func main() {
 		identifier := []interface{}{bson.D{{"hotOptions", bson.D{{"$regex", "hot"}}}}}
 		update := bson.D{{"$unset", bson.D{{"styles.$[hotOptions]", ""}}}}
 		opts := options.FindOneAndUpdate().
-			SetArrayFilters(options.ArrayFilters{Filters: identifier}).
+			SetArrayFilters(identifier).
 			SetReturnDocument(options.After)
 
-		// Updates the first document that matches the filter and prints
-		// the updated document as a struct
+		// Updates the first document that matches the filter
 		var updatedDoc Drink
-		err := coll.FindOneAndUpdate(context.TODO(), bson.D{}, update, opts).Decode(&updatedDoc)
+		err := coll.FindOneAndUpdate(context.TODO(), bson.D{}, update, opts).
+			Decode(&updatedDoc)
 		if err != nil {
 			panic(err)
 		}
 
+		// Prints the updated document
 		res, _ := bson.MarshalExtJSON(updatedDoc, false, false)
 		fmt.Println(string(res))
 		// end filtered positional
@@ -119,7 +121,7 @@ func main() {
 
 		_, err := coll.UpdateOne(context.TODO(), bson.D{}, update)
 		if err != nil {
-			log.Fatal(err)
+			panic(err)
 		}
 
 		fmt.Println("\nData Restored\n")
@@ -134,14 +136,14 @@ func main() {
 		opts := options.FindOneAndUpdate().
 			SetReturnDocument(options.After)
 
-		// Updates the first document that matches the filter and prints
-		// the updated document as a struct
+		// Updates the first document that matches the filter
 		var updatedDoc Drink
 		err := coll.FindOneAndUpdate(context.TODO(), bson.D{}, update, opts).Decode(&updatedDoc)
 		if err != nil {
 			panic(err)
 		}
 
+		// Prints the updated document
 		res, _ := bson.MarshalExtJSON(updatedDoc, false, false)
 		fmt.Println(string(res))
 		// end positional all