Grant contributions in profile (#3316)

app/dashboard/models.py

@@ -1554,6 +1554,7 @@ class Activity(SuperModel):
         ('update_grant', 'Updated Grant'),
         ('killed_grant', 'Cancelled Grant'),
         ('new_grant_contribution', 'Contributed to Grant'),
+        ('new_grant_subscription', 'Subscribed to Grant'),
         ('killed_grant_contribution', 'Cancelled Grant Contribution'),
         ('new_milestone', 'New Milestone'),
         ('update_milestone', 'Updated Milestone'),
@@ -1585,6 +1586,12 @@ class Activity(SuperModel):
         on_delete=models.CASCADE,
         blank=True, null=True
     )
+    subscription = models.ForeignKey(
+        'grants.Subscription',
+        related_name='activities',
+        on_delete=models.CASCADE,
+        blank=True, null=True
+    )
     created = models.DateTimeField(auto_now_add=True, blank=True, null=True, db_index=True)
     activity_type = models.CharField(max_length=50, choices=ACTIVITY_TYPES, blank=True, db_index=True)
     metadata = JSONField(default=dict)
@@ -2435,8 +2442,9 @@ def get_bounty_and_tip_activities(self, network='mainnet'):
 
         all_activities = all_activities.filter(
             Q(bounty__network=network) |
-            Q(tip__network=network),
-        ).select_related('bounty', 'tip').all().order_by('-created')
+            Q(tip__network=network) |
+            Q(subscription__network=network)
+        ).select_related('bounty', 'tip', 'subscription').all().order_by('-created')
 
         return all_activities
 

app/dashboard/templates/profiles/profile_activities.html

@@ -3,5 +3,7 @@
     {% include "shared/profile_activities_tip.html" with tip=activity.tip %}
   {% elif activity.bounty %}
     {% include "shared/profile_activities_bounty.html" %}
+  {% elif activity.subscription %}
+    {% include "shared/profile_activities_grant.html" %}
   {% endif %}
 {% endfor %}

app/dashboard/templates/shared/profile_activities_grant.html

@@ -0,0 +1,77 @@
+{% load i18n humanize %}
+<a class="row result bounty_row {{ activity.subscription.network }}" target="_blank"
+ {% if activity.subscription.grant.url %} href="{{ activity.subscription.grant.url }}"
+ {% elif activity.subscription.grant.reference_url %} href="{{ activity.subscription.grant.reference_url }}"
+ {% endif %}>
+  <div class="avatar-container col-1 justify-content-center special_tag hide_min_viewport">
+    {% if activity.subscription.grant.logo %}
+      <img class="avatar" src="{{ activity.subscription.grant.logo.url }}">
+    {% else %}
+      <img class="avatar" src="{% url 'org_avatar' activity.subscription.grant.admin_profile.handle %}">
+    {% endif %}
+  </div>
+  <div class="col-12 col-md-7 d-flex flex-column">
+    <div class="bounty-detail">
+      <div class="title font-subheader">
+        {{ activity.subscription.grant.title }}
+      </div>
+
+      <div class="bounty-summary col-12">
+        <div class="info font-caption">
+          {{ activity.subscription.grant.amount_received | floatformat:2 }} /
+          {{ activity.subscription.grant.amount_goal | floatformat:2 }}
+          {{ activity.subscription.grant.token_symbol }}
+          &bull; {{ activity.created | naturaltime }}
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="col-12 col-md-4 tags fixed font-caption align-items-center">
+    {% if activity.activity_type == 'new_grant_contribution' %}
+      <div class="tag success">
+        <p>
+          <span>{% trans "Contributed " %}</span>
+        </p>
+      </div>
+    {% elif activity.activity_type == 'new_grant_subscription' %}
+      <div class="tag success">
+        <p>
+          <span>{% trans "Subscribed " %}</span>
+        </p>
+      </div>
+    {% elif activity.activity_type == 'killed_grant_contribution' %}
+      <div class="tag warning">
+        <p>
+          <span>{% trans "Canceled subscription " %}</span>
+        </p>
+      </div>
+    {% else %}
+      <div class="tag in-progress">
+        <p>
+          <span>{{ activity.i18n_name }}</span>
+        </p>
+      </div>
+    {% endif %}
+    {% if activity.subscription.network != 'mainnet' %}
+    <div class="tag network_warning">
+      <p>
+        <span>{{ activity.subscription.network }}</span>
+      </p>
+    </div>
+    {% endif %}
+    <div class="tag token">
+      <p>
+        {{ activity.subscription.amount_per_period | floatformat:2 }}
+        <span>{{ activity.subscription.token_symbol }}</span>
+      </p>
+    </div>
+    {% if activity.subscription.value_in_usdt_now %}
+      <div class="tag usd">
+        <p>
+          {{ activity.subscription.value_in_usdt_now }}
+          <span>USD</span>
+        </p>
+      </div>
+    {% endif %}
+  </div>
+</a>

app/dashboard/views.py

@@ -1267,6 +1267,9 @@ def profile(request, handle):
             ('work_done', _('Bounties Completed')),
             ('new_tip', _('Tips Sent')),
             ('receive_tip', _('Tips Received')),
+            ('new_grant_contribution', _('Grants contributed to')),
+            ('new_grant_subscription', _('Grants subscribed to')),
+            ('killed_grant_contribution', _('Grants unsubscribed from')),
         ]
         page = request.GET.get('p', None)
 

app/grants/views.py

@@ -37,7 +37,7 @@
 
 from app.utils import get_profile
 from cacheops import cached_view
-from dashboard.models import Profile
+from dashboard.models import Profile, Activity
 from gas.utils import conf_time_spread, eth_usd_conv_rate, gas_advisories, recommend_min_gas_price_to_confirm_in_time
 from grants.forms import MilestoneForm
 from grants.models import Contribution, Grant, MatchPledge, Milestone, Subscription, Update
@@ -387,13 +387,20 @@ def grant_fund(request, grant_id, grant_slug):
             subscription.contributor_profile = profile
             subscription.grant = grant
             subscription.save()
+            activity_kwargs = {
+                'profile': profile,
+                'subscription': subscription,
+                'activity_type': 'new_grant_subscription',
+            }
 
             # one time payments
             if subscription.num_tx_approved == '1':
                 subscription.successful_contribution(subscription.new_approve_tx_id);
                 subscription.error = True #cancel subs so it doesnt try to bill again
                 subscription.subminer_comments = "skipping subminer bc this is a 1 and done subscription, and tokens were alredy sent"
                 subscription.save()
+                activity_kwargs['activity_type'] = 'new_grant_contribution'
+            Activity.objects.create(**activity_kwargs)
 
             messages.info(
                 request,
@@ -472,6 +479,12 @@ def subscription_cancel(request, grant_id, grant_slug, subscription_id):
         subscription.cancel_tx_id = request.POST.get('sub_cancel_tx_id', '')
         subscription.active = False
         subscription.save()
+        activity_kwargs = {
+            'profile': profile,
+            'subscription': subscription,
+            'activity_type': 'killed_grant_contribution',
+        }
+        Activity.objects.create(**activity_kwargs)
 
         value_usdt = subscription.get_converted_amount
         if value_usdt: