fix: CD

lib/atomic/activities.ex

@@ -9,6 +9,7 @@ defmodule Atomic.Activities do
   alias Atomic.Activities.ActivityEnrollment
   alias Atomic.Activities.Speaker
   alias Atomic.Feed.Post
+  alias Atomic.Organizations
   alias Atomic.RateLimiter
 
   @doc """
@@ -195,8 +196,8 @@ defmodule Atomic.Activities do
 
   """
   def create_activity_with_post(attrs \\ %{}, after_save \\ &{:ok, &1}) do
-    case not is_nil(attrs["organization_id"]) and
-           RateLimiter.limit_activities(attrs["organization_id"]) do
+    case Organizations.verify_organization_id?(attrs) and
+           RateLimiter.limit_activities(Map.get(attrs, :organization_id)) do
       :ok ->
         Multi.new()
         |> Multi.insert(:post, fn _ ->
@@ -221,19 +222,25 @@ defmodule Atomic.Activities do
 
       {:error, reason} ->
         {:error, reason}
+
+      false ->
+        {:error, "Organization ID is required."}
     end
   end
 
   def create_activity(attrs \\ %{}) do
-    case not is_nil(attrs["organization_id"]) and
-           RateLimiter.limit_activities(attrs["organization_id"]) do
+    case Organizations.verify_organization_id?(attrs) and
+           RateLimiter.limit_activities(Map.get(attrs, :organization_id)) do
       :ok ->
         %Activity{}
         |> Activity.changeset(attrs)
         |> Repo.insert()
 
       {:error, reason} ->
         {:error, reason}
+
+      false ->
+        {:error, "Organization ID is required."}
     end
   end
 

lib/atomic/organizations.ex

@@ -732,8 +732,8 @@ defmodule Atomic.Organizations do
 
   """
   def create_announcement_with_post(attrs \\ %{}) do
-    case not is_nil(attrs["organization_id"]) and
-           RateLimiter.limit_announcements(attrs["organization_id"]) do
+    case verify_organization_id?(attrs) and
+           RateLimiter.limit_announcements(Map.get(attrs, :organization_id)) do
       :ok ->
         Multi.new()
         |> Multi.insert(:post, fn _ ->
@@ -758,12 +758,15 @@ defmodule Atomic.Organizations do
 
       {:error, reason} ->
         {:error, reason}
+
+      false ->
+        {:error, "Organization ID is required"}
     end
   end
 
   def create_announcement(attrs \\ %{}) do
-    case not is_nil(attrs["organization_id"]) and
-           RateLimiter.limit_announcements(attrs["organization_id"]) do
+    case verify_organization_id?(attrs) and
+           RateLimiter.limit_announcements(Map.get(attrs, :organization_id)) do
       :ok ->
         %Announcement{}
         |> Announcement.changeset(attrs)
@@ -774,6 +777,15 @@ defmodule Atomic.Organizations do
     end
   end
 
+  def verify_organization_id?(attrs) do
+    if not Map.has_key?(attrs, :organization_id) or
+         (Map.has_key?(attrs, :organization_id) and is_nil(Map.get(attrs, :organization_id))) do
+      false
+    else
+      true
+    end
+  end
+
   @doc """
   Updates an announcement.
 

test/atomic/activities_test.exs

@@ -32,7 +32,7 @@ defmodule Atomic.ActivitiesTest do
     end
 
     test "create_activity_with_post/2 with invalid data returns error changeset" do
-      assert {:error, %Ecto.Changeset{}} = Activities.create_activity_with_post(@invalid_attrs)
+      assert {:error, _reason} = Activities.create_activity_with_post(@invalid_attrs)
     end
 
     test "create_activity_with_post/2 with maximum_entries lower than minimum_entries" do

test/atomic/organizations_test.exs

@@ -220,13 +220,11 @@ defmodule Atomic.OrganizationsTest do
 
     test "create_announcement_with_post/2 with valid data creates an announcement" do
       valid_attrs = params_for(:announcement)
-
       assert {:ok, %Announcement{}} = Organizations.create_announcement_with_post(valid_attrs)
     end
 
     test "create_announcement_with_post/2 with invalid data returns error changeset" do
-      assert {:error, %Ecto.Changeset{}} =
-               Organizations.create_announcement_with_post(@invalid_attrs)
+      assert {:error, _reason} = Organizations.create_announcement_with_post(@invalid_attrs)
     end
 
     test "update_announcement/2 with valid data updates the announcement" do