Merge pull request #9 from dweep123/dashboard_models

Dashboard models

requirements.txt

@@ -1,7 +1,8 @@
 Django==1.6.5
 Sphinx==1.2.2
+django-cms==3.0
+django-countries==2.1.2
 django-nose==1.2
+djangocms-text-ckeditor==2.1.6
 flake8==2.1.0
 psycopg2==2.5.3
-django-cms==3.0
-djangocms-text-ckeditor==2.1.6

systers_portal/dashboard/admin.py

@@ -0,0 +1,12 @@
+from django.contrib import admin
+from dashboard.models import (
+    SysterUser, Community, News, Resource, Tag, ResourceType,
+    CommunityPage)
+
+admin.site.register(SysterUser)
+admin.site.register(Community)
+admin.site.register(News)
+admin.site.register(Resource)
+admin.site.register(Tag)
+admin.site.register(ResourceType)
+admin.site.register(CommunityPage)

systers_portal/dashboard/models.py

@@ -0,0 +1,110 @@
+from django.db import models
+from django.contrib.auth.models import User
+from django_countries.fields import CountryField
+from cms.models.pagemodel import Page
+
+
+class SysterUser(models.Model):
+
+    """Profile model to store additional information about a user"""
+    user = models.OneToOneField(User)
+    country = CountryField(blank=True, null=True)
+    blog_url = models.URLField(max_length=255, blank=True)
+    homepage_url = models.URLField(max_length=255, blank=True)
+    profile_picture = models.ImageField(upload_to='photos/',
+                                        default='photos/dummy.jpeg',
+                                        blank=True,
+                                        null=True)
+
+    def __unicode__(self):
+        firstname = self.user.first_name
+        lastname = self.user.last_name
+        if firstname and lastname:
+            return "{0} {1}".format(self.user.first_name, self.user.last_name)
+        else:
+            return self.user.username
+
+
+class Community(models.Model):
+
+    """Model to represent a Syster Community"""
+    name = models.CharField(max_length=255)
+    email = models.EmailField(max_length=255, blank=True)
+    mailing_list = models.EmailField(max_length=255, blank=True)
+    resource_area = models.URLField(max_length=255, blank=True)
+    members = models.ManyToManyField(SysterUser, blank=True, null=True,
+                                     related_name='member_of_community')
+    community_admin = models.ForeignKey(SysterUser, related_name='community')
+    parent_community = models.ForeignKey('self', blank=True, null=True)
+    website = models.URLField(max_length=255, blank=True)
+    facebook = models.URLField(max_length=255, blank=True)
+    googleplus = models.URLField(max_length=255, blank=True)
+    twitter = models.URLField(max_length=255, blank=True)
+    slug = models.SlugField(max_length=150, unique=True)
+
+    def __unicode__(self):
+        return self.name
+
+
+class Tag(models.Model):
+
+    """Model to represent the tags a resource can have"""
+    name = models.CharField(max_length=255)
+
+    def __unicode__(self):
+        return self.name
+
+
+class ResourceType(models.Model):
+
+    """Model to represent the types a resource can have"""
+    name = models.CharField(max_length=255)
+
+    def __unicode__(self):
+        return self.name
+
+
+class News(models.Model):
+
+    """Model to represent a News section on Community resource area"""
+    title = models.CharField(max_length=255)
+    community = models.ForeignKey(Community)
+    author = models.ForeignKey(SysterUser)
+    date_created = models.DateField(auto_now=False, auto_now_add=True)
+    date_modified = models.DateField(auto_now=True, auto_now_add=False)
+    is_public = models.BooleanField(default=True)
+    tags = models.ManyToManyField(Tag, blank=True, null=True)
+    content = models.TextField()
+    slug = models.SlugField(max_length=150, unique=True)
+
+    def __unicode__(self):
+        return "{0} of {1} Community".format(self.title, self.community.name)
+
+
+class CommunityPage(models.Model):
+
+    """Model to represent community pages"""
+    title = models.CharField(max_length=255)
+    page = models.OneToOneField(Page)
+    community = models.ForeignKey(Community)
+
+    def __unicode__(self):
+        return "{0} of {1} Community".format(self.page, self.community.name)
+
+
+class Resource(models.Model):
+
+    """Model to represent a Resources section on Community resource area"""
+    title = models.CharField(max_length=255)
+    community = models.ForeignKey(Community)
+    author = models.ForeignKey(SysterUser)
+    date_created = models.DateField(auto_now=False, auto_now_add=True)
+    date_modified = models.DateField(auto_now=True, auto_now_add=False)
+    is_public = models.BooleanField(default=True)
+    tags = models.ManyToManyField(Tag, blank=True, null=True)
+    resource_type = models.ForeignKey(ResourceType, blank=True, null=True)
+    content = models.TextField()
+    slug = models.SlugField(max_length=150, unique=True)
+
+    def __unicode__(self):
+        return "{0} of {1} Community".format(self.title, self.community.name)

systers_portal/dashboard/tests.py

@@ -0,0 +1,190 @@
+from django.contrib.auth.models import User
+from django.test import TestCase
+from cms.models.pagemodel import Page
+from cms.api import create_page
+from dashboard.models import (
+    SysterUser, Community, News, Resource, Tag, ResourceType,
+    CommunityPage)
+
+
+class DashboardTestCase(TestCase):
+
+    def setUp(self):
+        self.auth_user = User.objects.create(username='foo', password='foobar')
+        self.tag = Tag.objects.create(name='dummy_tag')
+        self.resource_type = ResourceType.objects.create(
+            name='dummy_resource_type')
+
+    def test_user_and_syster_user(self):
+        self.assertQuerysetEqual(SysterUser.objects.all(), [])
+        systeruser = SysterUser.objects.create(
+            user=self.auth_user,
+            blog_url='http://blog_url.com',
+            homepage_url='http://homepage_url.com')
+        self.assertEqual(len(User.objects.all()), 1)
+        self.assertEqual(len(SysterUser.objects.all()), 1)
+        self.assertEqual(unicode(systeruser), self.auth_user.username)
+        self.assertEqual(systeruser.blog_url,
+                         self.auth_user.systeruser.blog_url)
+        self.assertEqual(systeruser.blog_url, 'http://blog_url.com')
+        self.assertEqual(systeruser.homepage_url, 'http://homepage_url.com')
+        second_user = User.objects.create(username='user2', password='user2')
+        second_systeruser = SysterUser.objects.create(user=second_user)  # NOQA
+        self.assertEqual(len(User.objects.all()), 2)
+        self.assertEqual(len(SysterUser.objects.all()), 2)
+        second_user.delete()
+        self.assertEqual(len(User.objects.all()), 1)
+        self.assertEqual(len(SysterUser.objects.all()), 1)
+
+    def test_community_model(self):
+        self.assertQuerysetEqual(Community.objects.all(), [])
+        self.assertQuerysetEqual(SysterUser.objects.all(), [])
+        systeruser = SysterUser.objects.create(user=self.auth_user)
+        community = Community.objects.create(name='dummy_community',
+                                             community_admin=systeruser)
+        community.members.add(systeruser)
+        second_user = User.objects.create(username='user2', password='user2')
+        second_systeruser = SysterUser.objects.create(
+            user=second_user)
+        community.members.add(second_systeruser)
+        community_members = SysterUser.objects.filter(
+            member_of_community=community)
+        community_admin = SysterUser.objects.get(community=community)
+        self.assertEqual(len(Community.objects.all()), 1)
+        self.assertEqual(len(community_members), 2)
+        self.assertEqual(unicode(community), 'dummy_community')
+        self.assertEqual(community.community_admin, systeruser)
+        self.assertEqual(community_admin, systeruser)
+        self.assertEqual(systeruser in community_members, True)
+        self.assertEqual(second_systeruser in community_members, True)
+
+    def test_tag_model(self):
+        self.assertEqual(len(Tag.objects.all()), 1)
+        tag = Tag.objects.create(name='dummy_tag1')
+        self.assertEqual(len(Tag.objects.all()), 2)
+        self.assertEqual(unicode(tag), 'dummy_tag1')
+
+    def test_resourcetype_model(self):
+        self.assertEqual(len(ResourceType.objects.all()), 1)
+        resource = ResourceType.objects.create(name='dummy_resource1')
+        self.assertEqual(len(ResourceType.objects.all()), 2)
+        self.assertEqual(unicode(resource), 'dummy_resource1')
+
+    def test_news_model(self):
+        self.assertQuerysetEqual(News.objects.all(), [])
+        self.assertQuerysetEqual(Community.objects.all(), [])
+        self.assertQuerysetEqual(SysterUser.objects.all(), [])
+        systeruser = SysterUser.objects.create(user=self.auth_user)
+        community = Community.objects.create(name='dummy_community',
+                                             community_admin=systeruser)
+        news_article = News.objects.create(title='dummy_article',
+                                           community=community,
+                                           author=systeruser,
+                                           content='dummy news article')
+        news_article.tags.add(self.tag)
+        news_article_tags = Tag.objects.filter(news=news_article)
+        self.assertEqual(len(Community.objects.all()), 1)
+        self.assertEqual(len(SysterUser.objects.all()), 1)
+        self.assertEqual(len(News.objects.all()), 1)
+        self.assertEqual(unicode(news_article),
+                         'dummy_article of dummy_community Community')
+        self.assertEqual(news_article.community,
+                         community)
+        self.assertEqual(news_article.author, systeruser)
+        self.assertEqual(news_article.community.community_admin,
+                         systeruser)
+        self.assertEqual(news_article.author.user, self.auth_user)
+        self.assertEqual(news_article_tags[0], self.tag)
+        self.assertEqual(news_article.is_public, True)
+        self.assertEqual(news_article.community,
+                         Community.objects.get(news=news_article))
+
+    def test_resource_model(self):
+        self.assertQuerysetEqual(Resource.objects.all(), [])
+        self.assertQuerysetEqual(Community.objects.all(), [])
+        self.assertQuerysetEqual(SysterUser.objects.all(), [])
+        systeruser = SysterUser.objects.create(user=self.auth_user)
+        community = Community.objects.create(name='dummy_community',
+                                             community_admin=systeruser)
+        resource = Resource.objects.create(title='dummy_resource',
+                                           community=community,
+                                           author=systeruser,
+                                           content='dummy resource',
+                                           resource_type=self.resource_type)
+        resource.tags.add(self.tag)
+        resource_tags = Tag.objects.filter(resource=resource)
+        self.assertEqual(len(Community.objects.all()), 1)
+        self.assertEqual(len(SysterUser.objects.all()), 1)
+        self.assertEqual(len(Resource.objects.all()), 1)
+        self.assertEqual(unicode(resource),
+                         'dummy_resource of dummy_community Community')
+        self.assertEqual(resource.community, community)
+        self.assertEqual(resource.author, systeruser)
+        self.assertEqual(resource.community.community_admin, systeruser)
+        self.assertEqual(resource.author.user, self.auth_user)
+        self.assertEqual(resource_tags[0], self.tag)
+        self.assertEqual(resource.resource_type, self.resource_type)
+        self.assertEqual(resource.is_public, True)
+        self.assertEqual(resource.community,
+                         Community.objects.get(resource=resource))
+        resource.is_public = False
+        self.assertEqual(resource.is_public, False)
+
+    def test_CommunityPage_model(self):
+        self.assertQuerysetEqual(CommunityPage.objects.all(), [])
+        self.assertQuerysetEqual(Community.objects.all(), [])
+        self.assertQuerysetEqual(SysterUser.objects.all(), [])
+        systeruser = SysterUser.objects.create(user=self.auth_user)
+        community = Community.objects.create(name='dummy_community',
+                                             community_admin=systeruser)
+        about_dummy_community = create_page('About',
+                                            'page_template.html',
+                                            'en-us')
+        about_page_for_dummy_community = CommunityPage.objects.create(
+            title='About',
+            page=about_dummy_community,
+            community=community)
+        self.assertEqual(len(Community.objects.all()), 1)
+        self.assertEqual(len(Page.objects.all()), 1)
+        self.assertEqual(len(CommunityPage.objects.all()), 1)
+        self.assertEqual(len(Page.objects.all()), 1)
+        self.assertEqual(unicode(about_page_for_dummy_community),
+                         'About of dummy_community Community')
+        self.assertEqual(about_page_for_dummy_community.page,
+                         about_dummy_community)
+        self.assertEqual(about_page_for_dummy_community.community, community)
+        faq_dummy_community = create_page('faq', 'page_template.html', 'en-us')
+        self.assertEqual(len(Page.objects.all()), 2)
+        faq_page_for_dummy_community = CommunityPage.objects.create(
+            title='FAQ',
+            page=faq_dummy_community,
+            community=community)
+        self.assertEqual(faq_page_for_dummy_community.page,
+                         faq_dummy_community)
+        self.assertEqual(faq_page_for_dummy_community.community, community)
+        second_community = Community.objects.create(
+            name='second_dummy_community',
+            community_admin=systeruser,
+            slug='second_community',)
+        about_second_dummy_community = create_page('About',
+                                                   'page_template.html',
+                                                   'en-us')
+        about_page_for_second_dummy_community = CommunityPage.objects.create(
+            title='About',
+            page=about_second_dummy_community,
+            community=second_community)
+        self.assertEqual(len(Community.objects.all()), 2)
+        self.assertEqual(len(Page.objects.all()), 3)
+        self.assertEqual(len(CommunityPage.objects.all()), 3)
+        self.assertEqual(about_page_for_second_dummy_community.page,
+                         about_second_dummy_community)
+        self.assertEqual(about_page_for_second_dummy_community.community,
+                         second_community)
+        second_dummy_community_about = Page.objects.get(
+            communitypage=about_page_for_second_dummy_community)
+        self.assertEqual(about_page_for_second_dummy_community,
+                         second_dummy_community_about.communitypage)
+        second_dummy_community_about = Page.objects.get(
+            communitypage=about_page_for_second_dummy_community)
+        self.assertEqual(about_second_dummy_community,
+                         second_dummy_community_about)

systers_portal/manage.py

@@ -4,7 +4,7 @@
 
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE",
-		          "systers_portal.settings.dev")
+                          "systers_portal.settings.dev")
     from django.core.management import execute_from_command_line
 
     execute_from_command_line(sys.argv)

systers_portal/systers_portal/settings/base.py

@@ -41,6 +41,7 @@
     'south',
     'sekizai',
     'django.contrib.messages',
+    'dashboard',
 )
 
 MIDDLEWARE_CLASSES = (

systers_portal/systers_portal/urls.py

@@ -1,5 +1,4 @@
 from django.conf.urls import patterns, include, url
-from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 
 admin.autodiscover()