Add categories properly

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
master
Thomas Citharel 5 years ago
parent 9df9a795c7
commit 8b4d1ab4e4

@ -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
@ -51,6 +51,7 @@ defmodule Eventos.Events.Event do
field :publish_at, Timex.Ecto.DateTimeWithTimezone
belongs_to :organizer, Account, [foreign_key: :organizer_id]
has_many :tags, Tag
belongs_to :category, Category
many_to_many :participants, Account, join_through: Participant
has_many :event_request, Request
has_many :tracks, Track
@ -62,8 +63,8 @@ defmodule Eventos.Events.Event do
@doc false
def changeset(%Event{} = event, attrs) do
event
|> cast(attrs, [:title, :description, :begins_on, :ends_on, :organizer_id, :state, :geom, :status, :public, :thumbnail, :large_image, :publish_at])
|> 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])
|> validate_required([:title, :description, :begins_on, :ends_on, :organizer_id, :category_id])
|> TitleSlug.maybe_generate_slug()
|> TitleSlug.unique_constraint()
end

@ -16,6 +16,7 @@ defmodule Eventos.Repo.Migrations.CreateEvents do
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

@ -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]

@ -30,6 +30,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"]

@ -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

Loading…
Cancel
Save