diff --git a/bulk_load/admin.py b/bulk_load/admin.py index 8c38f3f..cb14423 100644 --- a/bulk_load/admin.py +++ b/bulk_load/admin.py @@ -1,3 +1,16 @@ from django.contrib import admin # Register your models here. + +from bulk_load.models import Answer, Parameter + +@admin.register(Answer) +class AnswerAdmin(admin.ModelAdmin): + pass + # list_display = ('','') + +@admin.register(Parameter) +class ParameterAdmin(admin.ModelAdmin): + pass + + diff --git a/bulk_load/migrations/0001_initial.py b/bulk_load/migrations/0001_initial.py new file mode 100644 index 0000000..9e7322c --- /dev/null +++ b/bulk_load/migrations/0001_initial.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Answer', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('answer_number', models.FloatField(null=True, blank=True)), + ('answer_date', models.DateField(null=True, blank=True)), + ('answer_boolean', models.BooleanField(default=False)), + ('answer_currency', models.DecimalField(null=True, max_digits=24, decimal_places=8, blank=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Parameter', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('name', models.CharField(max_length=100)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.AddField( + model_name='answer', + name='parameter', + field=models.ForeignKey(to='bulk_load.Parameter'), + preserve_default=True, + ), + migrations.AddField( + model_name='answer', + name='user', + field=models.ForeignKey(to=settings.AUTH_USER_MODEL), + preserve_default=True, + ), + migrations.AlterUniqueTogether( + name='answer', + unique_together=set([('user', 'parameter')]), + ), + ] diff --git a/bulk_load/tests.py b/bulk_load/tests.py index 7ce503c..799be0e 100644 --- a/bulk_load/tests.py +++ b/bulk_load/tests.py @@ -1,3 +1,50 @@ -from django.test import TestCase +from django.test import TestCase, Client +import django +import json + +from bulk_load.models import Answer, Parameter + +django.setup() # Create your tests here. + +class TestStuff(TestCase): + def test_bulk_create(self): + client = Client() + + data = [ + {'parameter': Parameter.objects.create(name='a').id, 'user': 1}, + {'parameter': Parameter.objects.create(name='b').id, 'user': 1}, + ] + + response = client.post("/answers/", data=json.dumps(data), content_type='application/json') + # print response.content + results = json.loads(response.content) + + print results + + def test_bulk_update(self): + client = Client() + + data = [ + {'parameter': Parameter.objects.create(name='a').id, 'user': 1}, + {'parameter': Parameter.objects.create(name='b').id, 'user': 1}, + ] + + response = client.post("/answers/", data=json.dumps(data), content_type='application/json') + # print response.content + results = json.loads(response.content) + + print results + + data = [ + {'id': results[0]['id'], 'parameter': Parameter.objects.create(name='a').id, 'user': 1}, + {'id': results[1]['id'], 'parameter': Parameter.objects.create(name='b').id, 'user': 1}, + ] + + response = client.patch("/answers/", data=json.dumps(data), content_type='application/json') + + + def xtest_nothing(self): + pass + diff --git a/drf_bulk_load/settings.py b/drf_bulk_load/settings.py index a716fdd..26537ae 100644 --- a/drf_bulk_load/settings.py +++ b/drf_bulk_load/settings.py @@ -87,7 +87,7 @@ STATIC_URL = '/static/' REST_FRAMEWORK = { - 'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAdminUser',), + # 'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAdminUser',), 'PAGE_SIZE': 10 } diff --git a/requirements.txt b/requirements.txt index 3c38755..28a7d2d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ Django==1.7 -djangorestframework==3.3.3 +djangorestframework==3.1.1 djangorestframework-bulk==0.2.1 tinyobj==0.1.0