Remove interaction saver and simplify ProbeSaver

app/controllers/application_controller.rb

@@ -8,7 +8,6 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
   before_action :authenticate_user!
   before_action :set_locale
-  after_action :store_interaction, if: :user_signed_in?
   before_action :set_current_user
 
   etag { current_user.try(:id) }
@@ -100,27 +99,6 @@ def set_locale
       cookies[:locale] = I18n.locale
     end
 
-    def store_interaction
-      return if controller_name.in?(["sessions", "administration", "users",
-                                     "events", "interactions", "profile",
-                                     "registrations"])
-      return if controller_name == "main" && action_name == "home"
-      return if controller_name == "tags" && action_name.in?(["fill_tag_select",
-                                                              "fill_course_tags"])
-
-      study_participant = current_user.anonymized_id if current_user.study_participant
-      # as of Rack 2.0.8, the session_id is wrapped in a class of its own
-      # it is not a string anymore
-      # see https://github.com/rack/rack/issues/1433
-
-      return if request.session_options[:id].nil?
-
-      InteractionSaver.perform_async(request.session_options[:id].public_id,
-                                     request.original_fullpath,
-                                     request.referer,
-                                     study_participant)
-    end
-
     def locale_param
       return unless params[:locale].in?(available_locales)
 

app/controllers/quizzes_controller.rb

@@ -111,9 +111,6 @@ def init_values
       else
         params
       end
-      if user_signed_in? && current_user.study_participant
-        quiz_round_params[:study_participant] = current_user.anonymized_id
-      end
 
       quiz_round_params[:save_probe] =
         if user_signed_in?

app/models/probe.rb

@@ -1,10 +1,4 @@
-require "csv"
-
 class Probe < InteractionsRecord
-  scope :created_between, lambda { |start_date, end_date|
-                            where(created_at: start_date.beginning_of_day..end_date.end_of_day)
-                          }
-
   def self.finished_quizzes(quiz)
     Probe.where(quiz_id: quiz.id, progress: -1).count
   end
@@ -45,17 +39,4 @@ def self.local_success_in_quiz(quiz)
     end
     results
   end
-
-  def self.to_csv
-    attributes = ["id", "session_id", "created_at", "quiz_id", "question_id", "remark_id",
-                  "correct", "progress", "success", "study_participant", "input"]
-
-    CSV.generate(headers: true) do |csv|
-      csv << attributes
-
-      all.each do |probe|
-        csv << attributes.map { |attr| probe.send(attr) }
-      end
-    end
-  end
 end

app/models/quiz_round.rb

@@ -1,13 +1,11 @@
-# QuizRound class
 # service model for quizzes_controller
 class QuizRound
   include ActiveModel::Validations
   attr_reader :quiz, :counter, :progress, :crosses, :vertex, :is_question,
               :answer_scheme, :progress_old, :counter_old, :round_id_old,
               :input, :correct, :hide_solution, :vertex_old, :question_id,
               :answer_shuffle, :answer_shuffle_old, :solution_input, :result,
-              :session_id, :study_participant, :is_remark, :remark_id,
-              :input_text, :certificate, :save_probe
+              :attempt_token, :certificate, :save_probe
 
   def initialize(params)
     @quiz = Quiz.find(params[:id])
@@ -21,19 +19,16 @@ def initialize(params)
     @vertex = @quiz.vertices[@progress]
     @vertex_old = @vertex
     question_details(params) if @vertex.present? && @vertex[:type] == "Question"
-    remark_details(params) if @vertex.present? && @vertex[:type] == "Remark"
     @answer_scheme ||= {}
     @answer_shuffle ||= []
     @answer_shuffle_old = []
-    @study_participant = params[:study_participant]
     @save_probe = params[:save_probe]
   end
 
   def update
     @input = @quiz.crosses_to_input(@progress, @crosses)
     @correct = (@input == @answer_scheme)
     create_question_probe if @is_question
-    create_remark_probe if @is_remark && @study_participant
     @progress = @quiz.next_vertex(@progress, @input)
     create_certificate_final_probe if @progress == -1 && @quiz.sort == "Quiz"
     @counter += 1
@@ -84,11 +79,11 @@ def progress_counter(params)
       if params[:quiz].present?
         @counter = params[:quiz][:counter].to_i
         @progress = params[:quiz][:progress].to_i
-        @session_id = params[:quiz][:session_id]
+        @attempt_token = params[:quiz][:attempt_token]
       end
       @progress ||= @quiz.root
       @counter ||= 0
-      @session_id ||= SecureRandom.uuid.first(13).remove("-")
+      @attempt_token ||= SecureRandom.uuid.first(13).remove("-")
       @progress_old = @progress
       @counter_old = @counter
       @round_id_old = round_id
@@ -105,11 +100,6 @@ def question_details(params)
       end
     end
 
-    def remark_details(_params)
-      @is_remark = true
-      @remark_id = @vertex[:id]
-    end
-
     def update_answer_shuffle
       @answer_shuffle = Question.find_by(id: @vertex[:id])&.answers&.map(&:id)
                                 &.shuffle
@@ -119,24 +109,14 @@ def create_question_probe
       return unless @save_probe
 
       quiz_id = @quiz.id unless @quiz.sort == "RandomQuiz"
-      input = @solution_input || @input.to_s if @study_participant
-      ProbeSaver.perform_async(quiz_id, @question_id, nil, @correct, @progress,
-                               @session_id, @study_participant, input)
-    end
-
-    def create_remark_probe
-      return unless @save_probe
-
-      quiz_id = @quiz.id unless @quiz.sort == "RandomQuiz"
-      ProbeSaver.perform_async(quiz_id, nil, @remark_id, nil, @progress,
-                               @session_id, @study_participant, @input_text)
+      ProbeSaver.perform_async(quiz_id, @question_id, @correct, @progress,
+                               @attempt_token)
     end
 
     def create_certificate_final_probe
       return unless @save_probe
 
       @certificate = QuizCertificate.create(quiz: @quiz)
-      ProbeSaver.perform_async(@quiz.id, nil, nil, nil, -1, @session_id,
-                               @study_participant, nil)
+      ProbeSaver.perform_async(@quiz.id, nil, nil, -1, @attempt_token)
     end
 end

app/models/user.rb

@@ -615,10 +615,6 @@ def nonsubscribed_lectures
     Lecture.where.not(id: lectures.pluck(:id))
   end
 
-  def anonymized_id
-    Digest::SHA2.hexdigest(id.to_s + created_at.to_s).first(20)
-  end
-
   def subscribe_lecture!(lecture)
     return false unless lecture.is_a?(Lecture)
     return false if lecture.in?(lectures)

app/views/administration/_navbar.html.erb

@@ -85,12 +85,6 @@
                   title: t('admin.navbar.stats'),
                   target: :_blank %>
         </li>
-        <li>
-          <%= link_to '', interactions_path,
-                  class: 'nav-link bi-cloud-arrow-down-fill ' + get_class_for_path(interactions_path()),
-                  data: { 'bs-toggle': 'tooltip' },
-                  title: t('admin.navbar.export_stats') %>
-        </li>
       <% end %>
     </ul>
 

app/views/mathi_mailer/data_provide_email.html.erb

@@ -14,7 +14,6 @@
     email_for_teachable: @user.email_for_teachable,
     email_for_news: @user.email_for_news,
     unread_comments: @user.unread_comments,
-    study_participant: @user.study_participant,
     email_for_submission_upload: @user.email_for_submission_upload,
     email_for_submission_removal: @user.email_for_submission_removal,
     email_for_submission_join: @user.email_for_submission_join,

app/views/quizzes/_free_question_open.html.erb

@@ -40,7 +40,7 @@
                       id: 'quiz_question_crosses' %>
     <%= quiz_fields.hidden_field :solution_input, id: 'question_quiz_solution_input' %>
     <%= quiz_fields.hidden_field :result, id: 'question_quiz_result' %>
-    <%= quiz_fields.hidden_field :session_id, value: quiz_round.session_id %>
+    <%= quiz_fields.hidden_field :attempt_token, value: quiz_round.attempt_token %>
   <% end %>
 
   <%= f.hidden_field :id, value: quiz_round.quiz.id %>

app/views/quizzes/_mc_question_open.html.erb

@@ -19,8 +19,8 @@
                      value: quiz_round.counter %>
   <%= f.hidden_field :answer_shuffle,
                      value: quiz_round.answer_shuffle.to_json %>
-  <%= f.hidden_field :session_id,
-                     value: quiz_round.session_id %>
+  <%= f.hidden_field :attempt_token,
+                     value: quiz_round.attempt_token %>
   <div class="text-center">
     <%= f.submit t('buttons.submit'),
                  class: "send-it btn btn-secondary mt-2"  %>

app/views/quizzes/_remark.html.erb

@@ -23,8 +23,8 @@
                              value: @quiz_round.progress %>
           <%= f.hidden_field :counter,
                              value: @quiz_round.counter %>
-          <%= f.hidden_field :session_id,
-                             value: @quiz_round.session_id %>
+          <%= f.hidden_field :attempt_token,
+                             value: @quiz_round.attempt_token %>
         </div>
         <% if remark.video || remark.manuscript || remark.geogebra %>
           <div class="col-12 text-center my-2 remark-infotainment-text">

app/workers/probe_saver.rb

@@ -1,21 +1,15 @@
 class ProbeSaver
   include Sidekiq::Worker
 
-  # rubocop:todo Metrics/ParameterLists
-  def perform(quiz_id, question_id, remark_id, correct, progress, session_id,
-              study_participant, input)
-    # rubocop:enable Metrics/ParameterLists
+  def perform(quiz_id, question_id, correct, progress, attempt_token)
     probe = Probe.create(quiz_id: quiz_id,
                          question_id: question_id,
-                         remark_id: remark_id,
                          correct: correct,
                          progress: progress,
-                         session_id: session_id,
-                         study_participant: study_participant,
-                         input: input)
+                         attempt_token: attempt_token)
     return unless progress == -1
 
-    success = Probe.where(session_id: session_id, correct: true).count
+    success = Probe.where(attempt_token: attempt_token, correct: true).count
     probe.update(success: success)
   end
 end