feat: counts for day field in badge table (#379)

cesium · Feb 4, 2024 · 4f900d0 · 4f900d0
1 parent 47a4c96
commit 4f900d0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/lib/mix/tasks/gen.badges.ex b/lib/mix/tasks/gen.badges.ex
@@ -66,7 +66,8 @@ defmodule Mix.Tasks.Gen.Badges do
                      end_badge,
                      image_path,
                      type,
-                     tokens
+                     tokens,
+                     counts_for_day
                    ] ->
       {:ok, begin_datetime, _} = DateTime.from_iso8601(begin_time)
       {:ok, end_datetime, _} = DateTime.from_iso8601(end_time)
@@ -82,7 +83,8 @@ defmodule Mix.Tasks.Gen.Badges do
           begin_badge: begin_badge_datetime,
           end_badge: end_badge_datetime,
           type: String.to_integer(type),
-          tokens: String.to_integer(tokens)
+          tokens: String.to_integer(tokens),
+          counts_for_day: String.to_integer(counts_for_day) != 0
         },
         %{
           avatar: get_avatar(image_path)

diff --git a/lib/safira/contest/badge.ex b/lib/safira/contest/badge.ex
@@ -28,6 +28,8 @@ defmodule Safira.Contest.Badge do
     field(:type, :integer)
     field(:tokens, :integer)
 
+    field(:counts_for_day, :boolean, default: true)
+
     has_many(:referrals, Referral)
     many_to_many(:attendees, Attendee, join_through: Redeem)
 
@@ -45,7 +47,8 @@ defmodule Safira.Contest.Badge do
       :begin_badge,
       :end_badge,
       :type,
-      :tokens
+      :tokens,
+      :counts_for_day
     ])
     |> cast_attachments(attrs, [:avatar])
     |> validate_required([
@@ -56,7 +59,8 @@ defmodule Safira.Contest.Badge do
       :begin_badge,
       :end_badge,
       :type,
-      :tokens
+      :tokens,
+      :counts_for_day
     ])
     |> validate_length(:name, min: 1, max: 255)
     |> validate_length(:description, min: 1, max: 1000)
@@ -74,7 +78,8 @@ defmodule Safira.Contest.Badge do
       :name,
       :description,
       :type,
-      :tokens
+      :tokens,
+      :counts_for_day
     ])
     |> cast_attachments(attrs, [:avatar])
     |> validate_required([
@@ -85,7 +90,8 @@ defmodule Safira.Contest.Badge do
       :name,
       :description,
       :type,
-      :tokens
+      :tokens,
+      :counts_for_day
     ])
     |> validate_length(:name, min: 1, max: 255)
     |> validate_length(:description, min: 1, max: 1000)

diff --git a/lib/safira/contest/contest.ex b/lib/safira/contest/contest.ex
@@ -241,7 +241,8 @@ defmodule Safira.Contest do
         join: t in DailyToken,
         on: a.id == t.attendee_id,
         where:
-          not is_nil(a.user_id) and fragment("?::date", r.inserted_at) == ^date and b.type != ^0 and
+          not is_nil(a.user_id) and fragment("?::date", r.inserted_at) == ^date and
+            b.counts_for_day and
             fragment("?::date", t.day) == ^date,
         select: %{attendee: a, token_count: t.quantity},
         preload: [badges: b, daily_tokens: t]

diff --git a/priv/repo/migrations/20240204181008_add_counts_for_day_to_badges.exs b/priv/repo/migrations/20240204181008_add_counts_for_day_to_badges.exs
@@ -0,0 +1,9 @@
+defmodule Safira.Repo.Migrations.AddCountsForDayToBadges do
+  use Ecto.Migration
+
+  def change do
+    alter table(:badges) do
+      add :counts_for_day, :boolean, default: true
+    end
+  end
+end