From e9f3d47100fd5f61342af0a6f8e1abbe3bea9093 Mon Sep 17 00:00:00 2001 From: Luiz Gustavo Monteiro Date: Sun, 26 Oct 2025 14:36:11 -0300 Subject: Added database model --- mqtt_client/crud.py | 0 mqtt_client/database.py | 0 mqtt_client/models.py | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ mqtt_client/schemas.py | 0 4 files changed, 81 insertions(+) create mode 100644 mqtt_client/crud.py create mode 100644 mqtt_client/database.py create mode 100644 mqtt_client/models.py create mode 100644 mqtt_client/schemas.py (limited to 'mqtt_client') diff --git a/mqtt_client/crud.py b/mqtt_client/crud.py new file mode 100644 index 0000000..e69de29 diff --git a/mqtt_client/database.py b/mqtt_client/database.py new file mode 100644 index 0000000..e69de29 diff --git a/mqtt_client/models.py b/mqtt_client/models.py new file mode 100644 index 0000000..d6bd2ba --- /dev/null +++ b/mqtt_client/models.py @@ -0,0 +1,81 @@ +from sqlalchemy import Column, Integer, String, Float, DateTime, ForeignKey, Boolean +from sqlalchemy.orm import relationship +from sqlalchemy.sql import func +from database import Base + +# ---------------------------- +# Location +# ---------------------------- +class Location(Base): + __tablename__ = "locations" + + id = Column(Integer, primary_key=True, index=True) + street = Column(String(200), nullable=True, index=True) + avenue = Column(String(200), nullable=True, index=True) + zip_code = Column(String(20), nullable=True, index=True) + + # Relationship: One location to many stations + stations = relationship("Station", back_populates="location") + + +# ---------------------------- +# Station +# ---------------------------- +class Station(Base): + __tablename__ = "stations" + + id = Column(Integer, primary_key=True, index=True) + name = Column(String(100), nullable=False, index=True) + location_id = Column(Integer, ForeignKey("locations.id"), nullable=True, index=True) + installation_date = Column(DateTime, server_default=func.now()) + is_active = Column(Boolean, default=True) + + # Relationships + location = relationship("Location", back_populates="stations") + sensor_devices = relationship("SensorDevice", back_populates="station") + + +# ---------------------------- +# SensorDevice +# ---------------------------- +class SensorDevice(Base): + __tablename__ = "sensor_devices" + + id = Column(Integer, primary_key=True, index=True) + name = Column(String(100), nullable=True, index=True) + installation_date = Column(DateTime, server_default=func.now()) + station_id = Column(Integer, ForeignKey("stations.id"), nullable=True, index=True) + is_active = Column(Boolean, default=True) + + # Relationships + station = relationship("Station", back_populates="sensor_devices") + readings = relationship("Reading", back_populates="sensor_device") + + +# ---------------------------- +# Measure +# ---------------------------- +class Measure(Base): + __tablename__ = "measures" + + id = Column(Integer, primary_key=True, index=True) + name = Column(String(50), nullable=True, index=True) + + # Relationships + readings = relationship("Reading", back_populates="measure") + + +# ---------------------------- +# Reading +# ---------------------------- +class Reading(Base): + __tablename__ = "readings" + + id = Column(Integer, primary_key=True, index=True) + sensor_device_id = Column(Integer, ForeignKey("sensor_devices.id"), nullable=True, index=True) + measure_id = Column(Integer, ForeignKey("measures.id"), nullable=True, index=True) + value = Column(Float, nullable=True) + + # Relationships + sensor_device = relationship("SensorDevice", back_populates="readings") + measure = relationship("Measure", back_populates="readings") diff --git a/mqtt_client/schemas.py b/mqtt_client/schemas.py new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3 From 52a4fe2625b63683fcdcd74f704e49aa65cb0dd8 Mon Sep 17 00:00:00 2001 From: Luiz Gustavo Monteiro Date: Sun, 26 Oct 2025 16:09:12 -0300 Subject: database connection tested successfully - tables readed on pgadmin --- compose.yaml | 11 ++++++++--- database/init_scripts/create_table.sql | 21 --------------------- mqtt_client/database.py | 10 ++++++++++ mqtt_client/main.py | 13 ++++++++++--- mqtt_client/requirements.txt | 4 +++- 5 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 database/init_scripts/create_table.sql (limited to 'mqtt_client') diff --git a/compose.yaml b/compose.yaml index c5102e4..549379a 100644 --- a/compose.yaml +++ b/compose.yaml @@ -23,6 +23,7 @@ services: environment: MQTT_CLIENT_USER: ${MQTT_CLIENT_USER} MQTT_CLIENT_PASSWORD: ${MQTT_CLIENT_PASSWORD} + DATABASE_URL: postgresql://root:public@postgres:5432/control_station build: context: ./mqtt_client/ networks: @@ -33,14 +34,18 @@ services: image: postgres:13 container_name: postgres networks: - - database + - mosquitto + ports: + - "5432:5432" environment: POSTGRES_PASSWORD: public POSTGRES_USER: root POSTGRES_DB: control_station volumes: - - ${PWD}/database/init_scripts:/docker-entrypoint-initdb.d + #- ${PWD}/database/init_scripts:/docker-entrypoint-initdb.d - db_data:/var/lib/postgresql/data + + pgadmin: image: dpage/pgadmin4 container_name: pgadmin @@ -50,7 +55,7 @@ services: ports: - "5050:80" networks: - - database + - mosquitto depends_on: - postgres networks: diff --git a/database/init_scripts/create_table.sql b/database/init_scripts/create_table.sql deleted file mode 100644 index ae5b3d1..0000000 --- a/database/init_scripts/create_table.sql +++ /dev/null @@ -1,21 +0,0 @@ -create table if not exists station ( - id integer, - name varchar(100), - locationid int null, - installation_date date -); - -create table if not exists climameasures ( - stationname varchar(255), - measurevalue int null, - unit float null, - currenttime timestamp default current_timestamp -); - - -create table if not exists climameasures ( - stationname varchar(255), - measurevalue int null, - unit float null, - currenttime timestamp default current_timestamp -); \ No newline at end of file diff --git a/mqtt_client/database.py b/mqtt_client/database.py index e69de29..c0691a1 100644 --- a/mqtt_client/database.py +++ b/mqtt_client/database.py @@ -0,0 +1,10 @@ +from sqlalchemy import create_engine +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import sessionmaker +import os + +DATABASE_URL = os.getenv("DATABASE_URL", "postgresql://root:public@postgres:5432/control_station") + +engine = create_engine(DATABASE_URL) +SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) +Base = declarative_base() diff --git a/mqtt_client/main.py b/mqtt_client/main.py index dad09b5..109ca49 100644 --- a/mqtt_client/main.py +++ b/mqtt_client/main.py @@ -2,8 +2,15 @@ import paho.mqtt.client as mqtt from paho.mqtt.enums import MQTTProtocolVersion import json from time import sleep +from database import engine +from models import Base import os +print("Creating ORM SQL Tables..") +Base.metadata.create_all(bind=engine) +print("Tables created successfully.") + + def on_connect(client, userdata, flags, reason_code, properties): print(f"Conectado: {reason_code}") # Me inscrevo em todos os tópicos sobre clima @@ -13,9 +20,9 @@ def on_connect(client, userdata, flags, reason_code, properties): def on_message(client, userdata, msg): payload = json.loads(msg.payload) print(msg.topic) - print(f"Value: {payload["value"]}") - print(f"Unit: {payload["unit"]}") - print(f"Timestamp: {payload["timestamp"]}") + print(f"Value: {payload['value']}") + print(f"Unit: {payload['unit']}") + print(f"Timestamp: {payload['timestamp']}") try: user_name = os.environ["MQTT_CLIENT_USER"] diff --git a/mqtt_client/requirements.txt b/mqtt_client/requirements.txt index 96a2716..1521b2d 100644 --- a/mqtt_client/requirements.txt +++ b/mqtt_client/requirements.txt @@ -1 +1,3 @@ -paho-mqtt==2.1.0 +sqlalchemy +psycopg2-binary +paho-mqtt -- cgit v1.2.3