Added profile app and date constraints

bash.exe.stackdump

+Stack trace:
+Frame        Function    Args
+000FFFF5B20  0018005D31C (000FFFFE3F4, 00000000000, 00000000000, 000FFFFDE50)
+000FFFF5BC0  0018005E91B (00000000064, 00000000000, 00000000000, 00000000000)
+000FFFF5E10  00180121DA0 (001801FCA40, 00000000068, 00000000000, 006FFFFFFB7)
+000FFFF6070  00180122389 (000FFFF5FF0, 00000000001, 00000000001, 001802FE678)
+000FFFF6070  001800AAAAC (000FFFF6320, 000FFFF656C, 000FFFF62A8, 00000000000)
+000FFFF6270  0018011A58B (000FFFF6320, 000FFFF656C, 000FFFF62A8, 00000000000)
+000FFFF6270  00100428FB2 (000000015F0, 00000000000, 001005F1F98, 00000000000)
+00000000001  0010043257E (006001D3DF0, 006001D31B0, 001800BA34C, 00000000000)
+006001D3810  00100437B8A (006001D31B0, 006001D33D7, 00000000076, 000FFFF6578)
+006001D31B0  00100438BE4 (00000000001, 00600000000, 000FFFF66B8, 00000000000)
+006001D33F0  00100439A7C (00000000000, 00000000000, 00000000000, 00000000000)
+001005F6B74  0010043A3E6 (00000000083, 00000000009, 006001D2670, 006001D3360)
+001005F6B74  0010043A53F (001800F2D30, 03000000000, 000801FC8D0, 006001D2670)
+001005F6B74  001004337B1 (00100000000, 0010043A4E0, 006001BEC10, 006001BEC10)
+006001D2670  00100433C41 (00000000000, 000FFFFFF01, 00000000000, 001004DB7B8)
+006001D2850  0010043C2C7 (0000000001F, 0000000012C, 00000000000, 000FFFFFFFF)
+End of stack trace (more stack frames may be present)

environment.sh.example

-export SECRET_KEY=<CHANGE_TO_SECRET>
-export AUTHSCH_KEY=<CHANGE_TO_CLIENT_ID>
-export AUTHSCH_SECRET=<CHANGE_TO_AUTHSCH_SECRET>

src/stats/migrations/0002_auto_20171023_2320.py → src/account/migrations/0002_auto_20171114_2144.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-23 21:20
+# Generated by Django 1.11.5 on 2017-11-14 20:44
 from __future__ import unicode_literals
 
-from django.conf import settings
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('stats', '0001_initial'),
+        ('account', '0001_initial'),
     ]
 
     operations = [
-        migrations.AddField(
+        migrations.AlterField(
             model_name='profile',
             name='pref_group',
-            field=models.CharField(choices=[('DT', 'DevTeam'), ('NET', 'NeTeam'), ('ST', 'SecurITeam'), ('SYS', 'SysAdmin'), ('N', 'None')], default='None', max_length=10),
-        ),
-        migrations.AlterField(
-            model_name='kszkevent',
-            name='visitors',
-            field=models.ManyToManyField(related_name='visitor', to=settings.AUTH_USER_MODEL),
+            field=models.CharField(choices=[('DT', 'DevTeam'), ('NET', 'NeTeam'), ('ST', 'SecurITeam'), ('SYS', 'SysAdmin'), ('HAT', 'Hallgatói Tudásbázis'), ('N', 'None')], default='None', max_length=10),
         ),
     ]

src/account/models.py

 from django.db import models
 from django.contrib.auth.models import User
+from django.utils import timezone
+from django.core.exceptions import ValidationError
+import datetime
 
 
 class Profile(models.Model):
@@ -10,6 +13,7 @@ class Profile(models.Model):
         ('NET', 'NeTeam'),
         ('ST', 'SecurITeam'),
         ('SYS', 'SysAdmin'),
+        ('HAT', 'Hallgatói Tudásbázis'),
         ('N', 'None'),
     )
     pref_group = models.CharField(max_length=10, choices=TEAMS, default='None')
@@ -18,4 +22,6 @@ class Profile(models.Model):
     def __str__(self):
         return self.user.username
 
-# Create your models here.
+    def clean(self):
+        if self.join_date > datetime.date.today() or self.join_date < datetime.date(2015, 1,1):
+            raise ValidationError('Invalid date')

src/account/tests.py

-from django.test import TestCase
-
-# Create your tests here.

src/kszkepzes/settings.py

@@ -123,7 +123,7 @@ LOGIN_URL = "login/authsch/"
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Budapest'
 
 USE_I18N = True
 

src/stats/admin.py

 from django.contrib import admin
-from .models import Profile, KszkEvent
-
-
-@admin.register(Profile)
-class ProfileAdmin(admin.ModelAdmin):
-    list_display = ('user_username', 'year_of_join', 'pref_group')
-
-    def user_username(self, obj):
-        return obj.user.username
-
-    user_username.admin_order_field = 'user__username'
+from .models import KszkEvent
 
 
 @admin.register(KszkEvent)
 class KszkEventAdmin(admin.ModelAdmin):
-    list_display= ('date', 'num_of_pers')
+    list_display = ('date')

src/stats/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-03 21:48
+# Generated by Django 1.11.5 on 2017-11-11 14:14
 from __future__ import unicode_literals
 
-from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -12,7 +10,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('account', '0001_initial'),
     ]
 
     operations = [
@@ -22,15 +20,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('date', models.DateField()),
                 ('num_of_pers', models.IntegerField()),
-                ('visitors', models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Profile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('year_of_join', models.IntegerField()),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('visitors', models.ManyToManyField(related_name='visitor', to='account.Profile')),
             ],
         ),
     ]

src/stats/migrations/0002_auto_20171111_1646.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-11-11 15:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stats', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='kszkevent',
+            name='num_of_pers',
+            field=models.IntegerField(editable=False),
+        ),
+    ]

src/stats/migrations/0003_auto_20171114_2026.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-11-14 19:26
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stats', '0002_auto_20171111_1646'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='kszkevent',
+            name='date',
+            field=models.DateTimeField(),
+        ),
+    ]

src/stats/migrations/0004_remove_kszkevent_num_of_pers.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-11-14 19:38
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stats', '0003_auto_20171114_2026'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='kszkevent',
+            name='num_of_pers',
+        ),
+    ]

src/stats/migrations/0006_auto_20170926_2122.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-26 19:22
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stats', '0005_auto_20170925_2329'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Kszk_training',
+            new_name='Event',
+        ),
+    ]

src/stats/models.py

 from django.db import models
-from django.contrib.auth.models import User
+from account.models import Profile
+from django.utils import timezone
+from django.core.exceptions import ValidationError
 # Create your models here.
 
 
-class Profile(models.Model):
-    year_of_join = models.IntegerField()
-    user = models.OneToOneField(User, on_delete=models.CASCADE)
-    TEAMS = (
-     ('DT', 'DevTeam'),
-     ('NET', 'NeTeam'),
-     ('ST', 'SecurITeam'),
-     ('SYS', 'SysAdmin'),
-     ('N', 'None'),
-    )
-    pref_group = models.CharField(max_length=10, choices=TEAMS, default='None')
-    # Homeworks=models.ForeignKey(Homework)
-
-    def __str__(self):
-        return self.user.username
-
-
 class KszkEvent(models.Model):
-    date = models.DateField()
-    visitors = models.ManyToManyField(User, related_name='visitor')
+    date = models.DateTimeField(null=False)
+    visitors = models.ManyToManyField(Profile, related_name='visitor')
 
-    num_of_pers = models.IntegerField()
+    def clean(self):
+        if self.date > timezone.now():
+            raise ValidationError('Invalid date')

src/stats/serializers.py

@@ -5,10 +5,4 @@ from . import models
 class KszkEventSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.KszkEvent
-        fields = ('date', 'num_of_pers', 'visitors')
-
-
-class ProfileSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = models.Profile
-        fields = '__all__'
+        fields = ('date',  'visitors')

src/stats/urls.py

@@ -4,8 +4,6 @@ from . import views
 
 router = routers.DefaultRouter(trailing_slash=False)
 router.register(r'events', views.KszkEventViewSet)
-router.register(r'profiles', views.ProfileViewSet)
-
 
 # app_name = 'stats'
 urlpatterns = router.urls

src/stats/views.py

@@ -6,9 +6,4 @@ from . import serializers
 
 class KszkEventViewSet(viewsets.ModelViewSet):
     serializer_class = serializers.KszkEventSerializer
-    queryset = models.KszkEvent.objects.filter()
-
-
-class ProfileViewSet(viewsets.ModelViewSet):
-    serializer_class = serializers.ProfileSerializer
-    queryset = models.Profile.objects.all()
+    queryset = models.KszkEvent.objects.all()