Merge branch 'main' into 599-feat-add-logic-to-download-results

Author: albertisfu

.github/workflows/lint.yml

@@ -92,6 +92,7 @@ jobs:
           cl/users/management/commands/cl_retry_failed_email.py \
           cl/users/tasks.py \
           cl/recap/management/commands/remove_appellate_entries_with_long_numbers.py \
+          cl/recap/utils.py \
           cl/search/management/commands/cl_index_parent_and_child_docs.py \
           cl/search/management/commands/sweep_indexer.py \
           cl/search/management/commands/pacer_bulk_fetch.py

cl/assets/templates/base.html

@@ -142,15 +142,13 @@ <h1>You did not supply the "private" variable to your template.
                            tabindex="204"><i class="fa fa-bookmark-o gray fa-fw"></i>&nbsp;Notes</a></li>
                     <li><a href="{% url "tag_list" username=user.username %}"
                            tabindex="205"><i class="fa fa-tags gray fa-fw"></i>&nbsp;Tags</a></li>
-                    {% flag "pray-and-pay" %}
                     <li><a href="{% url 'user_prayers' user.username %}" tabindex="206">
                         <div class="fa gray fa-fw">
                           {% include "includes/hand-holding-heart.svg" %}
                         </div>
                         &nbsp;Prayers
                       </a>
                     </li><!--need to fix class-->
-                    {% endflag %}
                     <li class="divider"></li>
                     <li><a href="{% url "profile_your_support" %}"
                            tabindex="207"><i class="fa fa-money gray fa-fw"></i>&nbsp;Your Support</a></li>
@@ -240,11 +238,9 @@ <h1>You did not supply the "private" variable to your template.
                 <li>
                   <a href="https://free.law/recap/" tabindex="202">Install RECAP</a>
                 </li>
-                {% flag "pray-and-pay" %}
                   <li>
                     <a href="{% url "top_prayers" %}" tabindex="203">Pray and Pay Project</a>
                   </li>
-                {% endflag %}
                 <li>
                   <a href="{% url "alert_help" %}#recap-alerts" tabindex="204">Get Case Alerts</a>
                 </li>

cl/citations/admin.py

@@ -0,0 +1,38 @@
+from admin_cursor_paginator import CursorPaginatorAdmin
+from django.contrib import admin
+
+from cl.citations.models import UnmatchedCitation
+
+
+@admin.register(UnmatchedCitation)
+class UnmatchedCitationAdmin(CursorPaginatorAdmin):
+    list_display = (
+        "__str__",
+        "citing_opinion",
+    )
+    list_display_links = ("citing_opinion",)
+    list_filter = ("type", "status")
+    search_fields = (
+        "volume",
+        "reporter",
+        "page",
+    )
+    raw_id_fields = ("citing_opinion",)
+
+    def formfield_for_choice_field(self, db_field, request, **kwargs):
+        if db_field.name == "status":
+            # Show only integer values in the dropdown
+            kwargs["choices"] = [
+                (value, value) for value, _ in db_field.choices
+            ]
+
+            # Generate a new help text including both value and description
+            choices_text = "<br>".join(
+                f"<strong>{value}:</strong> {desc}"
+                for value, desc in db_field.choices
+            )
+            kwargs["help_text"] = (
+                f"<div>{db_field.help_text}</div><div>{choices_text}</div>"
+            )
+
+        return super().formfield_for_choice_field(db_field, request, **kwargs)

cl/corpus_importer/task_canvases.py

@@ -11,7 +11,7 @@
     get_bankr_claims_registry,
     get_docket_by_pacer_case_id,
     get_pacer_case_id_and_title,
-    make_attachment_pq_object,
+    save_attachment_pq_object,
 )
 from cl.lib.celery_utils import CeleryThrottle
 from cl.recap.tasks import process_recap_attachment
@@ -73,6 +73,6 @@ def get_district_attachment_pages(options, rd_pks, tag_names, session):
         throttle.maybe_wait()
         chain(
             get_attachment_page_by_rd.s(rd_pk, session).set(queue=q),
-            make_attachment_pq_object.s(rd_pk, recap_user.pk).set(queue=q),
+            save_attachment_pq_object.s(rd_pk, recap_user.pk).set(queue=q),
             process_recap_attachment.s(tag_names=tag_names).set(queue=q),
         ).apply_async()

cl/corpus_importer/tasks.py

@@ -1938,6 +1938,33 @@ def get_bankr_claims_registry(
     return data
 
 
+def create_attachment_pq(
+    rd_pk: int,
+    user_pk: int,
+) -> ProcessingQueue:
+    """Create a ProcessingQueue instance for an attachment.
+
+    Note that the PQ returned hasn't been persisted in the database.
+    It must be saved in a subsequent step.
+
+    :param rd_pk: The pk of the RECAPDocument.
+    :param user_pk: The pk of the User uploading the attachment.
+    :return: A ProcessingQueue instance for the attachment upload.
+    """
+
+    rd = RECAPDocument.objects.get(pk=rd_pk)
+    user = User.objects.get(pk=user_pk)
+    pq = ProcessingQueue(
+        court_id=rd.docket_entry.docket.court_id,
+        pacer_doc_id=rd.pacer_doc_id,
+        uploader=user,
+        upload_type=UPLOAD_TYPE.ATTACHMENT_PAGE,
+        pacer_case_id=rd.docket_entry.docket.pacer_case_id,
+    )
+    return pq
+
+
+# TODO: Remove after the new related methods have been rolled out.
 @app.task(bind=True, ignore_result=True)
 def make_attachment_pq_object(
     self: Task,
@@ -1975,7 +2002,65 @@ def make_attachment_pq_object(
     pq.filepath_local.save(
         "attachment_page.html", ContentFile(att_report_text.encode())
     )
+    return pq.pk
+
+
+@app.task(bind=True, ignore_result=True)
+def save_attachment_pq_object(
+    self: Task,
+    attachment_report: AttachmentPage,
+    rd_pk: int,
+    user_pk: int,
+) -> int:
+    """Create an item in the processing queue for an attachment page.
+
+    This is a helper shim to convert attachment page results into processing
+    queue objects that can be processed by our standard pipeline.
 
+    :param self: The celery task
+    :param attachment_report: An AttachmentPage object that's already queried
+    a page and populated its data attribute.
+    :param rd_pk: The RECAP document that the attachment page is associated
+    with
+    :param user_pk: The user to associate with the ProcessingQueue object when
+    it's created.
+    :return: The pk of the ProcessingQueue object that's created.
+    """
+
+    pq = create_attachment_pq(
+        rd_pk,
+        user_pk,
+    )
+    att_report_text = attachment_report.response.text
+    pq.filepath_local.save(
+        "attachment_page.html", ContentFile(att_report_text.encode())
+    )
+    return pq.pk
+
+
+def save_attachment_pq_from_text(
+    rd_pk: int,
+    user_pk: int,
+    att_report_text: str,
+) -> int:
+    """Create an item in the processing queue for an attachment page from the
+    att report text.
+
+    :param rd_pk: The RECAP document that the attachment page is associated
+    with
+    :param user_pk: The user to associate with the ProcessingQueue object when
+    it's created.
+    :param att_report_text: The attachment page report text.
+    :return: The pk of the ProcessingQueue object that's created.
+    """
+
+    pq = create_attachment_pq(
+        rd_pk,
+        user_pk,
+    )
+    pq.filepath_local.save(
+        "attachment_page.html", ContentFile(att_report_text.encode())
+    )
     return pq.pk
 
 

cl/favorites/tests.py

@@ -29,6 +29,7 @@
     get_prayer_counts_in_bulk,
     get_top_prayers,
     get_user_prayer_history,
+    get_user_prayers,
     prayer_eligible,
 )
 from cl.lib.test_helpers import AudioTestCase, SimpleUserDataMixin
@@ -889,6 +890,34 @@ async def test_get_top_prayers_by_number_and_age(self) -> None:
             top_prayers[3].geometric_mean, rd_3_score, places=2
         )
 
+    async def test_get_user_prayers(self) -> None:
+        """Does the get_user_prayer method work properly?"""
+        # Create prayers for user and user_2 to establish test data.
+        prayer_rd_2 = await create_prayer(self.user, self.rd_2)
+        await create_prayer(self.user_2, self.rd_2)
+        await create_prayer(self.user, self.rd_3)
+
+        user_prayers = await get_user_prayers(user=self.user)
+        user_2_prayers = await get_user_prayers(user=self.user_2)
+
+        # Verify the correct number of prayers are returned for each user
+        self.assertEqual(
+            await user_prayers.acount(), 2, "User 1 should have 2 prayers."
+        )
+        self.assertEqual(
+            await user_2_prayers.acount(), 1, "User 2 should have 1 prayer."
+        )
+
+        # Update the status of one of user's prayers to 'GRANTED'.
+        prayer_rd_2.status = Prayer.GRANTED
+        await prayer_rd_2.asave()
+
+        # Verify only the 'GRANTED' prayer is returned.
+        user_granted_prayers = await get_user_prayers(
+            user=self.user, status=Prayer.GRANTED
+        )
+        self.assertEqual(await user_granted_prayers.acount(), 1)
+
     async def test_get_user_prayer_history(self) -> None:
         """Does the get_user_prayer_history method work properly?"""
         # # Prayers for user_2

cl/favorites/utils.py

@@ -166,15 +166,12 @@ async def get_top_prayers() -> QuerySet[RECAPDocument]:
 async def get_user_prayers(
     user: User, status: str | None = None
 ) -> QuerySet[RECAPDocument]:
-    user_prayers = Prayer.objects.filter(user=user)
-
+    filters = {"prayers__user": user}
     if status is not None:
-        user_prayers = user_prayers.filter(status=status)
-
-    user_prayer_ids = user_prayers.values("recap_document_id")
+        filters["prayers__status"] = status
 
     documents = (
-        RECAPDocument.objects.filter(id__in=Subquery(user_prayer_ids))
+        RECAPDocument.objects.filter(**filters)
         .select_related(
             "docket_entry",
             "docket_entry__docket",

cl/opinion_page/templates/docket_tabs.html

@@ -55,9 +55,7 @@
             src="{% static "js/react/vendor.js" %}"></script>
 
     <script type="text/javascript" src="{% static "js/export-csv.js" %}"></script>
-    {% flag "pray-and-pay" %}
     <script src="{% static "js/pray_and_pay.js" %}"></script>
-    {% endflag %}
 {% endblock %}
 
 {% block nav %}
@@ -88,9 +86,7 @@ <h1 class="bottom inline" data-type="search.Docket" data-id="{{ docket.pk }}">
     </h1>
     {% include "includes/notes_modal.html" %}
     {% include "includes/docket_alerts_modal.html" %}
-    {% flag "pray-and-pay" %}
-      {% include "includes/first_prayer_modal.html" %}
-    {% endflag %}
+    {% include "includes/first_prayer_modal.html" %}
 
     <h2>{{ docket.court }}</h2>
 

cl/opinion_page/templates/includes/de_list.html

@@ -171,11 +171,9 @@
                             target="_blank"
                             rel="nofollow">Buy on PACER {% if rd.page_count %}(${{ rd|price }}){% endif %}
                         </a>
-                        {% flag "pray-and-pay" %}
                           <div class="prayer-button" data-gap-size="{% if rd.page_count %}small{% else %}large{% endif %}">
                             {% include "includes/pray_and_pay_htmx/pray_button.html" with prayer_exists=rd.prayer_exists document_id=rd.id count=rd.prayer_count%}
                           </div>
-                        {% endflag %}
                       {% endif %}
                     {% endif %}
                   {% endif %}

cl/opinion_page/templates/includes/redirect_to_pacer_modal.html

@@ -35,11 +35,9 @@ <h2 class="modal-title">Sorry, this document isn't in the RECAP Archive yet</h2>
                rel="nofollow"
                target="_blank"><i class="fa fa-dollar"></i>&nbsp;Buy on PACER</a>
           </div>
-          {% flag "pray-and-pay" %}
             <div class="prayer-button" data-gap-size="2px">
               {% include "includes/pray_and_pay_htmx/pray_button.html" with prayer_exists=rd.prayer_exists document_id=rd.id count=rd.prayer_count regular_size=True%}
             </div>
-          {% endflag %}
         </div>
       </div>
     </div>

cl/opinion_page/templates/recap_document.html

@@ -36,9 +36,7 @@
   {% else %}
     <script src="{% static "js/htmx.min.js" %}"></script>
   {% endif %}
-  {% flag "pray-and-pay" %}
-  <script src="{% static "js/pray_and_pay.js" %}"></script>
-  {% endflag %}
+    <script src="{% static "js/pray_and_pay.js" %}"></script>
 {% endblock %}
 
 {% block sidebar %}
@@ -86,9 +84,7 @@ <h2 class="inline"><a
       {% if redirect_to_pacer_modal %}
         {% include "includes/redirect_to_pacer_modal.html" %}
       {% endif %}
-      {% flag "pray-and-pay" %}
-        {% include "includes/first_prayer_modal.html" %}
-      {% endflag %}
+      {% include "includes/first_prayer_modal.html" %}
       {% include "includes/rd_metadata_headers.html" %}
       <br>
 
@@ -202,11 +198,9 @@ <h4>Description</h4>
                   <a href="https://free.law/recap/"
                      class="btn btn-success btn-sm recap_install_plea">Install RECAP</a>
                 {% endif %}
-                {% flag "pray-and-pay" %}
                 <div class="prayer-button">
                   {% include "includes/pray_and_pay_htmx/pray_button.html" with prayer_exists=rd.prayer_exists document_id=rd.id count=rd.prayer_count regular_size=True%}
                 </div>
-                {% endflag %}
               </div>
             </div>
           {% endif %}