Refactor #3 (#30) - redo project structure, add new user model & pseuds

* make sure all sqlite3 dbs are ignored * delete all migrations * Rename fanarchive app to 'fanfic' * modify INSTALLED_APPS * Add users app * Add custom user using authtools * Add authtools to requirements * Rename custom user & register it in settings * Add pseuds app * Add authorship via pseuds for fic * Remove extra argument in pseud_owner definition * Make new initial migrations * split up INSTALLED_APPS * Misc refactoring - Move Authorship & AuthorGroup models into a misc model file - delete unused import in Admin.py - register moved models properly * Renamed templates/fanarchive so templates would work * Eradicate last 'fanarchive' references * Eradicating ACTUAL LAST 'fanarchive' reference? * fix flake8 errors * Move Pseud model in under fanfic app * rename author models file * Add actual Pseud model file to fanfic app * Add pseud model to model init * Add new migrations * Add docstrings + refactor * Add docstrings * renamed author-specific models file * Register custom user in admin * Register new fanfic models * Add date fields to FicPart * add date_created to Pseud * Make pseud_names unique * Add migration for model changes * Add pseud __str__ method * Non-working changes to author model stuff * Change name of user model Change in settings.py Change in user app Redo & replace migrations because I don't want to fuck around with the old set * Add __str__ methods for author models * Change date_updated fields to have auto_now attribute * Add migration to reflect field changes * Add non many-to-many Pseud/AuthorGroup style relationship Also add the needed migrations * Also add new models so they are loaded * Move connector field to PseudInstance model * Add unique_together constraint to Authorship model * Remove PseudGroup and PseudInstance models * Add 'name' field to AuthorGroup model * Make AuthorGroup.name nullable and fix migration so it works * Change __str__ method of AuthorGroup so it can also return the group name * Add new models so you can test them * Remove field label tests * Add fic_part_name test, plus refactor old fic_name test * Add new models to the class setUp function * Add more comments re future tests * Add new models, and refactor so class setUp is all in MyTestCase
quivop · Aug 27, 2018 · 2acdbcf · 2acdbcf
1 parent 39af213
commit 2acdbcf
Show file tree

Hide file tree

Showing 66 changed files with 644 additions and 363 deletions.
diff --git a/.gitignore b/.gitignore
@@ -101,10 +101,7 @@ ENV/
 .mypy_cache/
 
 # Make sure development dbs are ignored
-.sqlite3
-
-# Ignoring db.sqlite3 in particular
-db.sqlite3
+*.sqlite3
 
 # Ignore test data dumps
 dump*.json

diff --git a/archive/settings.py b/archive/settings.py
@@ -81,19 +81,27 @@
 
 # Application definition
 
-INSTALLED_APPS = [
+DJANGO_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    # Registering the Fanarchive app
-    'fanarchive.apps.FanarchiveConfig',
-    # Adding ssl server for development
+]
+
+THIRD_PARTY_APPS = [
     'sslserver',
+    'authtools',
+]
+
+LOCAL_APPS = [
+    'fanfic',
+    'users',
 ]
 
+INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
+
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -135,6 +143,10 @@
 }
 
 
+# Custom user model
+
+AUTH_USER_MODEL = 'users.User'
+
 # Password validation
 
 AUTH_PASSWORD_VALIDATORS = [

diff --git a/archive/urls.py b/archive/urls.py
@@ -6,16 +6,16 @@
 from django.urls import path, include  # we need include, so add it here
 
 # Import RedirectView so redirecting our base url
-# to the fanarchive app will work
+# to the fanfic app will work
 from django.views.generic import RedirectView
 
 urlpatterns = [
     path('admin/', admin.site.urls),
 
-    # forward requests for 'fanarchive/' links to urls.py
-    # in the fanarchive app
-    path('fanarchive/', include('fanarchive.urls')),
+    # forward requests for 'archive/' links to urls.py
+    # in the fanfic app
+    path('archive/', include('fanfic.urls')),
 
-    # redirect the base url to the fanarchive app
-    path('', RedirectView.as_view(url='fanarchive/')),
+    # redirect the base url to the fanfic app
+    path('', RedirectView.as_view(url='archive/')),
 ]
diff --git a/fanarchive/admin.py b/fanarchive/admin.py
diff --git a/fanarchive/apps.py b/fanarchive/apps.py
diff --git a/fanarchive/migrations/0001_initial.py b/fanarchive/migrations/0001_initial.py
diff --git a/fanarchive/migrations/0002_auto_20180407_0332.py b/fanarchive/migrations/0002_auto_20180407_0332.py
diff --git a/fanarchive/migrations/0003_remove_fic_date_created.py b/fanarchive/migrations/0003_remove_fic_date_created.py
diff --git a/fanarchive/migrations/0004_auto_20180407_0357.py b/fanarchive/migrations/0004_auto_20180407_0357.py
diff --git a/fanarchive/migrations/0005_ficpart_fic_part_number.py b/fanarchive/migrations/0005_ficpart_fic_part_number.py
diff --git a/fanarchive/models/__init__.py b/fanarchive/models/__init__.py
diff --git a/fanarchive/models/fic.py b/fanarchive/models/fic.py
diff --git a/fanarchive/tests/test_views.py b/fanarchive/tests/test_views.py
diff --git a/fanarchive/__init__.py → fanfic/__init__.py b/fanarchive/__init__.py → fanfic/__init__.py
diff --git a/fanfic/admin.py b/fanfic/admin.py
@@ -0,0 +1,10 @@
+from django.contrib import admin
+
+# registering our models
+from .models import Fic, FicPart, AuthorGroup, Authorship, Pseud
+
+admin.site.register(Fic)
+admin.site.register(FicPart)
+admin.site.register(AuthorGroup)
+admin.site.register(Authorship)
+admin.site.register(Pseud)
diff --git a/fanfic/apps.py b/fanfic/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class FanficConfig(AppConfig):
+    name = 'fanfic'
diff --git a/fanarchive/fixtures/initial_data.json → fanfic/fixtures/initial_data.json b/fanarchive/fixtures/initial_data.json → fanfic/fixtures/initial_data.json
diff --git a/fanarchive/forms/__init__.py → fanfic/forms/__init__.py b/fanarchive/forms/__init__.py → fanfic/forms/__init__.py
diff --git a/fanarchive/forms/admin_forms.py → fanfic/forms/admin_forms.py b/fanarchive/forms/admin_forms.py → fanfic/forms/admin_forms.py