Adding amount to the contribution index table (#10764)

Author: nutrina

app/dashboard/management/commands/add_main_rnd_tag.py

@@ -2,6 +2,7 @@
 
 from grants.models import Grant, GrantTag
 
+
 class Command(BaseCommand):
 
     help = 'updates all approved grants to include the main-round tag'

app/dashboard/management/commands/migrate_stamp_data.py

@@ -21,7 +21,6 @@
 from django.utils import timezone
 
 from dashboard.models import Passport, PassportStamp
-
 from dashboard.passport_reader import TRUSTED_IAM_ISSUER
 
 

app/grants/management/commands/compute_grant_contribution_index.py

@@ -28,20 +28,13 @@ def handle(self, *args, **kwargs):
                     "subscription__grant__clr_calculations__grantclr__end_date"
                 ),
             )
-            .order_by(
-                "subscription__contributor_profile__id",
-                "subscription__grant__clr_calculations__grantclr__round_num",
-                "subscription__grant__id",
-            )
-            .distinct(
-                "subscription__contributor_profile__id",
-                "subscription__grant__clr_calculations__grantclr__round_num",
-                "subscription__grant__id",
-            )
+            .order_by("id")
+            .distinct("id")
             .values_list(
-                "subscription__contributor_profile__id",
+                "id",
                 "subscription__grant__clr_calculations__grantclr__round_num",
                 "subscription__grant__id",
+                "amount_per_period_usdt"
             )
         )
 
@@ -51,6 +44,7 @@ def handle(self, *args, **kwargs):
                 profile_id=contribInfo[0],
                 round_num=contribInfo[1],
                 grant_id=contribInfo[2],
+                amount=contribInfo[3]
             )
             for contribInfo in contributions
         ]

app/grants/migrations/0148_grantcontributionindex_amount.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2022-08-19 10:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0147_grantcontributionindex'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='grantcontributionindex',
+            name='amount',
+            field=models.DecimalField(db_index=True, decimal_places=18, default=0, help_text='The amount contributed', max_digits=64),
+        ),
+    ]

app/grants/models/grant_contribution_index.py

@@ -6,9 +6,27 @@
 
 class GrantContributionIndex(SuperModel):
     """Stores the grants and round number to shich a user contributed to.
-    The purpose of this table is to allow a a fast query. This will be used from 
-    the `contributor_statistics` API """
+    The purpose of this table is to allow a a fast query. This will be used from
+    the `contributor_statistics` API"""
 
-    profile = models.ForeignKey('dashboard.Profile', help_text=_('Contributor'), on_delete=models.CASCADE, db_index=True)
-    grant = models.ForeignKey('grants.Grant', help_text=_('The grant a user contributed to'), on_delete=models.CASCADE)
-    round_num = models.IntegerField(help_text=_('The round number a user contributed to'))
+    profile = models.ForeignKey(
+        "dashboard.Profile",
+        help_text=_("Contributor"),
+        on_delete=models.CASCADE,
+        db_index=True,
+    )
+    grant = models.ForeignKey(
+        "grants.Grant",
+        help_text=_("The grant a user contributed to"),
+        on_delete=models.CASCADE,
+    )
+    round_num = models.IntegerField(
+        help_text=_("The round number a user contributed to")
+    )
+    amount = models.DecimalField(
+        default=0,
+        decimal_places=18,
+        max_digits=64,
+        db_index=True,
+        help_text=_("The amount contributed"),
+    )