Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
joelbyrnes committed Mar 29, 2016
1 parent 3a72c71 commit 5957a58
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 3 deletions.
13 changes: 13 additions & 0 deletions bulk_load/admin.py
Original file line number Diff line number Diff line change
@@ -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


54 changes: 54 additions & 0 deletions bulk_load/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -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')]),
),
]
49 changes: 48 additions & 1 deletion bulk_load/tests.py
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion drf_bulk_load/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==1.7
djangorestframework==3.3.3
djangorestframework==3.1.1
djangorestframework-bulk==0.2.1
tinyobj==0.1.0

0 comments on commit 5957a58

Please sign in to comment.