Merge branch 'staging' into brandon3

Author: bryanwong8

backend/conduit/articles/models.py

@@ -136,6 +136,13 @@ def bookmark(self, profile):
             return True
         return False
 
+    #Function to remove bookmark on an article
+    def unbookmark(self, profile):
+        if self.is_bookmarked(profile):
+            self.bookmarkers.remove(profile)
+            return True
+        return False
+
     #Function to check if a current bookmark already exists for a particular article and user
     def is_bookmarked(self, profile):
         return bool(self.query.filter(db.and_(bookmarker_assoc.c.bookmarker == profile.id,

backend/conduit/articles/views.py

@@ -168,6 +168,20 @@ def bookmark_an_article(slug):
     return article
 
 
+#Route to remove a bookmark on a particular article
+@blueprint.route('/api/articles/<slug>/bookmark', methods=('DELETE',))
+@jwt_required
+@marshal_with(article_schema)
+def unbookmark_an_article(slug):
+    profile = current_user.profile
+    article = Article.query.filter_by(slug=slug).first()
+    if not article:
+        raise InvalidUsage.article_not_found()
+    article.unbookmark(profile)
+    article.save()
+    return article
+
+
 ##########
 # Comments
 ##########
@@ -192,6 +206,7 @@ def make_comment_on_article(slug, body, comment_id=None, **kwargs):
         raise InvalidUsage.article_not_found()
     if comment_id:
         comment = Comment(None, current_user.profile, body, comment_id, **kwargs)
+        comment.comment_id = comment_id
     else:
         comment = Comment(article, current_user.profile, body, comment_id, **kwargs)
     comment.save()

backend/conduit/extensions.py

@@ -28,7 +28,11 @@ def update(self, commit=True, **kwargs):
                 tags = []
                 for tag in value:
                     tag = Tags.query.filter_by(slug=tag).first()
-                    tags.append(tag)
+                    if tag:
+                        tags.append(tag)
+                    else:
+                        tag = Tags(tag)
+                        tag.save()
                 self.tagList = tags
             else:
                 setattr(self, attr, value)

backend/conduit/organizations/models.py

@@ -111,3 +111,9 @@ def is_following(self):
         if current_user:
             return current_user.profile in self.members or current_user.profile in self.moderators 
         return False
+
+    @property
+    def is_moderator(self):
+        if current_user:
+            return current_user.profile in self.moderators
+        return False

backend/conduit/organizations/serializers.py

@@ -16,6 +16,7 @@ class OrganizationSchema(Schema):
     username = fields.Str()
     image = fields.Str()
     is_following = fields.Bool()
+    is_moderator = fields.Bool()
     moderators = fields.Nested(ProfileSchema, many=True)
     members = fields.Nested(ProfileSchema, many=True, data_key='followers')
 

backend/conduit/profile/views.py

@@ -14,6 +14,7 @@
 from conduit.tags.serializers import tags_schemas
 from conduit.user.serializers import followers_schema
 from conduit.articles.serializers import articles_schema
+from conduit.organizations.serializers import organizations_schema
 
 blueprint = Blueprint('profiles', __name__)
 
@@ -97,4 +98,11 @@ def get_user_articles(type=None):
         else:
             raise InvalidUsage.article_not_found()
     res = res.join(Article.author).join(User).filter_by(username=current_user.username)
-    return res.all()
+    return res.all()
+
+
+@blueprint.route('/api/profile/organizations', methods=('GET',))
+@jwt_required
+@marshal_with(organizations_schema)
+def get_user_organizations():
+    return current_user.profile.mem_organization + current_user.profile.mod_organization

backend/conduit/tags/serializers.py

@@ -26,6 +26,24 @@ def dump_Tag(self, data, **kwargs):
         return {'tag': data}
 
 
+class TagFormSchema(Schema):
+    tagname = fields.Str()
+    description = fields.Str()
+    slug = fields.Str()
+    old_slug = fields.Str()
+    icon = fields.Str()
+    modSetting = fields.Int()
+    tag = fields.Nested('self', exclude=('tag',), default=True, load_only=True)
+
+    @pre_load
+    def make_Tag(self, data, **kwargs):
+        return data['tag']
+
+    @post_dump
+    def dump_Tag(self, data, **kwargs):
+        return {'tag': data}
+
+
 class TagsSchema(TagSchema):
     class Meta:
         exclude = ('tagFollowers', 'moderators',)
@@ -49,5 +67,6 @@ def dump_Tag(self, data, **kwargs):
 
 
 tag_schema = TagSchema()
+tag_form_schema = TagFormSchema()
 tags_schemas = TagsSchema(many=True)
 tag_mebership_schema = TagMembershipSchema()

backend/conduit/tags/views.py

@@ -1,5 +1,5 @@
 from .models import Tags
-from .serializers import tag_schema, tag_mebership_schema
+from .serializers import tag_schema, tag_form_schema, tag_mebership_schema
 
 from conduit.decorators import isAdmin
 from conduit.exceptions import InvalidUsage
@@ -46,10 +46,10 @@ def get_tag(slug, **kwargs):
 
 @blueprint.route('/api/tags/<slug>', methods=('PUT',))
 @jwt_required
-@use_kwargs(tag_schema)
-@marshal_with(tag_schema)
-def update_tag(slug, **kwargs):
-    tag = Tags.query.filter_by(slug=slug).first()
+@use_kwargs(tag_form_schema)
+@marshal_with(tag_form_schema)
+def update_tag(old_slug, **kwargs):
+    tag = Tags.query.filter_by(slug=old_slug).first()
     if not tag:
         raise InvalidUsage.tag_not_found()
     tag.update(**kwargs)

backend/tests/test_models.py

@@ -8,6 +8,7 @@
 from conduit.profile.models import UserProfile
 from conduit.articles.models import Article, Comment
 from conduit.tags.models import Tags
+from conduit.organizations.models import Organization
 
 from .factories import UserFactory
 
@@ -179,3 +180,85 @@ def test_make_comments(self, user):
         assert comment1.article == article
         assert comment1.author == user.profile
         assert len(article.comments.all()) == 2
+
+
+@pytest.mark.usefixtures('db')
+class TestOrganization:
+
+    def test_add_moderator(self, user):
+        user = user.get()
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+        
+        assert organization.add_moderator(user.profile)
+
+    def test_add_member(self, user):
+        user = user.get()
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+        
+        assert organization.add_member(user.profile)
+
+    def test_remove_moderator(self, user):
+        user = user.get()
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+        organization.add_member(user.profile)
+        
+        assert organization.remove_member(user.profile)
+
+
+    def test_update_slug_true(self):
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+
+        return organization.update_slug("New Slug")
+
+    def test_update_slug_false(self):
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+
+        return organization.update_slug("New Slug_of_organization") 
+        
+    def test_is_member(self, user):
+        user = user.get()
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+        organization.add_member(user.profile)  
+        
+        assert organization.is_member(user.profile)
+
+    def test_moderator(self, user):
+        user = user.get()
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+        organization.add_moderator(user.profile)
+        
+        assert organization.moderator(user.profile)
+
+    def test_promote(self, user):
+        user = user.get()
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+        organization.add_member(user.profile)  
+        
+        assert organization.promote(user.profile)
+
+    def test_request_review(self, user):
+        user = user.get()
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+        article = Article(user.profile, 'title', 'some body', description='some', isPublished='True', coverImage= "Image")
+        article.save()
+
+        return organization.request_review(article)
+
+    def test_remove_review_status(self, user):
+        user = user.get()
+        organization = Organization(name="Name_of_organization", description="Description_of_organization", slug="Slug_of_organization")
+        organization.save()
+        article = Article(user.profile, 'title', 'some body', description='some', isPublished='True', coverImage= "Image")
+        article.save()
+        organization.pending_articles.append(article)
+
+        return organization.remove_review_status(article)

components/article/ArticleList.tsx

@@ -1,6 +1,11 @@
 import { useRouter } from "next/router";
 import React from "react";
 import useSWR from "swr";
+import storage from "../../lib/utils/storage";
+import checkLogin from "../../lib/utils/checkLogin";
+import Router from "next/router";
+import axios from "axios";
+
 
 import ErrorMessage from "../common/ErrorMessage";
 import LoadingSpinner from "../common/LoadingSpinner";
@@ -16,8 +21,13 @@ import { SERVER_BASE_URL, DEFAULT_LIMIT } from "../../lib/utils/constant";
 import fetcher from "../../lib/utils/fetcher";
 import ArticleCard from "../../components/global/ArticleCard";
 import CustomLink from "../common/CustomLink";
+import ArticleAPI from "../../lib/api/article";
+import {message} from 'antd';
+
 
 const ArticleList = (props) => {
+  const [refresh,setRefresh] = React.useState(false)
+
   const page = usePageState();
   const pageCount = usePageCountState();
   const setPageCount = usePageCountDispatch();
@@ -32,6 +42,8 @@ const ArticleList = (props) => {
   const isProfilePage = pathname.startsWith(`/profile`);
 
   let fetchURL = `${SERVER_BASE_URL}/articles?offset=${page * DEFAULT_LIMIT}`;
+  const { data: currentUser } = useSWR("user", storage);
+  const isLoggedIn = checkLogin(currentUser);
 
   switch (true) {
     case !!tag:
@@ -80,7 +92,67 @@ const ArticleList = (props) => {
   if (articles && articles.length === 0) {
     return <div className="article-preview">No articles are here... yet.</div>;
   }
+  
+  const rightButtonClicked=async(e,slug,bookmarked)=>{
+    e.preventDefault()
+    if(currentUser == null){
+      message.info('Please Sign in');
+    }else{
 
+      if(!bookmarked){
+        
+        await ArticleAPI.bookmark(slug,currentUser.token);
+      }else{
+        await ArticleAPI.removeBookmark(slug,currentUser.token); 
+      }
+      for (let index in props.articles){
+        if(props.articles[index].slug== slug){
+          props.articles[index].bookmarked = !bookmarked
+          break;
+        }
+      }
+      setRefresh(!refresh)
+
+    }
+
+  }
+    const handleClickFavorite = async (e,slug,favorited) => {
+    e.preventDefault()
+    if (!isLoggedIn) {
+      Router.push(`/user/login`);
+      return;
+    }
+    try {
+      if (favorited) {
+       await axios.delete(`${SERVER_BASE_URL}/articles/${slug}/favorite`, {
+          headers: {
+            Authorization: `Token ${currentUser?.token}`,
+          },
+        });
+        
+      } else {
+        await axios.post(
+          `${SERVER_BASE_URL}/articles/${slug}/favorite`,
+          {},
+          {
+            headers: {
+              Authorization: `Token ${currentUser?.token}`,
+            },
+          }
+        );
+     
+      }
+      for (let index in props.articles){
+        if(props.articles[index].slug== slug){
+          props.articles[index].favorited = !favorited
+          break;
+        }
+      }
+      setRefresh(!refresh)
+    } catch (error) {
+     
+    }
+  };
   return (
     <>
       {articles?.map((article) => (
@@ -89,7 +161,7 @@ const ArticleList = (props) => {
           as={`/article/${article.slug}`}
           className="preview-link"
         >
-          <ArticleCard key={article.slug} article={article} />
+          <ArticleCard key={article.slug} article={article} onRightButtonClick ={(e)=>rightButtonClicked(e,article.slug,article.bookmarked)} favoriteClick = {(e)=>handleClickFavorite(e,article.slug,article.favorited)}  />
         </CustomLink>
       ))}