tech feedback

Author: lindseymoore

source/crud/query/retrieve.txt

@@ -101,58 +101,25 @@ Find Multiple Documents Example: Full File
 
 The following example finds all documents in the ``restaurants`` collection
 in which the value of ``cuisine`` is ``"Italian"``. The example returns a cursor that
-references the matched documents and unpacks the documents into a slice.
-Select the :guilabel:`Struct` or :guilabel:`bson.D` tab to see the corresponding code:
+references the matched documents and unpacks the documents into a slice:
 
-.. tabs::
-
-  .. tab :: Struct
-    :tabid: structExample
-
-    The following code uses structs to find and return all documents in the 
-    ``restaurants`` collection in which the value of ``cuisine`` is "Italian":
-
-    .. io-code-block::
-      :copyable: true
-
-      .. input:: /includes/usage-examples/code-snippets/find.go
-        :language: go
-        :dedent:
-
-      .. output::
-        :language: none
-        :visible: false
-
-        // results truncated
-        ...
-        { ... , "Name" : "Epistrophy Cafe", "RestaurantId": "41117553", "Cuisine" : "Italian", ... },
-        { ... , "Name" : "Remi", "RestaurantId": "41118090", "Cuisine" : "Italian", ... },
-        { ... , "Name" : "Sant Ambroeus", "RestaurantId": "41120682", "Cuisine" : "Italian", ... },
-        ...
-
-  .. tab :: bson.D
-    :tabid: bsonDExample
-
-    The following code uses a bson.D type to find and return all documents in 
-    the ``restaurants`` collection in which the value of ``cuisine`` is "Italian":
-
-    .. io-code-block::
-      :copyable: true
+.. io-code-block::
+  :copyable: true
 
-      .. input:: /includes/usage-examples/code-snippets/findBsonD.go
-        :language: go
-        :dedent:
+  .. input:: /includes/usage-examples/code-snippets/find.go
+    :language: go
+    :dedent:
 
-      .. output::
-        :language: none
-        :visible: false
+  .. output::
+    :language: none
+    :visible: false
 
-        // results truncated
-        ...
-        { ... , "Name" : "Epistrophy Cafe", "RestaurantId": "41117553", "Cuisine" : "Italian", ... },
-        { ... , "Name" : "Remi", "RestaurantId": "41118090", "Cuisine" : "Italian", ... },
-        { ... , "Name" : "Sant Ambroeus", "RestaurantId": "41120682", "Cuisine" : "Italian", ... },
-        ...
+    // results truncated
+    ...
+    { ... , "Name" : "Epistrophy Cafe", "RestaurantId": "41117553", "Cuisine" : "Italian", ... },
+    { ... , "Name" : "Remi", "RestaurantId": "41118090", "Cuisine" : "Italian", ... },
+    { ... , "Name" : "Sant Ambroeus", "RestaurantId": "41120682", "Cuisine" : "Italian", ... },
+    ...
 
 .. _golang-find-one-example:
 
@@ -247,67 +214,30 @@ Find One Document Example: Full File
 
 .. include:: /includes/usage-examples/example-intro.rst
 
-The following example finds a document in the ``restaurants`` collection that
-matches a query filter. Select the :guilabel:`Struct` or :guilabel:`bson.D` 
-tab to see the corresponding code:
-
-.. tabs::
-
-  .. tab :: Struct
-    :tabid: structExample
-
-    The following code uses structs to find and return the first document in the 
-    ``restaurants`` collection in which the value of ``name`` is "Bagels N Buns":
-
-    .. io-code-block::
-      :copyable: true
-
-      .. input:: /includes/usage-examples/code-snippets/findOne.go
-        :language: go
-        :dedent:
-
-      .. output::
-        :language: none
-        :visible: false
-
-        // results truncated
-        {
-            "ID": "5eb3d668b31de5d588f42950",
-            "Name": "Bagels N Buns",
-            "RestaurantId": "40363427"
-            "Address": [...],
-            "Borough": "Staten Island",
-            "Cuisine": "Delicatessen",
-            "Grades": [...]
-        }
-
-  .. tab :: bson.D
-    :tabid: bsonDExample
-
-    The following code uses a bson.D type to find and return the first document 
-    in the ``restaurants`` collection in which the value of ``name`` is "Bagels N Buns":
-    
-    .. io-code-block::
-      :copyable: true
-
-      .. input:: /includes/usage-examples/code-snippets/findOneBsonD.go
-        :language: go
-        :dedent:
-
-      .. output::
-        :language: none
-        :visible: false
-
-        // results truncated
-        {
-            "ID": "5eb3d668b31de5d588f42950",
-            "Name": "Bagels N Buns",
-            "RestaurantId": "40363427"
-            "Address": [...],
-            "Borough": "Staten Island",
-            "Cuisine": "Delicatessen",
-            "Grades": [...]
-        }
+The following example finds and returns the first document in the 
+``restaurants`` collection in which the value of ``name`` is ``"Bagels N Buns"``:
+
+.. io-code-block::
+  :copyable: true
+
+  .. input:: /includes/usage-examples/code-snippets/findOne.go
+    :language: go
+    :dedent:
+
+  .. output::
+    :language: none
+    :visible: false
+
+    // results truncated
+    {
+        "ID": "5eb3d668b31de5d588f42950",
+        "Name": "Bagels N Buns",
+        "RestaurantId": "40363427"
+        "Address": [...],
+        "Borough": "Staten Island",
+        "Cuisine": "Delicatessen",
+        "Grades": [...]
+    }
 
 .. _golang-retrieve-options:
 

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

@@ -25,11 +25,6 @@ type Restaurant struct {
 	Grades       interface{}
 }
 
-// Creates a filter struct to use for the query
-type RestaurantCuisineFilter struct {
-	Cuisine string
-}
-
 func main() {
 	if err := godotenv.Load(); err != nil {
 		log.Println("No .env file found")
@@ -54,7 +49,7 @@ func main() {
 
 	// Creates a query filter to match documents in which the "cuisine"
 	// is "Italian"
-	filter := RestaurantCuisineFilter{Cuisine: "Italian"}
+	filter := bson.D{{"cuisine", "Italian"}}
 
 	// Retrieves documents that match the query filter
 	cursor, err := coll.Find(context.TODO(), filter)
@@ -70,7 +65,6 @@ func main() {
 
 	// Prints the results of the find operation as structs
 	for _, result := range results {
-		cursor.Decode(&result)
 		output, err := json.MarshalIndent(result, "", "    ")
 		if err != nil {
 			panic(err)

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

@@ -25,11 +25,6 @@ type Restaurant struct {
 	Grades       []interface{}
 }
 
-// Creates a filter struct to use for the query
-type RestaurantNameFilter struct {
-	Name string
-}
-
 func main() {
 	if err := godotenv.Load(); err != nil {
 		log.Println("No .env file found")
@@ -54,7 +49,7 @@ func main() {
 
 	// Creates a query filter to match documents in which the "name" is
 	// "Bagels N Buns"
-	filter := RestaurantNameFilter{Name: "Bagels N Buns"}
+	filter := bson.D{{"name", "Bagels N Buns"}}
 
 	// Retrieves the first matching document
 	var result Restaurant