Merge branch 'feat/adiciona-friendly-id' into feat/adiciona-friendlyid-a-outros-models

Author: anaresgalla

app/controllers/connections_controller.rb

@@ -48,6 +48,6 @@ def set_connection_and_profile
   end
 
   def set_profile
-    @profile = Profile.find params[:profile_id]
+    @profile = Profile.friendly.find params[:profile_id]
   end
 end

app/controllers/invitations_controller.rb

@@ -25,7 +25,7 @@ def show; end
   private
 
   def set_invitation
-    @invitation = Invitation.find(params[:id])
+    @invitation = Invitation.friendly.find(params[:id])
   end
 
   def authorize!

app/controllers/profiles_controller.rb

@@ -50,7 +50,7 @@ def redirect_unauthorized_access
   end
 
   def set_profile_and_posts
-    @profile = Profile.find(params[:id])
+    @profile = Profile.friendly.find(params[:id])
     @posts = current_user == @profile.user ? @profile.posts : @profile.posts.published
   end
 

app/controllers/reports_controller.rb

@@ -49,7 +49,7 @@ def remove_profile
   def set_reportable_for_new
     reportable_type = params[:reportable_type]
     @reportable = Post.friendly.find(reportable_id) if reportable_type == 'Post'
-    @reportable = Profile.find(reportable_id) if reportable_type == 'Profile'
+    @reportable = Profile.friendly.find(reportable_id) if reportable_type == 'Profile'
     @reportable = Comment.find(reportable_id) if reportable_type == 'Comment'
     @reportable = Reply.find(reportable_id) if reportable_type == 'Reply'
   end

app/controllers/settings_controller.rb

@@ -40,7 +40,7 @@ def open_to_work
   private
 
   def redirect_unauthorized_access
-    @profile = Profile.find(params[:profile_id])
+    @profile = Profile.friendly.find(params[:profile_id])
     return if current_user == @profile.user
 
     redirect_to root_path, alert: t('alerts.unauthorized')

app/mailers/invitations_mailer.rb

@@ -1,6 +1,6 @@
 class InvitationsMailer < ApplicationMailer
   def received_invitation
-    profile = Profile.find(params[:profile_id])
+    profile = Profile.friendly.find(params[:profile_id])
     project_title = params[:project_title]
     mail(subject: t('.subject'), to: profile.user.email,
          body: t('.body', title: project_title))

app/models/invitation.rb

@@ -13,6 +13,9 @@ class Invitation < ApplicationRecord
   after_create :create_notification
   after_create :validate_and_approve_pending_request
 
+  extend FriendlyId
+  friendly_id :project_title, use: :slugged
+
   def set_status
     self.status = 'pending'
   end

app/models/profile.rb

@@ -1,30 +1,22 @@
 class Profile < ApplicationRecord
   belongs_to :user
-
   has_one_attached :photo
   has_one :personal_info, dependent: :destroy
-
   has_many :professional_infos, dependent: :destroy
   has_many :education_infos, dependent: :destroy
   has_many :profile_job_categories, dependent: :destroy
   has_many :invitations, dependent: :destroy
   has_many :notifications, dependent: :destroy
   has_many :invitation_requests, dependent: :destroy
-
   has_many :posts, through: :user
   has_many :job_categories, through: :profile_job_categories
-
   has_many :reports_submitted, class_name: 'Report', dependent: :destroy
   has_many :reports_received, class_name: 'Report', as: :reportable, dependent: :destroy
-
   has_many :connections, foreign_key: :followed_profile_id, dependent: :destroy, inverse_of: :followed_profile
-
   has_many :followers, class_name: 'Connection', foreign_key: :followed_profile_id, dependent: :destroy,
                        inverse_of: :follower
-
   has_many :followed_profiles, class_name: 'Connection', foreign_key: :follower_id, dependent: :destroy,
                                inverse_of: :followed_profile
-
   accepts_nested_attributes_for :personal_info
   accepts_nested_attributes_for :professional_infos
   accepts_nested_attributes_for :education_infos
@@ -38,28 +30,33 @@ class Profile < ApplicationRecord
   enum privacy: { private_profile: 0, public_profile: 10 }
   enum status: { inactive: 0, active: 5 }
 
+  extend FriendlyId
+  friendly_id :profile_permalink, use: :slugged
+
   delegate :full_name, :email, to: :user
 
+  def profile_permalink
+    user.full_name.to_s
+  end
+
   def self.order_by_premium
     joins(user: :subscription).order('subscriptions.status DESC, users.full_name ASC')
   end
 
   def self.advanced_search(search_query)
     left_outer_joins(:job_categories, :personal_info, :user).where(
-      'job_categories.name LIKE :term OR
-       personal_infos.city LIKE :term OR
-       users.full_name LIKE :term OR users.search_name LIKE :term',
+      'job_categories.name LIKE :term OR personal_infos.city LIKE :term OR users.full_name LIKE :term
+       OR users.search_name LIKE :term',
       { term: "%#{sanitize_sql_like(search_query)}%" }
     ).public_profile.active.uniq
   end
 
   def self.get_profile_job_categories_json(query)
     profiles = search_by_job_categories(query)
-    profiles_json = profiles.map do |profile|
+    profiles.map do |profile|
       { user_id: profile.user_id, full_name: profile.full_name,
         job_categories: ProfileJobCategory.generate_profile_job_categories_json(profile.id) }
-    end
-    profiles_json.as_json
+    end.as_json
   end
 
   def self.search_by_job_categories(query)
@@ -96,20 +93,15 @@ def self.most_followed(limit)
   def inactive!
     super
     user.update(old_name: user.full_name, full_name: 'Perfil Desativado')
-    user.posts.each do |post|
-      post.update(old_status: post.status)
-    end
-
+    user.posts.each { |post| post.update(old_status: post.status) }
     user.posts.each(&:archived!)
     Connection.where(follower: self).or(Connection.where(followed_profile: self)).find_each(&:inactive!)
   end
 
   def active!
     super
     user.update(full_name: user.old_name)
-    user.posts.each do |post|
-      post.update(status: post.old_status)
-    end
+    user.posts.each { |post| post.update(status: post.old_status) }
     Connection.where(follower: self).or(Connection.where(followed_profile: self)).find_each(&:active!)
   end
 

db/migrate/20240215115659_add_slug_to_profiles.rb

@@ -0,0 +1,6 @@
+class AddSlugToProfiles < ActiveRecord::Migration[7.1]
+  def change
+    add_column :profiles, :slug, :string
+    add_index :profiles, :slug, unique: true
+  end
+end

db/migrate/20240215173337_add_slug_to_invitations.rb

@@ -0,0 +1,6 @@
+class AddSlugToInvitations < ActiveRecord::Migration[7.1]
+  def change
+    add_column :invitations, :slug, :string
+    add_index :invitations, :slug, unique: true
+  end
+end

db/migrate/20240215171359_create_friendly_id_slugs.rb renamed to db/migrate/20240215181135_create_friendly_id_slugs.rb

@@ -59,7 +59,7 @@
     click_button class: 'dropdown-toggle'
     click_on 'Sair'
 
-    expect(current_path).to eq root_path
+    expect(page).to have_current_path root_path
     expect(page).to have_content 'Logout efetuado com sucesso'
   end
 

db/schema.rb

@@ -17,7 +17,7 @@
     expect(mail).to have_received(:deliver_later)
 
     expect(Connection.count).to eq 1
-    expect(current_path).to eq profile_path(followed)
+    expect(page).to have_current_path profile_path(followed.profile.slug)
     expect(page).to have_content('Agora você está seguindo Eliseu Ramos')
     expect(page).not_to have_button('Seguir', exact: true)
     expect(page).to have_button('Deixar de Seguir', exact: true)
@@ -28,7 +28,7 @@
 
     visit profile_path(followed.profile)
 
-    expect(current_path).to eq new_user_session_path
+    expect(page).to have_current_path new_user_session_path
     expect(page).to have_content 'Para continuar, faça login ou registre-se.'
   end
 
@@ -43,7 +43,7 @@
     click_on 'Seguir'
 
     follower_relationship = Connection.last
-    expect(current_path).to eq profile_path(followed.profile)
+    expect(page).to have_current_path profile_path(followed.profile)
     expect(follower_relationship).to be_active
     expect(page).to have_content('Agora você está seguindo Eliseu Ramos')
     expect(page).to have_button('Deixar de Seguir', exact: true)

spec/system/authentication/visitor_logs_in_spec.rb

@@ -12,7 +12,7 @@
     click_on 'Deixar de Seguir'
 
     follower_relationship = Connection.last
-    expect(current_path).to eq profile_path(followed.profile)
+    expect(page).to have_current_path profile_path(followed.profile)
     expect(follower_relationship).to be_inactive
     expect(page).to have_content("Você deixou de seguir #{followed.full_name}")
     expect(page).to have_button('Seguir', exact: true)

spec/system/connections/user_follows_another_user_spec.rb

@@ -47,7 +47,7 @@
 
       visit profile_following_path(user.profile)
 
-      expect(current_path).to eq new_user_session_path
+      expect(page).to have_current_path new_user_session_path
     end
   end
 end

spec/system/connections/user_unfollows_another_user_spec.rb

@@ -47,6 +47,6 @@
 
     visit profile_connections_path(user.profile)
 
-    expect(current_path).to eq new_user_session_path
+    expect(page).to have_current_path new_user_session_path
   end
 end

spec/system/connections/user_views_followers_spec.rb

@@ -62,7 +62,7 @@
       check 'Exibir no Perfil'
       click_on 'Salvar'
 
-      expect(current_path).to eq new_user_profile_education_info_path
+      expect(page).to have_current_path new_user_profile_education_info_path
       expect(page).to have_content 'Não foi possível cadastrar formação acadêmica'
       expect(page).to have_content 'Instituição não pode ficar em branco'
       expect(page).to have_content 'Curso não pode ficar em branco'

spec/system/connections/user_views_following_users_spec.rb

@@ -38,7 +38,7 @@
       check 'Exibir no Perfil'
       click_on 'Salvar'
 
-      expect(current_path).to eq edit_education_info_path(education_info)
+      expect(page).to have_current_path edit_education_info_path(education_info)
       expect(page).to have_content 'Não foi possível atualizar formação acadêmica'
       expect(page).to have_content 'Instituição não pode ficar em branco'
       expect(page).to have_content 'Curso não pode ficar em branco'

spec/system/education_info/user_creates_education_info_spec.rb

@@ -13,7 +13,7 @@
         click_on 'Convites'
       end
 
-      expect(current_path).to eq invitations_path
+      expect(page).to have_current_path invitations_path
       expect(page).to have_content 'Projeto Cola?Bora!'
       expect(page).to have_content 'Um projeto muito legal'
       expect(page).to have_content "Expira dia: #{I18n.l(invitation.expiration_date, format: :default)}"
@@ -134,6 +134,6 @@
   it 'mas precisa estar logado' do
     visit invitations_path
 
-    expect(current_path).to eq new_user_session_path
+    expect(page).to have_current_path new_user_session_path
   end
 end

spec/system/education_info/user_edits_education_info_spec.rb

@@ -17,7 +17,7 @@
   it 'e deve estar logado' do
     visit job_categories_path
 
-    expect(current_path).to eq(new_user_session_path)
+    expect(page).to have_current_path(new_user_session_path)
     expect(page).to have_content('Para continuar, faça login ou registre-se.')
   end
 

spec/system/invitations/user_views_invitations_spec.rb

@@ -22,7 +22,7 @@
     visit notifications_path
     click_on 'Paulo começou a seguir você'
 
-    expect(page).to have_current_path profile_path(follower)
+    expect(page).to have_current_path profile_path(follower.profile.slug)
     expect(Notification.last).to be_clicked
   end
 end

spec/system/job_categories/admin_create_job_category_spec.rb

@@ -78,7 +78,7 @@
     it 'e é redirecionado para a tela de login' do
       visit edit_user_profile_path
 
-      expect(current_path).to eq new_user_session_path
+      expect(page).to have_current_path new_user_session_path
       expect(page).to have_content 'Para continuar, faça login ou registre-se'
     end
   end

spec/system/notifications/user_sees_new_follower_notification_spec.rb

@@ -4,7 +4,7 @@
   it 'apenas quando autenticado' do
     visit new_post_path
 
-    expect(current_path).to eq new_user_session_path
+    expect(page).to have_current_path new_user_session_path
   end
 
   it 'com sucesso' do

spec/system/personal_info/user_edits_personal_info_spec.rb

@@ -37,7 +37,7 @@
     login_as user
     visit edit_post_path(post)
 
-    expect(current_path).to eq root_path
+    expect(page).to have_current_path root_path
     expect(page).to have_content 'Você não pode acessar este conteúdo ou realizar esta ação'
   end
 
@@ -70,7 +70,7 @@
     post = create(:post, user:, title: 'Post A', content: 'Primeira postagem')
 
     login_as user
-    visit profile_path(user)
+    visit profile_path(user.profile.slug)
     within "div#post-#{post.id}" do
       click_button id: 'pin'
     end
@@ -91,7 +91,7 @@
     post = create(:post, user:, title: 'Post A', content: 'Primeira postagem', pin: 'pinned')
 
     login_as user
-    visit profile_path(user)
+    visit profile_path(user.profile.slug)
     within 'div#fixed' do
       click_button id: 'unpin'
     end
@@ -111,7 +111,7 @@
     post2 = create(:post, user:, title: 'Post B', content: 'Segunda postagem')
 
     login_as user
-    visit profile_path(user)
+    visit profile_path(user.profile.slug)
     within "div#post-#{post.id}" do
       click_button id: 'pin'
     end
@@ -134,7 +134,7 @@
     other_user = create(:user, citizen_id_number: '61328427056', email: '[email protected]')
 
     login_as other_user
-    visit profile_path(user)
+    visit profile_path(user.profile.slug)
 
     expect(page).not_to have_content 'Fixar'
     expect(page).not_to have_content 'Desafixar'