code-dot-org · drizco · Jan 20, 2026 · Jan 15, 2026 · Jan 15, 2026 · Jan 20, 2026
diff --git a/dashboard/app/controllers/aichat_requests_controller.rb b/dashboard/app/controllers/aichat_requests_controller.rb
@@ -46,24 +46,9 @@ def start_chat_completion
       return head :too_many_requests
     end
 
-    # Filter out non-OK messages (e.g. errors).
-    messages_for_model = params[:storedMessages].select {|message| message[:status] == SharedConstants::AI_INTERACTION_STATUS[:OK]}
-    context = params[:aichatContext]
-
-    # Add client type to model parameters.
-    params[:modelParameters][:clientType] = params[:aichatContext][:clientType]
-
     # Create the request object.
     begin
-      request = AichatRequest.create!(
-        user_id: current_user.id,
-        model_customizations: params[:modelParameters],
-        stored_messages: messages_for_model,
-        new_message: params[:newMessage],
-        level_id: context[:currentLevelId],
-        script_id: context[:scriptId],
-        project_id: get_project_id(context)
-      )
+      request = create_request
     rescue StandardError => exception
       return render status: :bad_request, json: {error: exception.message}
     end
@@ -101,6 +86,15 @@ def chat_request
     render(status: :ok, json: response_body)
   end
 
+  def create_request
+    # TODO: confirm request shape and data usage https://codedotorg.atlassian.net/browse/TEACHING-60
+    request_params = params.permit!.to_h.deep_symbolize_keys
+
+    attributes = AichatAiHelper.build_request_attributes(current_user.id, request_params)
+
+    AichatRequest.new(attributes).tap(&:save!)
+  end
+
   private def can_access_ai_tutor_chat_completion?(client_type)
     return false if DCDO.get("block_ai_tutor_chat_completion", false)
     current_user.trust_chat_client?(client_type)
@@ -155,13 +149,6 @@ def chat_request
     end
   end
 
-  private def get_project_id(context)
-    if context[:channelId]
-      _, project_id = get_storage_id_and_project_id(context[:channelId])
-      project_id
-    end
-  end
-
   private def get_polling_interval_ms
     DCDO.get("aichat_polling_interval_ms", DEFAULT_POLLING_INTERVAL_MS)
   end

diff --git a/dashboard/app/helpers/aichat_ai_helper.rb b/dashboard/app/helpers/aichat_ai_helper.rb
@@ -1,4 +1,5 @@
 require 'cdo/aws/metrics'
+require_relative '../../../shared/middleware/helpers/storage_id'
 
 class OpenaiUserInputResponseTimeout < StandardError; end
 
@@ -207,4 +208,53 @@ def self.token_throttling_key(model_id, user_id)
     # Token throttling also only currently in place for gpt-4o-mini, but inclusion of model ID leaves space for other models.
     TOKEN_THROTTLING_PREFIX + 'model/' + model_id + '/user/' + user_id.to_s
   end
+
+  def self.handle_error(source, exception, request, locale)
+    if rack_env?(:development)
+      puts "#{source} Error: #{exception.full_message}"
+    end
+
+    request.update!(response: exception.message, execution_status: SharedConstants::AI_REQUEST_EXECUTION_STATUS[:FAILURE])
+    Honeybadger.notify(
+      "#{source} failed with unexpected error: #{exception.message}",
+      context: {
+        request: request.to_json,
+        user_id: request.user_id,
+        locale: locale
+      }
+    )
+  end
+
+  def self.build_request_attributes(user_id, params)
+    context = params[:aichatContext] || {}
+    model_customizations = params[:modelParameters] || {}
+
+    # Add client type to model parameters.
+    model_customizations[:clientType] ||= context[:clientType]
+
+    {
+      user_id:              user_id,
+      model_customizations: model_customizations,
+      stored_messages:      successful_stored_chat_messages(params[:storedMessages]),
+      new_message:          params[:newMessage] || {},
+      level_id:             context[:currentLevelId],
+      script_id:            context[:scriptId],
+      project_id:           project_id_from_context(context),
+    }
+  end
+
+  def self.successful_stored_chat_messages(stored_messages)
+    # Filter out non-OK messages (e.g. errors).
+    Array(stored_messages).select do |message|
+      message[:status] == SharedConstants::AI_INTERACTION_STATUS[:OK] &&
+        message[:chatMessageText].present?
+    end
+  end
+
+  def self.project_id_from_context(context)
+    if context[:channelId]
+      _, project_id = get_storage_id_and_project_id(context[:channelId])
+      project_id
+    end
+  end
 end
diff --git a/dashboard/app/jobs/aichat_request_chat_completion_job.rb b/dashboard/app/jobs/aichat_request_chat_completion_job.rb
@@ -24,18 +24,10 @@ class AichatRequestChatCompletionJob < ApplicationJob
 
   # Catch any exceptions that occur during the job and update the request status accordingly.
   rescue_from StandardError do |exception|
-    if rack_env?(:development)
-      puts "AichatRequestChatCompletionJob Error: #{exception.full_message}"
-    end
-
     request = arguments.first[:request]
-    request.update!(response: exception.message, execution_status: SharedConstants::AI_REQUEST_EXECUTION_STATUS[:FAILURE])
-    Honeybadger.notify(
-      "AichatRequestChatCompletionJob failed with unexpected error: #{exception.message}",
-      context: {
-        request: request.to_json
-      }
-    )
+    locale = arguments.first[:locale]
+
+    AichatAiHelper.handle_error("AichatRequestChatCompletionJob", exception, request, locale)
 
     # Report metrics for the failed job (after_perform doesn't run on failure).
     report_job_finish(request)

diff --git a/dashboard/test/controllers/aichat_requests_controller_test.rb b/dashboard/test/controllers/aichat_requests_controller_test.rb
@@ -33,7 +33,7 @@ class AichatRequestsControllerTest < ActionController::TestCase
   end
 
   setup do
-    @controller.stubs(:get_storage_id_and_project_id).returns([123, @project_id])
+    AichatAiHelper.stubs(:project_id_from_context).returns(@project_id)
     DCDO.stubs(:get).with('block_ai_tutor_chat_completion', anything).returns(false)
     DCDO.stubs(:get).with('block_aichat_chat_completion', anything).returns(false)
     DCDO.stubs(:get).with('aichat_request_limit_per_min', anything).returns(AichatRequestsController::DEFAULT_REQUEST_LIMIT_PER_MIN)