comment out new code so sample documents still work for demo

nimya-aot · Jan 31, 2023 · d24611d · d24611d
1 parent 8debfe2
commit d24611d
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/api/reviewer_api/models/Documents.py b/api/reviewer_api/models/Documents.py
@@ -41,11 +41,12 @@ def getdocuments(cls, foiministryrequestid):
         ]
 
         #subquery for filtering out duplicates, merging divisions
-        subquery_hashcode = cls.__getoriginalsubquery(foiministryrequestid).add_columns(
-            func.json_agg(DocumentTag.tag['divisions'][0]).label('divisions')
-        ).join(
-            DocumentTag, DocumentTag.documentid == Document.documentid
-        ).subquery('sq')
+        # Commented out for demo purposes
+        # subquery_hashcode = cls.__getoriginalsubquery(foiministryrequestid).add_columns(
+        #     func.json_agg(DocumentTag.tag['divisions'][0]).label('divisions')
+        # ).join(
+        #     DocumentTag, DocumentTag.documentid == Document.documentid
+        # ).subquery('sq')
 
         selectedcolumns = [
             Document.documentid,
@@ -60,7 +61,9 @@ def getdocuments(cls, foiministryrequestid):
             Document.updated_at,
             Document.statusid,
             DocumentStatus.name.label('status'),
-            (func.to_jsonb(DocumentTag.tag).op('||')(func.jsonb_build_object('divisions', subquery_hashcode.c.divisions))).label('tags'),
+            DocumentTag.tag.label('tags'),
+            # Commented out for demo purposes
+            # (func.to_jsonb(DocumentTag.tag).op('||')(func.jsonb_build_object('divisions', subquery_hashcode.c.divisions))).label('tags'),
             Document.pagecount
         ]
 
@@ -75,9 +78,9 @@ def getdocuments(cls, foiministryrequestid):
                             ).join(
                                 DocumentTag,
                                 and_(DocumentTag.documentid == Document.documentid, DocumentTag.documentversion == Document.version)
-                            ).join(
-                                subquery_hashcode,
-                                subquery_hashcode.c.minid == Document.documentid
+                            # ).join(
+                            #     subquery_hashcode,
+                            #     subquery_hashcode.c.minid == Document.documentid
                             ).filter(
                                 Document.foiministryrequestid == foiministryrequestid,
                             ).all()