Merge branch 'main' of https://github.com/uofa-cmput404/404f23project…

…-beeg-yoshi

backend/comment/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
-from .models import Comment
+from .models import Comment, remoteComment
 
 admin.site.register(Comment)
+admin.site.register(remoteComment)
 # Register your models here.

backend/comment/models.py

@@ -11,3 +11,16 @@ class Comment(models.Model):
     published=models.DateTimeField(auto_now_add=True)
     def __str__(self):
         return self.comment + " by " + self.author.displayName 
+
+class remoteComment(models.Model):
+    type=models.CharField(default="comment",max_length=1024)
+    id=models.AutoField(primary_key=True)
+    author=models.CharField(max_length=1024)
+    displayName=models.CharField(max_length=1024,default="unknown")
+    post=models.ForeignKey(Post,on_delete=models.CASCADE)
+    comment=models.TextField()  
+    contentType=models.CharField(max_length=1024, default="text/plain")
+    published=models.DateTimeField(auto_now_add=True)
+    server=models.CharField(max_length=1024,default="unknown")
+    def __str__(self):
+        return self.comment + " by " + self.displayName

backend/comment/serializers.py

@@ -1,7 +1,12 @@
 from rest_framework import serializers
-from .models import Comment
+from .models import Comment,remoteComment
 
 class CommentSerializer(serializers.ModelSerializer):
     class Meta:
         model=Comment
-        fields=["id","author","post","comment","contentType","published"]
+        fields=["id","author","post","comment","contentType","published"]
+
+class remoteCommentSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=remoteComment
+        fields="__all__"

backend/comment/tests.py

@@ -63,4 +63,5 @@ def test_post_comment(self):
         response = self.client.post(url, comment_data)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(Comment.objects.count(), 2)
-
+
+

backend/comment/urls.py

@@ -3,5 +3,5 @@
 
 urlpatterns = [
     path('authors/<str:pk>/posts/<str:postID>/comments', views.comment_on_post, name='comment_on_post'),
-
+    path('remote/posts/<str:postID>/comments', views.remote_comment_on_post, name='remote_comment_on_post'),
 ]

backend/comment/views.py

@@ -2,8 +2,8 @@
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.decorators import api_view
-from .models import Comment
-from .serializers import CommentSerializer
+from .models import Comment,remoteComment
+from .serializers import CommentSerializer, remoteCommentSerializer
 from user.models import User
 from post.models import Post
 from drf_yasg import openapi
@@ -27,6 +27,8 @@ def comment_on_post(request,pk,postID):
     if request.method=='GET':
         comments=Comment.objects.filter(post=postID)
         serializer=CommentSerializer(comments,many=True)
+        remote_comments=remoteComment.objects.filter(post=postID)
+        remote_serializer=remoteCommentSerializer(remote_comments,many=True)
         for comment in serializer.data:
             comment["author"]={
                 "id":comment["author"],
@@ -36,7 +38,10 @@ def comment_on_post(request,pk,postID):
                 "github":User.objects.get(pk=comment["author"]).github,
                 "profileImage":User.objects.get(pk=comment["author"]).profileImage
             }
-        return Response(serializer.data,status=status.HTTP_200_OK)
+        print(remote_serializer.data)
+        print(serializer.data)
+        response=serializer.data+remote_serializer.data
+        return Response(response,status=status.HTTP_200_OK)
     elif request.method=='POST':
         serializer=CommentSerializer(data=request.data)
         if serializer.is_valid():
@@ -46,3 +51,20 @@ def comment_on_post(request,pk,postID):
             post.save()
             return Response(serializer.data,status=status.HTTP_201_CREATED)
         return Response(serializer.errors,status=status.HTTP_400_BAD_REQUEST)
+
+@api_view(['GET', 'POST'])
+def remote_comment_on_post(request,postID):
+    if request.method=='GET':
+        comments=remoteComment.objects.filter(post=postID)
+        serializer=remoteCommentSerializer(comments,many=True)
+        return Response(serializer.data,status=status.HTTP_200_OK)
+    elif request.method=='POST':
+        post_obj=Post.objects.get(pk=postID)
+        request.data["post"]=postID
+        serializer=remoteCommentSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            post_obj.count+=1
+            post_obj.save()
+            return Response(serializer.data,status=status.HTTP_201_CREATED)
+        return Response(serializer.errors,status=status.HTTP_400_BAD_REQUEST)

backend/friendship/views.py

@@ -254,6 +254,15 @@ def remote_friend_request_methods(request,pk,fk):
         except remoteFriendRequest.DoesNotExist:
             return Response({"message":{f"Friend request does not exist "}},status=status.HTTP_404_NOT_FOUND)
         friend_request.delete()
+        user_ids=list(User.objects.values_list('id', flat=True))
+        user_ids_str = [str(user_id) for user_id in user_ids]
+        if fk in user_ids_str:
+            inbox_object=Inbox.objects.get(author=fk)
+            inbox_object.items["friendrequests"]=[]
+            inbox_object.save()
+        if remoteFriendship.objects.filter(from_user=pk,to_user=fk).exists():
+            remote_friendship=remoteFriendship.objects.get(from_user=pk,to_user=fk)
+            remote_friendship.delete()
         return Response({"message":"friend request deleted"},status=status.HTTP_200_OK)
     elif request.method=='POST':
         friend_request=remoteFriendRequest.objects.filter(from_user=pk,to_user=fk)
@@ -263,13 +272,17 @@ def remote_friend_request_methods(request,pk,fk):
             serializer=remoteFriendRequestSerializer(data={"from_user":pk,"to_user":fk, "server": request.data["server"]})
             if serializer.is_valid():
                 serializer.save()
-                # inbox_object=Inbox.objects.get(author=fk)
-                # message=serializer.data
-                # message["from_user_name"]=pk
-                # message["to_user_name"]=User.objects.get(id=fk).displayName
-                # message["summary"]=f"{message['from_user_name']} sent you a friend request"
-                # inbox_object.items["friendrequests"].append(message)
-                # inbox_object.save()
+                user_ids=list(User.objects.values_list('id', flat=True))
+                user_ids_str = [str(user_id) for user_id in user_ids]
+                if fk in user_ids_str:
+                    inbox_object=Inbox.objects.get(author=fk)
+                    message=serializer.data
+                    message["from_user_name"]=request.data["displayName"]
+                    message["to_user_name"]=User.objects.get(id=fk).displayName
+                    message["summary"]=f"{message['from_user_name']} sent you a friend request"
+                    message["server"]=request.data["server"]
+                    inbox_object.items["friendrequests"].append(message)
+                    inbox_object.save()
                 return Response(serializer.data,status=status.HTTP_201_CREATED)
     elif request.method=='PUT':
         try:
@@ -281,6 +294,12 @@ def remote_friend_request_methods(request,pk,fk):
             friend_request.save()
             remote_friendship=remoteFriendship.objects.create(from_user=pk,to_user=fk, server=request.data["server"])
             remote_friendship.save()
+            user_ids=list(User.objects.values_list('id', flat=True))
+            user_ids_str = [str(user_id) for user_id in user_ids]
+            if fk in user_ids_str:
+                inbox_object=Inbox.objects.get(author=fk)
+                inbox_object.items["friendrequests"]=request.data["friendrequests"]
+                inbox_object.save()
             return Response({"message":"friend request status changed"},status=status.HTTP_200_OK)
         else:
             return Response({"message":{f"Friend request is not pending"}},status=status.HTTP_400_BAD_REQUEST)

backend/post/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
-from .models import Post
+from .models import Post,Image
 admin.site.register(Post)
+admin.site.register(Image)
 # Register your models here.

backend/post/beeg-yoshi.json

@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "beeg-yoshi",
+  "private_key_id": "d488d007cc41a940b7e29d2de4d3a5b3c753745a",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDIAvj5RCAN76vt\nV38QU33xL58xw65GazwBaEy/0DKn7pn9XPCbeziW82ELMLUuNjAZ5u7qtDBc2KPU\nIwQgzQvFrWfzYSlKpyKDUeEDQ/0HwV1ftXb70/XOrpKqrxianoaYxCQwDW5vhC4Q\naxHzsFqsVb/YN1yNZQ8wYvHxCnCNuU3l+rGelnqbkFspEo/jtfzO8jfooz8t14XU\n1VPszgydNN4phgHpCVpwg6neJjb9Q9bnJSHtF5oBLcqIQeEsMIkfnlmV4Kcn/C95\nDUO1LodHF9cv4RysoIxBy5yggvqtZpi5fi/DHs9uYXl6fCt/Cgw9HGwYXECJe4oE\nt0jT7KBTAgMBAAECggEAYozQZ2WxU5yRvpa7lWxGJGY+DtOnlav1u43ML0DjDMqs\nlmHKbhnHVt1hphVgWH47si+O7hdNsxnNk1OTj6PoloSsMQfhRBbZExJvh9/il4Un\nwGZV05xrQ+TRgIdY3KqakEAowoKDtS/QUKepB0UQUFTJ+7u/fy3Zz5IZOxbVQYa7\nABaY1Tw0fTo3l2apSl4/9WQV3/JvzEFn9m8jwRwZ0+Yg21OXJOECgwVHvvvMoJ6Y\n23dFKRboOcRtXGu+RSs53nB/0d2gx4eDyfqkqEd4ayU4C7UbNcmziX8WgnX9DpUe\nAE1/XxLFxD9HA/M0EsWx2vaQNm9J3rl/dCC7vLu4RQKBgQDlWPn2tiNTnLVa3hK+\n8zlROZvFx5cxyQQoO8rENzpmzNzSefpNEbUbeMude9tMQbOsk5/PCzpjgkrFzlzx\n06EkAcimZhTvwpXW+UFfKf+ItXUGLDgpDVAZiQxoxDdklneVh2Lg6OyTYbllb/3f\nlG8NMU0093kksd29pPMIRPKSpwKBgQDfQUKSKyBKE5XB4nAQarurdJRpRgQNHmra\nF9BJZVMv+av7pOtAlZtGmxelu6FmdVAzQJ+45u3vHM2UqgerREz70IAS6WrTamRX\nZriuwh06B8JFu05MULL309vhnAFCXBggE8hs9iP5SBAj5xYMy61TBRll7yHi7rwf\n6X+bSMjWdQKBgQCR6092gaHuU7krLDnfFd705+NNLdTrjwq/EnPK7ZyRxWwF2ie/\nmzGQXgWmmCQJ24+WkIJP98PZhg9O1SJblhtjTmM8Q5y0gyhUk1fdVVpIv7LKD55X\nuCmrZX/otFbN/9Hr6CyoDmpexwFvIZb0Bnu1eBW4Sm/gQe5j96vNKhjv5wKBgQCi\nZL7+wb34BCz/3i0z0991BRTbSqGxxTlmMMJCUSDkmdD+9+Rjky9ieXgHBueNNrJC\nxbQo9FmIf8QOamuvqbvxw6UVnJIm/JHGfaLDA9Hsny4yON/oZR75ZDLh9e94jLLD\nyoAUuipKrp+G7hW88v69j8z8t6hHgO54rAk1NAla7QKBgHTKSHmjuAq3S/Xz4Rb7\nQESeBlcOvL3VV+enSgMCT7p23NJNphNKeFjwK4MyDCrmJCEuMoV33kV3Pxyx6bUw\ndSgDDK+oHifP7q8Zx00gJc1sdLHpJTf1wPhmx+PjkwXk35nRPcRPgQJPUa0EQboW\nOoKsBnbQaLKSGA7NHLb311Kf\n-----END PRIVATE KEY-----\n",
+  "client_email": "[email protected]",
+  "client_id": "107045459258425906515",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/beeg-yoshi-upload%40beeg-yoshi.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}

backend/post/models.py

@@ -5,11 +5,11 @@ class Post(models.Model):
     type=models.CharField(default="post",max_length=1024)
     title=models.CharField(max_length=512)
     id=models.AutoField(primary_key=True)
-    source=models.CharField(max_length=1024)
-    origin=models.CharField(max_length=1024)
-    description=models.CharField(max_length=1024)
-    contentType=models.CharField(max_length=1024)
-    content=models.TextField()
+    source=models.CharField(max_length=1024, blank=True)
+    origin=models.CharField(max_length=1024, blank=True)
+    description=models.CharField(max_length=1024, blank=True)
+    contentType=models.CharField(max_length=1024, default="text/plain")
+    content=models.TextField(blank=True)
     author=models.ForeignKey(User,on_delete=models.CASCADE)
     categories=models.JSONField(blank=True,null=True)
     count=models.PositiveIntegerField(default=0)
@@ -26,3 +26,9 @@ class Visibility(models.TextChoices):
     unlisted = models.BooleanField(default=False)
     def __str__(self):
         return self.content
+
+class Image(models.Model):
+    post=models.ForeignKey(Post,on_delete=models.CASCADE)
+    image=models.URLField()
+    def __str__(self):
+        return self.post.title

backend/post/serializers.py

@@ -1,8 +1,12 @@
 from rest_framework import serializers
-from .models import Post
+from .models import Post,Image
 
 class PostSerializer(serializers.ModelSerializer):
     class Meta:
         model=Post
         # fields=["type","title","id","author","source","origin","description","contentType","content"]
+        fields="__all__"
+class ImageSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=Image
         fields="__all__"

backend/post/tests.py

@@ -33,7 +33,8 @@ def setUp(self):
             source="Test source1",
             origin="Test origin1",
             description="Test description1",
-            contentType="text/plain",                               
+            contentType="text/plain",
+            categories= ['test1', 'test2']                              
         )
         self.private_post = Post.objects.create(
             title='Private Post', 
@@ -43,6 +44,7 @@ def setUp(self):
             origin="Test origin1",
             description="Test description1",
             contentType="text/plain",
+            categories= ['test1', 'test2']
             )
         self.client = APIClient()
 

backend/post/urls.py

@@ -3,7 +3,9 @@
 from django.urls import path
 urlpatterns = [
     path('authors/<str:pk>/posts/', views.create_post, name='create_post'),
-    path('authors/<str:pk>/posts/<str:postID>', views.post_method, name='post_method'),
+    path('authors/<str:pk>/posts/<str:postID>/', views.post_method, name='post_method'),
     path('authors/get/<str:pk>/posts/', views.get_public_and_friends_posts, name='get_public_and_friends_posts'),
     path('get/public/posts/', views.get_public_posts, name='get_public_posts'),
+    path('authors/<str:pk>/posts/<str:postID>/image', views.image_method, name='image_method'),
+    path('get/all/images/', views.get_all_images, name='get_all_images'),
 ]