assignment_questionnaires = AssignmentQuestionnaire.where(assignment_id: @assignment.id, topic_id: topic_id)
      assignment_questionnaires.each do |aq|
        # If the AQ questionnaire matches the type of the questionnaire that needs to be updated, return it
        return aq if aq.questionnaire_id && Questionnaire.find(aq.questionnaire_id).type == questionnaire_type
      end