tech feedback

Author: stephmarie17

source/crud/delete.txt

@@ -142,18 +142,9 @@ DeleteOne() Example: Full File
 .. include:: /includes/usage-examples/example-intro.rst
 
 The following example is a fully runnable file that finds and deletes an
-existing document in the ``restaurants`` collection. Select the
-:guilabel:`Struct` or :guilabel:`bson.D` tab to see the corresponding code:
+existing document in the ``restaurants`` collection. 
 
-.. tabs::
-
-   .. tab:: Struct
-      :tabid: structExample
-
-      The following code uses structs to define and delete a document in the
-      ``restaurants`` collection:
-
-      .. io-code-block::
+.. io-code-block::
          :copyable: true
 
          .. input:: /includes/usage-examples/code-snippets/deleteOne.go
@@ -166,74 +157,30 @@ existing document in the ``restaurants`` collection. Select the
 
             Documents deleted: 1
 
-   .. tab:: bson.D
-      :tabid: bsonExample
-
-      The following code uses a bson.D type to define and delete a document in the
-      ``restaurants`` collection:
-
-      .. io-code-block::
-         :copyable: true
-
-         .. input:: /includes/usage-examples/code-snippets/deleteOneBson.go
-            :language: go
-            :dedent:
-
-         .. output::
-            :language: none
-            :visible: false
-
-            Documents deleted: 1
-
 DeleteMany() Example: Full File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. include:: /includes/usage-examples/example-intro.rst
 
-The following example is a fully runnable file that finds and deletes multiple
-existing documents in the ``restaurants`` collection. Select the
-:guilabel:`Struct` or :guilabel:`bson.D` tab to see the corresponding code:
+The following example is a fully runnable file that performs the following
+actions on the ``restaurants`` collection:
 
-.. tabs::
+- Matches and deletes documents where the ``cuisine`` field value is ``German``
+  and the ``borough`` field value is ``Queens``
+- Deletes all matching documents
 
-   .. tab:: Struct
-      :tabid: structExample
-
-      The following code uses structs to define and delete documents in the
-      ``restaurants`` collection:
-
-      .. io-code-block::
-         :copyable: true
-
-         .. input:: /includes/usage-examples/code-snippets/deleteMany.go
-            :language: go
-            :dedent:
-         
-
-         .. output::
-            :language: none
-            :visible: false
-
-            Documents deleted: 6
-
-   .. tab:: bson.D
-      :tabid: bsonExample
-
-      The following code uses a bson.D type to define and delete documents in the
-      ``restaurants`` collection:
-
-      .. io-code-block::
-         :copyable: true
+.. io-code-block::
+   :copyable: true
 
-         .. input:: /includes/usage-examples/code-snippets/deleteManyBson.go
-            :language: go
-            :dedent:
+   .. input:: /includes/usage-examples/code-snippets/deleteMany.go
+      :language: go
+      :dedent:
 
-         .. output::
-            :language: none
-            :visible: false
+   .. output::
+      :language: none
+      :visible: false
 
-            Documents deleted: 6
+      Documents deleted: 6
 
 Additional Information
 ----------------------

source/includes/usage-examples/code-snippets/deleteMany.go

@@ -21,12 +21,6 @@ type Restaurant struct {
 	Cuisine string        `bson:"cuisine"`
 }
 
-// Creates a filter struct to specify the documents to delete
-type DeleteRestaurantFilter struct {
-	Borough string `bson:"borough"`
-	Cuisine string `bson:"cuisine"`
-}
-
 func main() {
 	if err := godotenv.Load(); err != nil {
 		log.Println("No .env file found")
@@ -48,9 +42,9 @@ func main() {
 	}()
 
 	coll := client.Database("sample_restaurants").Collection("restaurants")
-	filter := DeleteRestaurantFilter{
-		Borough: "Queens",
-		Cuisine: "German",
+	filter := bson.D{
+		{"borough", "Queens"},
+		{"cuisine", "German"},
 	}
 
 	// Deletes all documents that have a "Borough" value of "Queens" and a "Cuisine" value of "German"

source/includes/usage-examples/code-snippets/deleteManyBson.go

@@ -15,13 +15,12 @@ import (
 
 // Defines a Restaurant struct as a model for documents in the "restaurants" collection
 type Restaurant struct {
-	ID   bson.ObjectID `bson:"_id"`
-	Name string        `bson:"name"`
-}
-
-// Creates a filter struct to specify the document to delete
-type DeleteRestaurantFilter struct {
-	Name string `bson:"name"`
+	ID      bson.ObjectID `bson:"_id"`
+	Name    string        `bson:"name"`
+	Cuisine string        `bson:"cuisine,omitempty"`
+	Address interface{}   `bson:"address,omitempty"`
+	Borough string        `bson:"borough,omitempty"`
+	Grades  []interface{} `bson:"grades,omitempty"`
 }
 
 func main() {
@@ -45,7 +44,7 @@ func main() {
 	}()
 
 	coll := client.Database("sample_restaurants").Collection("restaurants")
-	filter := DeleteRestaurantFilter{Name: "New Corner"}
+	filter := bson.D{{"name", "New Corner"}}
 
 	// Deletes the first document that has a "name" value of "New Corner"
 	result, err := coll.DeleteOne(context.TODO(), filter)