A kezdetleges modellek REST-esitve lettek

src/kszkepzes/settings.py

@@ -39,10 +39,15 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django_extensions',
     'rest_framework',
+<<<<<<< HEAD
     'stats'
     'social_django',
     'authsch',
 ]
+=======
+    'stats',
+    ]
+>>>>>>> A kezdetleges modellek REST-esitve lettek
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
@@ -135,3 +140,5 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.11/howto/static-files/
 
 STATIC_URL = '/static/'
+
+APPEND_SLASH = False

src/kszkepzes/urls.py

@@ -19,4 +19,6 @@ from django.contrib import admin
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url('', include('social_django.urls', namespace='social')),
+    url(r'^api/v1/', include('stats.urls')),
+
 ]

src/stats/admin.py

 from django.contrib import admin
-from .models import Profile, Event
+from .models import Profile, KszkEvent
 
 admin.site.register(Profile)
-admin.site.register(Event)
+admin.site.register(KszkEvent)
 # Register your models here.

src/stats/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-24 23:01
+# Generated by Django 1.11.5 on 2017-10-03 21:48
 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):
@@ -10,16 +12,25 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='User',
+            name='KszkEvent',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('user_name', models.CharField(max_length=50)),
-                ('year_of_kepzes', models.IntegerField()),
-                ('megjegyzes', models.TextField()),
+                ('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)),
             ],
         ),
     ]

src/stats/migrations/0002_auto_20170925_1936.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-25 17:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('stats', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Kepzes_alkalom',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('idopont', models.DateField()),
-                ('letszam', models.IntegerField()),
-            ],
-        ),
-        migrations.RenameField(
-            model_name='user',
-            old_name='user_name',
-            new_name='felhaszbalo_nev',
-        ),
-        migrations.RenameField(
-            model_name='user',
-            old_name='year_of_kepzes',
-            new_name='kepzes_eve',
-        ),
-        migrations.RemoveField(
-            model_name='user',
-            name='megjegyzes',
-        ),
-        migrations.AddField(
-            model_name='kepzes_alkalom',
-            name='resztvevok',
-            field=models.ManyToManyField(to='stats.User'),
-        ),
-    ]

src/stats/migrations/0003_auto_20170925_1938.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-25 17:38
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('stats', '0002_auto_20170925_1936'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='user',
-            old_name='felhaszbalo_nev',
-            new_name='felhasznalo_nev',
-        ),
-    ]

src/stats/migrations/0004_auto_20170925_2315.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-25 21:15
-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):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('stats', '0003_auto_20170925_1938'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Kszk_training',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('date', models.DateField()),
-                ('num_of_pers', models.IntegerField()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Profile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('year_of_join', models.IntegerField()),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='kepzes_alkalom',
-            name='resztvevok',
-        ),
-        migrations.DeleteModel(
-            name='Kepzes_alkalom',
-        ),
-        migrations.DeleteModel(
-            name='User',
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='kszk_training',
-            name='visitors',
-            field=models.ManyToManyField(to=settings.AUTH_USER_MODEL),
-        ),
-    ]

src/stats/migrations/0005_auto_20170925_2329.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-25 21:29
-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):
-
-    dependencies = [
-        ('stats', '0004_auto_20170925_2315'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

src/stats/models.py

@@ -4,14 +4,15 @@ from django.contrib.auth.models import User
 
 
 class Profile(models.Model):
-    year_of_join = models.IntegerField()  # mikor csatlakozott a kszkepzeshez
-    user = models.OneToOneField(User)  # django beépített user osztálya
+    year_of_join = models.IntegerField()
+    user = models.OneToOneField(User)
+    # Homeworks=models.ForeignKey(Homework);
 
     def __str__(self):
         return self.user.username
 
 
-class Event(models.Model):
+class KszkEvent(models.Model):
     date = models.DateField()
     num_of_pers = models.IntegerField()
     visitors = models.ManyToManyField(User)

src/stats/serializers.py

+from rest_framework import serializers
+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__'

src/stats/urls.py

+from rest_framework import routers
+
+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

-from django.shortcuts import render
+from rest_framework import viewsets
 
-# Create your views here.
+from . import models
+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()