Merge pull request #7 from TheRealGD/develop

Merge changes

Author: jpleger

Procfile

@@ -0,0 +1,3 @@
+release: python manage.py migrate --no-input
+web: gunicorn rgundeals.wsgi --log-file -
+

README.md

@@ -2,14 +2,19 @@
 from django.db.models import Count
 from django.utils import timezone
 
-from .models import Category, Comment, Deal, Vendor
+from .models import Category, Comment, Deal, Vendor, VendorDomain
+
+
+class VendorDomainInline(admin.TabularInline):
+    model = VendorDomain
 
 
 @admin.register(Vendor)
 class VendorAdmin(admin.ModelAdmin):
-    list_display = ('name', 'domains', 'url', 'deal_count')
+    list_display = ('name', 'url', 'deal_count')
     prepopulated_fields = {'slug': ('name',)}
-    search_fields = ('name', 'domains', 'url')
+    search_fields = ('name', 'url')
+    inlines = [VendorDomainInline, ]
 
     def get_queryset(self, request):
         # Include count of assigned deals

rgundeals/deals/__init__.py renamed to deals/__init__.py

@@ -1,6 +1,5 @@
-# Generated by Django 2.0.3 on 2018-03-28 04:11
+# Generated by Django 2.0.3 on 2018-03-30 04:46
 
-import django.contrib.postgres.fields
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
@@ -27,7 +26,6 @@ class Migration(migrations.Migration):
                 ('level', models.PositiveIntegerField(db_index=True, editable=False)),
             ],
             options={
-                'ordering': ('name',),
                 'verbose_name_plural': 'categories',
             },
         ),
@@ -95,10 +93,17 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(help_text='Company name', max_length=100)),
                 ('slug', models.SlugField(unique=True)),
                 ('url', models.URLField(help_text='Public-facing website', verbose_name='URL')),
-                ('domains', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), help_text='URLs matching any of these domains will be associated with this vendor', size=None)),
             ],
             options={
                 'ordering': ('name',),
             },
         ),
+        migrations.CreateModel(
+            name='VendorDomain',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('domain', models.CharField(help_text='Vendor Domain', max_length=255, unique=True)),
+                ('vendor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='deals.Vendor')),
+            ],
+        ),
     ]

rgundeals/deals/admin.py renamed to deals/admin.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0.3 on 2018-03-28 04:11
+# Generated by Django 2.0.3 on 2018-03-30 04:46
 
 from django.conf import settings
 from django.db import migrations, models

rgundeals/deals/apps.py renamed to deals/apps.py

@@ -47,6 +47,14 @@
 )
 
 
+class VendorDomain(models.Model):
+    domain = models.CharField(max_length=255, help_text="Vendor Domain", unique=True)
+    vendor = models.ForeignKey('Vendor', on_delete=models.CASCADE)
+
+    def __str__(self):
+        return self.domain
+
+
 class Vendor(models.Model):
     name = models.CharField(
         max_length=100,
@@ -59,10 +67,6 @@ class Vendor(models.Model):
         verbose_name='URL',
         help_text="Public-facing website"
     )
-    domains = ArrayField(
-        base_field=models.CharField(max_length=100),
-        help_text="URLs matching any of these domains will be associated with this vendor"
-    )
 
     class Meta:
         ordering = ('name',)
@@ -225,7 +229,10 @@ def save(self, *args, **kwargs):
 
         # Assign vendor based on URL domain upon creation of new deals
         if not self.pk and not self.vendor and self.domain:
-            self.vendor = Vendor.objects.filter(domains__contains=[self.domain]).order_by('pk').first()
+            try:
+                self.vendor = VendorDomain.objects.get(domain=self.domain).vendor
+            except VendorDomain.DoesNotExist:
+                pass
 
         return super().save(*args, **kwargs)
 

rgundeals/deals/filters.py renamed to deals/filters.py

@@ -1,8 +1,29 @@
-Django>=2.0.3
-django-bootstrap4>=0.0.6
-django-debug-toolbar>=1.9.1
-django-filter>=1.1.0
-django-mptt>=0.9.0
-Markdown>=2.6.11
-psycopg2-binary>=2.7.4
-py-gfm>=0.1.3
+appnope==0.1.0
+decorator==4.2.1
+dj-database-url==0.5.0
+Django==2.0.3
+django-bootstrap4==0.0.6
+django-debug-toolbar==1.9.1
+django-filter==1.1.0
+django-js-asset==1.0.0
+django-mptt==0.9.0
+gunicorn==19.7.1
+ipython==6.2.1
+ipython-genutils==0.2.0
+jedi==0.11.1
+Markdown==2.6.11
+parso==0.1.1
+pexpect==4.4.0
+pickleshare==0.7.4
+prompt-toolkit==1.0.15
+psycopg2-binary==2.7.4
+ptyprocess==0.5.2
+py-gfm==0.1.3
+Pygments==2.2.0
+pytz==2018.3
+simplegeneric==0.8.1
+six==1.11.0
+sqlparse==0.2.4
+traitlets==4.3.2
+wcwidth==0.1.7
+whitenoise==3.3.1

rgundeals/deals/forms.py renamed to deals/forms.py

@@ -1,10 +1,22 @@
 import os
-
-from .configuration import *
-
+import dj_database_url
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
+
+# Debugging settings, export the DJ_DEBUG if you need to enable debugging (SHOULD NEVER BE ON IN PROD!)
+DEBUG = os.environ.get('DJ_DEBUG', 'False').lower() == 'true'
+
+# SECRET KEY SHOULD ALWAYS BE CHANGED IN PROD!
+SECRET_KEY = os.environ.get('DJ_SECRET_KEY', 'CHANGEME!!!')
+
+# Allowed domain names
+# TODO: change to a DJ_HOSTS variable
+ALLOWED_HOSTS = ['*']
+
+# For emailing errors
+ADMINS = (('root', 'root@localhost'), )
 
 INSTALLED_APPS = [
 
@@ -14,6 +26,9 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
+
+    # WhiteNoise
+    'whitenoise.runserver_nostatic',
     'django.contrib.staticfiles',
 
     # Third party
@@ -29,6 +44,7 @@
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -86,8 +102,19 @@
 # Custom user model
 AUTH_USER_MODEL = 'users.User'
 
+
+# Set the default DB up, but use dj_database_url to pull the DATABASE_URL from the ENV variable
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+DATABASES['default'].update(dj_database_url.config(conn_max_age=500))
+
+
 # Static files (CSS, JavaScript, Images)
-STATIC_ROOT = BASE_DIR + '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
 STATIC_URL = '/static/'
 STATICFILES_DIRS = (
     os.path.join(BASE_DIR, 'project-static'),
@@ -106,3 +133,6 @@
 # Pagination
 DEFAULT_PAGE_SIZE = 50
 MAX_PAGE_SIZE = 200
+
+# WhiteNoise Configuration
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'

rgundeals/deals/migrations/0001_initial.py renamed to deals/migrations/0001_initial.py

@@ -0,0 +1 @@
+python-3.6.4

rgundeals/deals/migrations/0002_auto_20180328_0411.py renamed to deals/migrations/0002_auto_20180330_0446.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0.3 on 2018-03-28 04:11
+# Generated by Django 2.0.3 on 2018-03-30 04:46
 
 import django.contrib.auth.models
 from django.db import migrations, models
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('deals', '0001_initial'),
         ('auth', '0009_alter_user_last_name_max_length'),
+        ('deals', '0001_initial'),
     ]
 
     operations = [