Merge branch 'fix-categories' into 'master'

Fix categories and tags

See merge request tcit/eventos!3

lib/eventos/events/event.ex

@@ -32,7 +32,7 @@ defmodule Eventos.Events.Event do
   """
   use Ecto.Schema
   import Ecto.Changeset
-  alias Eventos.Events.{Event, Participant, Request, Tag, Session, Track}
+  alias Eventos.Events.{Event, Participant, Request, Tag, Category, Session, Track}
   alias Eventos.Events.Event.TitleSlug
   alias Eventos.Accounts.Account
 
@@ -44,12 +44,14 @@ defmodule Eventos.Events.Event do
     field :geom, Geo.Geometry
     field :slug, TitleSlug.Type
     field :state, :integer, default: 0
+    field :status, :integer, default: 0
     field :public, :boolean, default: true
     field :thumbnail, :string
     field :large_image, :string
     field :publish_at, Timex.Ecto.DateTimeWithTimezone
     belongs_to :organizer, Account, [foreign_key: :organizer_id]
-    has_many :tags, Tag
+    many_to_many :tags, Tag, join_through: "events_tags"
+    belongs_to :category, Category
     many_to_many :participants, Account, join_through: Participant
     has_many :event_request, Request
     has_many :tracks, Track
@@ -61,8 +63,9 @@ defmodule Eventos.Events.Event do
   @doc false
   def changeset(%Event{} = event, attrs) do
     event
-    |> cast(attrs, [:title, :description, :begins_on, :ends_on, :organizer_id])
-    |> validate_required([:title, :description, :begins_on, :ends_on, :organizer_id])
+    |> cast(attrs, [:title, :description, :begins_on, :ends_on, :organizer_id, :category_id, :state, :geom, :status, :public, :thumbnail, :large_image, :publish_at])
+    |> cast_assoc(:tags)
+    |> validate_required([:title, :description, :begins_on, :ends_on, :organizer_id, :category_id])
     |> TitleSlug.maybe_generate_slug()
     |> TitleSlug.unique_constraint()
   end

priv/repo/migrations/20180110092600_create_events.exs

@@ -11,10 +11,12 @@ defmodule Eventos.Repo.Migrations.CreateEvents do
       add :geom, :geometry
       add :state, :integer, null: false
       add :public, :boolean, null: false
+      add :status, :integer, null: false
       add :large_image, :string
       add :thumbnail, :string
       add :publish_at, :datetimetz
       add :organizer_id, references(:accounts, on_delete: :nothing), null: false
+      add :category_id, references(:categories, on_delete: :nothing), null: false
 
       timestamps()
     end

priv/repo/migrations/20180110093906_create_events_tags.exs

@@ -0,0 +1,10 @@
+defmodule Eventos.Repo.Migrations.CreateEventsTags do
+  use Ecto.Migration
+
+  def change do
+    create table(:events_tags, primary_key: false) do
+      add :event_id, references(:events)
+      add :tag_id, references(:tags)
+    end
+  end
+end

test/eventos/events/events_test.exs

@@ -17,6 +17,10 @@ defmodule Eventos.EventsTest do
     insert(:event, organizer: account_fixture())
   end
 
+  def category_fixture do
+    insert(:category)
+  end
+
   describe "events" do
     alias Eventos.Events.Event
 
@@ -37,7 +41,9 @@ defmodule Eventos.EventsTest do
 
     test "create_event/1 with valid data creates a event" do
       {:ok, account} = Accounts.create_account(@account_valid_attrs)
+      category = category_fixture()
       valid_attrs_with_account_id = Map.put(@event_valid_attrs, :organizer_id, account.id)
+      valid_attrs_with_account_id = Map.put(valid_attrs_with_account_id, :category_id, category.id)
       assert {:ok, %Event{} = event} = Events.create_event(valid_attrs_with_account_id)
       assert event.begins_on == DateTime.from_naive!(~N[2010-04-17 14:00:00.000000Z], "Etc/UTC")
       assert event.description == "some description"
@@ -146,15 +152,6 @@ defmodule Eventos.EventsTest do
     @update_attrs %{description: "some updated description", picture: "some updated picture", title: "some updated title"}
     @invalid_attrs %{description: nil, picture: nil, title: nil}
 
-    def category_fixture(attrs \\ %{}) do
-      {:ok, category} =
-        attrs
-        |> Enum.into(@valid_attrs)
-        |> Events.create_category()
-
-      category
-    end
-
     test "list_categories/0 returns all categories" do
       category = category_fixture()
       assert Events.list_categories() == [category]

test/eventos_web/controllers/event_controller_test.exs

@@ -31,6 +31,9 @@ defmodule EventosWeb.EventControllerTest do
   describe "create event" do
     test "renders event when data is valid", %{conn: conn, user: user} do
       attrs = Map.put(@create_attrs, :organizer_id, user.account.id)
+
+      category = insert(:category)
+      attrs = Map.put(attrs, :category_id, category.id)
       conn = auth_conn(conn, user)
       conn = post conn, event_path(conn, :create), event: attrs
       assert %{"id" => id} = json_response(conn, 201)["data"]

test/support/factory.ex

@@ -25,6 +25,13 @@ defmodule Eventos.Factory do
     }
   end
 
+  def category_factory do
+    %Eventos.Events.Category{
+      title: sequence("MyCategory"),
+      description: "My category desc"
+    }
+  end
+
   def event_factory do
     %Eventos.Events.Event{
       title: sequence("MyEvent"),
@@ -32,7 +39,8 @@ defmodule Eventos.Factory do
       description: "My desc",
       begins_on: nil,
       ends_on: nil,
-      organizer: build(:account)
+      organizer: build(:account),
+      category: build(:category)
     }
   end