Fix current request logic

- to account for a contributor never having received a message
tactilenews · Oct 18, 2023 · 0d20844 · 0d20844
1 parent 7bf4828
commit 0d20844
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ApiController < ApplicationController
-  skip_before_action :require_login
+  skip_before_action :require_login, :verify_authenticity_token
   before_action :authorize_api_access, :contributor
 
   def show
@@ -39,13 +39,13 @@ def create
 
   def current_request
     if contributor
-      current_personalized_request = contributor.received_messages.first
+      current_request = contributor.active_request
       render json: {
         status: 'ok',
         data: {
-          id: current_personalized_request.id,
-          personalized_text: current_personalized_request.text,
-          contributor_replies_count: contributor.replies.where(request_id: current_personalized_request.request.id).count
+          id: current_request.id,
+          personalized_text: current_request.personalized_text(contributor),
+          contributor_replies_count: contributor.replies.where(request_id: current_request.id).count
         }
       }, status: :ok
     else