NullSoldier · NullSoldier · Jun 19, 2018 · Jun 19, 2018 · Jun 19, 2018 · Jun 19, 2018
diff --git a/api/admin.py b/api/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/api/apps.py b/api/apps.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

diff --git a/api/migrations/0001_initial_squash.py → api/migrations/0001_initial.py b/api/migrations/0001_initial_squash.py → api/migrations/0001_initial.py
@@ -1,33 +1,11 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.2 on 2018-05-27 23:31
-from __future__ import unicode_literals
+# Generated by Django 2.0.6 on 2018-06-19 04:52
 
 from django.db import migrations, models
 import django.db.models.deletion
 
 
-# Functions from the following migrations need manual copying.
-# Move them and any dependencies into this file, then update the
-# RunPython operations to refer to the local versions:
-# api.migrations.0002_add_test_data
-
 class Migration(migrations.Migration):
 
-    replaces = [
-        (b'api', '0001_initial'),
-        (b'api', '0002_add_test_data'),
-        (b'api', '0003_remove_server_public_secret'),
-        (b'api', '0004_characterhistory'),
-        (b'api', '0005_ginfocharacter'),
-        (b'api', '0006_clan'),
-        (b'api', 'add_clan_id'),
-        (b'api', '0001_server_ip_address'),
-        (b'api', '0002_clean_data_schema'),
-        (b'api', '0003_add_server_fields'),
-        (b'api', '0004_server_version'),
-        (b'api', '0005_make_location_nullable')
-    ]
-
     initial = True
 
     dependencies = [
@@ -43,136 +21,82 @@ class Migration(migrations.Migration):
                 ('is_online', models.BooleanField()),
                 ('steam_id', models.TextField()),
                 ('conan_id', models.TextField()),
+                ('conan_clan_id', models.TextField(null=True)),
                 ('last_online', models.DateTimeField(null=True)),
                 ('last_killed_by', models.TextField(null=True)),
                 ('created', models.DateTimeField(auto_now_add=True)),
-                ('x', models.FloatField()),
-                ('y', models.FloatField()),
-                ('z', models.FloatField()),
+                ('x', models.FloatField(null=True)),
+                ('y', models.FloatField(null=True)),
+                ('z', models.FloatField(null=True)),
             ],
         ),
         migrations.CreateModel(
-            name='Server',
+            name='CharacterHistory',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.TextField()),
-                ('public_secret', models.UUIDField()),
-                ('private_secret', models.UUIDField()),
-                ('last_sync', models.DateTimeField(null=True)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('x', models.FloatField()),
+                ('y', models.FloatField()),
+                ('z', models.FloatField()),
+                ('character', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='history', to='api.Character')),
             ],
         ),
-        migrations.AddField(
-            model_name='character',
-            name='server',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.Server'),
-        ),
-        migrations.RemoveField(
-            model_name='server',
-            name='public_secret',
-        ),
         migrations.CreateModel(
-            name='CharacterHistory',
+            name='Clan',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.TextField()),
+                ('conan_id', models.TextField()),
+                ('conan_owner_id', models.TextField()),
+                ('motd', models.TextField()),
                 ('created', models.DateTimeField(auto_now_add=True)),
-                ('x', models.FloatField()),
-                ('y', models.FloatField()),
-                ('z', models.FloatField()),
-                ('character', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history', to='api.Character')),
+                ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='owner', to='api.Character')),
             ],
         ),
         migrations.CreateModel(
             name='GinfoCharacter',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('ginfo_marker_uid', models.TextField()),
-                ('character', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ginfo_character', related_query_name='ginfo_character', to='api.Character')),
+                ('character', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='ginfo_character', related_query_name='ginfo_character', to='api.Character')),
             ],
         ),
         migrations.CreateModel(
-            name='Clan',
+            name='Server',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.TextField()),
-                ('conan_id', models.TextField()),
-                ('conan_owner_id', models.TextField()),
-                ('motd', models.TextField()),
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.Server')),
+                ('ip_address', models.TextField(default='')),
+                ('version', models.TextField(null=True)),
+                ('query_port', models.TextField(null=True)),
+                ('max_players', models.IntegerField(null=True)),
+                ('tick_rate', models.IntegerField(null=True)),
+                ('private_secret', models.UUIDField()),
+                ('last_sync', models.DateTimeField(null=True)),
             ],
         ),
-        migrations.AddField(
-            model_name='character',
-            name='conan_clan_id',
-            field=models.TextField(null=True),
-        ),
-        migrations.AlterField(
-            model_name='character',
-            name='server',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='characters', to='api.Server'),
-        ),
-        migrations.AddField(
-            model_name='server',
-            name='ip_address',
-            field=models.TextField(default=b''),
-        ),
         migrations.CreateModel(
             name='ServerSyncData',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('data', models.TextField()),
                 ('created', models.DateTimeField(auto_now_add=True)),
-                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='api.Server')),
+                ('server', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='api.Server')),
             ],
         ),
         migrations.AddField(
-            model_name='character',
-            name='clan',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='members', to='api.Clan'),
-        ),
-        migrations.AddField(
-            model_name='clan',
-            name='owner',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='owner', to='api.Character'),
-        ),
-        migrations.AlterField(
             model_name='clan',
             name='server',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='clans', to='api.Server'),
-        ),
-        migrations.AddField(
-            model_name='server',
-            name='max_players',
-            field=models.IntegerField(null=True),
-        ),
-        migrations.AddField(
-            model_name='server',
-            name='query_port',
-            field=models.TextField(null=True),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='clans', to='api.Server'),
         ),
         migrations.AddField(
-            model_name='server',
-            name='tick_rate',
-            field=models.IntegerField(null=True),
-        ),
-        migrations.AddField(
-            model_name='server',
-            name='version',
-            field=models.TextField(null=True),
-        ),
-        migrations.AlterField(
-            model_name='character',
-            name='x',
-            field=models.FloatField(null=True),
-        ),
-        migrations.AlterField(
             model_name='character',
-            name='y',
-            field=models.FloatField(null=True),
+            name='clan',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='members', to='api.Clan'),
         ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name='character',
-            name='z',
-            field=models.FloatField(null=True),
+            name='server',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='characters', to='api.Server'),
         ),
     ]
diff --git a/api/models/__init__.py b/api/models/__init__.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 from .character import Character
 from .characterhistory import CharacterHistory
 from .server import Server

diff --git a/api/models/character.py b/api/models/character.py
@@ -12,8 +12,8 @@ class Character(models.Model):
     last_online    = models.DateTimeField(null=True)
     last_killed_by = models.TextField(null=True)
     created        = models.DateTimeField(auto_now_add=True)
-    clan           = models.ForeignKey('api.Clan', related_name='members', null=True)
-    server         = models.ForeignKey('api.Server', related_name='characters')
+    clan           = models.ForeignKey('api.Clan', related_name='members', null=True, on_delete=models.DO_NOTHING)
+    server         = models.ForeignKey('api.Server', related_name='characters', on_delete=models.DO_NOTHING)
     x              = models.FloatField(null=True)
     y              = models.FloatField(null=True)
     z              = models.FloatField(null=True)

diff --git a/api/models/characterhistory.py b/api/models/characterhistory.py
@@ -3,7 +3,7 @@
 
 class CharacterHistory(models.Model):
     created           = models.DateTimeField(auto_now_add=True)
-    character         = models.ForeignKey('api.Character', related_name='history')
+    character         = models.ForeignKey('api.Character', related_name='history', on_delete=models.DO_NOTHING)
     x                 = models.FloatField()
     y                 = models.FloatField()
     z                 = models.FloatField()
diff --git a/api/models/clan.py b/api/models/clan.py
@@ -9,6 +9,6 @@ class Clan(models.Model):
     motd           = models.TextField()
     created        = models.DateTimeField(auto_now_add=True)
     owner          = models.ForeignKey('api.Character', related_name='owner', null=True, on_delete=models.DO_NOTHING)
-    server         = models.ForeignKey('api.Server', related_name='clans')
+    server         = models.ForeignKey('api.Server', related_name='clans', on_delete=models.DO_NOTHING)
 
     objects = ClanManager.as_manager()
diff --git a/api/models/serversyncdata.py b/api/models/serversyncdata.py
@@ -2,6 +2,6 @@
 
 
 class ServerSyncData(models.Model):
-    server  = models.ForeignKey('api.Server', related_name='+')
+    server  = models.ForeignKey('api.Server', related_name='+', on_delete=models.DO_NOTHING)
     data    = models.TextField()
     created = models.DateTimeField(auto_now_add=True)
diff --git a/api/plugins/ginfo/firebase_pushid.py b/api/plugins/ginfo/firebase_pushid.py
@@ -4,7 +4,7 @@
 # https://gist.github.com/mikelehen/3596a30bd69384624c11
 import random
 import time
-from exceptions import ValueError
+#from exceptions import ValueError
 
 
 """

diff --git a/api/plugins/ginfo/ginfo.py b/api/plugins/ginfo/ginfo.py
@@ -2,8 +2,8 @@
 
 import requests
 
-from firebase_pushid import PushID
-from ginfocharacter import GinfoCharacter
+from .firebase_pushid import PushID
+from .ginfocharacter import GinfoCharacter
 
 
 class GinfoPlugin(object):
@@ -116,7 +116,7 @@ def update_position(self, character, group, access_token):
             json_data = response.json()
             if "error" in json_data:
                 # TODO: Use proper logger
-                print "Error from Ginfo Firebase: " + json_data["error"]
+                print("Error from Ginfo Firebase: " + json_data["error"])
         except:
             pass
 

diff --git a/api/plugins/ginfo/ginfocharacter.py b/api/plugins/ginfo/ginfocharacter.py
@@ -8,5 +8,6 @@ class GinfoCharacter(models.Model):
         Character,
         related_name="ginfo_character",
         related_query_name="ginfo_character",
+        on_delete=models.DO_NOTHING
     )
     ginfo_marker_uid = models.TextField()
diff --git a/api/sync/serverdata.py b/api/sync/serverdata.py
@@ -139,14 +139,14 @@ def sync_server_data(sync_data_id, request_get_params):
         .first())
 
     if sync_data is None:
-        print 'Dropping sync request because data is invalid'
+        print('Dropping sync request because data is invalid')
         return
 
     sync_data.delete()
     server = sync_data.server
 
     if server.last_sync and server.last_sync >= sync_data.created:
-        print "Dropping stale sync request"
+        print("Dropping stale sync request")
         return
 
     data = json.loads(sync_data.data)

diff --git a/api/tests.py b/api/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/api/urls.py b/api/urls.py
@@ -1,20 +1,20 @@
-from django.conf.urls import url
+from django.urls import path
 
 from .views import (CharacterHistoryView, CharactersView, CharacterView,
                     ClansView, ClanView, ServersView, ServerView,
                     SyncCharactersView, ClanCharactersView, ActiveClansView,
                     ServerInfoView)
 
 urlpatterns = [
-    url(r'^$', ServersView.as_view()),
-    url(r'^widgets/serverinfo$', ServerInfoView.as_view()),
-    url(r'^(?P<server_id>\d+)$', ServerView.as_view()),
-    url(r'^(?P<server_id>\d+)/sync/characters$', SyncCharactersView.as_view()),
-    url(r'^(?P<server_id>\d+)/clans$', ClansView.as_view()),
-    url(r'^(?P<server_id>\d+)/clans/(?P<clan_id>\d+)$', ClanView.as_view()),
-    url(r'^(?P<server_id>\d+)/clans/(?P<clan_id>\d+)/characters$', ClanCharactersView.as_view()),
-    url(r'^(?P<server_id>\d+)/characters$', CharactersView.as_view()),
-    url(r'^(?P<server_id>\d+)/characters/(?P<character_id>\d+)$', CharacterView.as_view()),
-    url(r'^(?P<server_id>\d+)/characters/(?P<character_id>\d+)/history$', CharacterHistoryView.as_view()),
-    url(r'^(?P<server_id>\d+)/widgets/activeclans$', ActiveClansView.as_view()),
+    path(r'', ServersView.as_view()),
+    path(r'widgets/serverinfo/', ServerInfoView.as_view()),
+    path(r'<int:server_id>/', ServerView.as_view()),
+    path(r'<int:server_id>/sync/characters/', SyncCharactersView.as_view()),
+    path(r'<int:server_id>/clans/', ClansView.as_view()),
+    path(r'<int:server_id>/clans/<int:clan_id>/', ClanView.as_view()),
+    path(r'<int:server_id>/clans/<int:clan_id>/characters/', ClanCharactersView.as_view()),
+    path(r'<int:server_id>/characters/', CharactersView.as_view()),
+    path(r'<int:server_id>/characters/<int:character_id>/', CharacterView.as_view()),
+    path(r'<int:server_id>/characters/<int:character_id>/history/', CharacterHistoryView.as_view()),
+    path(r'<int:server_id>/widgets/activeclans/', ActiveClansView.as_view()),
 ]
diff --git a/api/views/__init__.py b/api/views/__init__.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 from .character import CharacterView
 from .characterhistory import CharacterHistoryView
 from .characters import CharactersView

diff --git a/manage.py b/manage.py
@@ -1,25 +1,15 @@
 #!/usr/bin/env python
-# flake8: noqa
 import os
 import sys
 
-sys.dont_write_bytecode = True
-
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "serverthrallapi.settings")
     try:
         from django.core.management import execute_from_command_line
-    except ImportError:
-        # The above import may fail for some other reason. Ensure that the
-        # issue is really that Django is missing to avoid masking other
-        # exceptions on Python 2.
-        try:
-            import django
-        except ImportError:
-            raise ImportError(
-                "Couldn't import Django. Are you sure it's installed and "
-                "available on your PYTHONPATH environment variable? Did you "
-                "forget to activate a virtual environment?"
-            )
-        raise
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
     execute_from_command_line(sys.argv)
diff --git a/requirements.txt b/requirements.txt
diff --git a/runtime.txt b/runtime.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.contrib import admin

		# Register your models here.
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,3 @@
		from __future__ import unicode_literals

		from django.apps import AppConfig


Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.test import TestCase

		# Create your tests here.