4695 - Bounty request when nothing has been found

app/assets/v2/js/pages/bounty_request_form.js

@@ -38,10 +38,22 @@ $(document).ready(function() {
     submitHandler: function(form) {
       const inputElements = $(form).find(':input');
       const formData = {};
+      let githubOrgName = '';
 
       inputElements.removeAttr('disabled');
       $.each($(form).serializeArray(), function() {
-        formData[this.name] = this.value;
+        if (this.name === 'github_url') {
+          formData['github_url'] = this.value;
+
+          const url = new URL(this.value);
+          const urlParts = url.pathname.split('/');
+
+          githubOrgName = urlParts[1] || '';
+          formData['github_org_name'] = githubOrgName;
+        } else if (this.name !== 'github_org_name') {
+          // Ignore 'github_org_name' value from the form as this is already handled 2 lines above
+          formData[this.name] = this.value;
+        }
       });
 
       inputElements.attr('disabled', 'disabled');

app/bounty_requests/forms.py

@@ -30,12 +30,14 @@ class BountyRequestForm(forms.ModelForm):
 
     class Meta:
         model = BountyRequest
-        fields = ['github_url', 'eth_address', 'amount', 'comment']
+        fields = ['github_url', 'eth_address', 'amount', 'comment', 'github_org_name']
         labels = {
             'eth_address': _('Your ETH Address (Optional)'),
             'amount': _('Proposed Funding Amount (USD)'),
-            'comment': _('Comment')
+            'comment': _('Comment'),
+            'github_org_name': ''
         }
+        widgets = {'github_org_name': forms.HiddenInput()}
 
     def __init__(self, *args, **kwargs):
         super(BountyRequestForm, self).__init__(*args, **kwargs)

app/bounty_requests/migrations/0003_bountyrequest_github_org_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.7 on 2019-09-24 20:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bounty_requests', '0002_auto_20181226_1716'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bountyrequest',
+            name='github_org_name',
+            field=models.CharField(default='', max_length=50),
+        ),
+    ]

app/bounty_requests/migrations/0004_bountyrequest_github_org_email.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.7 on 2019-09-24 20:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bounty_requests', '0003_bountyrequest_github_org_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bountyrequest',
+            name='github_org_email',
+            field=models.CharField(default='', max_length=255),
+        ),
+    ]

app/bounty_requests/models.py

@@ -54,11 +54,14 @@ class BountyRequest(SuperModel):
         related_name='bounty_requests',
     )
     github_url = models.CharField(max_length=255, default='')
+    github_org_name = models.CharField(max_length=50, default='')
     eth_address = models.CharField(max_length=50, blank=True)
     comment = models.TextField(max_length=500, default='')
     comment_admin = models.TextField(max_length=500, blank=True)
     amount = models.FloatField(blank=False, validators=[MinValueValidator(1.0)])
 
+    github_org_email = models.CharField(max_length=255, default='')
+
     objects = BountyQuerySet.as_manager()
 
     def __str__(self):

app/bounty_requests/views.py

@@ -24,6 +24,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 
+import requests
 from linkshortener.models import Link
 from marketing.mails import new_bounty_request
 from ratelimit.decorators import ratelimit
@@ -60,7 +61,16 @@ def bounty_request(request):
             return JsonResponse({'error': 'Invalid JSON.'}, status=400)
 
         model = result.save(commit=False)
+
+        gh_org_api_url = 'https://api.github.com/orgs/' + model.github_org_name
+        gh_org_api_resp = requests.get(url=gh_org_api_url).json()
+
+        gh_org_email = ''
+        if gh_org_api_resp is not None and gh_org_api_resp['email'] is not None:
+            gh_org_email = gh_org_api_resp['email']
+
         model.requested_by = profile
+        model.github_org_email = gh_org_email
         model.save()
         new_bounty_request(model)
         return JsonResponse({'msg': _('Bounty Request received.')}, status=200)

app/dashboard/templates/dashboard/index.html

@@ -96,7 +96,12 @@ <h1 class="font-bigger-1">Issue Explorer - Freelance Code Bounties</h1>
           <div class="row nonefound mx-auto" style="display:none;">
             <img src="{% static "v2/images/shrug_bot.png" %}" alt="Shrug bot">
             <h3>{% trans "No results found." %}</h3>
-            <p>{% trans "Please try another query" %}</p>
+            <p>{% trans "Request an organisation to fund an issue" %}</p>
+            <div class="mt-3">
+              <a class="button button--primary white-txt" role="button" href="/requests">
+                {% trans "Request bounty" %}
+              </a>
+            </div>
           </div>
           {% include 'dashboard/featured_bounties.html' %}
 
@@ -121,7 +126,7 @@ <h3>{% trans "No results found." %}</h3>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    
+
 
     <script>
       $('[data-toggle="popover"]').popover()

app/marketing/mails.py

@@ -1096,9 +1096,13 @@ def new_bounty_request(model):
     try:
         setup_lang(to_email)
         subject = _("New Bounty Request")
-        body_str = _("New Bounty Request from")
-        body = f"{body_str} {model.requested_by}: "\
-            f"{settings.BASE_URL}_administrationbounty_requests/bountyrequest/{model.pk}/change"
+        body_str = _("New Gitcoin bounty funding request from")
+        body = f"{body_str} {model.requested_by.github_url}: \n\n"\
+               f"Link to the issue: {model.github_url}. \nThe user proposes funding of {model.amount} (USD) "\
+               f"and has attached the following comment along with the funding request:\n \"{model.comment}\".\n\n "\
+               f"Should you wish to fund the aforementioned issue, you can follow this URL:\n\n "\
+               f"{settings.BASE_URL}bounty/new?invite={model.requested_by.pk}&source={model.github_url}"
+
         send_mail(
             from_email,
             to_email,
@@ -1107,6 +1111,18 @@ def new_bounty_request(model):
             from_name=_("No Reply from Gitcoin.co"),
             categories=['admin', 'new_bounty_request'],
         )
+
+        if model.github_org_email != '':
+            to_email = model.github_org_email
+            setup_lang(to_email)
+            send_mail(
+                from_email,
+                to_email,
+                subject,
+                body,
+                from_name=_("No Reply from Gitcoin.co"),
+                categories=['admin', 'new_bounty_request'],
+            )
     finally:
         translation.activate(cur_language)