[Feat] Confirmation email and new petitions emails

app/controllers/application_controller.rb

@@ -129,4 +129,10 @@ def member_should_exist_and_be_active
       redirect_to select_organization_path
     end
   end
+
+  def user_should_be_confirmed
+    return if current_user.confirmed?
+
+    redirect_to please_confirm_users_path
+  end
 end

app/controllers/organizations_controller.rb

@@ -1,5 +1,6 @@
 class OrganizationsController < ApplicationController
   before_action :load_resource, only: [:show, :edit, :update, :set_current]
+  before_action :user_should_be_confirmed
 
   def index
     if current_user

app/controllers/petitions_controller.rb

@@ -1,8 +1,13 @@
 class PetitionsController < ApplicationController
+  before_action :authenticate_user!
+
   def create
     petition = Petition.new petition_params
 
     if petition.save
+      OrganizationNotifier.new_petition(petition).deliver_now
+      OrganizationNotifier.petition_sent(petition).deliver_now
+
       flash[:notice] = 'Application sent'
     else
       flash[:error] = 'Something went wrong'

app/controllers/users_controller.rb

@@ -1,6 +1,7 @@
 class UsersController < ApplicationController
   before_action :authenticate_user!, except: %i[signup create]
-  before_action :member_should_exist_and_be_active, except: %i[signup create edit show update]
+  before_action :user_should_be_confirmed, except: %i[signup create please_confirm]
+  before_action :member_should_exist_and_be_active, except: %i[signup create edit show update please_confirm]
 
   has_scope :tagged_with, as: :tag
 
@@ -36,17 +37,16 @@ def edit
   def create
     authorize User
 
-    from_signup = params[:from_signup].present?
     email = user_params[:email]
     @user = User.find_or_initialize_by(email: email) do |u|
       u.attributes = user_params
     end
     empty_email = @user.email.empty?
-    @user.from_signup = from_signup
+    @user.from_signup = params[:from_signup].present?
     @user.setup_and_save_user
 
     if @user.persisted?
-      unless from_signup
+      unless @user.from_signup
         @user.tune_after_persisted(current_organization)
         @user.add_tags(current_organization, params[:tag_list] || [])
       end
@@ -55,7 +55,7 @@ def create
     else
       @user.email = "" if empty_email
 
-      render action: from_signup ? 'signup' : 'new'
+      render action: @user.from_signup ? 'signup' : 'new'
     end
   end
 
@@ -73,6 +73,8 @@ def update
   end
 
   def signup
+    redirect_to root_path and return if current_user
+
     @user = User.new
   end
 
@@ -88,6 +90,8 @@ def update_avatar
     redirect_to current_user
   end
 
+  def please_confirm; end
+
   private
 
   def search_and_load_members(members_scope, default_search_params)

app/mailers/organization_notifier.rb

@@ -12,4 +12,27 @@ def recent_posts(posts, locale, users)
       mail(bcc: users.map(&:email))
     end
   end
+
+  def new_petition(petition)
+    @user = petition.user
+    organization = petition.organization
+
+    I18n.with_locale(locale) do
+      mail(
+        subject: 'New Application',
+        to: organization.users.joins(:members).where(members: { manager: true }).pluck(:email).uniq
+      )
+    end
+  end
+
+  def petition_sent(petition)
+    @organization_name = petition.organization.name
+
+    I18n.with_locale(locale) do
+      mail(
+        subject: 'Application sent correctly',
+        to: petition.user.email
+      )
+    end
+  end
 end

app/models/user.rb

@@ -102,7 +102,7 @@ def setup_and_save_user
     # this will be updated to user.id@example.com later on
     self.empty_email = email.strip.empty?
     self.email = "user#{DateTime.now.strftime('%Q')}@example.com" if empty_email && !from_signup
-    skip_confirmation! # auto-confirm, not sending confirmation email
+    skip_confirmation! unless from_signup?
     save
   end
 

app/views/organization_notifier/new_petition.html.erb

@@ -0,0 +1 @@
+Hello! New petition from user <%= @user.username %>. manage your applications <%= link_to 'here', manage_petitions_url %>.

app/views/organization_notifier/petition_sent.html.erb

@@ -0,0 +1 @@
+Hello! your application to <%= @organization_name %> has been sent correctly.

app/views/users/please_confirm.html.erb

@@ -0,0 +1,2 @@
+<h1>Please, confirm the email</h1>
+An email has been sent to <%= current_user.email %>. After confirm you will be able to apply to any organization.

config/routes.rb

@@ -39,6 +39,7 @@
     collection do
       get 'signup'
       get 'manage'
+      get 'please_confirm'
     end
   end
   put :update_avatar, to: 'users#update_avatar'