Merge remote-tracking branch 'upstream/stable'

Author: thelostone-mc

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

@@ -0,0 +1,87 @@
+import datetime as dt
+from datetime import datetime, timezone
+from time import sleep
+
+from django.core.management.base import BaseCommand
+from django.db.models import F
+
+import requests
+from grants.models import Contribution, Grant, GrantContributionIndex
+
+
+class Command(BaseCommand):
+
+    help = "rebuilds the table GrantContributionIndex"
+
+    def handle(self, *args, **kwargs):
+        self.stdout.write(f"{datetime.now()} Building query for contributions ...")
+        contributions = (
+            Contribution.objects.filter(
+                success=True,
+                subscription__network="mainnet",
+                subscription__grant__clr_calculations__latest=True,
+                subscription__contributor_profile__isnull=False,
+                created_on__gt=F(
+                    "subscription__grant__clr_calculations__grantclr__start_date"
+                ),
+                created_on__lt=F(
+                    "subscription__grant__clr_calculations__grantclr__end_date"
+                ),
+            )
+            .order_by("id")
+            .distinct("id")
+            .values_list(
+                "profile_for_clr_id",
+                "subscription__grant__clr_calculations__grantclr__round_num",
+                "subscription__grant__id",
+                "amount_per_period_usdt"
+            )
+        )
+
+        self.stdout.write(f"{datetime.now()} Building contribIndexList ...")
+        contribIndexList = [
+            GrantContributionIndex(
+                profile_id=contribInfo[0],
+                round_num=contribInfo[1],
+                grant_id=contribInfo[2],
+                amount=contribInfo[3]
+            )
+            for contribInfo in contributions
+        ]
+
+        count = len(contribIndexList)
+        self.stdout.write(f"{datetime.now()} Length of contribIndexList: {count}")
+        self.stdout.write(f"{datetime.now()} Clearing GrantContributionIndex ...")
+
+        first_id = 0
+        last_id = 0
+
+        try:
+            first_id = GrantContributionIndex.objects.all().order_by("id")[0].id
+            last_id = GrantContributionIndex.objects.all().order_by("-id")[0].id
+        except:
+            pass
+
+        self.stdout.write(
+            f"{datetime.now()} ... deleting {last_id - first_id + 1} records"
+        )
+
+        count_to_delete = last_id - first_id
+        count_deleted = 0
+        batch_size = 50000
+        for i in range(first_id, last_id, batch_size):
+            count_deleted += batch_size
+            self.stdout.write(
+                f"{datetime.now()} ... {(count_deleted / count_to_delete * 100):.2f}% deleting {count} records up to id {i + batch_size}"
+            )
+            GrantContributionIndex.objects.filter(id__lt=i + batch_size).delete()
+
+        self.stdout.write(f"{datetime.now()} Saving to GrantContributionIndex ...")
+        # GrantContributionIndex.objects.bulk_create(contribIndexList, batch_size=1000, ignore_conflicts=True)
+        for i in range(0, count, batch_size):
+            self.stdout.write(
+                f"{datetime.now()} {(i / count * 100):.2f}% Saving to GrantContributionIndex ..."
+            )
+            GrantContributionIndex.objects.bulk_create(
+                contribIndexList[i : i + batch_size], ignore_conflicts=True
+            )

app/grants/migrations/0147_grantcontributionindex.py

@@ -0,0 +1,30 @@
+# Generated by Django 2.2.24 on 2022-08-16 12:10
+
+from django.db import migrations, models
+import django.db.models.deletion
+import economy.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0210_auto_20220718_1306'),
+        ('grants', '0146_auto_20220809_1134'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GrantContributionIndex',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_on', models.DateTimeField(db_index=True, default=economy.models.get_time)),
+                ('modified_on', models.DateTimeField(default=economy.models.get_time)),
+                ('round_num', models.IntegerField(help_text='The round number a user contributed to')),
+                ('grant', models.ForeignKey(help_text='The grant a user contributed to', on_delete=django.db.models.deletion.CASCADE, to='grants.Grant')),
+                ('profile', models.ForeignKey(help_text='Contributor', on_delete=django.db.models.deletion.CASCADE, to='dashboard.Profile')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

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/__init__.py

@@ -35,3 +35,4 @@
 from .hall_of_fame import GrantHallOfFame, GrantHallOfFameGrantee
 from .phantom_funding import PhantomFunding
 from .subscription import Subscription
+from .grant_contribution_index import GrantContributionIndex

app/grants/models/grant_contribution_index.py

@@ -0,0 +1,32 @@
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+from economy.models import SuperModel
+
+
+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"""
+
+    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"),
+    )

app/grants/views_api_vc.py

@@ -18,13 +18,14 @@
 
 """
 import logging
+from datetime import datetime
 
 from django.conf import settings
 from django.db.models import Sum
 from django.http import JsonResponse
 from django.utils.translation import gettext_lazy as _
 
-from grants.models import Contribution, Grant
+from grants.models import Contribution, Grant, GrantContributionIndex
 from perftools.models import StaticJsonEnv
 from townsquare.models import SquelchProfile
 
@@ -75,46 +76,39 @@ def contributor_statistics(request):
 
     # Get number of grants the user contributed to
     num_grants_contribute_to = (
-        Contribution.objects.filter(profile_for_clr__handle=handle, success=True)
+        GrantContributionIndex.objects.filter(profile__handle=handle)
         .order_by("grant_id")
         .distinct("grant_id")
         .count()
     )
 
-    # Get the number of grants the user contributed to
+    # Get number of rounds the user contributed to
     num_rounds_contribute_to = (
-        Contribution.objects.filter(
-            success=True,
-            subscription__contributor_profile__handle=handle,
-            subscription__network="mainnet",
-            subscription__grant__clr_calculations__latest=True,
-        )
-        .order_by("subscription__grant__clr_calculations__grantclr__round_num")
-        .distinct("subscription__grant__clr_calculations__grantclr__round_num")
+        GrantContributionIndex.objects.filter(profile__handle=handle)
+        .order_by("round_num")
+        .distinct("round_num")
         .count()
     )
 
-    total_contribution_amount = Contribution.objects.filter(
-        profile_for_clr__handle=handle, success=True
-    ).aggregate(Sum("amount_per_period_usdt"))["amount_per_period_usdt__sum"]
-    total_contribution_amount = (
-        total_contribution_amount if total_contribution_amount is not None else 0
-    )
+    # Get the total contribution amount
+    total_contribution_amount = GrantContributionIndex.objects.filter(
+        profile__handle=handle
+    ).aggregate(total_contribution_amount=Sum("amount"))["total_contribution_amount"]
+
+    total_contribution_amount
+
+    if total_contribution_amount is None:
+        total_contribution_amount = 0
 
     # GR14 contributor (and not squelched by FDD)
+    start = datetime.now()
     profile_squelch = SquelchProfile.objects.filter(
         profile__handle=handle, active=True
     ).values_list("profile_id", flat=True)
 
     num_gr14_contributions = (
-        Contribution.objects.filter(
-            success=True,
-            subscription__contributor_profile__handle=handle,
-            subscription__network="mainnet",
-            subscription__grant__clr_calculations__latest=True,
-            subscription__grant__clr_calculations__grantclr__round_num=14,
-        )
-        .exclude(subscription__contributor_profile_id__in=profile_squelch)
+        GrantContributionIndex.objects.filter(profile__handle=handle, round_num=14)
+        .exclude(profile_id__in=profile_squelch)
         .count()
     )
 
@@ -123,7 +117,7 @@ def contributor_statistics(request):
             "num_grants_contribute_to": num_grants_contribute_to,
             "num_rounds_contribute_to": num_rounds_contribute_to,
             "total_contribution_amount": total_contribution_amount,
-            "is_gr14_contributor": num_gr14_contributions > 0,
+            "num_gr14_contributions": num_gr14_contributions,
         }
     )
 

app/perftools/management/commands/create_page_cache.py

@@ -329,6 +329,8 @@ def create_results_cache():
             print(f"- executing {keyword}")
             data = build_stat_results(keyword)
             print("- creating")
+            if 'hackathons' in data:
+                    del data['hackathons']
             items.append(JSONStore(
                 view=view,
                 key=keyword,

app/retail/templates/results.html

@@ -286,33 +286,6 @@ <h4 class="m-1 p-1">{{kudos_leaderboard.0}}</h4>
       </div>
 
 
-      <div class="content-block content-block--grey">
-        <div class="container" >
-          <h2 class="content-block__title">{{hackathons | length }} {% trans "Virtual Hackathons" %} worth ${{hackathon_total|floatformat:0|intcomma}}.</h2>
-
-          <div class="hackathon-breakdown">
-            {% for hackathon in hackathons %}
-              <div class="{% if forloop.counter > 7 %}hidden{%endif%}" >
-                {% if hackathon.1.logo %}
-                  <img data-src="{{hackathon.1.logo}}"/>
-                {%else %}
-                  <img data-src="/dynamic/avatar/gitcoinbot"/>
-                {%endif %}
-                <h4>{{hackathon.0.name}}</h4>
-                {% if hackathon.1.num_bounties and hackathon.1.total_volume > 1 %}
-                  <p>{{hackathon.1.num_bounties}} Bounties</p>
-                  <p>${{hackathon.1.total_volume|floatformat:0|intcomma}} In Prizes</p>
-                {% endif %}
-                <p>{{hackathon.1.range}}</p>
-                <a href="{% url 'hackathon' hackathon.0.slug %}">View Prize Explorer</a>
-              </div>
-            {% endfor %}
-            <h4>
-            <a class="btn btn-primary view_more" role="button" href="#">{% trans "See more" %}</a>
-          </div>
-        </div>
-      </div>
-
 
       <div class="row mt-5 pb-5 text-center">
         <div class="col">