From b8b4a5849aed4b5f52f2f1c88cd210f21b1f921e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Thu, 6 Aug 2020 20:42:17 +0200
Subject: [PATCH] make uuid fields string

---
 docker-compose.yml | 4 ----
 requirements.txt   | 1 -
 src/models.py      | 7 +++----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e691614..b9b70ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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
diff --git a/requirements.txt b/requirements.txt
index 02a73d9..a993f24 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,4 +9,3 @@ marshmallow-sqlalchemy
 flask-marshmallow
 paho-mqtt
 flask-mqtt
-psycopg2-binary
diff --git a/src/models.py b/src/models.py
index 28cf865..9d79252 100644
--- a/src/models.py
+++ b/src/models.py
@@ -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'))