1
0
mirror of https://github.com/daniviga/bite.git synced 2024-11-25 06:16:13 +01:00

Compare commits

...

2 Commits

Author SHA1 Message Date
0fce565c85
Fix tests 2020-08-23 15:55:42 +02:00
5c6736a817
Move to Django 3.1 2020-08-23 15:44:17 +02:00
3 changed files with 27 additions and 9 deletions

View File

@ -0,0 +1,19 @@
# Generated by Django 3.1 on 2020-08-23 13:40
from django.db import migrations, models
import telemetry.models
class Migration(migrations.Migration):
dependencies = [
('telemetry', '0008_auto_20200619_1627'),
]
operations = [
migrations.AlterField(
model_name='telemetry',
name='payload',
field=models.JSONField(validators=[telemetry.models.telemetry_validation]),
),
]

View File

@ -20,7 +20,6 @@
from django.db import models from django.db import models
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.contrib.postgres.fields import JSONField
from api.models import Device from api.models import Device
@ -39,7 +38,7 @@ class Telemetry(models.Model):
clock = models.IntegerField( clock = models.IntegerField(
validators=[MinValueValidator(0)], validators=[MinValueValidator(0)],
null=True) null=True)
payload = JSONField(validators=[telemetry_validation]) payload = models.JSONField(validators=[telemetry_validation])
class Meta: class Meta:
ordering = ['-time', 'device'] ordering = ['-time', 'device']

View File

@ -26,12 +26,12 @@ class ApiTestCase(TestCase):
c = Client() c = Client()
payload = { payload = {
'id': 'sensor.server.domain', "id": "sensor.server.domain",
'light': 434, "light": 434,
'temperature': { "temperature": {
'celsius': 27.02149, "celsius": 27.02149,
'raw': 239, "raw": 239,
'volts': 0.770215 "volts": 0.770215
} }
} }
@ -69,4 +69,4 @@ class ApiTestCase(TestCase):
self.assertEqual( self.assertEqual(
response.json()['transport'], 'http') response.json()['transport'], 'http')
self.assertJSONEqual( self.assertJSONEqual(
json.dumps(response.json()['payload']), self.payload) response.json()['payload'], self.payload)