Merge pull request #560 from fecgov/release/sprint-32

Release/sprint 32
fecgov · Oct 25, 2023 · b599a42 · b599a42
2 parents d275088 + 4f95e17
commit b599a42
Show file tree

Hide file tree

Showing 141 changed files with 4,010 additions and 4,448 deletions.
diff --git a/.safety.dependency.ignore b/.safety.dependency.ignore
@@ -13,3 +13,6 @@
 59293 2023-12-01 # django
 55264 2023-12-01 # django
 60350 2023-12-01 # django
+60841 2023-12-01 # django
+60789 2023-12-01 # django
+60956 2023-12-01 # django
diff --git a/django-backend/.gitignore b/django-backend/.gitignore
@@ -12,4 +12,5 @@ local_settings.py
 /env/
 .python-version
 *.python_history
-*.bash_history
+*.bash_history
+fecfiler/web_services/dot_fec/output/
diff --git a/django-backend/fecfiler/committee_accounts/migrations/0003_uuid_pk.py b/django-backend/fecfiler/committee_accounts/migrations/0003_uuid_pk.py
@@ -10,7 +10,6 @@ class Migration(migrations.Migration):
         ("contacts", "0008_committee_fk_to_int"),
         ("f3x_summaries", "0023_committee_fk_to_int"),
         ("memo_text", "0005_committee_fk_to_int"),
-        ("scha_transactions", "0021_committee_fk_to_int"),
     ]
 
     operations = [

diff --git a/django-backend/fecfiler/committee_accounts/migrations/0004_remove_id.py b/django-backend/fecfiler/committee_accounts/migrations/0004_remove_id.py
@@ -9,7 +9,6 @@ class Migration(migrations.Migration):
         ("contacts", "0009_committee_uuid_fk"),
         ("f3x_summaries", "0024_committee_uuid_fk"),
         ("memo_text", "0006_committee_uuid_fk"),
-        ("scha_transactions", "0022_committee_uuid_fk"),
     ]
 
     operations = [

diff --git a/django-backend/fecfiler/contacts/serializers.py b/django-backend/fecfiler/contacts/serializers.py
@@ -55,9 +55,6 @@ class Meta:
             if f.name
             not in [
                 "deleted",
-                "schatransaction",
-                "scheduleatransaction",
-                "schedulebtransaction",
                 "transaction",
                 "contact_1_transaction_set",
                 "contact_2_transaction_set",

diff --git a/django-backend/fecfiler/f3x_summaries/migrations/0021_f3xsummary_uuid_primary.py b/django-backend/fecfiler/f3x_summaries/migrations/0021_f3xsummary_uuid_primary.py
@@ -8,7 +8,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("memo_text", "0003_report_id"),
-        ("scha_transactions", "0019_report_id"),
         ("f3x_summaries", "0020_f3xsummary_submission_keys"),
     ]
 

diff --git a/django-backend/fecfiler/f3x_summaries/migrations/0022_remove_id.py b/django-backend/fecfiler/f3x_summaries/migrations/0022_remove_id.py
@@ -7,7 +7,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("memo_text", "0004_report_fk"),
-        ("scha_transactions", "0020_report_fk"),
         ("f3x_summaries", "0021_f3xsummary_uuid_primary"),
     ]
 

diff --git a/.../fecfiler/f3x_summaries/migrations/0028_f3xsummary_report_id_f3xsummary_report_version.py b/.../fecfiler/f3x_summaries/migrations/0028_f3xsummary_report_id_f3xsummary_report_version.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.1.3 on 2023-10-06 22:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('f3x_summaries', '0027_remove_f3xsummary_filer_committee_id_number'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='f3xsummary',
+            name='report_id',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='f3xsummary',
+            name='report_version',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/django-backend/fecfiler/f3x_summaries/models.py b/django-backend/fecfiler/f3x_summaries/models.py
@@ -24,6 +24,10 @@ class F3XSummary(SoftDeleteModel, CommitteeOwnedModel):
     )
 
     form_type = models.TextField(null=True, blank=True)
+    # fec 1-up version of amendment
+    report_version = models.TextField(null=True, blank=True)
+    # fec id for report
+    report_id = models.TextField(null=True, blank=True)
     # TODO get rid of this field.  It is redundant with the related Committee_Account
     committee_name = models.TextField(null=True, blank=True)
     change_of_address = models.BooleanField(default=False, null=True, blank=True)
@@ -390,7 +394,7 @@ def pull_forward_loans(self):
 
         if previous_report:
             loans_to_pull_forward = previous_report.transaction_set.filter(
-                ~Q(loan_balance=Decimal(0)) | Q(loan_balance=None),
+                ~Q(loan_balance=Decimal(0)) | Q(loan_balance__isnull=True),
                 ~Q(memo_code=True),
                 schedule_c_id__isnull=False,
             )
@@ -425,7 +429,7 @@ def pull_forward_debts(self):
 
         if previous_report:
             debts_to_pull_forward = previous_report.transaction_set.filter(
-                ~Q(balance_at_close=Decimal(0)) | Q(balance_at_close=None),
+                ~Q(balance_at_close=Decimal(0)) | Q(balance_at_close__isnull=True),
                 ~Q(memo_code=True),
                 schedule_d_id__isnull=False,
             )

diff --git a/django-backend/fecfiler/f3x_summaries/serializers.py b/django-backend/fecfiler/f3x_summaries/serializers.py
@@ -76,9 +76,6 @@ class Meta:
             if f.name
             not in [
                 "deleted",
-                "schatransaction",
-                "scheduleatransaction",
-                "schedulebtransaction",
                 "transaction",
                 "dotfec",
                 "memotext",

diff --git a/django-backend/fecfiler/f3x_summaries/test_views.py b/django-backend/fecfiler/f3x_summaries/test_views.py
diff --git a/django-backend/fecfiler/f3x_summaries/views.py b/django-backend/fecfiler/f3x_summaries/views.py
@@ -28,9 +28,7 @@ def get_status_mapping():
         ]
     ) | Q(upload_submission__fec_status=FECStatus.PROCESSING)
     success = Q(upload_submission__fec_status=FECStatus.ACCEPTED)
-    failed = Q(
-        upload_submission__fecfile_task_state=FECSubmissionState.FAILED
-    ) | Q(
+    failed = Q(upload_submission__fecfile_task_state=FECSubmissionState.FAILED) | Q(
         upload_submission__fec_status=FECStatus.REJECTED
     )
 
@@ -78,6 +76,19 @@ def coverage_dates(self, request):
         )
         return JsonResponse(data, safe=False)
 
+    @action(
+        detail=True,
+        methods=["post"],
+        url_name="amend",
+    )
+    def amend(self, request, pk):
+        report = self.get_object()
+        report.form_type = "F3XA"
+        report.report_version = int(report.report_version or "0") + 1
+        report.upload_submission = None
+        report.save()
+        return Response(f"amended {report}")
+
     @action(
         detail=False,
         methods=["post"],

diff --git a/..._schatransaction_parent_transaction_id.py → .../migrations/0012_alter_memotext_report.py b/..._schatransaction_parent_transaction_id.py → .../migrations/0012_alter_memotext_report.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.12 on 2022-06-30 19:35
+# Generated by Django 4.1.3 on 2023-10-13 15:54
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -7,19 +7,19 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("scha_transactions", "0009_alter_schatransaction_contribution_date"),
+        ("reports", "0002_copy_to_unified_table"),
+        ("memo_text", "0011_remove_memotext_back_reference_sched_form_name_and_more"),
     ]
 
     operations = [
-        migrations.AddField(
-            model_name="schatransaction",
-            name="parent_transaction_id",
+        migrations.AlterField(
+            model_name="memotext",
+            name="report",
             field=models.ForeignKey(
                 blank=True,
-                default=None,
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
-                to="scha_transactions.schatransaction",
+                to="reports.report",
             ),
         ),
     ]
diff --git a/django-backend/fecfiler/memo_text/models.py b/django-backend/fecfiler/memo_text/models.py
@@ -1,6 +1,6 @@
 from fecfiler.soft_delete.models import SoftDeleteModel
 from fecfiler.committee_accounts.models import CommitteeOwnedModel
-from fecfiler.f3x_summaries.models import ReportMixin
+from fecfiler.reports.models import ReportMixin
 from fecfiler.shared.utilities import generate_fec_uid
 from django.db import models
 import uuid

diff --git a/django-backend/fecfiler/memo_text/serializers.py b/django-backend/fecfiler/memo_text/serializers.py
@@ -23,9 +23,6 @@ class Meta:
             not in [
                 "report",
                 "deleted",
-                "schatransaction",
-                "scheduleatransaction",
-                "schedulebtransaction",
                 "transaction",
             ]
         ] + [

diff --git a/django-backend/fecfiler/memo_text/test_models.py b/django-backend/fecfiler/memo_text/test_models.py
@@ -4,7 +4,7 @@
 
 
 class MemoTextTestCase(TestCase):
-    fixtures = ["test_f3x_summaries", "test_memo_text", "test_committee_accounts"]
+    fixtures = ["test_f3x_reports", "test_memo_text", "test_committee_accounts"]
 
     def setUp(self):
         self.valid_memo_text = MemoText(

diff --git a/django-backend/fecfiler/memo_text/test_serializers.py b/django-backend/fecfiler/memo_text/test_serializers.py
@@ -5,7 +5,7 @@
 
 
 class MemoTextSerializerTestCase(TestCase):
-    fixtures = ["test_memo_text", "test_committee_accounts", "test_f3x_summaries"]
+    fixtures = ["test_memo_text", "test_committee_accounts", "test_f3x_reports"]
 
     def setUp(self):
         self.valid_memo_text = {
@@ -31,13 +31,11 @@ def setUp(self):
 
     def test_serializer_validate(self):
         valid_serializer = MemoTextSerializer(
-            data=self.valid_memo_text,
-            context={"request": self.mock_request},
+            data=self.valid_memo_text, context={"request": self.mock_request},
         )
         self.assertTrue(valid_serializer.is_valid(raise_exception=True))
         invalid_serializer = MemoTextSerializer(
-            data=self.invalid_memo_text,
-            context={"request": self.mock_request},
+            data=self.invalid_memo_text, context={"request": self.mock_request},
         )
         self.assertFalse(invalid_serializer.is_valid())
         self.assertIsNotNone(invalid_serializer.errors["rec_type"])
diff --git a/django-backend/fecfiler/memo_text/test_views.py b/django-backend/fecfiler/memo_text/test_views.py
@@ -6,7 +6,7 @@
 
 class MemoTextViewSetTest(TestCase):
     fixtures = [
-        "test_f3x_summaries",
+        "test_f3x_reports",
         "test_memo_text",
         "test_committee_accounts",
         "test_accounts",

diff --git a/django-backend/fecfiler/memo_text/views.py b/django-backend/fecfiler/memo_text/views.py
@@ -1,19 +1,16 @@
 from .models import MemoText
 from .serializers import MemoTextSerializer
 from fecfiler.committee_accounts.views import CommitteeOwnedViewSet
-from fecfiler.f3x_summaries.views import ReportViewMixin
+from fecfiler.reports.views import ReportViewMixin
 
 
 class MemoTextViewSet(CommitteeOwnedViewSet, ReportViewMixin):
     def get_queryset(self):
         memos = MemoText.objects.all()
         query_params = self.request.query_params.keys()
-        if ("report_id" in query_params):
+        if "report_id" in query_params:
             report_id = self.request.query_params["report_id"]
-            memos = memos.filter(
-                report_id=report_id,
-                transaction_uuid=None
-            )
+            memos = memos.filter(report_id=report_id, transaction_uuid=None)
 
         return memos
 

diff --git a/django-backend/fecfiler/reports/__init__.py b/django-backend/fecfiler/reports/__init__.py
@@ -0,0 +1,3 @@
+"""Django App for Reports
+
+"""
diff --git a/...ackend/fecfiler/scha_transactions/apps.py → django-backend/fecfiler/reports/apps.py b/...ackend/fecfiler/scha_transactions/apps.py → django-backend/fecfiler/reports/apps.py
@@ -1,8 +1,8 @@
 from django.apps import AppConfig
 
 
-class SchedAConfig(AppConfig):
-    name = "fecfiler.scha_transactions"
+class ReportsConfig(AppConfig):
+    name = "fecfiler.reports"
 
     def ready(self):
         # Implicitly connect a signal handlers decorated with @receiver.