Merge branch 'feature/track-file-downloads' into staging

Author: tsubik

app/controllers/uploads_controller.rb

@@ -51,7 +51,11 @@ def parse_upload_path
   end
 
   def track_download
-    TrackFileDownloadJob.perform_later(request.url, @filename, @model_name)
+    TrackFileDownloadJob.perform_later(client_id, request.url, @filename, @model_name)
+  end
+
+  def client_id
+    session.id || SecureRandom.uuid
   end
 
   def trackable_request?

app/jobs/track_file_download_job.rb

@@ -1,16 +1,17 @@
 class TrackFileDownloadJob < ApplicationJob
   queue_as :default
 
-  def perform(file_url, file_name, model_name)
+  def perform(client_id, file_url, file_name, model_name)
     return if measurement_id.blank? || api_secret.blank?
 
     send_ga4_event(file_url, file_name, model_name)
   end
 
   private
 
-  def send_ga4_event(file_url, file_name, model_name)
+  def send_ga4_event(client_id, file_url, file_name, model_name)
     payload = {
+      client_id: client_id,
       events: [{
         name: "file_download",
         params: {

spec/integration/uploads_spec.rb

@@ -64,13 +64,15 @@
 
     context "download tracking" do
       it "tracks downloads for trackable models with regular browsers" do
+        allow_any_instance_of(UploadsController).to receive(:client_id).and_return("test-client-id")
+
         get @document_file.attachment.url, headers: {
           "User-Agent" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
         }
 
         expect(response).to have_http_status(:ok)
         expect(TrackFileDownloadJob).to have_received(:perform_later).with(
-          request.url, @document_file.attachment.filename, "document_file"
+          "test-client-id", request.url, @document_file.attachment.filename, "document_file"
         )
 
         get @observation_report.attachment.url, headers: {
@@ -79,7 +81,7 @@
 
         expect(response).to have_http_status(:ok)
         expect(TrackFileDownloadJob).to have_received(:perform_later).with(
-          request.url, @observation_report.attachment.filename, "observation_report"
+          "test-client-id", request.url, @observation_report.attachment.filename, "observation_report"
         )
       end
 

spec/job/track_file_download_job_spec.rb

@@ -6,6 +6,7 @@
   let(:model_name) { "User" }
   let(:measurement_id) { "G-XXXXXXXXXX" }
   let(:api_secret) { "test_api_secret" }
+  let(:client_id) { "test_client" }
 
   before do
     ENV["GA4_MEASUREMENT_ID"] = measurement_id
@@ -21,6 +22,7 @@
     context "when environment variables are present" do
       let(:expected_payload) do
         {
+          client_id: client_id,
           events: [{
             name: "file_download",
             params: {
@@ -48,7 +50,7 @@
           json: expected_payload
         )
 
-        described_class.perform_now(file_url, file_name, model_name)
+        described_class.perform_now(client_id, file_url, file_name, model_name)
       end
     end
 
@@ -59,7 +61,7 @@
 
       it "does not send GA4 event" do
         expect(HTTP).not_to receive(:post)
-        described_class.perform_now(file_url, file_name, model_name)
+        described_class.perform_now(client_id, file_url, file_name, model_name)
       end
     end
 
@@ -70,7 +72,7 @@
 
       it "does not send GA4 event" do
         expect(HTTP).not_to receive(:post)
-        described_class.perform_now(file_url, file_name, model_name)
+        described_class.perform_now(client_id, file_url, file_name, model_name)
       end
     end
   end