make uuid fields string
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Torma Kristóf 2020-08-06 20:42:17 +02:00
parent c573e9f876
commit b8b4a5849a
Signed by: tormakris
GPG Key ID: DC83C4F2C41B1047
3 changed files with 3 additions and 9 deletions

View File

@ -14,16 +14,12 @@ services:
- POSTGRES_DB=cnc-service
networks:
- cnc
volumes:
- ./postres-volume:/var/lib/postgresql/data
activemq:
image: registry.kmlabz.com/birbnetes/activemq-artemis
restart: always
networks:
- cnc
volumes:
- ./artemis-volume:/var/lib/artemis-instance
cnc-service:
image: registry.kmlabz.com/birbnetes/activemq-artemis

View File

@ -9,4 +9,3 @@ marshmallow-sqlalchemy
flask-marshmallow
paho-mqtt
flask-mqtt
psycopg2-binary

View File

@ -1,6 +1,5 @@
#!/usr/bin/env python3
import enum
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.sql import func
from db import db
@ -29,7 +28,7 @@ class SensorStatusEnum(enum.Enum):
class Device(db.Model):
__tablename__ = 'device'
id = db.Column(db.Integer, primary_key=True)
sensorid = db.Column(UUID(as_uuid=True), nullable=True)
sensorid = db.Column(db.String, nullable=True)
status = db.Column(db.Enum(DeviceStatusEnum), nullable=False)
url = db.Column(db.String, nullable=False)
lastupdate = db.Column(db.TIMESTAMP, nullable=False, server_default=func.now(), onupdate=func.current_timestamp())
@ -38,6 +37,6 @@ class Device(db.Model):
class Sensor(db.Model):
__tablename__ = 'sensor'
id = db.Column(UUID(as_uuid=True), primary_key=True)
id = db.Column(db.String, primary_key=True)
status = db.Column(db.Enum(SensorStatusEnum), nullable=False)
device_id = db.Column(UUID(as_uuid=True), db.ForeignKey('device.id'))
device_id = db.Column(db.String, db.ForeignKey('device.id'))