Merge branch 'main' into feat/adiciona-friendly-id

TreinaDev · Feb 15, 2024 · c708278 · c708278
2 parents 3631964 + 1ad9d72
commit c708278
Show file tree

Hide file tree

Showing 25 changed files with 219 additions and 143 deletions.
diff --git a/app/controllers/api/v1/projects_controller.rb b/app/controllers/api/v1/projects_controller.rb
@@ -2,7 +2,7 @@ module Api
   module V1
     class ProjectsController < ApiController
       def index
-        response = Faraday.get('http://localhost:3000/api/v1/projects')
+        response = ProjectsService::ColaBoraApiGetProjects.send
         if response.status == 200
           projects = JSON.parse(response.body)
           render status: :ok, json: projects.as_json
@@ -13,9 +13,9 @@ def index
       end
 
       def request_invitation
-        data = proposal_params.as_json
-        connection = Faraday.new(url: 'http://localhost:3000', params: data)
-        response = connection.post('api/v1/proposals')
+        invitation_request_id = proposal_params.fetch('invitation_request_id').to_i
+        invitation_request = InvitationRequest.find(invitation_request_id)
+        response = InvitationRequestService::ColaBoraInvitationRequestPost.send(invitation_request)
 
         if response.status == 201
           proposal = JSON.parse(response.body)
@@ -29,8 +29,7 @@ def request_invitation
       private
 
       def proposal_params
-        proposal_attributes = %i[invitation_request_id email message profile_id project_id]
-        params.require(:data).permit(proposal: proposal_attributes)
+        params.permit(:invitation_request_id)
       end
     end
   end

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -6,6 +6,7 @@ def index
     @invitation_request = current_user.invitation_requests.build
     @invitation_requests = current_user.invitation_requests.pluck(:project_id).to_json
     @invitation_requests_projects_ids = current_user.invitation_requests.pluck(:project_id)
+    @projects_url = Rails.configuration.portfoliorrr_api_v1.projects_url
     @free_user = current_user.subscription.inactive?
   end
 

diff --git a/app/javascript/components/projects_vue.js b/app/javascript/components/projects_vue.js
@@ -12,6 +12,7 @@ export default {
       invitationRequestsProjectsIds: window.invitationRequestsProjectsIds,
       freeUser: window.freeUser,
       errorMsg: false,
+      portfoliorrrProjectsApiUrl: window.portfoliorrrProjectsApiUrl,
     }
   },
   computed:{
@@ -47,7 +48,7 @@ export default {
   async created() {
     if (!freeUser) {
       try {
-        let response = await fetch('/api/v1/projects', { signal });
+        let response = await fetch(this.portfoliorrrProjectsApiUrl, { signal });
         if (response.ok) {
           let data = await response.json();
           if (!data.message) {

diff --git a/app/jobs/decline_invitation_job.rb b/app/jobs/decline_invitation_job.rb
@@ -1,10 +1,12 @@
 class DeclineInvitationJob < ApplicationJob
+  PORTFOLIORRR_BASE_URL = Rails.configuration.portfoliorrr_api_v1.base_url
+  PORTFOLIORRR_INVITATION_URL = Rails.configuration.portfoliorrr_api_v1.invitations_url
   retry_on Faraday::ConnectionFailed, Faraday::ServerError, wait: :polynomially_longer, attempts: 5 do |job|
     job.arguments.first.pending!
   end
 
   def perform(invitation)
-    url = "http://localhost:4000/api/v1/invitations/#{invitation.colabora_invitation_id}"
+    url = "#{PORTFOLIORRR_BASE_URL}#{PORTFOLIORRR_INVITATION_URL}#{invitation.colabora_invitation_id}"
     Faraday.new { |faraday| faraday.response :raise_error }.patch(url)
     invitation.declined!
   rescue Faraday::ResourceNotFound, Faraday::ConflictError

diff --git a/app/jobs/request_invitation_job.rb b/app/jobs/request_invitation_job.rb
@@ -1,13 +1,15 @@
 class RequestInvitationJob < ApplicationJob
+  PORTFOLIORRR_BASE_URL = Rails.configuration.portfoliorrr_api_v1.base_url
+  PORTFOLIORRRR_REQUEST_INVITATION_URL = Rails.configuration.portfoliorrr_api_v1.request_invitation_url
   queue_as :default
   retry_on Exceptions::PortfoliorrrAPIOffline, wait: 1.hour, attempts: :unlimited
   retry_on Exceptions::ColaBoraAPIOffline, wait: 1.hour, attempts: 5 do |job, _error|
     job.arguments.first[:invitation_request].aborted!
   end
 
   def perform(invitation_request:)
-    data = invitation_request.create_json_for_proposal_request
-    response = Faraday.new(url: 'http://localhost:4000', params: data).get('/api/v1/projects/request_invitation')
+    data = { invitation_request_id: invitation_request.id }.as_json
+    response = Faraday.new(url: PORTFOLIORRR_BASE_URL, params: data).get(PORTFOLIORRRR_REQUEST_INVITATION_URL)
     return raise Exceptions::PortfoliorrrAPIOffline if response.status == :internal_server_error
 
     invitation_request.process_colabora_api_response(response)

diff --git a/app/mailers/invitations_mailer.rb b/app/mailers/invitations_mailer.rb
@@ -2,7 +2,6 @@ class InvitationsMailer < ApplicationMailer
   def received_invitation
     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))
+    mail(subject: t('.subject'), to: profile.user.email)
   end
 end
diff --git a/app/models/invitation_request.rb b/app/models/invitation_request.rb
@@ -22,14 +22,6 @@ def process_colabora_api_response(response)
     end
   end
 
-  def create_json_for_proposal_request
-    { data: { proposal: { invitation_request_id: id,
-                          project_id:,
-                          profile_id: profile.id,
-                          email: profile.email,
-                          message: } } }.as_json
-  end
-
   private
 
   def json_treated_response(response)

diff --git a/app/services/invitation_request_service.rb b/app/services/invitation_request_service.rb
@@ -1,40 +1,44 @@
 module InvitationRequestService
-  COLABORA_PROJECTS_URL = 'http://localhost:3000/api/v1/projects'.freeze
-  COLABORA_INVITATIONS_BASE_URL = 'http://localhost:3000/api/v1/invitations'.freeze
+  include ProjectsService
 
-  class ColaboraProject
-    def self.send
-      @response = Faraday.get(COLABORA_PROJECTS_URL)
-      return build_projects if @response.success?
-
-      raise StandardError
-    end
-
-    class << self
-      private
-
-      def build_projects
-        projects = JSON.parse(@response.body, symbolize_names: true)
-        projects.map do |project|
-          Project.new(id: project[:id],
-                      title: project[:title],
-                      description: project[:description],
-                      category: project[:category])
-        end
-      end
-    end
-  end
+  COLABORA_BASE_URL = Rails.configuration.colabora_api_v1.base_url
+  COLABORA_API_V1_PROJECTS_URL = Rails.configuration.colabora_api_v1.projects_url
+  COLABORA_API_V1_PROPOSALS_URL = Rails.configuration.colabora_api_v1.proposals_url
 
   class InvitationRequest
     def self.send(requests)
       return [] if requests.empty?
 
-      projects = ColaboraProject.send
+      projects = ProjectsService::ColaBoraProject.send
 
       requests.map do |request|
         project = projects.find { |proj| proj.id == request.project_id }
         InvitationRequestInfo.new(invitation_request: request, project:)
       end
     end
   end
+
+  class ColaBoraInvitationRequestPost
+    def self.send(invitation_request)
+      @invitation_request = invitation_request
+      post_connection
+
+      @response
+    end
+
+    class << self
+      private
+
+      def build_invitation_request_params(invitation_request)
+        { 'proposal': { 'invitation_request_id': invitation_request.id, 'email': invitation_request.profile.email,
+                        'message': invitation_request.message, 'profile_id': invitation_request.profile.id,
+                        'project_id': invitation_request.project_id } }.as_json
+      end
+
+      def post_connection
+        url = "#{COLABORA_BASE_URL}#{COLABORA_API_V1_PROPOSALS_URL}"
+        @response = Faraday.post(url, build_invitation_request_params(@invitation_request))
+      end
+    end
+  end
 end
diff --git a/app/services/projects_service.rb b/app/services/projects_service.rb
@@ -0,0 +1,34 @@
+module ProjectsService
+  COLABORA_BASE_URL = Rails.configuration.colabora_api_v1.base_url
+  COLABORA_API_V1_PROJECTS_URL = Rails.configuration.colabora_api_v1.projects_url
+
+  class ColaBoraProject
+    def self.send
+      @response = ColaBoraApiGetProjects.send
+      return build_projects if @response.success?
+
+      raise StandardError
+    end
+
+    class << self
+      private
+
+      def build_projects
+        projects = JSON.parse(@response.body, symbolize_names: true)
+        projects.map do |project|
+          Project.new(id: project[:id],
+                      title: project[:title],
+                      description: project[:description],
+                      category: project[:category])
+        end
+      end
+    end
+  end
+
+  class ColaBoraApiGetProjects
+    def self.send
+      url = "#{COLABORA_BASE_URL}#{COLABORA_API_V1_PROJECTS_URL}"
+      Faraday.get(url)
+    end
+  end
+end
diff --git a/app/views/connections_mailer/notify_follow.html.erb b/app/views/connections_mailer/notify_follow.html.erb
@@ -1 +1,7 @@
-<p><%= @notification.notifiable.follower.full_name %> <%= t('notifications.started_following_you') %></p>
+<p><%= t('.greeting', recipient: @notification.profile.full_name) %></p>
+
+<p><%= link_to @notification.notifiable.follower.full_name, profile_url(@notification.notifiable.follower) %> <%= t('notifications.started_following_you') %></p>
+
+<p><%= link_to t('click_btn'), @notification.profile %> <%= t('.access_profile') %></p>
+<%= t('.regards') %>
+<p>Portfoliorrr</p>
diff --git a/app/views/invitations/show.html.erb b/app/views/invitations/show.html.erb
@@ -16,7 +16,7 @@
       <% if @invitation.pending? %>  
         <div class="btn-group">
           <div>
-            <%= link_to t('accept_btn'), 'http://localhost:3000', class: 'btn btn-primary me-4' %>
+            <%= link_to t('accept_btn'), Rails.configuration.colabora_api_v1.base_url, class: 'btn btn-primary me-4' %>
           </div>
           <div>
             <%= button_to t('decline_btn'), decline_invitation_path(@invitation), method: :patch, class: 'btn btn-secondary' %>

diff --git a/app/views/invitations_mailer/received_invitation.html.erb b/app/views/invitations_mailer/received_invitation.html.erb
@@ -0,0 +1,7 @@
+<p><%= t('.greeting', recipient: @profile.full_name) %></p>
+
+<p><%= t('.body', title: @project_title) %></p>
+
+<p><%= link_to t('click_btn'), invitations_url %> <%= t('.access_invitations') %></p>
+<%= t('.regards') %>
+<p>Portfoliorrr</p>
diff --git a/app/views/likes_mailer/notify_like.html.erb b/app/views/likes_mailer/notify_like.html.erb
@@ -6,12 +6,12 @@
   <dd><%= t('.comment_likes', like_count: @comment_likes.count) if @comment_likes.any? %></dd>
 </dl>
 <% if @post_likes.any? %>
-  <br><p><%= t('.most_liked_post') %> <%= link_to @most_liked_post.title, post_url(@most_liked_post) %></p>
+  <p><%= t('.most_liked_post') %> <%= link_to @most_liked_post.title, post_url(@most_liked_post) %></p>
 <% end %>
 <% if @comment_likes.any? %>
   <p><%= t('.most_liked_comment', comment: @most_liked_comment.message) %> <%= link_to @most_liked_comment.post.title, post_url(@most_liked_comment.post) %></p>
 <% end %>
 
-<br><p><%= link_to t('click_btn'), profile_url(@user.profile) %> <%= t('.access_profile') %></p>
+<p><%= link_to t('click_btn'), profile_url(@user.profile) %> <%= t('.access_profile') %></p>
 <%= t('.regards') %>,
-Portfoliorrr
+<p>Portfoliorrr</p>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
@@ -74,6 +74,7 @@
 </div>
 
 <script>
+  var portfoliorrrProjectsApiUrl = '<%= @projects_url %>'
   var invitationRequestsProjectsIds = <%= @invitation_requests_projects_ids %>
   var freeUser = <%= @free_user %>
 </script>
diff --git a/config/application.rb b/config/application.rb
@@ -38,5 +38,11 @@ class Application < Rails::Application
 
     # Don't generate system test files.
     config.generators.system_tests = nil
+
+    # ColaBora API configurations
+    config.colabora_api_v1 = config_for(:colabora_api_v1)
+
+    # Portfoliorrr API configurations
+    config.portfoliorrr_api_v1 = config_for(:portfoliorrr_api_v1)
   end
 end
diff --git a/config/colabora_api_v1.yml b/config/colabora_api_v1.yml
@@ -0,0 +1,9 @@
+development:
+  base_url: 'http://localhost:3000'
+  projects_url: '/api/v1/projects'
+  proposals_url: '/api/v1/proposals'
+
+test:
+  base_url: 'http://localhost:3000'
+  projects_url: '/api/v1/projects'
+  proposals_url: '/api/v1/proposals'
diff --git a/config/locales/models/connections.pt-BR.yml b/config/locales/models/connections.pt-BR.yml
@@ -29,4 +29,7 @@ pt-BR:
 
   connections_mailer:
     notify_follow:
-      subject: 'Alguém seguiu seu perfil'
+      subject: 'Alguém seguiu seu perfil'
+      greeting: Olá, %{recipient}!
+      access_profile: para acessar seu perfil e continuar interagindo.
+      regards: Abraços,
diff --git a/config/locales/models/invitation.pt-BR.yml b/config/locales/models/invitation.pt-BR.yml
@@ -32,5 +32,8 @@ pt-BR:
 
   invitations_mailer:
     received_invitation:
+      greeting: Olá, %{recipient}!
       subject: 'Você recebeu um convite'
-    body: Você recebeu um convite para participar do projeto %{title}.
+      body: Você recebeu um convite para participar do projeto %{title}.
+      access_invitations: para ver seus convites e aceitá-los.
+      regards: Abraços,
diff --git a/config/portfoliorrr_api_v1.yml b/config/portfoliorrr_api_v1.yml
@@ -0,0 +1,11 @@
+development:
+  base_url: 'http://localhost:4000'
+  invitations_url: '/api/v1/invitations/'
+  request_invitation_url: '/api/v1/projects/request_invitation'
+  projects_url: '/api/v1/projects'
+
+test:
+  base_url: 'http://localhost:4000'
+  invitations_url: '/api/v1/invitations/'
+  request_invitation_url: '/api/v1/projects/request_invitation'
+  projects_url: '/api/v1/projects'
diff --git a/spec/jobs/request_invitation_job_spec.rb b/spec/jobs/request_invitation_job_spec.rb
@@ -3,11 +3,7 @@
 RSpec.describe RequestInvitationJob, type: :job do
   it 'altera a solicitação de convite para pending caso receba uma confirmação de sucesso do Cola?Bora!' do
     invitation_request = create(:invitation_request)
-    invitation_request_params = { data: { proposal: { invitation_request_id: invitation_request.id,
-                                                      project_id: invitation_request.project_id,
-                                                      profile_id: invitation_request.profile.id,
-                                                      email: invitation_request.profile.email,
-                                                      message: invitation_request.message } } }.as_json
+    invitation_request_params = { invitation_request_id: invitation_request.id }.as_json
 
     json_proposal_response = File.read(Rails.root.join('./spec/support/json/proposal_201.json'))
     fake_portfoliorrr_response = double('faraday_response', status: :ok, body: json_proposal_response)
@@ -30,11 +26,7 @@
 
   it 'enfileira um novo job caso receba um aviso de erro no servidor do Cola?Bora!' do
     invitation_request = create(:invitation_request)
-    invitation_request_params = { data: { proposal: { invitation_request_id: invitation_request.id,
-                                                      project_id: invitation_request.project_id,
-                                                      profile_id: invitation_request.profile.id,
-                                                      email: invitation_request.profile.email,
-                                                      message: invitation_request.message } } }.as_json
+    invitation_request_params = { invitation_request_id: invitation_request.id }.as_json
 
     fake_colabora_response_body = { 'errors': ['Erro interno de servidor.'] }.as_json
     fake_portfoliorrr_response = double('faraday_response', status: :ok, body: fake_colabora_response_body)
@@ -57,11 +49,7 @@
 
   it 'altera a solicitação de convite para error caso receba um aviso de erro do Cola?Bora!' do
     invitation_request = create(:invitation_request)
-    invitation_request_params = { data: { proposal: { invitation_request_id: invitation_request.id,
-                                                      project_id: invitation_request.project_id,
-                                                      profile_id: invitation_request.profile.id,
-                                                      email: invitation_request.profile.email,
-                                                      message: invitation_request.message } } }.as_json
+    invitation_request_params = { invitation_request_id: invitation_request.id }.as_json
 
     fake_colabora_response_body = { 'errors': ['Usuário já faz parte deste projeto'] }.as_json
     fake_portfoliorrr_response = double('faraday_response', status: :ok, body: fake_colabora_response_body)
@@ -84,11 +72,7 @@
 
   it 'altera a solicitação de convite para aborted se receber pela quinta vez um erro da API do Cola?Bora!' do
     invitation_request = create(:invitation_request)
-    invitation_request_params = { data: { proposal: { invitation_request_id: invitation_request.id,
-                                                      project_id: invitation_request.project_id,
-                                                      profile_id: invitation_request.profile.id,
-                                                      email: invitation_request.profile.email,
-                                                      message: invitation_request.message } } }.as_json
+    invitation_request_params = { invitation_request_id: invitation_request.id }.as_json
 
     fake_colabora_response_body = { 'errors': ['Erro interno de servidor.'] }.as_json
     fake_portfoliorrr_response = double('faraday_response', status: :ok, body: fake_colabora_response_body)
@@ -114,11 +98,7 @@
 
   it 'gera uma nova tentativa caso a API do Portfoliorrr esteja fora do ar, sem limite de tentativas' do
     invitation_request = create(:invitation_request)
-    invitation_request_params = { data: { proposal: { invitation_request_id: invitation_request.id,
-                                                      project_id: invitation_request.project_id,
-                                                      profile_id: invitation_request.profile.id,
-                                                      email: invitation_request.profile.email,
-                                                      message: invitation_request.message } } }.as_json
+    invitation_request_params = { invitation_request_id: invitation_request.id }.as_json
 
     fake_response_body = { 'error': 'Houve um erro interno no servidor ao processar sua solicitação.' }.as_json
     fake_portfoliorrr_response = double('faraday_response', status: :internal_server_error, body: fake_response_body)