Merge pull request #138 from etalab/ops/bugfixes

Multiple bugfixes

app/controllers/instruction/authorization_request_events_controller.rb

@@ -4,7 +4,7 @@ class Instruction::AuthorizationRequestEventsController < Instruction::Authoriza
   def index
     authorize [:instruction, @authorization_request], :show?
 
-    @events = @authorization_request.events.includes(%i[user entity]).order(created_at: :desc).decorate
+    @events = @authorization_request.events.order(created_at: :desc).decorate
   end
 
   private

app/interactors/deliver_authorization_request_webhook.rb

@@ -19,7 +19,7 @@ def webhook_payload
     WebhookSerializer.new(
       context.authorization_request,
       context.state_machine_event || context.event_name
-    ).serializable_hash
+    ).to_json
   end
 
   def target_api = context.authorization_request.definition.id

app/jobs/deliver_authorization_request_webhook_job.rb

@@ -3,7 +3,7 @@ class DeliverAuthorizationRequestWebhookJob < ApplicationJob
 
   class WebhookDeliveryFailedError < StandardError; end
 
-  retry_on(WebhookDeliveryFailedError, wait: :polynomially_longer)
+  retry_on(WebhookDeliveryFailedError, wait: :polynomially_longer, attempts: :unlimited)
 
   def serialize
     super.merge('tries_count' => (@attempts || 1) + 1)
@@ -32,7 +32,7 @@ def perform(target_api, json, authorization_request_id)
   private
 
   def request(target_api, payload)
-    Faraday.new(webhook_url(target_api)).post('/webhook') do |req|
+    Faraday.new(webhook_uri(target_api).to_s).post(webhook_uri(target_api).path) do |req|
       req.headers['Content-Type'] = 'application/json'
       req.headers['X-Hub-Signature-256'] = "sha256=#{generate_hub_signature(target_api, payload)}"
       req.body = payload.to_json
@@ -95,6 +95,10 @@ def generate_hub_signature(target_api, payload)
     )
   end
 
+  def webhook_uri(target_api)
+    URI(webhook_url(target_api))
+  end
+
   def webhook_url(target_api)
     Rails.application.credentials.webhooks.public_send(target_api)&.url
   end

app/models/authorization.rb

@@ -18,6 +18,11 @@ class Authorization < ApplicationRecord
     inverse_of: :authorization,
     dependent: :destroy
 
+  has_many :events,
+    class_name: 'AuthorizationRequestEvent',
+    inverse_of: :entity,
+    dependent: :destroy
+
   delegate :name, to: :request
 
   def kind

app/models/authorization_request.rb

@@ -15,6 +15,11 @@ class AuthorizationRequest < ApplicationRecord
     inverse_of: :authorization_request,
     dependent: :destroy
 
+  has_many :instructor_modification_requests,
+    class_name: 'InstructorModificationRequest',
+    inverse_of: :authorization_request,
+    dependent: :destroy
+
   has_one :denial,
     -> { order(created_at: :desc) },
     class_name: 'DenialOfAuthorization',
@@ -40,11 +45,16 @@ class AuthorizationRequest < ApplicationRecord
   has_many :authorizations,
     class_name: 'Authorization',
     inverse_of: :request,
-    dependent: :nullify
+    dependent: :destroy
 
   has_many :messages,
     dependent: :destroy
 
+  has_many :events,
+    class_name: 'AuthorizationRequestEvent',
+    inverse_of: :entity,
+    dependent: :destroy
+
   def latest_authorization
     authorizations.order(created_at: :desc).limit(1).first
   end

app/models/authorization_request_changelog.rb

@@ -1,3 +1,8 @@
 class AuthorizationRequestChangelog < ApplicationRecord
   belongs_to :authorization_request
+
+  has_many :events,
+    class_name: 'AuthorizationRequestEvent',
+    inverse_of: :entity,
+    dependent: :destroy
 end

app/models/denial_of_authorization.rb

@@ -1,4 +1,9 @@
 class DenialOfAuthorization < ApplicationRecord
   validates :reason, presence: true
   belongs_to :authorization_request
+
+  has_many :events,
+    class_name: 'AuthorizationRequestEvent',
+    inverse_of: :entity,
+    dependent: :destroy
 end

app/models/instructor_modification_request.rb

@@ -1,4 +1,9 @@
 class InstructorModificationRequest < ApplicationRecord
   validates :reason, presence: true
   belongs_to :authorization_request
+
+  has_many :events,
+    class_name: 'AuthorizationRequestEvent',
+    inverse_of: :entity,
+    dependent: :destroy
 end

app/models/message.rb

@@ -5,6 +5,11 @@ class Message < ApplicationRecord
     class_name: 'User',
     optional: true
 
+  has_many :events,
+    class_name: 'AuthorizationRequestEvent',
+    inverse_of: :entity,
+    dependent: :destroy
+
   belongs_to :authorization_request
 
   scope :unread, -> { where(read_at: nil) }

app/models/user.rb

@@ -44,6 +44,10 @@ def instructor?(authorization_request_type = nil)
     end
   end
 
+  def admin?
+    roles.include?('admin')
+  end
+
   def authorization_definition_roles_as(kind)
     roles.select { |role| role.end_with?(":#{kind}") }.map do |role|
       AuthorizationDefinition.find(role.split(':').first)

app/queries/authorization_request_events_query.rb

@@ -8,6 +8,7 @@ def initialize(authorization_request)
   # rubocop:disable Metrics/AbcSize
   def perform
     AuthorizationRequestEvent
+      .includes(%i[user entity])
       .where(
         sql_query,
         authorization_request.id,

app/serializers/webhook_authorization_request_serializer.rb

@@ -6,10 +6,10 @@ class WebhookAuthorizationRequestSerializer < ApplicationSerializer
     :status,
     :siret,
     :scopes,
+    :team_members,
     :previous_authorization_request_id,
     :copied_from_authorization_request_id
 
-  has_many(:contacts, serializer: ContactSerializer)
   has_many(:events, serializer: WebhookEventSerializer) do
     object.events.map(&:decorate)
   end
@@ -18,9 +18,29 @@ class WebhookAuthorizationRequestSerializer < ApplicationSerializer
     object.scopes.to_h { |scope| [scope.to_sym, true] }
   end
 
-  def demarche = object.form.name
-  def status   = object.state
-  def siret    = object.organization.siret
+  def intitule    = object.data['intitule']
+  def description = object.data['description']
+  def demarche    = object.form.id
+  def status      = object.state
+  def siret       = object.organization.siret
+
+  def team_members
+    object.contacts.map { |contact|
+      ContactSerializer.new(contact).serializable_hash
+    } << applicant_as_team_member
+  end
+
+  def applicant_as_team_member
+    {
+      id: nil,
+      type: 'demandeur',
+      email: object.applicant.email,
+      given_name: object.applicant.given_name,
+      family_name: object.applicant.family_name,
+      phone_number: object.applicant.phone_number,
+      job: object.applicant.job_title,
+    }
+  end
 
   def previous_authorization_request_id = nil
   def copied_from_authorization_request_id = nil

app/serializers/webhook_serializer.rb

@@ -27,14 +27,16 @@ def to_json(*_args)
   private
 
   def model_type
-    authorization_request.class.name.underscore
+    "enrollment/#{authorization_request.type.underscore.split('/').last}"
   end
 
   def now
     @now ||= Time.zone.now
   end
 
   def authorization_request_serialized
-    WebhookAuthorizationRequestSerializer.new(authorization_request).serializable_hash
+    WebhookAuthorizationRequestSerializer.new(authorization_request).serializable_hash(
+      include: ['events.user']
+    )
   end
 end

app/serializers/webhook_user_with_profile_serializer.rb

@@ -1,5 +1,5 @@
 class WebhookUserWithProfileSerializer < ApplicationSerializer
   attributes :id, :uid, :email, :given_name, :family_name, :phone_number, :job_title
 
-  def uid = nil
+  def uid = object.external_id
 end

app/views/mailer/shared/applicant/_header.text.erb

@@ -1 +1 @@
-<%= t('.text', entity_name:) %>
+<%= [t('.text'), entity_name].compact.join(" ") %>,

config/authorization_request_forms.yml

@@ -152,10 +152,10 @@ shared:
       destinataire_donnees_caractere_personnel: "Services marchés d’organismes publics et collectivités locales"
       duree_conservation_donnees_caractere_personnel: 36
       contact_metier_type: 'organization'
-      contact_metier_email: "p.gue@e-attestations.com"
+      contact_metier_email: "<%= Rails.application.credentials.api_entreprise_e_attestation_contact_metier_email || 'metier-e-attestation@yopmail.com' %>"
       contact_metier_phone_number: "0158060016"
       contact_technique_type: 'organization'
-      contact_technique_email: "tech@e-attestations.com"
+      contact_technique_email: "<%= Rails.application.credentials.api_entreprise_e_attestation_contact_technique_email || 'tech-e-attestation@yopmail.com' %>"
       contact_technique_phone_number: "0158060010"
       scopes:
         - unites_legales_etablissements_insee
@@ -225,10 +225,10 @@ shared:
       destinataire_donnees_caractere_personnel: "Maître d’ouvrage, acheteurs publics dans le cadre de leurs contrôles de la régularité fiscale et sociale des entreprises"
       duree_conservation_donnees_caractere_personnel: 36
       contact_metier_type: 'organization'
-      contact_metier_email: "<%= Rails.application.credentials.api_entreprise_achat_solution_contact_metier_email || 'metier@achat-solution.com' %>"
+      contact_metier_email: "<%= Rails.application.credentials.api_entreprise_achat_solution_contact_metier_email || 'metier-achat-solution@yopmail.com' %>"
       contact_metier_phone_number: "<%= Rails.application.credentials.api_entreprise_achat_solution_contact_metier_phone_number || '0836656565' %>"
       contact_technique_type: 'organization'
-      contact_technique_email: "<%= Rails.application.credentials.api_entreprise_achat_solution_contact_technique_email || 'metier@achat-solution.com' %>"
+      contact_technique_email: "<%= Rails.application.credentials.api_entreprise_achat_solution_contact_technique_email || 'metier-achat-solution@yopmail.com' %>"
       contact_technique_phone_number: "<%= Rails.application.credentials.api_entreprise_achat_solution_contact_technique_phone_number || '0836656565' %>"
       scopes:
         - unites_legales_etablissements_insee
@@ -305,7 +305,7 @@ La plateforme, mise en place pour permettre le dépôt de ces aides publiques et
       contact_technique_email: '[email protected]'
       contact_technique_phone_number: '0175440934'
       contact_metier_type: 'organization'
-      contact_metier_email: "<%= Rails.application.credentials.api_entreprise_atexo_contact_metier_email || 'produit@atexo.com' %>"
+      contact_metier_email: "<%= Rails.application.credentials.api_entreprise_atexo_contact_metier_email || 'produit-atexo@yopmail.com' %>"
       contact_metier_phone_number: '0153430678'
       scopes:
         - unites_legales_etablissements_insee

config/credentials/production.yml.enc

@@ -1 +1 @@
-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--bcTAPSVltY5wocPb--4U1jvrFVkLCFaLTtQ0AOtA==
+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--0k+80OahCC3tzyrI--sc6g+ueqPUDukPZ7iI9Mzw==

config/environments/sandbox.rb

@@ -71,7 +71,7 @@
   # config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
-  # config.active_job.queue_adapter = :resque
+  config.active_job.queue_adapter = :good_job
   # config.active_job.queue_name_prefix = "data_pass_production"
 
   config.action_mailer.delivery_method = :mailjet

config/environments/staging.rb

@@ -71,7 +71,7 @@
   # config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
-  # config.active_job.queue_adapter = :resque
+  config.active_job.queue_adapter = :good_job
   # config.active_job.queue_name_prefix = "data_pass_production"
 
   config.action_mailer.delivery_method = :mailjet

config/environments/test.rb

@@ -16,6 +16,9 @@
     Bullet.enable        = true
     Bullet.bullet_logger = true
     Bullet.raise         = true # raise an error if n+1 query occurs
+
+    Bullet.add_safelist type: :unused_eager_loading, class_name: 'AuthorizationRequestEvent', association: :entity
+    Bullet.add_safelist type: :unused_eager_loading, class_name: 'AuthorizationRequestEvent', association: :user
   end
 
   # Settings specified here will take precedence over those in config/application.rb.

config/initializers/good_job.rb

@@ -0,0 +1,9 @@
+ActiveSupport.on_load(:good_job_application_controller) do
+  include Authentication
+
+  allow_unauthenticated_access
+
+  before_action do
+    raise ActionController::RoutingError.new('Not Found') unless current_user&.admin?
+  end
+end

config/initializers/sentry.rb

@@ -1,7 +1,7 @@
 Sentry.init do |config|
   config.dsn = Rails.application.credentials.sentry_dsn
   config.breadcrumbs_logger = [:sentry_logger, :active_support_logger, :http_logger]
-  config.enabled_environments = %w[sandbox production]
+  config.enabled_environments = %w[sandbox staging production]
 
   config.traces_sample_rate = 1.0
 end

config/locales/mailer.fr.yml

@@ -7,7 +7,7 @@ fr:
         email: [email protected]
       applicant:
         header:
-          text: <%= ["Bonjour", entity_name].compact.join(" ") %>,
+          text: 'Bonjour'
         footer:
           text: L'équipe %{authorization_definition_name}
       instruction:

config/routes.rb

@@ -57,4 +57,6 @@
       resources :messages, only: %w[index create], path: 'messages'
     end
   end
+
+  mount GoodJob::Engine => '/workers'
 end

features/instruction/historique_habilitation.feature

@@ -7,7 +7,6 @@ Fonctionnalité: Instruction: historique habilitation
     Sachant que je suis un instructeur "API Entreprise"
     Et que je me connecte
 
-  @DisableBullet
   Scénario: Je vois les événements
     Quand je me rends sur une demande d'habilitation "API Entreprise" à modérer
     Et je clique sur "Valider"

features/instruction/modérer_une_habilitation.feature

@@ -14,7 +14,6 @@ Fonctionnalité: Instruction: modération
     Et il n'y a pas de champ éditable
 
   @AvecCourriels
-  @DisableBullet
   Scénario: Je valide une demande d'habilitation
     Quand je me rends sur une demande d'habilitation "API Entreprise" à modérer
     Et je clique sur "Valider"
@@ -27,7 +26,6 @@ Fonctionnalité: Instruction: modération
     Et il y a un message de succès contenant "a été validé"
 
   @AvecCourriels
-  @DisableBullet
   Scénario: Je refuse une demande d'habilitation avec un message valide
     Quand je me rends sur une demande d'habilitation "API Entreprise" à modérer
     Et je clique sur "Refuser"
@@ -45,7 +43,6 @@ Fonctionnalité: Instruction: modération
     Alors il y a au moins une erreur sur un champ
 
   @AvecCourriels
-  @DisableBullet
   Scénario: Je demande des modifications sur une demande d'habilitation avec un message valide
     Quand je me rends sur une demande d'habilitation "API Entreprise" à modérer
     Et je clique sur "Demander des modifications"

features/step_definitions/authorization_requests_steps.rb

@@ -233,11 +233,12 @@
   authorization_request = AuthorizationRequest.first
 
   webhook_job = ActiveJob::Base.queue_adapter.enqueued_jobs.find do |job|
-    job['job_class'] == 'DeliverAuthorizationRequestWebhookJob' &&
-      job.dig('arguments', 1, 'event', 'value') == event_name
+    next unless job['job_class'] == 'DeliverAuthorizationRequestWebhookJob'
+
+    JSON.parse(job['arguments'][1])['event'] == event_name
   end
 
-  webhook_job_arg = [authorization_request.definition.id, an_instance_of(Hash), authorization_request.id]
+  webhook_job_arg = [authorization_request.definition.id, an_instance_of(String), authorization_request.id]
 
   expect(webhook_job).not_to be_nil