adds Data model

Author: scott2b

.gitignore

@@ -1,6 +1,9 @@
 # Generated data file
 *data.json
 
+# environments
+*.env
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

Pipfile

@@ -0,0 +1,14 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+django = "==1.11.9"
+djangorestframework = "==3.7.7"
+"psycopg2" = "==2.7.3.2"
+
+[dev-packages]
+
+[requires]
+python_version = "3.6"

Pipfile.lock

@@ -104,6 +104,20 @@
 
 STATIC_URL = '/static/'
 
+# Database
+# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': env['DB_ENGINE__DEFAULT'],
+        'NAME': env['DB_NAME__DEFAULT'],
+        'USER': env['DB_USER__DEFAULT'],
+        'PASSWORD': env['DB_PASSWORD__DEFAULT'],
+        'HOST': env['DB_HOST__DEFAULT'],
+        'PORT': env['DB_PORT__DEFAULT']
+    }
+}
+
 # to be removed later -- sets up default permissions
 REST_FRAMEWORK = {
     # Use Django's standard `django.contrib.auth` permissions,

sensorgridapi/core/settings/common.py

@@ -5,12 +5,5 @@
 
 SECRET_KEY = 'development'
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-    }
-}
-
 STATIC_URL='/static/'
 STATIC_ROOT=os.path.join(BASE_DIR, 'static/')

sensorgridapi/core/settings/dev.py

@@ -6,19 +6,6 @@
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = env['DJANGO_SECRET_KEY']
 
-# Database
-# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
-
-DATABASES = {
-    'default': {
-        'ENGINE': env['DB_ENGINE__DEFAULT'],
-        'NAME': env['DB_NAME__DEFAULT'],
-        'USER': env['DB_USER__DEFAULT'],
-        'PASSWORD': env['DB_PASSWORD__DEFAULT'],
-        'HOST': env['DB_HOST__DEFAULT'],
-        'PORT': env['DB_PORT__DEFAULT']
-    }
-}
 
 STATIC_URL = env['STATIC_URL']
 STATIC_ROOT = env['STATIC_TMPDIR']

sensorgridapi/core/settings/ec2.py

@@ -17,7 +17,7 @@
 from django.contrib.auth.models import User
 from rest_framework import routers, serializers, viewsets
 from django.contrib import admin
-from sensordata.models import SensorData
+from sensordata.models import SensorData, Data
 from sensordata import views
 from sensordata.views import SensorDataList
 
@@ -39,6 +39,20 @@ class Meta:
         # exclude means include all fields
         exclude = []
 
+class DataSerializer(serializers.HyperlinkedModelSerializer):
+    #json = serializers.JSONField()
+
+    class Meta:
+        model = Data
+        # exclude means include all fields
+        exclude = []
+        #fields = ('json',)
+
+#class DataSerializer(serializers.BaseSerializer):
+#    class Meta:
+#        model = Data
+#        fields = ('json',)
+
 # shove the view into urls.py but it's the controller (handles request, returns response)
 # viewset = view.
 # response needs to be serialized. It's a json payload (serializer takes a model, converts to json)
@@ -49,12 +63,20 @@ class SensorDataViewSet(viewsets.ModelViewSet):
     queryset = SensorData.objects.all()
     serializer_class = SensorDataSerializer
 
+
+class DataViewSet(viewsets.ModelViewSet):
+    model = Data
+    queryset = Data.objects.all()
+    serializer_class = DataSerializer
+    #filter_fields = ['json']
+
 # Routers provide an easy way of automatically determining the URL configuration.
 router = routers.DefaultRouter()
 router.register(r'users', UserViewSet)
 # for REST api, handles incoming requests. When it gets a sensordata request,
 # routers say which view to route it to
-router.register(r'data', SensorDataViewSet)
+#router.register(r'data', SensorDataViewSet)
+router.register(r'data', DataViewSet)
 
 # Wire up our API using automatic URL routing.
 # Additionally, we include login URLs for the browsable API.

sensorgridapi/core/urls.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.9 on 2018-05-09 21:54
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sensordata', '0011_auto_20180308_1659'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Data',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ver', models.IntegerField()),
+                ('json', django.contrib.postgres.fields.jsonb.JSONField(default=dict)),
+            ],
+        ),
+    ]

sensorgridapi/sensordata/migrations/0012_data.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.9 on 2018-05-09 21:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sensordata', '0012_data'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='data',
+            old_name='json',
+            new_name='data',
+        ),
+    ]

sensorgridapi/sensordata/migrations/0013_auto_20180509_2157.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.9 on 2018-05-09 22:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sensordata', '0013_auto_20180509_2157'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='data',
+            name='net',
+            field=models.IntegerField(default=1),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='data',
+            name='node',
+            field=models.IntegerField(default=1),
+            preserve_default=False,
+        ),
+    ]