Remove PhantomFunding (#9404)

* Extract grants models into individual files (#9341)

* create new directory for models, copy over Contribution model

* extract grants models to individual files

* rename relocated_models directory, remove original models directory, add imports, resolve circular dependencies

* extract CLRMatch into separate file

* extract Flag into separate file

* extract MatchPledge to separate file

* extract Donation and PhantomFunding

* extract GrantStat into separate file

* refactor

* extract GrantBrandingRoutingPolicy to separate file

* update migration

* add missing import to MatchPledge, remove imports from __init__.py

* add missing import

* decouple GrantCLRCalculation and move to own file

* extract GrantType to own file

* extract GrantCLR to own file

* add missing import

* refactor, add missing imports

* remove whitespace

* resolve circular dependency

* run 'make fix'

* import changes from #9314

* add try/except to migration file instead of editing migration directly

* refactor

* remove PhantomFunding model

* remove imports and calls to PhantomFunding

* remove references to PhantomFunding in scripts/debug/address_usage_finder.py

* run migration deleting PhantomFunding model

* replace GrantCategory with GrantTag in admin.py

* resolve conflict resulting in CI failure

app/grants/admin.py

@@ -27,8 +27,8 @@
 
 import twitter
 from grants.models import (
-    CartActivity, CLRMatch, Contribution, Flag, Grant, GrantBrandingRoutingPolicy, GrantCLR, GrantCLRCalculation,
-    GrantCollection, GrantStat, GrantTag, GrantType, MatchPledge, PhantomFunding, Subscription,
+    CartActivity, CLRMatch, Contribution, Flag, Grant, GrantBrandingRoutingPolicy, GrantTag, GrantCLR,
+    GrantCLRCalculation, GrantCollection, GrantStat, GrantType, MatchPledge, Subscription,
 )
 from grants.views import record_grant_activity_helper
 from marketing.mails import grant_more_info_required, new_grant_approved
@@ -410,24 +410,6 @@ def response_change(self, request, obj):
         return redirect(obj.admin_url)
 
 
-class PhantomFundingAdmin(admin.ModelAdmin):
-    """Define the GeneralAdmin administration layout."""
-
-    ordering = ['-id']
-    list_display = ['id', 'github_created_on', 'from_ip_address', '__str__']
-    raw_id_fields = ['profile', 'grant']
-
-    def github_created_on(self, instance):
-        return naturaltime(instance.profile.github_created_on)
-
-    def from_ip_address(self, instance):
-        end = instance.created_on + timezone.timedelta(hours=1)
-        start = instance.created_on - timezone.timedelta(hours=1)
-        visits = set(instance.profile.actions.filter(created_on__gt=start, created_on__lte=end).values_list('ip_address', flat=True))
-        visits = [visit for visit in visits if visit]
-        return " , ".join(visits)
-
-
 class CartActivityAdmin(admin.ModelAdmin):
     list_display = ['id', 'grant', 'profile', 'action', 'bulk', 'latest', 'created_on']
     raw_id_fields = ['grant', 'profile']
@@ -537,7 +519,6 @@ class GrantBrandingRoutingPolicyAdmin(admin.ModelAdmin):
     list_display = ['pk', 'policy_name', 'url_pattern', 'priority' ]
 
 
-admin.site.register(PhantomFunding, PhantomFundingAdmin)
 admin.site.register(MatchPledge, MatchPledgeAdmin)
 admin.site.register(Grant, GrantAdmin)
 admin.site.register(Flag, FlagAdmin)

app/grants/migrations/0124_delete_phantomfunding.py

@@ -0,0 +1,16 @@
+# Generated by Django 2.2.24 on 2021-09-23 22:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0123_auto_20210726_0703'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='PhantomFunding',
+        ),
+    ]

app/grants/models/__init__.py

@@ -33,5 +33,4 @@
 from .grant_tag import GrantTag
 from .grant_type import GrantType
 from .match_pledge import MatchPledge
-from .phantom_funding import PhantomFunding
 from .subscription import Subscription

app/grants/models/clr_match.py

@@ -53,4 +53,4 @@ class CLRMatch(SuperModel):
 
     def __str__(self):
         """Return the string representation of a Grant."""
-        return f"id: {self.pk}, grant: {self.grant.pk}, round: {self.round_number}, amount: {self.amount}"
+        return f"id: {self.pk}, grant: {self.grant.pk}, round: {self.round_number}, amount: {self.amount}"

app/grants/models/grant.py

@@ -488,7 +488,7 @@ class Meta:
     )
 
     in_active_clrs = models.ManyToManyField(
-        GrantCLR,
+        "GrantCLR",
         help_text="Active Grants CLR Round"
     )
     is_clr_active = models.BooleanField(default=False, help_text=_('CLR Round active or not? (auto computed)'))
@@ -885,7 +885,6 @@ def save(self, update=True, *args, **kwargs):
 
         self.clr_prediction_curve = self.calc_clr_prediction_curve
         self.clr_round_num = self.calc_clr_round_label
-
         self.search_vector = (
             SearchVector('title', weight='A') + SearchVector('description', weight='B')
         )

app/grants/models/match_pledge.py

@@ -57,4 +57,4 @@ def data_json(self):
 
     def __str__(self):
         """Return the string representation of this object."""
-        return f"{self.profile} <> {self.amount} DAI"
+        return f"{self.profile} <> {self.amount} DAI"

app/grants/models/subscription.py

@@ -554,4 +554,4 @@ def create_contribution(self, tx_id, is_successful_contribution=True):
             successful_contribution(self.grant, self, contribution)
 
         update_grant_metadata.delay(self.pk)
-        return contribution
+        return contribution

app/marketing/management/commands/post_data.py

@@ -28,7 +28,7 @@
 from dashboard.models import Activity, Earning, Profile
 from economy.utils import convert_token_to_usdt
 from grants.models import *
-from grants.models import CartActivity, Contribution, PhantomFunding
+from grants.models import CartActivity, Contribution
 from grants.utils import get_clr_rounds_metadata
 from townsquare.models import Comment
 
@@ -308,8 +308,7 @@ def grants():
     contributions = Contribution.objects.filter(created_on__gt=start, created_on__lt=end, subscription_network='mainnet')#, subscription__grant__in=grants_pks)
     if must_be_successful:
         contributions = contributions.filter(success=True)
-    pfs = PhantomFunding.objects.filter(created_on__gt=start, created_on__lt=end)
-    total = contributions.count() + pfs.count()
+    total = contributions.count()
 
     current_carts = CartActivity.objects.filter(created_on__gt=start, latest=True)#, grant__in=grants_pks)
     num_carts = 0

scripts/debug/add_squelched_profiles.py

@@ -3,7 +3,7 @@
 from django.utils import timezone
 
 from grants.models import *
-from grants.models import Contribution, PhantomFunding
+from grants.models import Contribution
 from grants.utils import get_clr_rounds_metadata
 
 # total stats
@@ -12,11 +12,10 @@
 _, round_start_date, round_end_date, _ = get_clr_rounds_metadata()
 
 contributions = Contribution.objects.filter(created_on__gt=round_start_date, created_on__lt=round_end_date, success=True)
-pfs = PhantomFunding.objects.filter(created_on__gt=round_start_date, created_on__lt=round_end_date)
-total = contributions.count() + pfs.count()
+total = contributions.count()
 
-contributors = len(set(list(contributions.values_list('subscription__contributor_profile', flat=True)) + list(pfs.values_list('profile', flat=True))))
-amount = sum([float(contrib.subscription.amount_per_period_usdt) for contrib in contributions] + [float(pf.value) for pf in pfs])
+contributors = len(set(list(contributions.values_list('subscription__contributor_profile', flat=True))))
+amount = sum([float(contrib.subscription.amount_per_period_usdt) for contrib in contributions])
 
 print("contributions", total)
 print("contributors", contributors)

scripts/debug/address_usage_finder.py

@@ -3,19 +3,18 @@
 from django.utils import timezone
 
 from grants.models import *
-from grants.models import Contribution, PhantomFunding, Subscription
+from grants.models import Contribution, Subscription
 from grants.utils import get_clr_rounds_metadata
 
 # total stats
 
 _, round_start_date, round_end_date, _ = get_clr_rounds_metadata()
 
 contributions = Contribution.objects.filter(created_on__gt=round_start_date, created_on__lt=round_end_date, success=True)
-pfs = PhantomFunding.objects.filter(created_on__gt=round_start_date, created_on__lt=round_end_date)
-total = contributions.count() + pfs.count()
+total = contributions.count()
 
-contributors = len(set(list(contributions.values_list('subscription__contributor_profile', flat=True)) + list(pfs.values_list('profile', flat=True))))
-amount = sum([float(contrib.subscription.amount_per_period_usdt) for contrib in contributions] + [float(pf.value) for pf in pfs])
+contributors = len(set(list(contributions.values_list('subscription__contributor_profile', flat=True))))
+amount = sum([float(contrib.subscription.amount_per_period_usdt) for contrib in contributions])
 
 print("contributions", total)
 print("contributors", contributors)