From 6aa380e3fd28eba92faac481045b13246cef8ae6 Mon Sep 17 00:00:00 2001
From: Ivan Cvitkovic <ivanc@uw.edu>
Date: Wed, 11 Dec 2019 14:33:22 -0800
Subject: [PATCH] Revert "TN-2417 provide ugly workaround to failed query until
 we can figure out the source of the problem. (#3579)"

This reverts commit 08a7642be94fda86d624e8f285e3a43ec8a28895.
---
 portal/models/questionnaire_response.py | 28 +------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/portal/models/questionnaire_response.py b/portal/models/questionnaire_response.py
index d1d904e152..0aa65733ee 100644
--- a/portal/models/questionnaire_response.py
+++ b/portal/models/questionnaire_response.py
@@ -340,41 +340,15 @@ def qnrs(self):
             ).filter(
                 QuestionnaireResponse.qb_iteration == self.qb_iteration)
         self._qnrs = []
-        requery = False
         for qnr in query:
-            if qnr.instrument_id is None:
-                current_app.logger.warning(
-                    "QNR {} query returned no instrument".format(qnr.id))
-                instrument = None
-                requery = True
-            else:
-                instrument = qnr.instrument_id.split('/')[-1]
             self._qnrs.append(QNR(
                 qnr_id=qnr.id,
                 qb_id=qnr.questionnaire_bank_id,
                 iteration=qnr.qb_iteration,
                 status=qnr.status,
-                instrument=instrument,
+                instrument=qnr.instrument_id.split('/')[-1],
                 authored=qnr.authored,
                 encounter_id=qnr.encounter_id))
-
-        if requery:
-            # Ugly workaround till we figure out why this is happening
-            # see TN-2417
-            for i, qnr in enumerate(self._qnrs):
-                if qnr.instrument is None:
-                    doc = QuestionnaireResponse.query.filter(
-                        QuestionnaireResponse.id == qnr.qnr_id).with_entities(
-                        QuestionnaireResponse.document).first()
-                    if doc is None:
-                        current_app.logger.warning(
-                            "doc still None on second try for "
-                            "qnr {}".format(qnr.qnr_id))
-                    else:
-                        self._qnrs[i] = qnr._replace(
-                            instrument=
-                            doc[0]['questionnaire']['reference'].split(
-                                '/')[-1])
         return self._qnrs
 
     def assign_qb_relationships(self, qb_generator):