Merge pull request #122 from yknx4/fix/better-float-compare

fix: better float compare

Author: yknx4

.formatter.exs

@@ -1,4 +1,5 @@
 [
+  import_deps: [:ecto, :phoenix],
   inputs: [
     "mix.exs",
     "{config,lib,test,priv,web}/**/*.{ex,exs}"

lib/opencov/helpers/number.ex

@@ -0,0 +1,14 @@
+defmodule Librecov.Helpers.Number do
+  defguard is_greater_than(a, b)
+           when trunc(a * 1000) > trunc(b * 1000)
+
+  defguard is_less_than(a, b)
+           when trunc(a * 1000) < trunc(b * 1000)
+
+  defguard is_equal(a, b) when trunc(a * 1000) == trunc(b * 1000)
+
+  defguard is_different(a, b)
+           when trunc(a * 1000) != trunc(b * 1000)
+
+  defguard is_zero(a) when is_equal(a, 0)
+end

lib/opencov/services/github/checks.ex

@@ -6,6 +6,7 @@ defmodule Librecov.Services.Github.Checks do
   alias Librecov.Project
   alias Librecov.Services.Github.AuthData
   import Librecov.Helpers.Coverage
+  import Librecov.Helpers.Number
 
   def finish_check(
         %AuthData{token: token, owner: owner, repo: repo},
@@ -81,7 +82,7 @@ defmodule Librecov.Services.Github.Checks do
     )
   end
 
-  defp diff_conclusion(diff) when diff == 0, do: "neutral"
+  defp diff_conclusion(diff) when is_zero(diff), do: "neutral"
   defp diff_conclusion(diff) when diff < 0, do: "failure"
   defp diff_conclusion(diff) when diff > 0, do: "success"
 end

lib/opencov/templates/comment_template.ex

@@ -6,6 +6,7 @@ defmodule Librecov.Templates.CommentTemplate do
   alias Librecov.File
   import Librecov.Router.Helpers
   import Librecov.Helpers.Coverage
+  import Librecov.Helpers.Number
   alias Librecov.Repo
   alias Librecov.Queries.BuildQueries
 
@@ -62,7 +63,7 @@ defmodule Librecov.Templates.CommentTemplate do
       both_files =
         files
         |> Enum.map(fn f -> {f, base_files |> Enum.find(&(&1.name == f.name))} end)
-        |> Enum.filter(fn {f1, f2} -> is_nil(f2) || f1.coverage != f2.coverage end)
+        |> Enum.filter(fn {f1, f2} -> is_nil(f2) || is_different(f1.coverage, f2.coverage) end)
 
       """
       #{header}
@@ -81,12 +82,7 @@ defmodule Librecov.Templates.CommentTemplate do
   def get_jobs_files(jobs) do
     jobs
     |> JobManager.preload_files()
-    |> Enum.flat_map(fn job ->
-      job.files
-      |> Enum.filter(fn %File{coverage: coverage, previous_coverage: previous_coverage} ->
-        coverage_diff(coverage, previous_coverage) != 0
-      end)
-    end)
+    |> Enum.flat_map(& &1.files)
   end
 
   defp merge_message(_, nil, _, _), do: ""
@@ -134,11 +130,11 @@ defmodule Librecov.Templates.CommentTemplate do
     "| [#{filename}](#{file_url(Endpoint, :show, file_id)}) | `#{coverage |> format_coverage()} <#{cov_diff |> format_coverage()}> (#{cov_diff |> file_icon()})` | #{cov_diff |> diff_emoji()} |"
   end
 
-  defp diff_emoji(diff) when diff == 0, do: ""
+  defp diff_emoji(diff) when is_zero(diff), do: ""
   defp diff_emoji(diff) when diff < 0, do: "⬇️"
   defp diff_emoji(diff) when diff > 0, do: "⬆️"
 
-  defp file_icon(diff) when diff >= 0.0 and diff <= 0.01, do: "ø"
+  defp file_icon(diff) when is_zero(diff), do: "ø"
   defp file_icon(_diff), do: "Δ"
 
   defp format_commit(commit), do: String.slice(commit, 0, 7)
@@ -148,7 +144,7 @@ defmodule Librecov.Templates.CommentTemplate do
   defp format_branch("refs/heads/" <> branch), do: branch
   defp format_branch(branch), do: branch
 
-  defp diff_verb(diff) when diff == 0, do: "mantain"
+  defp diff_verb(diff) when is_zero(diff), do: "mantain"
   defp diff_verb(diff) when diff < 0, do: "decrease"
   defp diff_verb(diff) when diff > 0, do: "increase"
 end

lib/web/views/common_view.ex

@@ -1,11 +1,12 @@
 defmodule Librecov.CommonView do
+  import Librecov.Helpers.Number
   def format_coverage(num) when is_float(num), do: "#{Float.round(num, 1)}%"
   def format_coverage(_), do: "NA"
 
   def coverage_color(coverage) do
     cond do
       is_nil(coverage) -> "na"
-      coverage == 0 -> "none"
+      is_zero(coverage) -> "none"
       coverage < 80 -> "low"
       coverage < 90 -> "normal"
       coverage < 100 -> "good"