Merge branch 'main' into feat/protege-rotas-premium

Author: Luckvc

Procfile.dev

@@ -1,3 +1,4 @@
 web: env RUBY_DEBUG_OPEN=true bin/rails server
 js: yarn build --watch
 css: yarn watch:css
+job: bundle exec rake solid_queue:start

README.md

@@ -6,6 +6,7 @@ O Portfoliorrr é uma rede social com funcionalidades de portfólio para pessoas
 
 - [Informações técnicas](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#informa%C3%A7%C3%B5es-t%C3%A9cnicas)
 - [Como configurar a aplicação](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#como-configurar-a-aplica%C3%A7%C3%A3o)
+- [Ver emails enviados em ambiente de desenvolvimento](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#ver-emails-enviados-em-ambiente-de-desenvolvimento)
 - [Como visualizar a aplicação no navegador](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#como-visualizar-a-aplica%C3%A7%C3%A3o-no-navegador)
 - [Documentação da API](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#documenta%C3%A7%C3%A3o-da-api)
 
@@ -27,6 +28,19 @@ O Portfoliorrr é uma rede social com funcionalidades de portfólio para pessoas
 - Rode o comando `bin/dev`;
 - Acesse a aplicação através do endereço `http://localhost:4000/`
 
+## Ver emails enviados em ambiente de desenvolvimento
+
+- Siga as instruções de configuração da aplicação;
+- Instale localmente a gem `mailcatcher` executando o comando abaixo:
+```shell
+gem install mailcatcher 
+```
+- Execute o comando abaixo para iniciar o `mailcatcher`
+```shell
+mailcatcher
+```
+- Acesse o MailCatcher através do endereço `http://localhost:1080`. Todos e-mails enviados serão mostrados nessa página, que emula uma caixa de entrada.
+
 ## Como rodar os testes da aplicação
 
 - Siga as instruções de configuração da aplicação

api_doc.md

@@ -305,6 +305,7 @@ Corpo da requisição:
 {
   "invitation": {
                   "profile_id": 3,
+                  "project_id": 5,
                   "project_title": "Projeto Cola?Bora!",
                   "project_description": "Projeto Legal",
                   "project_category": "Tecnologia",

app/controllers/api/v1/invitations_controller.rb

@@ -21,7 +21,7 @@ def update
       private
 
       def invite_params
-        invitation_params = :profile_id, :project_title,
+        invitation_params = :profile_id, :project_id, :project_title,
                             :project_description, :project_category,
                             :colabora_invitation_id, :message,
                             :expiration_date

app/controllers/reports_controller.rb

@@ -3,9 +3,9 @@ class ReportsController < ApplicationController
   before_action :set_reportable_for_new, only: :new
   before_action :set_reportable_for_create, only: :create
   before_action :redirect_unless_published_post
-  before_action :authorize!, only: %i[index show]
   before_action :redirect_if_self_report, only: :create
-  before_action :set_report, only: %i[reject show remove_content]
+  before_action :authorize!, only: %i[index show reject remove_content remove_profile]
+  before_action :set_report, only: %i[reject show remove_content remove_profile]
 
   def new
     set_offences
@@ -37,6 +37,13 @@ def remove_content
     redirect_to @report, notice: t('.success')
   end
 
+  def remove_profile
+    @report.reportable.update removed: true
+    @report.reportable.inactive!
+    @report.granted!
+    redirect_to @report, notice: t('.success')
+  end
+
   private
 
   def set_reportable_for_new

app/models/invitation.rb

@@ -2,7 +2,7 @@ class Invitation < ApplicationRecord
   belongs_to :profile
   has_one :notification, as: :notifiable, dependent: :destroy
 
-  validates :profile_id, :project_title, :project_description,
+  validates :profile_id, :project_id, :project_title, :project_description,
             :project_category, :colabora_invitation_id, presence: true
 
   validate :expiration_date_cannot_be_in_the_past
@@ -11,6 +11,7 @@ class Invitation < ApplicationRecord
 
   after_create :set_status
   after_create :create_notification
+  after_create :validate_and_approve_pending_request
 
   def set_status
     self.status = 'pending'
@@ -31,4 +32,9 @@ def truncate_description
   def create_notification
     Notification.create(profile:, notifiable: self)
   end
+
+  def validate_and_approve_pending_request
+    pending_invitation_request = InvitationRequest.pending.find_by(profile_id:, project_id:)
+    pending_invitation_request&.accepted!
+  end
 end

app/models/invitation_request.rb

@@ -7,6 +7,10 @@ class InvitationRequest < ApplicationRecord
 
   after_create :queue_request_invitation_job
 
+  def accepted!
+    super if pending?
+  end
+
   def process_colabora_api_response(response)
     response = json_treated_response(response)
     if response.keys.first == 'data'

app/models/user.rb

@@ -78,6 +78,14 @@ def delete_user_data
     destroy
   end
 
+  def active_for_authentication?
+    super && !profile.removed?
+  end
+
+  def inactive_message
+    I18n.t('reports.removed_account')
+  end
+
   private
 
   def subscribe_likes_mailer_job

app/services/invitation_request_service.rb

@@ -1,5 +1,6 @@
 module InvitationRequestService
   COLABORA_PROJECTS_URL = 'http://localhost:3000/api/v1/projects'.freeze
+  COLABORA_INVITATIONS_BASE_URL = 'http://localhost:3000/api/v1/invitations'.freeze
 
   class ColaboraProject
     def self.send

app/views/invitations/index.html.erb

@@ -4,12 +4,13 @@
       <h2 class="text-center"><%= Invitation.model_name.human(count: 2) %></h2>
 
       <div class="nav-scroller border-bottom mb-4">
-        <nav class="d-flex nav nav-underline">
+        <nav class="d-flex nav nav-underline">          
           <%= link_to t('all'), invitations_path, class: "nav-item col nav-link link-body-emphasis" %>
           <%= link_to t('.pending'), invitations_path(status: :pending), class: "nav-item nav-link col link-body-emphasis #{'active' if params[:status] == 'pending'}" %>
           <%= link_to t('.accepted'), invitations_path(status: :accepted), class: "nav-item nav-link col link-body-emphasis #{'active' if params[:status] == 'accepted'}" %>
           <%= link_to t('.declined'), invitations_path(status: :declined), class: "nav-item nav-link col link-body-emphasis #{'active' if params[:status] == 'declined'}" %>
           <%= link_to t('.expired'), invitations_path(status: :expired), class: "nav-item nav-link col link-body-emphasis #{'active' if params[:status] == 'expired'}" %>
+          <%= link_to t('.cancelled'), invitations_path(status: :cancelled), class: "nav-item nav-link col link-body-emphasis #{'active' if params[:status] == 'cancelled'}" %>
         </nav>
       </div>
 

app/views/reports/show.html.erb

@@ -1,3 +1,6 @@
+<div class="container">
+  <%= link_to t('return_btn'), reports_path, class: 'btn btn-secondary' %>
+</div>
 <div class="d-flex">
   <div class="container d-flex flex-column w-50">
     <div class="mt-3">
@@ -35,22 +38,31 @@
           <p class="card-text"><%= @report.message %></p>
 
           <p class="card-subtitle mb-2 text-muted">
-            <%= I18n.t('.reporting_profile') %>: <%= link_to @report.profile.full_name, profile_path(@report.profile) %>
+            <%= t('.reporting_profile') %>: <%= link_to @report.profile.full_name, profile_path(@report.profile) %>
           </p>
           <% if @report.pending? %>
             <div class="d-flex flex-row justify-content-center mt-5 gap-5">
-              <% unless @report.reportable.is_a? Profile %>
-                <%= button_to t('.remove_content_btn'), remove_content_report_path(@report), class:'card-btn flex-column btn btn-danger btn-lg' %>
+              <% if @report.reportable.is_a? Profile %>
+                <%= button_to t('.remove_profile_btn'), remove_profile_report_path(@report),
+                              class:'card-btn flex-column btn btn-danger btn-lg',
+                              data: { turbo_confirm: t('.remove_profile_warning') } %>
+              <% else %>
+                <%= button_to t('.remove_content_btn'), remove_content_report_path(@report),
+                              class:'card-btn flex-column btn btn-danger btn-lg',
+                              data: { turbo_confirm: t('.remove_content_warning') } %>
               <% end %>
               <%= button_to t('.reject_btn'), reject_report_path(@report), class:'card-btn flex-column btn btn-secondary btn-lg ml-2' %>
             </div>
           <% else %>
             <div class="d-flex flex-row justify-content-center mt-5">
               <h4 class= "card-subtitle mb-2 text-dark">
-                <%= I18n.t('reports.index.rejected') if @report.rejected? %>
+                <%= t('reports.index.rejected') if @report.rejected? %>
               </h4>
               <h4 class= "card-subtitle mb-2 text-danger">
-                <%= I18n.t('reports.index.granted') if @report.granted? %>
+                <% if @report.granted? %>
+                  <%= t('.profile_removed') if @report.reportable.is_a? Profile %>
+                  <%= t('.content_removed') unless @report.reportable.is_a? Profile %>
+                <% end %>
               </h4>
             </div>
           <% end %>

app/views/settings/index.html.erb

@@ -28,7 +28,7 @@
 		<%= form_with(url: deactivate_profile_path, method: :patch) do |form| %>
 			<%= form.submit t('.arquive_btn'),
 				class: "btn btn-danger",
-				data: { turbo_confirm: I18n.t('.turbo_arquive_warning') }
+				data: { turbo_confirm: I18n.t('settings.index.turbo_arquive_warning') }
 			%>
 		<% end %>
 	</div>
@@ -37,7 +37,7 @@
 		<%= form_with(url: delete_account_path, method: :delete) do |form| %>
 			<%= form.submit t('.delete_btn'),
 				class: "btn btn-danger",
-				data: { turbo_confirm: I18n.t('.turbo_delete_warning') }
+				data: { turbo_confirm: I18n.t('settings.index.turbo_delete_warning') }
 			%>
 		<% end %>
 	</div>

config/environments/development.rb

@@ -38,9 +38,12 @@
   config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
 
   config.action_mailer.perform_caching = false
+  config.action_mailer.default_url_options = { host: 'localhost', port: 4000 }
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = { :address => '127.0.0.1', :port => 1025 }
+  config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
@@ -75,7 +78,6 @@
   # Raise error when a before_action's only/except options reference missing actions
   config.action_controller.raise_on_missing_callback_actions = true
 
-  config.action_mailer.default_url_options = { host: 'localhost', port: 4000 }
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
   config.active_job.queue_adapter = :solid_queue

config/locales/models/invitation.pt-BR.yml

@@ -22,6 +22,7 @@ pt-BR:
       accepted: Aceitos
       declined: Recusados
       expired: Expirados
+      cancelled: Cancelados
     date_error: deve ser maior que a data atual
     accepted_status: Aceito
     expired_status: Expirado

config/locales/models/reports.pt-BR.yml

@@ -11,6 +11,7 @@ pt-BR:
         offence_type: Tipo de ofensa
   reports:
     report_btn: Denunciar
+    removed_account: Sua conta foi removida pelos adminitradores
     create:
       self_report: Você não pode denunciar sí mesmo ou o próprio conteúdo.
       success: Sua denúncia foi registrada
@@ -21,12 +22,19 @@ pt-BR:
       success: Denúncia rejeitada com sucesso
     remove_content:
       success: Conteúdo removido com sucesso
+    remove_profile:
+      success: Perfil removido com sucesso
     comment:
       see_post: Ver publicação
     show:
       reporting_profile: Denunciado por
       reject_btn: Rejeitar denúncia
       remove_content_btn: Remover conteúdo
+      remove_profile_btn: Remover perfil
+      remove_profile_warning: O usuário perderá o acesso à conta dele permanentemente. Tem certeza que deseja continuar?
+      remove_content_warning: Esse conteúdo será deletado. Tem certeza que deseja continuar?
+      profile_removed: Perfil removido
+      content_removed: Conteúdo removido
     index:
       pending: Pendente
       granted: Conteúdo removido
@@ -43,3 +51,4 @@ pt-BR:
     spam: Spam
     disturbin_content: Conteúdo pertubador
     harassment: Abuso/Perseguição
+

config/routes.rb

@@ -24,7 +24,11 @@
   resources :subscriptions, only: %i[index update]
 
   resources :reports, only: %i[index new create show] do
-    post 'reject', 'remove_content', on: :member
+    member do
+      post 'reject'
+      post 'remove_content'
+      post 'remove_profile'
+    end
   end
 
   resources :posts, only: %i[] do

db/migrate/20240214130705_add_project_id_to_invitations.rb

@@ -0,0 +1,5 @@
+class AddProjectIdToInvitations < ActiveRecord::Migration[7.1]
+  def change
+    add_column :invitations, :project_id, :integer, null: false
+  end
+end

db/migrate/20240214134106_add_removed_to_profile.rb

@@ -0,0 +1,5 @@
+class AddRemovedToProfile < ActiveRecord::Migration[7.1]
+  def change
+    add_column :profiles, :removed, :boolean, default: false
+  end
+end

db/schema.rb

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :invitation do
     profile
+    project_id { 1 }
     project_title { 'Projeto Cola?Bora!' }
     project_description { 'Um projeto muito legal' }
     project_category { 'Ruby on Rails' }

spec/factories/invitations.rb

@@ -18,4 +18,50 @@
       expect(successful_request).to be_valid
     end
   end
+
+  describe '#accepted!' do
+    it 'muda o status para accepted quando o atual é pending' do
+      invitation_request = create(:invitation_request, status: :pending)
+
+      invitation_request.accepted!
+
+      expect(invitation_request.reload.status).to eq 'accepted'
+    end
+
+    it 'não muda o status para accepted quando o atual é processing' do
+      invitation_request = create(:invitation_request, status: :processing)
+
+      invitation_request.accepted!
+
+      expect(invitation_request.reload.status).not_to eq 'accepted'
+      expect(invitation_request.status).to eq 'processing'
+    end
+
+    it 'não muda o status para accepted quando o atual é refused' do
+      invitation_request = create(:invitation_request, status: :refused)
+
+      invitation_request.accepted!
+
+      expect(invitation_request.reload.status).not_to eq 'accepted'
+      expect(invitation_request.status).to eq 'refused'
+    end
+
+    it 'não muda o status para accepted quando o atual é error' do
+      invitation_request = create(:invitation_request, status: :error)
+
+      invitation_request.accepted!
+
+      expect(invitation_request.reload.status).not_to eq 'accepted'
+      expect(invitation_request.status).to eq 'error'
+    end
+
+    it 'não muda o status para accepted quando o atual é aborted' do
+      invitation_request = create(:invitation_request, status: :aborted)
+
+      invitation_request.accepted!
+
+      expect(invitation_request.reload.status).not_to eq 'accepted'
+      expect(invitation_request.status).to eq 'aborted'
+    end
+  end
 end