#453 addressing issue

src/api/views.py

@@ -313,7 +313,7 @@ def submit_license(request):
             if 'urlType' in request.POST:
                 # This is present only when executing submit license via tests
                 urlType = request.POST["urlType"]
-            statusCode = createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseComments, licenseSourceUrls, licenseHeader, licenseOsi, licenseRequestUrl, token, urlType)
+            statusCode,issueId = createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseComments, licenseSourceUrls, licenseHeader, licenseOsi, licenseRequestUrl, token, urlType)
             if str(statusCode) == '201':
                 result = "Success! The license request has been successfully submitted."
                 query.result = result

src/app/migrations/0002_auto_20230330_0034.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.18 on 2023-03-29 19:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='licensenamespace',
+            name='issueId',
+            field=models.TextField(default=''),
+        ),
+        migrations.AddField(
+            model_name='licenserequest',
+            name='issueId',
+            field=models.TextField(default=''),
+        ),
+    ]

src/app/migrations/0003_remove_licensenamespace_issueid.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.18 on 2023-04-01 08:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0002_auto_20230330_0034'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='licensenamespace',
+            name='issueId',
+        ),
+    ]

src/app/models.py

@@ -41,6 +41,7 @@ class Meta:
         abstract = True
 
 class LicenseRequest(License):
+    issueId = models.TextField(default='')
 
     def __unicode__(self):
         return "%s" % (self.fullname)

src/app/templates/app/license_information.html

@@ -8,7 +8,8 @@
 <p class ="lead"> {{ error }}</p>
 <div class="panel panel-default">
     {% if licenseInformation %}
-<div class="panel-heading"> <p class="lead">{{licenseInformation.fullname}}
+<div class="panel-heading"><a href="https://github.com/spdx/licnse-list-xml/issues/{{licenseInformation.issueId}}" target=”_blank”>
+    <p class="lead">{{licenseInformation.fullname}}</a> 
         {% if licenseInformation.archive %}
             <span class="label label-success">Archived</span>
         {% endif %}
@@ -51,6 +52,13 @@
         <p class="fieldName">Text</p>
         <p>{{licenseInformation.text|safe}}</p>
     </div>
+    <div class="licenseField col-sm-12">
+        <p class="fieldName">Github Issue</p>
+        <a href="https://github.com/spdx/licnse-list-xml/issues/{{licenseInformation.issueId}}" target=”_blank”>
+        <p>Issue #{{licenseInformation.issueId|safe}}</p>
+        </a>
+    </div>
+
     <div class="licenseField col-sm-12">
         <p class="fieldName">Submission Date</p>
         <p>{{licenseInformation.submissionDatetime}}</p>

src/app/utils.py

@@ -352,7 +352,7 @@ def createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseCommen
     headers = {'Authorization': 'token ' + token}
     url = "{0}/issues".format(TYPE_TO_URL_LICENSE[urlType])
     r = requests.post(url, data=json.dumps(payload), headers=headers)
-    return r.status_code
+    return r.status_code,  r.json()["number"]
 
 
 def postToGithub(message, encodedContent, filename):

src/app/views.py

@@ -162,8 +162,9 @@ def submitNewLicense(request):
                         licenseId = licenseRequest.id
                         serverUrl = request.build_absolute_uri('/')
                         licenseRequestUrl = os.path.join(serverUrl, reverse('license-requests')[1:], str(licenseId))
-                        statusCode = utils.createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseComments, licenseSourceUrls, licenseHeader, licenseOsi, licenseExamples, licenseRequestUrl, token, urlType)
-
+                        statusCode, issueId = utils.createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseComments, licenseSourceUrls, licenseHeader, licenseOsi, licenseExamples, licenseRequestUrl, token, urlType)
+                        licenseRequest.issueId = issueId
+                        licenseRequest.save()
                     # If the license text matches with either rejected or yet not approved license then return 409 Conflict
                     else:
                         statusCode = 409
@@ -346,6 +347,7 @@ def licenseInformation(request, licenseId):
 
     licenseInformation['licenseAuthorName'] = licenseRequest.licenseAuthorName
     licenseInformation['archive'] = licenseRequest.archive
+    licenseInformation['issueId'] = licenseRequest.issueId
     xmlString = licenseRequest.xml
     data = utils.parseXmlString(xmlString)
     licenseInformation['osiApproved'] = data['osiApproved']
@@ -986,7 +988,7 @@ def promoteNamespaceRequests(request, license_id=None):
             if 'urlType' in request.POST:
                 # This is present only when executing submit license via tests
                 urlType = request.POST["urlType"]
-            statusCode = utils.createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseComments, licenseSourceUrls, licenseHeader, licenseOsi, licenseExamples, licenseRequestUrl, token, urlType)
+            statusCode,issueId = utils.createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseComments, licenseSourceUrls, licenseHeader, licenseOsi, licenseExamples, licenseRequestUrl, token, urlType)
             return_tuple = (statusCode, licenseRequest)
             statusCode = return_tuple[0]
             if statusCode == 201:
@@ -1161,7 +1163,7 @@ def issue(request):
                     licenseRequestId = licenseRequest.id
                     serverUrl = request.build_absolute_uri('/')
                     licenseRequestUrl = os.path.join(serverUrl, reverse('license-requests')[1:], str(licenseRequestId))
-                    statusCode = utils.createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseComments, licenseSourceUrls, licenseHeader, licenseOsi, licenseExamples, licenseRequestUrl, token, urlType, matchId, diffUrl, msg)
+                    statusCode,issueId = utils.createIssue(licenseAuthorName, licenseName, licenseIdentifier, licenseComments, licenseSourceUrls, licenseHeader, licenseOsi, licenseExamples, licenseRequestUrl, token, urlType, matchId, diffUrl, msg)
                     data['statusCode'] = str(statusCode)
                     return JsonResponse(data)
                 except UserSocialAuth.DoesNotExist: