Add user membership management to group management

app/controllers/groups_controller.rb

@@ -2,7 +2,8 @@ class GroupsController < ApplicationController
   before_action :assure_signed_in
   before_action :set_user_group
   before_action :set_group, only: %i[ edit update destroy ]
-  before_action :assure_admin, only: %i[ edit update destroy ]
+  before_action :set_group_from_id, only: %i[ remove_user add_user ]
+  before_action :assure_admin, only: %i[ edit update destroy remove_user add_user ]
 
   # GET /groups or /groups.json
   def index
@@ -61,6 +62,32 @@ def leave
     end
   end
 
+  # PATCH /groups/1/remove_user or /groups/1/remove_user.json
+  def remove_user
+    user = User.find(params[:user])
+    respond_to do |format|
+      if user.memberships.destroy_by(group: @group)
+        respond_with_notice(format, redirect: edit_group_path(@group), notice: t(:group_user_removed))
+      else
+        unprocessable_response(format, redirect: :edit, entity: @group)
+      end
+    end
+  end
+
+  # PATCH /groups/1/add_user or /groups/1/add_user.json
+  def add_user
+    respond_to do |format|
+      user = User.where(email: params[:user][:email]).first
+      if user.blank?
+        respond_with_notice(format, redirect: edit_group_url(@group), notice: t(:group_user_not_found))
+      elsif Membership.where(user: user, group: @group, role: :member).first_or_create
+        respond_with_notice(format, redirect: edit_group_url(@group), notice: t(:group_user_added))
+      else
+        unprocessable_response(format, redirect: :edit, entity: @group)
+      end
+    end
+  end
+
   private
 
   def assure_signed_in
@@ -90,11 +117,20 @@ def set_group
     @group = Group.find(params[:id])
   end
 
+  def set_group_from_id
+    @group = Group.find(params[:group_id])
+  end
+
   def unprocessable_response(format, redirect:, entity:)
     format.html { render redirect, status: :unprocessable_entity }
     format.json { render json: entity.errors, status: :unprocessable_entity }
   end
 
+  def respond_with_notice(format, redirect:, notice:)
+    format.html { redirect_to redirect, notice: notice }
+    format.json { head :no_content }
+  end
+
   # Only allow a list of trusted parameters through.
   def group_params
     params.require(:group).permit(:name)

app/views/groups/_modal-add-member.html.erb

@@ -0,0 +1,22 @@
+<div class="modal fade" id="addMemberGroupModal" tabindex="-1" aria-labelledby="addMemberGroupModalLabel" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header border-0">
+        <h5 class="modal-title" id="addMemberGroupModalLabel"><%= t(:group_add_member) %></h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<%= t(:cancel) %>"></button>
+      </div>
+      <div class="modal-body">
+      <%= form_with(model: User.new, url: group_add_user_path(@group), method: :patch, local: true) do |form| %>
+        <div>
+          <%= form.label :email, t(:group_add_member_prompt), class: "form-label" %>
+          <%= form.email_field :email, placeholder: "[email protected]", class: "form-control" %>
+
+          <div class="modal-footer border-0 justify-content-evenly">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><%= t(:cancel) %></button>
+          <%= form.submit t(:save), :class => "btn btn-primary" %>
+        </div>
+      <% end %>
+      </div>
+    </div>
+  </div>
+</div>

app/views/groups/edit.html.erb

@@ -24,20 +24,31 @@
     <tr>
       <td><%= user.full_name %></td>
       <td><%= user.email %></td>
-      <td>
-        <a href="#" class="btn btn-sm btn-warning text-light"><i class="bi bi-chat-fill"></i></a>
-        <a href="#" class="btn btn-sm btn-primary"><i class="bi bi-person-dash-fill"></i></a>
-      </td>
+      <% if not user.admin_in?(@group) %>
+        <td>
+          <a href="#" class="btn btn-sm btn-warning text-light"><i class="bi bi-chat-fill"></i></a>
+          <% if @user.admin_in?(@group) %>
+            <%= button_to group_remove_user_path(@group), method: :patch, params: {group: @group, user: user}, class: "btn btn-sm btn-primary", form: {class: "d-inline"} do %>
+              <i class="bi bi-person-dash-fill"></i>
+            <% end %>
+          <% end %>
+        </td>
+      <% end %>
     </tr>
     <% end %>
   </tbody>
 </table>
 
-<div class="d-flex justify-content-center">
-  <%= link_to t(:group_add_member), "", class: "btn btn-secondary mx-1" %>
+<% if @user.admin_in?(@group) %> 
+  <div class="d-flex justify-content-center">
+    <button type="button" class="btn btn-secondary mx-1" data-bs-toggle="modal" data-bs-target="#addMemberGroupModal">
+      <%= t(:group_add_member) %>
+    </button>
+    <%= render "modal-add-member", group: @group %>
 
-  <button type="button" class="btn btn-primary mx-1" data-bs-toggle="modal" data-bs-target="#deleteGroupModal">
-    <%= t(:delete_group) %>
-  </button>
-  <%= render "modal-delete", group: @group %>
-</div>
+    <button type="button" class="btn btn-primary mx-1" data-bs-toggle="modal" data-bs-target="#deleteGroupModal">
+      <%= t(:delete_group) %>
+    </button>
+    <%= render "modal-delete", group: @group %>
+  </div>
+<% end %>

config/locales/views/groups/de.yml

@@ -9,7 +9,9 @@ de:
   delete_group: "Gruppe löschen"
   leave_group: "Gruppe verlassen"
   edit_group: "Gruppe bearbeiten"
+
   group_add_member: "Nutzer hinzufügen"
+  group_add_member_prompt: "Bitte gib die E-Mail-Adresse des Nutzers ein, den du zur Gruppe hinzufügen möchtest."
 
   group_name : "Gruppenname"
   group_name_prompt: "Bitte gib deiner Gruppe einen Namen"
@@ -28,3 +30,7 @@ de:
   group_new: "Die Gruppe wurde erfolgreich erstellt"
   group_update: "Die Gruppe wurde erfolgreich aktualisiert"
   group_destroy: "Die Gruppe wurde wurde erfolgreich gelöscht"
+
+  group_user_not_found: "Dieser Nutzer konnte nicht gefunden werden"
+  group_user_added: "Nutzer wurde hinzugefügt"
+  group_user_removed: "Nutzer wurde entfernt"

config/locales/views/groups/en.yml

@@ -9,7 +9,9 @@ en:
   delete_group: "Delete group"
   leave_group: "Leave group"
   edit_group: "Edit group"
+
   group_add_member: "Add user"
+  group_add_member_prompt: "Please provide the email address of the user you'd like to add to this group."
 
   group_name : "Groupname"
   group_name_prompt: "Please provide a name for your group"
@@ -28,3 +30,7 @@ en:
   group_new: "Group has been created successfully"
   group_update: "Group has been updated successfully"
   group_destroy: "Group has been deleted successfully"
+
+  group_user_not_found: "This user could not be found"
+  group_user_added: "User was successfully added"
+  group_user_removed: "User was successfully removed"

config/routes.rb

@@ -4,6 +4,7 @@
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
   resources :groups, except: [:show, :new] do
     post :leave
+    patch :add_user, :remove_user
   end
   resources :items do
     patch :reserve

db/schema.rb

@@ -108,10 +108,10 @@
     t.datetime "remember_created_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string "provider", limit: 50, default: "", null: false
-    t.string "uid", limit: 50, default: "", null: false
     t.string "full_name", default: "", null: false
     t.string "description", default: "", null: false
+    t.string "provider", limit: 50, default: "", null: false
+    t.string "uid", limit: 50, default: "", null: false
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end