Impove Onboarding / Membership management process

app/controllers/application_controller.rb

@@ -53,7 +53,7 @@ def after_sign_in_path_for(user)
     elsif user.members.present?
       users_path
     else
-      page_path("about")
+      organizations_path
     end
   end
 

app/controllers/members_controller.rb

@@ -6,6 +6,8 @@ def destroy
     toggle_active_posts
     @member.destroy
 
+    OrganizationNotifier.member_deleted(@member).deliver_now
+
     redirect_to request.referer.include?(organizations_path) ? organizations_path : manage_users_path
   end
 

app/mailers/organization_notifier.rb

@@ -18,8 +18,8 @@ def new_petition(petition)
 
     I18n.with_locale(locale) do
       mail(
-        subject: 'New Application',
-        bcc: organization.users.joins(:members).where(members: { manager: true }).pluck(:email).uniq
+        subject: "New Application - #{organization.name}",
+        bcc: organization.all_managers.pluck(:email).uniq
       )
     end
   end
@@ -34,4 +34,16 @@ def petition_sent(petition)
       )
     end
   end
+
+  def member_deleted(member)
+    @user = member.user
+    organization = member.organization
+
+    I18n.with_locale(locale) do
+      mail(
+        subject: "Membership deleted - #{organization.name}",
+        bcc: organization.all_managers.pluck(:email).uniq
+      )
+    end
+  end
 end

app/models/organization.rb

@@ -33,15 +33,19 @@ class Organization < ApplicationRecord
   before_validation :ensure_url
   after_create :create_account
 
+  def to_s
+    "#{name}"
+  end
+
   def all_transfers_with_accounts
     all_transfers.
       includes(movements: { account: :accountable }).
       order("transfers.created_at DESC").
       distinct
   end
 
-  def to_s
-    "#{name}"
+  def all_managers
+    users.where(members: { manager: true })
   end
 
   def display_name_with_uid

app/views/organization_notifier/member_deleted.html.erb

@@ -0,0 +1 @@
+User <%= @user.username %> has unsubscribed from the organization.

app/views/organizations/index.html.erb

@@ -31,7 +31,7 @@
         </tr>
       </thead>
       <tbody>
-        <%= render partial: 'organizations_row', collection: @user_organizations, as: :org if !params[:page] || params[:page] == '1' %>
+        <%= render partial: 'organizations_row', collection: @user_organizations, as: :org if @user_organizations.present? %>
         <%= render partial: 'organizations_row', collection: @organizations, as: :org %>
       </tbody>
     </table>