Fix warnings

apps/bors_database/lib/context/permission.ex

@@ -21,19 +21,19 @@ defmodule BorsNG.Database.Context.Permission do
       where: u.id == l.user_id)
   end
 
-  def has_permission?(:member, user, patch) do
+  def permission?(:member, user, patch) do
     %User{id: user_id} = user
     %Patch{project_id: project_id} = patch
     project_member?(user_id, project_id) or
-      has_permission?(:reviewer, user, patch)
+      permission?(:reviewer, user, patch)
   end
-  def has_permission?(:reviewer, user, patch) do
+  def permission?(:reviewer, user, patch) do
     %User{id: user_id} = user
     %Patch{id: patch_id, project_id: project_id} = patch
     project_reviewer?(user_id, project_id) or
       patch_delegated_reviewer?(user_id, patch_id)
   end
-  def has_permission?(:none, _, _) do
+  def permission?(:none, _, _) do
     true
   end
 

apps/bors_database/lib/project.ex

@@ -17,7 +17,7 @@ defmodule BorsNG.Database.Project do
     ping!(to_string(project_id))
   end
   def ping!(project_id) do
-    BorsNG.Endpoint.broadcast!("project_ping:1", "new_msg", %{})
+    BorsNG.Endpoint.broadcast!("project_ping:#{project_id}", "new_msg", %{})
   end
 
   schema "projects" do

apps/bors_database/test/context/permission_test.exs

@@ -30,28 +30,28 @@ defmodule BorsNG.Database.Context.PermissionTest do
 
   test "user does not have permission by default", params do
     %{patch: patch, user: user} = params
-    refute Permission.has_permission?(:reviewer, user, patch)
-    refute Permission.has_permission?(:member, user, patch)
+    refute Permission.permission?(:reviewer, user, patch)
+    refute Permission.permission?(:member, user, patch)
   end
 
   test "reviewers have permission", params do
     %{project: project, patch: patch, user: user} = params
     Repo.insert!(%LinkUserProject{user: user, project: project})
-    assert Permission.has_permission?(:reviewer, user, patch)
-    assert Permission.has_permission?(:member, user, patch)
+    assert Permission.permission?(:reviewer, user, patch)
+    assert Permission.permission?(:member, user, patch)
   end
 
   test "delegated users have permission", params do
     %{patch: patch, user: user} = params
     Repo.insert!(%UserPatchDelegation{user: user, patch: patch})
-    assert Permission.has_permission?(:reviewer, user, patch)
-    assert Permission.has_permission?(:member, user, patch)
+    assert Permission.permission?(:reviewer, user, patch)
+    assert Permission.permission?(:member, user, patch)
   end
 
   test "members have partial permission", params do
     %{project: project, patch: patch, user: user} = params
     Repo.insert!(%LinkMemberProject{user: user, project: project})
-    refute Permission.has_permission?(:reviewer, user, patch)
-    assert Permission.has_permission?(:member, user, patch)
+    refute Permission.permission?(:reviewer, user, patch)
+    assert Permission.permission?(:member, user, patch)
   end
 end

apps/bors_frontend/test/command_test.exs

@@ -106,8 +106,10 @@ defmodule BorsNG.CommandTest do
     assert :none == Command.required_permission_level([:ping])
     assert :member == Command.required_permission_level([{:try, ""}])
     assert :member == Command.required_permission_level([{:try, ""}, :ping])
-    assert :reviewer == Command.required_permission_level([:approve, {:try, ""}])
-    assert :reviewer == Command.required_permission_level([{:try, ""}, :approve])
+    assert :reviewer ==
+      Command.required_permission_level([:approve, {:try, ""}])
+    assert :reviewer ==
+      Command.required_permission_level([{:try, ""}, :approve])
   end
 
   test "running ping command should post comment", %{proj: proj} do

apps/bors_frontend/web/command.ex

@@ -286,7 +286,7 @@ defmodule BorsNG.Command do
 
     cmd_list
     |> required_permission_level()
-    |> Permission.has_permission?(c.commenter, c.patch)
+    |> Permission.permission?(c.commenter, c.patch)
     |> if do
       Enum.each(cmd_list, &run(c, &1))
     else

apps/bors_frontend/web/controllers/project_controller.ex

@@ -134,12 +134,14 @@ defmodule BorsNG.ProjectController do
         |> put_flash(:ok, "Successfully updated branches")
         |> redirect(to: project_path(conn, :settings, project))
       {:error, changeset} ->
-        reviewers = Repo.all(User.by_project(project.id))
+        reviewers = Permission.list_users_for_project(:reviewer, project.id)
+        members = Permission.list_users_for_project(:member, project.id)
         conn
         |> put_flash(:error, "Cannot update branches")
         |> render("settings.html",
           project: project,
           reviewers: reviewers,
+          members: members,
           current_user_id: conn.assigns.user.id,
           update_branches: changeset)
     end