Add follow page , FollowView view

Fix models test

Signed-off-by: ziad <ziadhany2016@gmail.com>

Author: ziadhany

purl_sync/purl_sync/settings.py

@@ -144,4 +144,4 @@
 MEDIA_URL = "/media/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 GIT_PATH = os.path.join(MEDIA_ROOT, "git")
-ACTIVITYPUB_CONTENT_TYPE = "application/activity+json"
+ACTIVITYPUB_CONTENT_TYPE = "application/activity+json"

purl_sync/purl_sync/urls.py

@@ -5,8 +5,10 @@
 from django.urls import include
 from django.urls import path
 
-from review.views import CreatGitView, CreateReview, repository
+from review.views import CreateReview
+from review.views import CreatGitView
 from review.views import DatabaseAdminView
+from review.views import FollowView
 from review.views import RepositoryListView
 from review.views import ReviewListView
 from review.views import ReviewView
@@ -16,9 +18,10 @@
 from review.views import SecurityTeamView
 from review.views import UserLogin
 from review.views import WebfingerView
+from review.views import comment_vote
 from review.views import database_admin_inbox
 from review.views import database_admin_outbox
-from review.views import comment_vote
+from review.views import repository
 from review.views import review_vote
 
 urlpatterns = [
@@ -30,22 +33,22 @@
     path("accounts/login/", UserLogin.as_view(), name="login"),
     path("accounts/logout", LogoutView.as_view(next_page="login"), name="logout"),
     path("create-repo", CreatGitView.as_view(), name="repo-create"),
-
-    path("repository/<uuid:repository_id>/create-review/", CreateReview.as_view(), name="review-create"),
-
+    path("follow-purl/", FollowView.as_view(), name="follow-purl"),
+    path(
+        "repository/<uuid:repository_id>/create-review/",
+        CreateReview.as_view(),
+        name="review-create",
+    ),
     path("review/<uuid:id>/", ReviewView.as_view(), name="review-page"),
     path("review-list", ReviewListView.as_view(), name="review-list"),
     path("repo-list", RepositoryListView.as_view(), name="repo-list"),
-
     path("review/<uuid:review_id>/votes/", review_vote, name="vote-review"),
     path("comment/<uuid:comment_id>/votes/", comment_vote, name="vote-comment"),
     path("repository/<uuid:repository_id>/", repository, name="repository"),
-
     path("security-team/<str:username>/inbox/", SecurityTeamInbox.as_view()),
     path("security-team/<str:username>/outbox/", SecurityTeamOutbox.as_view()),
     path("database-admin/<str:username>/outbox/", database_admin_outbox),
     path("database-admin/<str:username>/inbox/", database_admin_inbox),
-
     # path("security-team/@<str:username>/edit-followers/", database_admin_profile_view),
     # path("database-admin/<str:username>/followers/", ),
     # path("security-team/<str:username>/following/", ),

purl_sync/review/activitypub.py

@@ -2,22 +2,29 @@
 import json
 
 from django.contrib.auth.models import User
-from django.http import HttpResponseBadRequest, JsonResponse
+from django.http import HttpResponseBadRequest
+from django.http import JsonResponse
 
-from review.models import DatabaseAdmin, SecurityTeam, Review, Comment, Repository
+from review.models import Comment
+from review.models import DatabaseAdmin
+from review.models import Repository
+from review.models import Review
+from review.models import SecurityTeam
 
 CONTENT_TYPE = "application/activity+json"
 ACTOR_TYPES = ["SecurityTeam", "DatabaseAdmin"]
 ACTIVITY_TYPES = ["Like", "Follow", "Create", "Update", "Delete", "Dislike"]
-VALID_HEADERS = ['application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'application/activity+json']
+VALID_HEADERS = [
+    'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+    "application/activity+json",
+]
 OBJECT_TYPES = ["Notes", "Review", "Repository", "Vulnerability", "PackageURL"]
 
-AS_CONTEXT = {"@context": ["https://www.w3.org/ns/activitystreams",
-                           "..........."
-                           ], }
+AS_CONTEXT = {
+    "@context": ["https://www.w3.org/ns/activitystreams", "..........."],
+}
 response = {
     **AS_CONTEXT,
-
     "@type": "DatabaseAdmin",
     "@id": "https://example.com/database-admin/vcio",
     "name": "vcio",
@@ -26,9 +33,7 @@
     "inbox": "https://example.com/database-admin/vcio/inbox",
     "outbox": "https://example.com/database-admin/vcio/outbox",
     "followers": "https://example.com/database-admin/vcio/followers",
-    "icon": [
-        "https://example.com/image/avatar"
-    ],
+    "icon": ["https://example.com/image/avatar"],
     "liked": "https://example.com/database-admin/vcio/liked/",
 }
 
@@ -41,9 +46,7 @@ def ap_r(response):
         raise Exception("Invalid json response")
 
     if not response.get("@context"):
-        response.append(
-            **AS_CONTEXT
-        )
+        response.append(**AS_CONTEXT)
 
     return response
 
@@ -56,20 +59,20 @@ def ap_p(request):
     return json_r
 
 
-def get_actor(actor):
-    """
-    {
-        "type": "Person",
-        "name": "Sally"
-    }
-    """
-    actor_type = actor.get("type")
-    actor_name = actor.get("name")
-
-    if actor_type in ["Person", "Organization"]:
-        return User.objects.get(username=actor_name)
-    else:
-        return HttpResponseBadRequest("")
+# def get_actor(actor):
+#     """
+#     {
+#         "type": "Person",
+#         "name": "Sally"
+#     }
+#     """
+#     actor_type = actor.get("type")
+#     actor_name = actor.get("name")
+#
+#     if actor_type in ["Person", "Organization"]:
+#         return User.objects.get(username=actor_name)
+#     else:
+#         return HttpResponseBadRequest("")
 
 
 def create_object(actor, activity_object):

purl_sync/review/admin.py

@@ -1,13 +1,13 @@
 from django.contrib import admin
 
+from review.models import Comment
 from review.models import DatabaseAdmin
 from review.models import Follow
-from review.models import Repository
-from review.models import Comment
 from review.models import PackageUrl
 from review.models import RemoteActor
 from review.models import RemoteDatabaseAdmin
 from review.models import RemoteSecurityTeam
+from review.models import Repository
 from review.models import Reputation
 from review.models import Review
 from review.models import SecurityTeam

purl_sync/review/forms.py

@@ -2,8 +2,8 @@
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
 
-from review.models import Repository
 from review.models import Comment
+from review.models import Repository
 from review.models import Review
 
 
@@ -55,7 +55,27 @@ class Meta:
 
 
 class CreateReviewForm(forms.Form):
-    headline = forms.CharField(widget=forms.TextInput(attrs={'class': 'input is-medium title has-text-centered',
-                                                             "placeholder": "Review Title"}))
-    data = forms.CharField(widget=forms.Textarea(attrs={'class': 'textarea', 'rows': 16}))
+    headline = forms.CharField(
+        widget=forms.TextInput(
+            attrs={
+                "class": "input is-medium title has-text-centered",
+                "placeholder": "Review Title",
+            }
+        )
+    )
+    data = forms.CharField(widget=forms.Textarea(attrs={"class": "textarea", "rows": 16}))
     filename = forms.CharField(widget=forms.HiddenInput())
+
+
+class FollowPurlForm(forms.Form):
+    purl_string = forms.CharField(max_length=150, label="PackageURL:")
+    database_admin_webfinger = forms.CharField(max_length=100, label="Database Admin:")
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["purl_string"].widget.attrs.update(
+            {"class": "input", "placeholder": "pkg:maven/org.apache.commons/io@1.3.4"}
+        )
+        self.fields["database_admin_webfinger"].widget.attrs.update(
+            {"class": "input", "placeholder": "maven@vcio.com", "style": "width: 25%;"}
+        )

purl_sync/review/migrations/0001_initial.py

@@ -1,10 +1,12 @@
-# Generated by Django 4.2.2 on 2023-07-17 13:05
+# Generated by Django 4.2.2 on 2023-07-21 18:12
 
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
 import uuid
 
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
 
 class Migration(migrations.Migration):
 
@@ -224,13 +226,8 @@ class Migration(migrations.Migration):
             name="PackageUrl",
             fields=[
                 ("id", models.AutoField(primary_key=True, serialize=False)),
-                ("purl_string", models.CharField(max_length=300)),
-                (
-                    "vulnerability",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="review.vulnerability"
-                    ),
-                ),
+                ("purl_string", models.CharField(max_length=300, unique=True)),
+                ("vulnerabilities", models.ManyToManyField(to="review.vulnerability")),
             ],
         ),
         migrations.AddField(

purl_sync/review/models.py

@@ -26,8 +26,8 @@ def reputation_value(self):
         """if someone like your review you will get +1, dislike: -1"""
         user_reputation = Reputation.objects.filter(voter=self.acct)
         return (
-                user_reputation.filter(positive=True).count()
-                - user_reputation.filter(positive=False).count()
+            user_reputation.filter(positive=True).count()
+            - user_reputation.filter(positive=False).count()
         )
 
     class Meta:
@@ -70,8 +70,8 @@ def username(self):
     def reputation_value(self):
         review_reputation = Reputation.objects.filter(object_type=1, object_id=self.id)
         return (
-                review_reputation.filter(positive=True).count()
-                - review_reputation.filter(positive=False).count()
+            review_reputation.filter(positive=True).count()
+            - review_reputation.filter(positive=False).count()
         )
 
     @property
@@ -164,11 +164,14 @@ class Vulnerability(models.Model):
 
     @property
     def load_file(self):
+        """
+        copied from https://stackoverflow.com/a/54900961/9871531
+        """
         commit = self.repo.git_repo.commit(self.commit_id)
         target_file = commit.tree / self.filename
 
         with io.BytesIO(target_file.data_stream.read()) as f:
-            return f.read().decode('utf-8')
+            return f.read().decode("utf-8")
 
     @property
     def to_ap(self):
@@ -177,8 +180,8 @@ def to_ap(self):
 
 class PackageUrl(models.Model):
     id = models.AutoField(primary_key=True, help_text="")
-    purl_string = models.CharField(max_length=300, help_text="")
-    vulnerability = models.ForeignKey(Vulnerability, on_delete=models.CASCADE, help_text="")
+    purl_string = models.CharField(max_length=300, unique=True, help_text="")
+    vulnerabilities = models.ManyToManyField(Vulnerability, help_text="")
 
 
 class Follow(models.Model):
@@ -231,8 +234,8 @@ def __str__(self):
     def reputation_value(self):
         review_reputation = Reputation.objects.filter(object_type=0, object_id=self.id)
         return (
-                review_reputation.filter(positive=True).count()
-                - review_reputation.filter(positive=False).count()
+            review_reputation.filter(positive=True).count()
+            - review_reputation.filter(positive=False).count()
         )
 
     @property
@@ -250,7 +253,7 @@ def to_ap(self):
             "vulnerability": self.vulnerability.id,
             "reviewData": self.data,
             "commentCount": self.comments.count(),
-            "comments": [note.to_ap() for note in self.comments],
+            "comments": [comment.to_ap() for comment in self.comments],
             "dateCreated": self.created_at,
             "dateModified": self.updated_at,
         }

purl_sync/review/templates/follow_purl.html

@@ -0,0 +1,64 @@
+{% extends "base.html" %}
+{% block title %}
+Review page
+{% endblock %}
+
+{% block extrahead %}
+{% endblock %}
+{% block content %}
+<div class="columns">
+  <div class="column">
+  </div>
+
+  <div class="column is-two-thirds">
+      <div class="content is-normal">
+        <h1>Follow PackageURL List</h1>
+        <hr/>
+  <div>
+      {% if form.errors %}
+       <article class="message is-danger">
+          <div class="message-header">
+            <p>Error</p>
+            <button class="delete" aria-label="delete"></button>
+          </div>
+          <div class="message-body">
+              {{ form.errors }}
+          </div>
+       </article>
+       {% endif %}
+
+       <form method="post" class="is-flex mb-3">
+          {% csrf_token %}
+          <label class="mr-4">{{ form.purl_string.label }}</label>
+          {{ form.purl_string }}
+          <label class="has-text-centered mr-2 ml-2">{{ form.database_admin.label }}</label>
+          {{ form.database_admin_webfinger }}
+          <input class="button is-success mr-3 ml-3" type="submit" value="Save">
+       </form>
+
+
+     <table class="table">
+      <thead>
+        <tr>
+          <th>PackageURL</th>
+          <th>Database Admin</th>
+        </tr>
+      </thead>
+      <tbody>
+      {% for follow in follows %}
+        <tr>
+          <td> {{ follow.purl.purl_string }}</td>
+          <td> {{ follow.database_admin.acct }} </td>
+        </tr>
+      {% endfor %}
+      </tbody>
+    </table>
+  </div>
+
+  </div>
+  </div>
+
+  <div class="column"></div>
+</div>
+
+{% endblock %}