update changelog.md, fix unit test

Author: zookzook

CHANGELOG.md

@@ -7,20 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 0.8.5
 * Enhancements
-  * Add colored log output
-  * Add telemetry support for execution
+  * add colored log output
+  * add telemetry support for execution
+  * add new Repo module (thanks to daskycodes)
+  * add missing typespecs (thanks to fdie)
 
 ## 0.8.4 (2022-03-09)
 * Bugfix
   * add missing excludes from dump function (collections)
 
 ## 0.8.3 (2022-02-17)
 * Bugfix
-  * fix no function clause matching (thanks for bodbdigr)
+  * fix no function clause matching (thanks to bodbdigr)
 
 ## 0.8.2 (2022-02-03)
 * Enhancements
-  * Remove a compiler warning (thanks for a-jimenez )
+  * Remove a compiler warning (thanks to a-jimenez )
 
 ## 0.8.1 (2022-01-22) 
 * Enhancements

lib/mongo.ex

@@ -177,7 +177,7 @@ defmodule Mongo do
       iex> Mongo.uuid("848e90e9-5750-4e0a-ab73-66-c6b328242")
       {:error, %ArgumentError{message: "non-alphabet digit found: \"-\" (byte 45)"}}
   """
-  @spec uuid(any) :: {:ok, BSON.Binary.t()} | {:error, %ArgumentError{}}
+  @spec uuid(any) :: {:ok, BSON.Binary.t()} | {:error, Exception.t()}
   def uuid(string) when is_binary(string) and byte_size(string) == 36 do
     try do
       p1 = binary_part(string, 0, 8) |> Base.decode16!(case: :lower)
@@ -572,8 +572,7 @@ defmodule Mongo do
   end
 
   @doc false
-  @spec count(GenServer.server(), collection, BSON.document(), Keyword.t()) ::
-          result(non_neg_integer)
+  @spec count(GenServer.server(), collection, BSON.document(), Keyword.t()) :: result(non_neg_integer)
   def count(topology_pid, coll, filter, opts \\ []) do
     cmd =
       [
@@ -589,9 +588,7 @@ defmodule Mongo do
     opts = Keyword.drop(opts, ~w(limit skip hint collation)a)
 
     with {:ok, doc} <- issue_command(topology_pid, cmd, :read, opts) do
-      {:ok, trunc(doc["n"])}
-    else
-      _ -> {:error, Mongo.Error.exception("Failed to count")}
+        {:ok, trunc(doc["n"])}
     end
   end
 
@@ -623,11 +620,11 @@ defmodule Mongo do
       |> Enum.map(&List.wrap/1)
 
     with %Mongo.Stream{} = cursor <- Mongo.aggregate(topology_pid, coll, pipeline, opts),
-      documents <- Enum.to_list(cursor) do
-        case documents do
-          [%{"n" => count}] -> {:ok, count}
-          [] -> {:ok, 0}
-        end
+         documents <- Enum.to_list(cursor) do
+      case documents do
+        [%{"n" => count}] -> {:ok, count}
+        [] -> {:ok, 0}
+      end
     else
       _ -> {:error, Mongo.Error.exception("Failed to count")}
     end
@@ -1070,19 +1067,18 @@ defmodule Mongo do
       ]
       |> filter_nils()
 
-    with {:ok, doc} <- issue_command(topology_pid, cmd, :write, opts) do
-      case doc do
-        %{"writeErrors" => _} ->
-          {:error, %Mongo.WriteError{n: doc["n"], ok: doc["ok"], write_errors: doc["writeErrors"]}}
+    case issue_command(topology_pid, cmd, :write, opts) do
+      {:ok, %{"writeErrors" => _} = doc} ->
+        {:error, %Mongo.WriteError{n: doc["n"], ok: doc["ok"], write_errors: doc["writeErrors"]}}
 
-        _ ->
-          case acknowledged?(write_concern) do
-            false -> {:ok, %Mongo.InsertManyResult{acknowledged: false}}
-            true -> {:ok, %Mongo.InsertManyResult{inserted_ids: ids}}
-          end
-      end
-    else
-      _ -> {:error, Mongo.Error.exception("Failed to insert many")}
+      {:ok, _doc} ->
+        case acknowledged?(write_concern) do
+          false -> {:ok, %Mongo.InsertManyResult{acknowledged: false}}
+          true -> {:ok, %Mongo.InsertManyResult{inserted_ids: ids}}
+        end
+
+      _ ->
+        {:error, Mongo.Error.exception("Failed to insert many")}
     end
   end
 
@@ -1311,9 +1307,8 @@ defmodule Mongo do
     end
   end
 
-
   @spec filter_upsert_ids(any) :: list
-  defp filter_upsert_ids([_|_] = upserted), do: Enum.map(upserted, fn doc -> doc["_id"] end)
+  defp filter_upsert_ids([_ | _] = upserted), do: Enum.map(upserted, fn doc -> doc["_id"] end)
   defp filter_upsert_ids(_), do: []
 
   @doc """

lib/mongo/bulk_write.ex

@@ -346,8 +346,7 @@ defmodule Mongo.BulkWrite do
     |> BulkWriteResult.reduce()
   end
 
-  @spec filter_upsert_ids(any) :: list
-  defp filter_upsert_ids([_|_] = upserted), do: Enum.map(upserted, fn doc -> doc["_id"] end)
+  defp filter_upsert_ids([_ | _] = upserted), do: Enum.map(upserted, fn doc -> doc["_id"] end)
   defp filter_upsert_ids(_), do: []
 
   defp run_commands(session, {cmds, ids}, opts) do

lib/mongo/session.ex

@@ -115,7 +115,7 @@ defmodule Mongo.Session do
   # * `server_session` the server_session data
   # * `opts` options
   # * `implicit` true or false
-  # * `causal_consistency` true orfalse
+  # * `causal_consistency` true or false
   # * `wire_version` current wire version to check if transactions are possible
   # * `recovery_token` tracked recovery token from response in a sharded transaction
   defstruct topology: nil,

lib/mongo/write_concern.ex

@@ -21,9 +21,7 @@ defmodule Mongo.WriteConcern do
   @spec acknowledged?(nil | keyword | map) :: boolean
   def acknowledged?(nil), do: true
 
-  def acknowledged?(%{} = write_concern), do:
-    Map.get(write_concern, :w) != 0
+  def acknowledged?(%{} = write_concern), do: Map.get(write_concern, :w) != 0
 
-  def acknowledged?(write_concern) when is_list(write_concern), do:
-    Keyword.get(write_concern, :w) != 0
+  def acknowledged?(write_concern) when is_list(write_concern), do: Keyword.get(write_concern, :w) != 0
 end

test/mongo/read_preferences_test.exs

@@ -53,7 +53,6 @@ defmodule Mongo.ReadPreferencesTest do
     rs.reconfig(conf);
 
   """
-  @tag timeout: 700_000
   @tag :tag_set
   @tag :rs_required
   test "find_one, using read_preferences options, tag_set", %{pid: top, catcher: catcher} do
@@ -75,23 +74,21 @@ defmodule Mongo.ReadPreferencesTest do
     }
 
     assert %{"name" => "Oskar"} == Mongo.find_one(top, coll, %{name: "Oskar"}, read_preference: prefs) |> Map.take(["name"])
-
     prefs = %{
       mode: :nearest,
       max_staleness_ms: 120_000,
       tag_sets: [dc: "east", usage: "production"]
     }
 
     assert %{"name" => "Oskar"} == Mongo.find_one(top, coll, %{name: "Oskar"}, read_preference: prefs) |> Map.take(["name"])
-
     ## this configuration results in an empty selection
     prefs = %{
       mode: :secondary,
       max_staleness_ms: 120_000,
       tag_sets: [dc: "east", usage: "production"]
     }
 
-    assert catch_exit(Mongo.find_one(top, coll, %{name: "Oskar"}, read_preference: prefs))
+    assert catch_exit(Mongo.find_one(top, coll, %{name: "Oskar"}, read_preference: prefs, checkout_timeout: 500))
     assert [:checkout_session | _xs] = EventCatcher.empty_selection_events(catcher) |> Enum.map(fn event -> event.action end)
   end
 end

test/mongo/transaction_retries_test.exs

@@ -51,7 +51,7 @@ defmodule Mongo.TransactionRetriesTest do
     assert :ok == Session.end_session(top, session)
 
     assert [:commitTransaction, :commitTransaction, :commitTransaction] = EventCatcher.failed_events(catcher) |> Enum.map(fn event -> event.command_name end)
-    assert [:commitTransaction, :configureFailPoint, :insert, :create] = get_succeeded_events(catcher)
+    assert [:commitTransaction, :configureFailPoint, :insert, :create] = get_succeeded_events(catcher) |> Enum.reject(fn event -> event == :more_to_come end)
   end
 
   @tag :rs_required