Merge pull request #68 from dwyl/edit-response

Edit response

.buildpacks

@@ -0,0 +1,3 @@
+https://github.com/dscout/wkhtmltopdf-buildpack.git
+https://github.com/HashNuke/heroku-buildpack-elixir.git
+https://github.com/gjaldon/heroku-buildpack-phoenix-static.git

.gitignore

@@ -27,5 +27,4 @@ erl_crash.dump
 cover
 
 # Environment Variables
-
 .env

Procfile

@@ -0,0 +1 @@
+web: MIX_ENV=prod mix run priv/repo/seeds.exs && mix phoenix.server

README.md

@@ -53,9 +53,21 @@ We recommend reading: https://github.com/dwyl/learn-phoenix-framework
 
 ### Get Started in _2 Minutes_
 
+
 + Clone the Git repository: `git clone [email protected]:dwyl/feedback.git && cd feedback`
 + Install dependencies with `mix deps.get && npm install`
 + Create and migrate your database with `mix ecto.create && mix ecto.migrate`
++ Set environment variables:
+  + ADMIN_EMAIL - the email that you want to log in with (must also be verified by AWS)
+  + ADMIN_PASSWORD - the password you want to log in with
+  + SECRET_KEY_BASE - taken from `config.exs`
+  + TARGET_EMAIL - verified SES email for testing
+  + SES_SERVER - your SES server
+  + SES_PORT - your SES port
+  + SMTP_USERNAME - your SMTP username
+  + SMTP_PASSWORD - your SMTP password
++ Run `priv/repo/seeds.exs`
++ Run `source .env` to load your environment variables
 + Start Phoenix endpoint with `mix phoenix.server`
 
 Now visit [`localhost:4000`](http://localhost:4000) from your web browser.

config/config.exs

@@ -12,7 +12,7 @@ config :feedback,
 # Configures the endpoint
 config :feedback, Feedback.Endpoint,
   url: [host: "localhost"],
-  secret_key_base: "aBi07mDCHwwdqkunV/mx7LlDilXqy7GeZlrXMOm1Qxtdx9e6KfZ2BsF7O+qpZXSs",
+  secret_key_base: System.get_env("SECRET_KEY_BASE"),
   render_errors: [view: Feedback.ErrorView, accepts: ~w(html json)],
   pubsub: [name: Feedback.PubSub,
            adapter: Phoenix.PubSub.PG2]
@@ -22,6 +22,17 @@ config :logger, :console,
   format: "$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
+# Configures mailing
+config :feedback, Feedback.Mailer,
+  adapter: Bamboo.SMTPAdapter,
+  server: System.get_env("SES_SERVER"),
+  port: System.get_env("SES_PORT"),
+  username: System.get_env("SMTP_USERNAME"),
+  password: System.get_env("SMTP_PASSWORD"),
+  tls: :always, # can be `:always` or `:never`
+  ssl: false, # can be `true`
+  retries: 1
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env}.exs"

config/prod.exs

@@ -13,9 +13,19 @@ use Mix.Config
 # which you typically run after static files are built.
 config :feedback, Feedback.Endpoint,
   http: [port: {:system, "PORT"}],
-  url: [host: "example.com", port: 80],
+  url: [scheme: "https", host: "dwyl-feedback.herokuapp.com", port: 443],
+  force_ssl: [rewrite_on: [:x_forwarded_proto]],
+  secret_key_base: System.get_env("SECRET_KEY_BASE"),
   cache_static_manifest: "priv/static/manifest.json"
 
+# Configure the database
+
+config :feedback, Feedback.Repo,
+  adapter: Ecto.Adapters.Postgres,
+  url: System.get_env("DATABASE_URL"),
+  pool_size: "10",
+  ssl: true
+
 # Do not print debug messages in production
 config :logger, level: :info
 
@@ -58,4 +68,4 @@ config :logger, level: :info
 
 # Finally import the config/prod.secret.exs
 # which should be versioned separately.
-import_config "prod.secret.exs"
+# import_config "prod.secret.exs"

config/test.exs

@@ -17,3 +17,12 @@ config :feedback, Feedback.Repo,
   database: "feedback_test",
   hostname: "localhost",
   pool: Ecto.Adapters.SQL.Sandbox
+
+# Configure password hashing
+
+config :comeonin, :bcrypt_log_rounds, 4
+config :comeonin, :pbkdf2_rounds, 1
+
+# Configure Bamboo email
+config :feedback, Feedback.Mailer,
+  adapter: Bamboo.TestAdapter

coveralls.json

@@ -3,12 +3,11 @@
     "minimum_coverage": 100
   },
   "skip_files": [
-    "web/channels",
     "lib/feedback.ex",
     "test/support/model_case.ex",
     "test/support/channel_case.ex",
     "web/web.ex",
     "web/views/error_helpers.ex",
-    "web/models/*"
+    "web/models/forum.ex"
   ]
 }

elixir_buildpack.config

@@ -0,0 +1 @@
+always_rebuild=true

lib/email.ex

@@ -0,0 +1,11 @@
+defmodule Feedback.Email do
+  use Bamboo.Phoenix, view: Feedback.FeedbackView
+
+  def send_email(to_email_address, subject, message) do
+    new_email()
+    |> to(to_email_address)
+    |> from(System.get_env("ADMIN_EMAIL")) # also needs to be a validated email
+    |> subject(subject)
+    |> text_body(message)
+  end
+end

lib/feedback/mailer.ex

@@ -0,0 +1,3 @@
+defmodule Feedback.Mailer do
+  use Bamboo.Mailer, otp_app: :feedback
+end

mix.exs

@@ -24,7 +24,7 @@ defmodule Feedback.Mixfile do
   def application do
     [mod: {Feedback, []},
      applications: [:phoenix, :phoenix_pubsub, :phoenix_html, :cowboy, :logger, :gettext,
-                    :phoenix_ecto, :postgrex, :comeonin]]
+                    :phoenix_ecto, :postgrex, :comeonin, :bamboo]]
   end
 
   # Specifies which paths to compile per environment.
@@ -44,7 +44,10 @@ defmodule Feedback.Mixfile do
      {:gettext, "~> 0.11"},
      {:cowboy, "~> 1.0"},
      {:comeonin, "~> 2.0"},
-     {:excoveralls, "~> 0.6.2"}]
+     {:excoveralls, "~> 0.6.2"},
+     {:bamboo, "~> 0.7"},
+     {:bamboo_smtp, "~> 1.2.1"},
+     {:mock, "~> 0.2.0", only: :test}]
   end
 
   # Aliases are shortcuts or tasks specific to the current project.

mix.lock

@@ -1,4 +1,6 @@
-%{"certifi": {:hex, :certifi, "1.0.0", "1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039", [:rebar3], []},
+%{"bamboo": {:hex, :bamboo, "0.7.0", "2722e395a396dfedc12d300c900f65b216f7d7bf9d430c5dd0235690997878b7", [:mix], [{:httpoison, "~> 0.9", [hex: :httpoison, optional: false]}, {:plug, "~> 1.0", [hex: :plug, optional: false]}, {:poison, ">= 1.5.0", [hex: :poison, optional: false]}]},
+  "bamboo_smtp": {:hex, :bamboo_smtp, "1.2.1", "47181e338cbee9d028e94f2bc5829816b26d719d8213b07d0fa107d95b591947", [:mix], [{:bamboo, "~> 0.7.0", [hex: :bamboo, optional: false]}, {:gen_smtp, "~> 0.11.0", [hex: :gen_smtp, optional: false]}]},
+  "certifi": {:hex, :certifi, "1.0.0", "1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039", [:rebar3], []},
   "comeonin": {:hex, :comeonin, "2.6.0", "74c288338b33205f9ce97e2117bb9a2aaab103a1811d243443d76fdb62f904ac", [:make, :mix], []},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], []},
   "cowboy": {:hex, :cowboy, "1.1.2", "61ac29ea970389a88eca5a65601460162d370a70018afe6f949a29dca91f3bb0", [:rebar3], [{:cowlib, "~> 1.0.2", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.3.2", [hex: :ranch, optional: false]}]},
@@ -9,13 +11,17 @@
   "excoveralls": {:hex, :excoveralls, "0.6.3", "894bf9254890a4aac1d1165da08145a72700ff42d8cb6ce8195a584cb2a4b374", [:mix], [{:exjsx, "~> 3.0", [hex: :exjsx, optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, optional: false]}]},
   "exjsx": {:hex, :exjsx, "3.2.1", "1bc5bf1e4fd249104178f0885030bcd75a4526f4d2a1e976f4b428d347614f0f", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, optional: false]}]},
   "fs": {:hex, :fs, "0.9.2", "ed17036c26c3f70ac49781ed9220a50c36775c6ca2cf8182d123b6566e49ec59", [:rebar], []},
+  "gen_smtp": {:hex, :gen_smtp, "0.11.0", "d90ff2f021fc86cb2a4259b1f2b177ab6e506676265e26454bf5755855adc956", [:rebar3], []},
   "gettext": {:hex, :gettext, "0.13.1", "5e0daf4e7636d771c4c71ad5f3f53ba09a9ae5c250e1ab9c42ba9edccc476263", [:mix], []},
   "hackney": {:hex, :hackney, "1.7.1", "e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, optional: false]}, {:idna, "4.0.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
+  "httpoison": {:hex, :httpoison, "0.11.1", "d06c571274c0e77b6cc50e548db3fd7779f611fbed6681fd60a331f66c143a0b", [:mix], [{:hackney, "~> 1.7.0", [hex: :hackney, optional: false]}]},
   "idna": {:hex, :idna, "4.0.0", "10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], []},
   "jsx": {:hex, :jsx, "2.8.2", "7acc7d785b5abe8a6e9adbde926a24e481f29956dd8b4df49e3e4e7bcc92a018", [:mix, :rebar3], []},
+  "meck": {:hex, :meck, "0.8.4", "59ca1cd971372aa223138efcf9b29475bde299e1953046a0c727184790ab1520", [:make, :rebar], []},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []},
   "mime": {:hex, :mime, "1.1.0", "01c1d6f4083d8aa5c7b8c246ade95139620ef8effb009edde934e0ec3b28090a", [:mix], []},
   "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
+  "mock": {:hex, :mock, "0.2.1", "bfdba786903e77f9c18772dee472d020ceb8ef000783e737725a4c8f54ad28ec", [:mix], [{:meck, "~> 0.8.2", [hex: :meck, optional: false]}]},
   "phoenix": {:hex, :phoenix, "1.2.3", "b68dd6a7e6ff3eef38ad59771007d2f3f344988ea6e658e9b2c6ffb2ef494810", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, optional: true]}, {:phoenix_pubsub, "~> 1.0", [hex: :phoenix_pubsub, optional: false]}, {:plug, "~> 1.4 or ~> 1.3.3 or ~> 1.2.4 or ~> 1.1.8 or ~> 1.0.5", [hex: :plug, optional: false]}, {:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: false]}]},
   "phoenix_ecto": {:hex, :phoenix_ecto, "3.2.3", "450c749876ff1de4a78fdb305a142a76817c77a1cd79aeca29e5fc9a6c630b26", [:mix], [{:ecto, "~> 2.1", [hex: :ecto, optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, optional: true]}, {:plug, "~> 1.0", [hex: :plug, optional: false]}]},
   "phoenix_html": {:hex, :phoenix_html, "2.9.3", "1b5a2122cbf743aa242f54dced8a4f1cc778b8bd304f4b4c0043a6250c58e258", [:mix], [{:plug, "~> 1.0", [hex: :plug, optional: false]}]},

priv/repo/migrations/20170412151545_add_mood_to_feedback.exs

@@ -0,0 +1,9 @@
+defmodule Feedback.Repo.Migrations.AddMoodToFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      add :mood, :string
+    end
+  end
+end

priv/repo/migrations/20170413200800_add_privacy_to_feedback.exs

@@ -0,0 +1,9 @@
+defmodule Feedback.Repo.Migrations.AddPrivacyToFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      add :private, :boolean
+    end
+  end
+end

priv/repo/migrations/20170413213659_add_public_to_feedback.exs

@@ -0,0 +1,9 @@
+defmodule Feedback.Repo.Migrations.AddPublicToFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      add :public, :boolean
+    end
+  end
+end

priv/repo/migrations/20170413214226_remove_private_from_feedback.exs

@@ -0,0 +1,9 @@
+defmodule Feedback.Repo.Migrations.RemovePrivateFromFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      remove :private
+    end
+  end
+end

priv/repo/migrations/20170418184335_add_responded_at_to_feedback.exs

@@ -0,0 +1,9 @@
+defmodule Feedback.Repo.Migrations.AddRespondedAtToFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      add :responded_at, :date
+    end
+  end
+end

priv/repo/migrations/20170418191425_remove_responded_from_feedback.exs

@@ -0,0 +1,9 @@
+defmodule Feedback.Repo.Migrations.RemoveRespondedFromFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      remove :responded
+    end
+  end
+end

priv/repo/migrations/20170419174138_add_edit_to_feedback.exs

@@ -0,0 +1,10 @@
+defmodule Feedback.Repo.Migrations.AddEditToFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      add :edit, :boolean
+      add :edited, :boolean
+    end
+  end
+end

priv/repo/migrations/20170425145025_create_response.exs

@@ -0,0 +1,16 @@
+defmodule Feedback.Repo.Migrations.CreateResponse do
+  use Ecto.Migration
+
+  def change do
+    create table(:response) do
+      add :response, :text
+      add :edit, :boolean
+      add :edited, :boolean
+      add :feedback_id, references(:feedback, on_delete: :delete_all)
+
+      timestamps()
+    end
+
+    create index(:response, [:feedback_id])
+  end
+end

priv/repo/migrations/20170425155958_remove_response_from_feedback.exs

@@ -0,0 +1,9 @@
+defmodule Feedback.Repo.Migrations.RemoveResponseFromFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      remove :response
+    end
+  end
+end

priv/repo/migrations/20170425160206_remove_responded_at_from_feedback.exs

@@ -0,0 +1,9 @@
+defmodule Feedback.Repo.Migrations.RemoveRespondedAtFromFeedback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:feedback) do
+      remove :responded_at
+    end
+  end
+end

priv/repo/seeds.exs

@@ -1,11 +1,13 @@
-# Script for populating the database. You can run it as:
-#
-#     mix run priv/repo/seeds.exs
-#
-# Inside the script, you can read and write to any of your
-# repositories directly:
-#
-#     Feedback.Repo.insert!(%Feedback.SomeModel{})
-#
-# We recommend using the bang functions (`insert!`, `update!`
-# and so on) as they will fail if something goes wrong.
+alias Feedback.{Repo, User}
+
+case Repo.get_by(User, first_name: "Admin") do
+  nil ->
+    Repo.insert! %User{
+      first_name: "Admin",
+      last_name: "Account",
+      email: System.get_env("ADMIN_EMAIL"),
+      password: System.get_env("ADMIN_PASSWORD"),
+      password_hash: Comeonin.Bcrypt.hashpwsalt(System.get_env("ADMIN_PASSWORD"))
+    }
+  _user -> IO.puts "Admin already in database"
+end

test/channels/room_channel_test.exs

@@ -0,0 +1,18 @@
+defmodule Feedback.RoomChannelTest do
+  use Feedback.ChannelCase
+  alias Feedback.RoomChannel
+
+  setup do
+    {:ok, _, socket} =
+      socket("responded", %{body: "body"})
+      |> subscribe_and_join(RoomChannel, "room:lobby")
+
+    {:ok, socket: socket}
+  end
+
+  test "responded replies with status ok", %{socket: socket} do
+    push socket, "responded", %{body: "body"}
+    assert_broadcast "responded", %{body: "body"}
+    leave socket
+  end
+end