Count holidays inside the function.

digitalnatives · Jun 22, 2017 · 33a1296 · 33a1296
1 parent 621e546
commit 33a1296
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/web/models/terms/term.ex b/web/models/terms/term.ex
@@ -28,21 +28,21 @@ defmodule CoursePlanner.Terms.Term do
   end
 
   def validate_minimum_teaching_days(%{valid?: true} = changeset, holidays) do
-    teaching_days = count_teaching_days(changeset)
+    teaching_days = count_teaching_days(changeset, holidays)
     min = Changeset.get_field(changeset, :minimum_teaching_days)
-    if teaching_days - length(holidays) > min do
+    if teaching_days > min do
       changeset
     else
       Changeset.add_error(changeset, :minimum_teaching_days, "There's not enough minimum teaching days.")
     end
   end
   def validate_minimum_teaching_days(changeset, _holidays), do: changeset
 
-  defp count_teaching_days(changeset) do
+  defp count_teaching_days(changeset, holidays) do
     Timex.diff(
       Changeset.get_field(changeset, :end_date),
       Changeset.get_field(changeset, :start_date),
-      :days) + 1
+      :days) + 1 - length(holidays)
   end
 
   defp validate_date_range(%{valid?: true} = changeset) do