fin

.dockerignore

@@ -0,0 +1,45 @@
+# This file excludes paths from the Docker build context.
+#
+# By default, Docker's build context includes all files (and folders) in the
+# current directory. Even if a file isn't copied into the container it is still sent to
+# the Docker daemon.
+#
+# There are multiple reasons to exclude files from the build context:
+#
+# 1. Prevent nested folders from being copied into the container (ex: exclude
+#    /assets/node_modules when copying /assets)
+# 2. Reduce the size of the build context and improve build time (ex. /build, /deps, /doc)
+# 3. Avoid sending files containing sensitive information
+#
+# More information on using .dockerignore is available here:
+# https://docs.docker.com/engine/reference/builder/#dockerignore-file
+
+.dockerignore
+
+# Ignore git, but keep git HEAD and refs to access current commit hash if needed:
+#
+# $ cat .git/HEAD | awk '{print ".git/"$2}' | xargs cat
+# d0b8727759e1e0e7aa3d41707d12376e373d5ecc
+.git
+!.git/HEAD
+!.git/refs
+
+# Common development/test artifacts
+/cover/
+/doc/
+/test/
+/tmp/
+.elixir_ls
+
+# Mix artifacts
+/_build/
+/deps/
+*.ez
+
+# Generated on crash by the VM
+erl_crash.dump
+
+# Static artifacts - These should be fetched and built inside the Docker image
+/assets/node_modules/
+/priv/static/assets/
+/priv/static/cache_manifest.json

Dockerfile

@@ -0,0 +1,97 @@
+# Find eligible builder and runner images on Docker Hub. We use Ubuntu/Debian
+# instead of Alpine to avoid DNS resolution issues in production.
+#
+# https://hub.docker.com/r/hexpm/elixir/tags?page=1&name=ubuntu
+# https://hub.docker.com/_/ubuntu?tab=tags
+#
+# This file is based on these images:
+#
+#   - https://hub.docker.com/r/hexpm/elixir/tags - for the build image
+#   - https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye-20240513-slim - for the release image
+#   - https://pkgs.org/ - resource for finding needed packages
+#   - Ex: hexpm/elixir:1.15.7-erlang-26.1.2-debian-bullseye-20240513-slim
+#
+ARG ELIXIR_VERSION=1.15.7
+ARG OTP_VERSION=26.1.2
+ARG DEBIAN_VERSION=bullseye-20240513-slim
+
+ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
+ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}"
+
+FROM ${BUILDER_IMAGE} as builder
+
+# install build dependencies
+RUN apt-get update -y && apt-get install -y build-essential git \
+    && apt-get clean && rm -f /var/lib/apt/lists/*_*
+
+# prepare build dir
+WORKDIR /app
+
+# install hex + rebar
+RUN mix local.hex --force && \
+    mix local.rebar --force
+
+# set build ENV
+ENV MIX_ENV="prod"
+
+# install mix dependencies
+COPY mix.exs mix.lock ./
+RUN mix deps.get --only $MIX_ENV
+RUN mkdir config
+
+# copy compile-time config files before we compile dependencies
+# to ensure any relevant config change will trigger the dependencies
+# to be re-compiled.
+COPY config/config.exs config/${MIX_ENV}.exs config/
+RUN mix deps.compile
+
+COPY priv priv
+
+COPY lib lib
+
+COPY assets assets
+
+# compile assets
+RUN mix assets.deploy
+
+# Compile the release
+RUN mix compile
+
+# Changes to config/runtime.exs don't require recompiling the code
+COPY config/runtime.exs config/
+
+COPY rel rel
+RUN mix release
+
+# start a new build stage so that the final image will only contain
+# the compiled release and other runtime necessities
+FROM ${RUNNER_IMAGE}
+
+RUN apt-get update -y && \
+  apt-get install -y libstdc++6 openssl libncurses5 locales ca-certificates \
+  && apt-get clean && rm -f /var/lib/apt/lists/*_*
+
+# Set the locale
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+WORKDIR "/app"
+RUN chown nobody /app
+
+# set runner ENV
+ENV MIX_ENV="prod"
+
+# Only copy the final release from the build stage
+COPY --from=builder --chown=nobody:root /app/_build/${MIX_ENV}/rel/phoenixRealWorld ./
+
+USER nobody
+
+# If using an environment that doesn't automatically reap zombie processes, it is
+# advised to add an init process such as tini via `apt-get install`
+# above and adding an entrypoint. See https://github.com/krallin/tini for details
+# ENTRYPOINT ["/tini", "--"]
+
+CMD ["/app/bin/server"]

lib/phoenixRealWorld/blogs.ex

@@ -38,7 +38,7 @@ defmodule PhoenixRealWorld.Blogs do
 
   """
   def get_article!(id) do
-    Repo.get!(Article, id) |> Repo.preload(:tags)
+    Repo.get!(Article, id) |> Repo.preload([:tags, comments: :author]) #←変更
   end
 
   @doc """

lib/phoenixRealWorld/release.ex

@@ -0,0 +1,28 @@
+defmodule PhoenixRealWorld.Release do
+  @moduledoc """
+  Used for executing DB release tasks when run in production without Mix
+  installed.
+  """
+  @app :phoenixRealWorld
+
+  def migrate do
+    load_app()
+
+    for repo <- repos() do
+      {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
+    end
+  end
+
+  def rollback(repo, version) do
+    load_app()
+    {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
+  end
+
+  defp repos do
+    Application.fetch_env!(@app, :ecto_repos)
+  end
+
+  defp load_app do
+    Application.load(@app)
+  end
+end

lib/phoenixRealWorld_web/components/article_components.ex

@@ -0,0 +1,19 @@
+defmodule PhoenixRealWorldWeb.ArticleComponents do
+  use Phoenix.Component
+
+  alias PhoenixRealWorld.Blogs.Article
+
+  attr :article, Article, required: true
+
+  def tags(assigns) do
+    tag_names =
+      assigns.article.tags
+      |> Enum.map(fn %{tag: tag} -> tag end)
+      |> Enum.join(", ")
+    assigns = assign(assigns, :tag_names, tag_names)
+
+    ~H"""
+    <%= @tag_names %>
+    """
+  end
+end

lib/phoenixRealWorld_web/live/article_live/form_component.ex

@@ -21,6 +21,7 @@ defmodule PhoenixRealWorldWeb.ArticleLive.FormComponent do
       >
         <.input field={@form[:title]} type="text" label="Title" />
         <.input field={@form[:body]} type="text" label="Body" />
+        <.input field={@form[:tags_string]} type="text" label="Tags" /> <!-- 追加 -->
         <:actions>
           <.button phx-disable-with="Saving...">Save Article</.button>
         </:actions>
@@ -50,8 +51,8 @@ defmodule PhoenixRealWorldWeb.ArticleLive.FormComponent do
   end
 
   defp save_article(socket, :edit, article_params) do
-    case Blogs.update_article(socket.assigns.article, article_params) do
-      {:ok, article} ->
+    case Blogs.insert_or_update_article_with_tags(socket.assigns.article, article_params) do #←変更
+      {:ok, %{article: article}} -> #←変更
         notify_parent({:saved, article})
 
         {:noreply,
@@ -65,8 +66,9 @@ defmodule PhoenixRealWorldWeb.ArticleLive.FormComponent do
   end
 
   defp save_article(socket, :new, article_params) do
-    case Blogs.create_article(article_params) do
-      {:ok, article} ->
+    article_params = Map.put(article_params, "author_id", socket.assigns.current_user.id)
+    case Blogs.insert_article_with_tags(article_params) do #←変更
+      {:ok, %{article: article}} -> #←変更
         notify_parent({:saved, article})
 
         {:noreply,

lib/phoenixRealWorld_web/live/article_live/index.ex

@@ -4,9 +4,30 @@ defmodule PhoenixRealWorldWeb.ArticleLive.Index do
   alias PhoenixRealWorld.Blogs
   alias PhoenixRealWorld.Blogs.Article
 
+  # ↓削除
+  # @impl true
+  # def mount(_params, _session, socket) do
+  #   {:ok, stream(socket, :articles, Blogs.list_articles())}
+  # end
+
+  # ↓追加
+  @impl true
+  def mount(%{"tag" => tag}, _session, socket) do
+    {:ok,
+     socket
+     |> stream(:articles, Blogs.list_articles_by_tag(tag))
+     |> assign(:tags, Blogs.list_tags())
+    }
+  end
+
+  # ↓追加
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, stream(socket, :articles, Blogs.list_articles())}
+    {:ok,
+     socket
+     |> stream(:articles, Blogs.list_articles())
+     |> assign(:tags, Blogs.list_tags())
+    }
   end
 
   @impl true

lib/phoenixRealWorld_web/live/article_live/index.html.heex

@@ -7,6 +7,20 @@
   </:actions>
 </.header>
 
+<%!-- 追加 --%>
+<div class="flex gap-2">
+  Search by tag:
+  <.link
+    :for={%{tag: tag} <- @tags}
+    href={~p"/articles?tag=#{tag}"}
+    class="underline"
+  >
+
+    <%= tag %>
+  </.link>
+  <.link href={~p"/articles"} class="text-yellow-700">Reset</.link>
+</div>
+
 <.table
   id="articles"
   rows={@streams.articles}
@@ -14,20 +28,25 @@
 >
   <:col :let={{_id, article}} label="Title">{article.title}</:col>
   <:col :let={{_id, article}} label="Body">{article.body}</:col>
+  <%!-- ↓追加 --%>
+  <:col :let={{_id, article}} label="tags">
+    <PhoenixRealWorldWeb.ArticleComponents.tags article={article} />
+  </:col>
+
   <:action :let={{_id, article}}>
     <div class="sr-only">
       <.link navigate={~p"/articles/#{article}"}>Show</.link>
     </div>
-    <.link patch={~p"/articles/#{article}/edit"}>Edit</.link>
+    <%!-- <.link patch={~p"/articles/#{article}/edit"}>Edit</.link> --%>
   </:action>
-  <:action :let={{id, article}}>
+  <%!-- <:action :let={{id, article}}>
     <.link
       phx-click={JS.push("delete", value: %{id: article.id}) |> hide("##{id}")}
       data-confirm="Are you sure?"
     >
       Delete
     </.link>
-  </:action>
+  </:action> --%>
 </.table>
 
 <.modal :if={@live_action in [:new, :edit]} id="article-modal" show on_cancel={JS.patch(~p"/articles")}>
@@ -37,6 +56,7 @@
     title={@page_title}
     action={@live_action}
     article={@article}
+    current_user={@current_user}
     patch={~p"/articles"}
   />
 </.modal>

lib/phoenixRealWorld_web/live/article_live/show.ex

@@ -2,6 +2,7 @@ defmodule PhoenixRealWorldWeb.ArticleLive.Show do
   use PhoenixRealWorldWeb, :live_view
 
   alias PhoenixRealWorld.Blogs
+  alias PhoenixRealWorld.Blogs.Comment #←追加
 
   @impl true
   def mount(_params, _session, socket) do
@@ -10,10 +11,69 @@ defmodule PhoenixRealWorldWeb.ArticleLive.Show do
 
   @impl true
   def handle_params(%{"id" => id}, _, socket) do
+    #↓追加&変更
+    article = Blogs.get_article!(id)
+    %{live_action: action, current_user: user} = socket.assigns
+    # 編集モードで、ログインユーザーが記事の作者でない場合は、記事一覧にリダイレクト
+    if action == :edit && article.author_id != user.id do
+      {:noreply, push_navigate(socket, to: ~p"/articles/#{article}")}
+    # 編集モードで、ログインユーザーが記事の作者である場合は、記事を表示
+    else
+      changeset = Blogs.change_comment(%Comment{}) #←追加
+
       {:noreply,
       socket
       |> assign(:page_title, page_title(socket.assigns.live_action))
-     |> assign(:article, Blogs.get_article!(id))}
+      |> assign(:article, article)
+      |> assign(:comment_form, to_form(changeset))} #←追加
+    end
+  end
+
+  @impl true
+  def handle_event("delete", _value, socket) do
+    %{article: article, current_user: user} = socket.assigns
+
+    if article.author_id != user.id do
+      {:noreply, socket}
+    else
+      {:ok, _} = Blogs.delete_article(article)
+      {:noreply, push_navigate(socket, to: ~p"/articles")}
+    end
+  end
+
+  #追加
+  @impl true
+  def handle_event("validate_comment", %{"comment" => comment_params}, socket) do
+    changeset =
+      %Comment{}
+      |> Blogs.change_comment(comment_params)
+      |> Map.put(:action, :validate)
+
+      {:noreply, assign(socket, :comment_form, to_form(changeset))}
+  end
+
+  #追加
+  @impl true
+  def handle_event("post_comment", %{"comment" => comment_params}, socket) do
+    comment_params =
+      comment_params
+      |> Map.put("article_id", socket.assigns.article.id)
+      |> Map.put("author_id", socket.assigns.current_user.id)
+    case Blogs.create_comment(comment_params) do
+      #コメントの作成に成功した場合
+      {:ok, _} ->
+        article = Blogs.get_article!(socket.assigns.article.id)
+        changeset = Blogs.change_comment(%Comment{})
+
+        {:noreply,
+          socket
+          |> assign(:article, article)
+          |> assign(:comment_form, to_form(changeset))
+          |> put_flash(:info, "Comment posted successfully")}
+      #コメントの作成に失敗した場合
+      _ ->
+        {:noreply, socket}
+    end
   end
 
   defp page_title(:show), do: "Show Article"

lib/phoenixRealWorld_web/live/article_live/show.html.heex

@@ -1,9 +1,12 @@
 <.header>
-  Article {@article.id}
   <:subtitle>This is a article record from your database.</:subtitle>
-  <:actions>
-    <.link patch={~p"/articles/#{@article}/show/edit"} phx-click={JS.push_focus()}>
-      <.button>Edit article</.button>
+  <!--変更 ログインしているかどうか&ログインユーザーと記事の作者が同じかどうか-->
+  <:actions :if={@current_user && @current_user.id == @article.author_id}>
+    <.link patch={~p"/articles/#{@article}/edit"} phx-click={JS.push_focus()}>
+      <button>Edit article</button>
+    </.link>
+    <.link phx-click={JS.push("delete")} data-confirm="Are you sure?">
+      <button>Delete article</button>
     </.link>
   </:actions>
 </.header>
@@ -11,6 +14,24 @@
 <.list>
   <:item title="Title">{@article.title}</:item>
   <:item title="Body">{@article.body}</:item>
+  <:item title="Comments">
+    <.table id="comments" rows={@article.comments}>
+      <:col :let={comment} label="Author"><%= comment.author.email %></:col>
+      <:col :let={comment} label="Body"><%= comment.body %></:col>
+    </.table>
+    <.simple_form
+      :if={@current_user}
+      for={@comment_form}
+      id="comment-form"
+      phx-change="validate_comment"
+      phx-submit="post_comment"
+    >
+      <.input field={@comment_form[:body]} type="textarea" />
+      <:actions>
+        <.button phx-disable_with="Posting...">Post comment</.button>
+      </:actions>
+    </.simple_form>
+    </:item>
 </.list>
 
 <.back navigate={~p"/articles"}>Back to articles</.back>

lib/phoenixRealWorld_web/router.ex

@@ -94,7 +94,7 @@ defmodule PhoenixRealWorldWeb.Router do
 
       # 記事の一覧と詳細はログイン不要．ログインユーザーのデータも参照可能
       live "/articles", ArticleLive.Index, :index #←追加
-      live "/articles/:id", ArticleLive.Show :show #←追加
+      live "/articles/:id", ArticleLive.Show, :show #←追加
     end
   end
 end

rel/overlays/bin/migrate

@@ -0,0 +1,5 @@
+#!/bin/sh
+set -eu
+
+cd -P -- "$(dirname -- "$0")"
+exec ./phoenixRealWorld eval PhoenixRealWorld.Release.migrate

rel/overlays/bin/migrate.bat

@@ -0,0 +1 @@
+call "%~dp0\phoenixRealWorld" eval PhoenixRealWorld.Release.migrate

rel/overlays/bin/server

@@ -0,0 +1,5 @@
+#!/bin/sh
+set -eu
+
+cd -P -- "$(dirname -- "$0")"
+PHX_SERVER=true exec ./phoenixRealWorld start

rel/overlays/bin/server.bat

@@ -0,0 +1,2 @@
+set PHX_SERVER=true
+call "%~dp0\phoenixRealWorld" start

test/phoenixRealWorld_web/live/article_live_test.exs

@@ -13,8 +13,20 @@ defmodule PhoenixRealWorldWeb.ArticleLiveTest do
     %{article: article}
   end
 
+  # ↓追加
+  defp create_article_with_tag(_) do
+    {:ok, %{article: article}} =
+      Blogs.insert_article_with_tag(%{
+        title: "some title",
+        body: "some body",
+        author_id: user_fixture().id,
+        tags_string: "test"
+      })
+    %{article_with_tag: article}
+  end
+
   describe "Index" do
-    setup [:create_article]
+    setup [:create_article, :create_article_with_tag] # ←変更
 
     test "lists all articles", %{conn: conn, article: article} do
       {:ok, _index_live, html} = live(conn, ~p"/articles")
@@ -23,9 +35,26 @@ defmodule PhoenixRealWorldWeb.ArticleLiveTest do
       assert html =~ article.title
     end
 
-    test "saves new article", %{conn: conn} do
+    test "searches articles by tag", %{conn: conn, article: article, article_with_tag: article_with_tag} do
       {:ok, index_live, _html} = live(conn, ~p"/articles")
 
+      index_live |> element("a", "test") |> render_click()
+      assert_redirect(index_live, ~p"/articles?tag=test")
+
+      {:ok, _index_live, html} = live(conn, ~p"/articles?tag=test")
+
+      refute html =~ "/articles/#{article.id}"
+      assert html =~ "/articles/#{article_with_tag.id}"
+    end
+
+    test "saves new article", %{conn: conn} do
+      # {:ok, index_live, _html} = live(conn, ~p"/articles")
+      #↓追加
+      {:ok, index_live, _html} =
+         conn
+         |> log_in_user(user_fixture()) # 第2引数のユーザーでログインした状態にする
+         |> live(~p"/articles")
+
       assert index_live |> element("a", "New Article") |> render_click() =~
                "New Article"
 
@@ -46,35 +75,35 @@ defmodule PhoenixRealWorldWeb.ArticleLiveTest do
       assert html =~ "some title"
     end
 
-    test "updates article in listing", %{conn: conn, article: article} do
-      {:ok, index_live, _html} = live(conn, ~p"/articles")
+    # test "updates article in listing", %{conn: conn, article: article} do
+    #   {:ok, index_live, _html} = live(conn, ~p"/articles")
 
-      assert index_live |> element("#articles-#{article.id} a", "Edit") |> render_click() =~
-               "Edit Article"
+    #   assert index_live |> element("#articles-#{article.id} a", "Edit") |> render_click() =~
+    #            "Edit Article"
 
-      assert_patch(index_live, ~p"/articles/#{article}/edit")
+    #   assert_patch(index_live, ~p"/articles/#{article}/edit")
 
-      assert index_live
-             |> form("#article-form", article: @invalid_attrs)
-             |> render_change() =~ "can't be blank"
+    #   assert index_live
+    #          |> form("#article-form", article: @invalid_attrs)
+    #          |> render_change() =~ "can't be blank"
 
-      assert index_live
-             |> form("#article-form", article: @update_attrs)
-             |> render_submit()
+    #   assert index_live
+    #          |> form("#article-form", article: @update_attrs)
+    #          |> render_submit()
 
-      assert_patch(index_live, ~p"/articles")
+    #   assert_patch(index_live, ~p"/articles")
 
-      html = render(index_live)
-      assert html =~ "Article updated successfully"
-      assert html =~ "some updated title"
-    end
+    #   html = render(index_live)
+    #   assert html =~ "Article updated successfully"
+    #   assert html =~ "some updated title"
+    # end
 
-    test "deletes article in listing", %{conn: conn, article: article} do
-      {:ok, index_live, _html} = live(conn, ~p"/articles")
+    # test "deletes article in listing", %{conn: conn, article: article} do
+    #   {:ok, index_live, _html} = live(conn, ~p"/articles")
 
-      assert index_live |> element("#articles-#{article.id} a", "Delete") |> render_click()
-      refute has_element?(index_live, "#articles-#{article.id}")
-    end
+    #   assert index_live |> element("#articles-#{article.id} a", "Delete") |> render_click()
+    #   refute has_element?(index_live, "#articles-#{article.id}")
+    # end
   end
 
   describe "Show" do
@@ -88,7 +117,12 @@ defmodule PhoenixRealWorldWeb.ArticleLiveTest do
     end
 
     test "updates article within modal", %{conn: conn, article: article} do
-      {:ok, show_live, _html} = live(conn, ~p"/articles/#{article}")
+      # {:ok, show_live, _html} = live(conn, ~p"/articles/#{article}")
+      #↓追加
+      {:ok, show_live, _html} =
+         conn
+         |> log_in_user(PhoenixRealWorld.Repo.preload(article, :author).author)
+         |> live(~p"/articles/#{article}")
 
       assert show_live |> element("a", "Edit") |> render_click() =~
                "Edit Article"
@@ -109,5 +143,42 @@ defmodule PhoenixRealWorldWeb.ArticleLiveTest do
       assert html =~ "Article updated successfully"
       assert html =~ "some updated title"
     end
+
+    # 追加 記事の削除のテスト
+    test "deletes article", %{conn: conn, article: article} do
+      {:ok, show_live, _html}=
+        conn
+        |> log_in_user(PhoenixRealWorld.Repo.preload(article, :author).author)
+        |> live(~p"/articles/#{article}")
+
+      assert show_live |> element("a", "Delete article") |> render_click()
+      assert_redirect(show_live, ~p"/articles")
+
+      {:ok, index_live, _html} = live(conn, ~p"/articles")
+      refute html =~ "/articles/#{article.id}"
+    end
+
+    # 追加 コメントの作成のテスト
+    test "creates comment", %{conn: conn, article: article} do
+      author = user_fixture()
+      {:ok, show_live, _html} =
+        conn
+        |> log_in_user(author)
+        |> live(~p"/articles/#{article}")
+
+        assert show_live
+                |> form("#comment-form", comment: %{body: ""})
+                |> render_change() =~ "can't be blank"
+
+        assert show_live
+                |> form("#comment-form", comment: %{body: "some comment"})
+                |> render_submit()
+
+        html = render(show_live)
+
+        assert html =~ author.email
+        assert html =~ "some comment"
+    end
+
   end
 end

test/support/fixtures/blogs_fixtures.ex

@@ -15,8 +15,8 @@ defmodule PhoenixRealWorld.BlogsFixtures do
       attrs
       |> Enum.into(%{
         body: "some body",
-        title: "some title"
-        authore_id: user_fixture().id #←追加
+        title: "some title",
+        author_id: user_fixture().id #←追加
       })
       |> PhoenixRealWorld.Blogs.create_article()
 
@@ -34,7 +34,7 @@ defmodule PhoenixRealWorld.BlogsFixtures do
       attrs
       |> Enum.into(%{
         body: "some body",
-        article_id: article_fixture().id #←追加
+        article_id: article_fixture().id, #←追加
         author_id: user_fixture().id #←追加
       })
       |> PhoenixRealWorld.Blogs.create_comment()