Uses viewflow for project and remove django-fsm, updated migrations

Author: sandeepsajan0

hypha/apply/funds/migrations/0033_use_django_fsm.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.0.2 on 2018-06-11 16:14
 
 from django.db import migrations, models
-import django_fsm
 
 
 class Migration(migrations.Migration):
@@ -13,8 +12,9 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="applicationsubmission",
             name="status",
-            field=django_fsm.FSMField(
-                default="in_discussion", max_length=50, protected=True
+            field=models.CharField(
+                default="in_discussion",
+                max_length=50,
             ),
         ),
         migrations.AlterField(

hypha/apply/funds/migrations/0127_alter_applicationsubmission_status.py

@@ -0,0 +1,84 @@
+# Generated by Django 4.2.21 on 2025-06-02 10:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("funds", "0126_add_max_length"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="applicationsubmission",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("com_accepted", "Accepted"),
+                    ("concept_review_discussion", "Ready For Discussion"),
+                    ("post_proposal_review_more_info", "More information required"),
+                    ("post_external_review_more_info", "More information required"),
+                    ("ext_accepted", "Accepted"),
+                    ("ext_post_external_review_discussion", "Ready For Discussion"),
+                    ("proposal_more_info", "More information required"),
+                    ("invited_to_proposal", "Concept Accepted"),
+                    ("proposal_rejected", "Dismissed"),
+                    ("draft_proposal", "Invited for Proposal"),
+                    ("same_more_info", "More information required"),
+                    ("com_almost", "Accepted but additional info required"),
+                    ("same_post_review_more_info", "More information required"),
+                    ("same_determination", "Ready for Determination"),
+                    ("same_internal_review", "Review"),
+                    ("post_external_review_discussion", "Ready For Discussion"),
+                    ("rejected", "Dismissed"),
+                    ("concept_internal_review", "Internal Review"),
+                    ("com_post_review_more_info", "More information required"),
+                    ("almost", "Accepted but additional info required"),
+                    ("determination", "Ready for Determination"),
+                    ("internal_review", "Internal Review"),
+                    ("ext_post_external_review_more_info", "More information required"),
+                    ("com_more_info", "More information required"),
+                    ("concept_determination", "Ready for Preliminary Determination"),
+                    ("concept_rejected", "Dismissed"),
+                    ("ext_post_review_discussion", "Ready For Discussion"),
+                    ("ext_determination", "Ready for Determination"),
+                    ("same_rejected", "Dismissed"),
+                    ("post_review_discussion", "Ready For Discussion"),
+                    ("com_rejected", "Dismissed"),
+                    ("ext_external_review", "External Review"),
+                    ("post_proposal_review_discussion", "Ready For Discussion"),
+                    ("concept_review_more_info", "More information required"),
+                    ("post_review_more_info", "More information required"),
+                    ("com_internal_review", "Internal Review"),
+                    ("same_post_review_discussion", "Ready For Discussion"),
+                    ("com_open_call", "Open Call (public)"),
+                    ("com_determination", "Ready for Determination"),
+                    ("proposal_internal_review", "Internal Review"),
+                    ("same_accepted", "Accepted"),
+                    ("com_post_review_discussion", "Ready For Discussion"),
+                    ("ext_internal_review", "Internal Review"),
+                    ("ext_rejected", "Dismissed"),
+                    ("com_external_review", "External Review"),
+                    ("external_review", "External Review"),
+                    ("same_almost", "Accepted but additional info required"),
+                    ("com_post_external_review_discussion", "Ready For Discussion"),
+                    ("concept_more_info", "More information required"),
+                    ("in_discussion", "Need screening"),
+                    ("com_post_external_review_more_info", "More information required"),
+                    ("ext_almost", "Accepted but additional info required"),
+                    ("com_community_review", "Community Review"),
+                    ("ext_more_info", "More information required"),
+                    ("proposal_almost", "Accepted but additional info required"),
+                    ("ext_post_review_more_info", "More information required"),
+                    ("more_info", "More information required"),
+                    ("draft", "Draft"),
+                    ("proposal_discussion", "Proposal Received"),
+                    ("proposal_determination", "Ready for Final Determination"),
+                    ("accepted", "Accepted"),
+                    ("proposal_accepted", "Accepted"),
+                ],
+                default="in_discussion",
+                max_length=100,
+            ),
+        ),
+    ]

hypha/apply/projects/migrations/0045_use_fsm_field_for_status.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2.26 on 2022-01-27 10:12
 
-from django.db import migrations
-import django_fsm
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -13,7 +12,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="invoice",
             name="status",
-            field=django_fsm.FSMField(
+            field=models.CharField(
                 choices=[
                     ("submitted", "Submitted"),
                     ("resubmitted", "Resubmitted"),

hypha/apply/projects/migrations/0050_add_new_invoice_status.py

@@ -1,7 +1,6 @@
 # Generated by Django 3.2.12 on 2022-04-06 07:12
 
-from django.db import migrations
-import django_fsm
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -13,7 +12,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="invoice",
             name="status",
-            field=django_fsm.FSMField(
+            field=models.CharField(
                 choices=[
                     ("submitted", "Submitted"),
                     ("resubmitted", "Resubmitted"),

hypha/apply/projects/migrations/0077_alter_invoice_status.py

@@ -1,7 +1,6 @@
 # Generated by Django 3.2.19 on 2023-06-22 05:12
 
-from django.db import migrations
-import django_fsm
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -16,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="invoice",
             name="status",
-            field=django_fsm.FSMField(
+            field=models.CharField(
                 choices=[
                     ("submitted", "Submitted"),
                     ("resubmitted", "Resubmitted"),

hypha/apply/projects/migrations/0080_alter_invoice_status.py

@@ -1,7 +1,6 @@
 # Generated by Django 3.2.20 on 2023-09-19 06:23
 
-from django.db import migrations
-import django_fsm
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -13,7 +12,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="invoice",
             name="status",
-            field=django_fsm.FSMField(
+            field=models.CharField(
                 choices=[
                     ("submitted", "Submitted"),
                     ("resubmitted", "Resubmitted"),

hypha/apply/projects/migrations/0102_alter_invoice_status.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.2.21 on 2025-06-02 10:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("application_projects", "0101_alter_invoice_message_for_pm"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="invoice",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("submitted", "Submitted"),
+                    ("resubmitted", "Resubmitted"),
+                    ("changes_requested_staff", "Changes requested by staff"),
+                    ("changes_requested_finance_1", "Changes requested by finance"),
+                    ("approved_by_staff", "Approved by staff"),
+                    ("approved_by_finance_1", "Approved by finance"),
+                    ("paid", "Paid"),
+                    ("payment_failed", "Payment failed"),
+                    ("declined", "Declined"),
+                ],
+                default="submitted",
+                max_length=30,
+            ),
+        ),
+    ]

hypha/apply/projects/models/payment.py

@@ -8,7 +8,7 @@
 from django.db.models.functions import Coalesce
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django_fsm import FSMField, transition
+from viewflow.fsm import State
 
 from hypha.apply.utils.storage import PrivateStorage
 
@@ -131,16 +131,28 @@ class Invoice(models.Model):
     )
     invoice_date = models.DateField(null=True, verbose_name=_("Invoice date"))
     paid_date = models.DateField(null=True, verbose_name=_("Paid date"))
-    status = FSMField(default=SUBMITTED, choices=INVOICE_STATUS_CHOICES)
+    status = models.CharField(
+        default=SUBMITTED, choices=INVOICE_STATUS_CHOICES, max_length=30
+    )
+    status_field = State(default=SUBMITTED, states=INVOICE_STATUS_CHOICES)
     objects = InvoiceQueryset.as_manager()
 
     wagtail_reference_index_ignore = True
 
     def __str__(self):
         return _("Invoice requested for {project}").format(project=self.project)
 
-    @transition(
-        field=status, source=INVOICE_TRANSITION_TO_RESUBMITTED, target=RESUBMITTED
+    @status_field.getter()
+    def _get_object_status(self):
+        return self.status
+
+    @status_field.setter()
+    def _get_object_status(self, value):
+        self.status = value
+        return self.status
+
+    @status_field.transition(
+        source=INVOICE_TRANSITION_TO_RESUBMITTED, target=RESUBMITTED
     )
     def transition_invoice_to_resubmitted(self):
         """

hypha/settings/django.py

@@ -51,7 +51,7 @@
     "django_filters",
     "hypha.addressfield",
     "django_nh3",
-    "django_fsm",
+    "viewflow",
     "django_slack",
     "django_otp",
     "django_otp.plugins.otp_totp",

pyproject.toml

@@ -22,7 +22,6 @@ dependencies = [
     "django-file-form~=3.8.0",
     "django-filter==23.5",
     "django-formtools~=2.5.1",
-    "django-fsm~=2.8.2",
     "django-heroku~=0.3.1",
     "django-hijack~=3.7.0",
     "django-htmx~=1.23.0",
@@ -62,6 +61,7 @@ dependencies = [
     "xmltodict~=0.14.2",
     "wagtail-modeladmin>=2.1.0",
     "redis>=5.2.1",
+    "django-viewflow>=2.2.11",
 ]
 
 [dependency-groups]