From 416282386338e61fb0c5b80375f686c44c43f487 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Fri, 8 Oct 2021 14:42:49 +0200 Subject: [PATCH 1/8] set Version to 1.0.5-dev --- caromserver/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caromserver/settings.py b/caromserver/settings.py index df8540d..9c33d07 100644 --- a/caromserver/settings.py +++ b/caromserver/settings.py @@ -163,7 +163,7 @@ EMAIL_PORT = 25 URL_LOCATION_PROCESSOR = 'http://127.0.0.1:8000/billard/process_locationdata' PRODUCT_INFO = 'CAROM' -PRODUCT_VERSION = 'v 1.0.4' +PRODUCT_VERSION = 'v 1.0.5-dev' INTERNAL_IPS = ['127.0.0.1'] From cdee337831f64400b43af5903826fe4f83bb7f5c Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sun, 24 Oct 2021 10:26:50 +0200 Subject: [PATCH 2/8] Update packages --- Pipfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Pipfile b/Pipfile index 540556f..25bc0fa 100644 --- a/Pipfile +++ b/Pipfile @@ -6,10 +6,10 @@ verify_ssl = true [dev-packages] [packages] -django = "==3.2.7" +django = "==3.2.8" django-crispy-forms = "==1.13.0" django-debug-toolbar = "==3.2.2" django-extensions = "==3.1.3" -django-tables2 = "==2.4.0" +django-tables2 = "==2.4.1" djangorestframework = "==3.12.4" requests = "==2.26.0" From eaccacf4533cfbac3ebe7f9b844911e988184087 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sun, 24 Oct 2021 10:33:26 +0200 Subject: [PATCH 3/8] update django files --- billard/apps.py | 1 + caromserver/asgi.py | 16 ++++++++++++++++ caromserver/wsgi.py | 4 ++-- manage.py | 32 ++++++++++++++++---------------- 4 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 caromserver/asgi.py diff --git a/billard/apps.py b/billard/apps.py index 7477b1b..e609e9a 100644 --- a/billard/apps.py +++ b/billard/apps.py @@ -2,4 +2,5 @@ from django.apps import AppConfig class BillardConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' name = 'billard' diff --git a/caromserver/asgi.py b/caromserver/asgi.py new file mode 100644 index 0000000..49c65eb --- /dev/null +++ b/caromserver/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for caromserver project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'caromserver.settings') + +application = get_asgi_application() diff --git a/caromserver/wsgi.py b/caromserver/wsgi.py index d94b8c9..42ffc35 100644 --- a/caromserver/wsgi.py +++ b/caromserver/wsgi.py @@ -4,13 +4,13 @@ WSGI config for caromserver project. It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/ """ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "caromserver.settings") +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'caromserver.settings') application = get_wsgi_application() diff --git a/manage.py b/manage.py index 94e3094..b182391 100644 --- a/manage.py +++ b/manage.py @@ -1,22 +1,22 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" import os import sys -if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "caromserver.settings") + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'caromserver2.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) + + +if __name__ == '__main__': + main() From 93903e23fb670756d6f34ccf04327cfe5cdc5f30 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sun, 24 Oct 2021 10:58:55 +0200 Subject: [PATCH 4/8] adjust signal --- billard/__init__.py | 1 + billard/apps.py | 3 +++ billard/signals.py | 10 ++++++++++ 3 files changed, 14 insertions(+) create mode 100644 billard/signals.py diff --git a/billard/__init__.py b/billard/__init__.py index e69de29..3591408 100644 --- a/billard/__init__.py +++ b/billard/__init__.py @@ -0,0 +1 @@ +default_app_config = 'billard.apps.BillardConfig' \ No newline at end of file diff --git a/billard/apps.py b/billard/apps.py index e609e9a..b00fc93 100644 --- a/billard/apps.py +++ b/billard/apps.py @@ -4,3 +4,6 @@ from django.apps import AppConfig class BillardConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'billard' + + def ready(self): + import billard.signals #noqa diff --git a/billard/signals.py b/billard/signals.py new file mode 100644 index 0000000..53da303 --- /dev/null +++ b/billard/signals.py @@ -0,0 +1,10 @@ +from django.db.models.signals import post_save +from django.dispatch import receiver + +from billard.models import LocationData +from billard.tasks import process_location_data + + +@receiver(post_save, sender=LocationData) +def update_location_data(sender, instance, **kwargs): + process_location_data(sender=sender, kwargs=kwargs) From 3eb963736df34a31b6fbb09b8a37597c8de816d3 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sun, 24 Oct 2021 11:03:33 +0200 Subject: [PATCH 5/8] add task handler --- Pipfile | 1 + billard/signals.py | 3 ++- caromserver/asgi.py | 2 ++ caromserver/settings.py | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 25bc0fa..6ad387a 100644 --- a/Pipfile +++ b/Pipfile @@ -13,3 +13,4 @@ django-extensions = "==3.1.3" django-tables2 = "==2.4.1" djangorestframework = "==3.12.4" requests = "==2.26.0" +django-simple-task = "==0.1.2" diff --git a/billard/signals.py b/billard/signals.py index 53da303..826b12a 100644 --- a/billard/signals.py +++ b/billard/signals.py @@ -1,5 +1,6 @@ from django.db.models.signals import post_save from django.dispatch import receiver +from django_simple_task import defer from billard.models import LocationData from billard.tasks import process_location_data @@ -7,4 +8,4 @@ from billard.tasks import process_location_data @receiver(post_save, sender=LocationData) def update_location_data(sender, instance, **kwargs): - process_location_data(sender=sender, kwargs=kwargs) + defer(process_location_data(sender=sender, kwargs=kwargs)) diff --git a/caromserver/asgi.py b/caromserver/asgi.py index 49c65eb..0d239e0 100644 --- a/caromserver/asgi.py +++ b/caromserver/asgi.py @@ -10,7 +10,9 @@ https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/ import os from django.core.asgi import get_asgi_application +from django_simple_task import django_simple_task_middlware os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'caromserver.settings') application = get_asgi_application() +application = django_simple_task_middlware(application) diff --git a/caromserver/settings.py b/caromserver/settings.py index 9c33d07..72f0fd0 100644 --- a/caromserver/settings.py +++ b/caromserver/settings.py @@ -38,6 +38,7 @@ INSTALLED_APPS = [ # third party apps 'crispy_forms', 'debug_toolbar', + 'django_simple_task', 'django_tables2', 'rest_framework', 'rest_framework.authtoken', From 22f3da6add02f48d3649bb1cdc5bbec6de64460b Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sun, 24 Oct 2021 11:05:54 +0200 Subject: [PATCH 6/8] fix manage.py --- manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage.py b/manage.py index b182391..ebe4ea4 100644 --- a/manage.py +++ b/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'caromserver2.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'caromserver.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: From 4e4b8a43e96e7818b2af0409e8ecac43ffdcfb35 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sun, 24 Oct 2021 11:07:00 +0200 Subject: [PATCH 7/8] fix id fields --- billard/migrations/0028_auto_20211024_1106.py | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 billard/migrations/0028_auto_20211024_1106.py diff --git a/billard/migrations/0028_auto_20211024_1106.py b/billard/migrations/0028_auto_20211024_1106.py new file mode 100644 index 0000000..c9514b1 --- /dev/null +++ b/billard/migrations/0028_auto_20211024_1106.py @@ -0,0 +1,43 @@ +# Generated by Django 3.2.8 on 2021-10-24 11:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('billard', '0027_clientdata'), + ] + + operations = [ + migrations.AlterField( + model_name='accounting', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='client', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='clientdata', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='desk', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='location', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='locationdata', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] From da4794b9db284a12b49f5e4ca7b4223989d51f83 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Mon, 25 Oct 2021 16:22:04 +0200 Subject: [PATCH 8/8] set version to 1.0.5 --- caromserver/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caromserver/settings.py b/caromserver/settings.py index 72f0fd0..029e0cf 100644 --- a/caromserver/settings.py +++ b/caromserver/settings.py @@ -164,7 +164,7 @@ EMAIL_PORT = 25 URL_LOCATION_PROCESSOR = 'http://127.0.0.1:8000/billard/process_locationdata' PRODUCT_INFO = 'CAROM' -PRODUCT_VERSION = 'v 1.0.5-dev' +PRODUCT_VERSION = 'v 1.0.5' INTERNAL_IPS = ['127.0.0.1']