Update database configuration

Author: fjpacheco

.env.dist

@@ -7,8 +7,8 @@ POSTGRES_USER=
 POSTGRES_PASSWORD=
 POSTGRES_HOST=
 POSTGRES_PORT=
-MEASUREMENTS_DB=
-MEASUREMENTS_SCHEMA=
+POSTGRES_DB=
+POSTGRES_SCHEMA=
 
 # RabbitMQ
 CLOUDAMQP_URL=

README.md

@@ -14,7 +14,7 @@
 class SQLAlchemyClient():
     db_url = environ.get("DATABASE_URL", engine.URL.create(
         "postgres",
-        database=environ.get("MEASUREMENTS_DB", "measurements"),
+        database=environ.get("POSTGRES_DB", "dev"),
         username=environ.get("POSTGRES_USER", "user"),
         password=environ.get("POSTGRES_PASSWORD", "1234"),
         host=environ.get("POSTGRES_HOST", "sql"),

app/database/database.py

@@ -7,7 +7,7 @@
 
 class DevicePlant(Base):
     __tablename__ = "device_plant"
-    __table_args__ = {'schema': environ.get("MEASUREMENTS_SCHEMA", "dev")}
+    __table_args__ = {'schema': environ.get("POSTGRES_SCHEMA", "measurements")}
 
     id_device: Mapped[str] = mapped_column(String(32), primary_key=True)
     id_plant: Mapped[int] = mapped_column(Integer, unique=True)

app/database/models/device_plant.py

@@ -7,7 +7,7 @@
 
 class Measurement(Base):
     __tablename__ = "measurements"
-    __table_args__ = {'schema': environ.get("MEASUREMENTS_SCHEMA", "dev")}
+    __table_args__ = {'schema': environ.get("POSTGRES_SCHEMA", "measurements")}
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     id_plant: Mapped[int] = mapped_column(Integer, unique=True)
@@ -22,7 +22,7 @@ class Measurement(Base):
         CheckConstraint('humidity >= 0 AND humidity <= 100', name='check_humidity'),
         CheckConstraint('humidity >= 0 ', name='check_light'),
         CheckConstraint('humidity >= 0 AND humidity <= 100', name='check_watering'),
-        {'schema': environ.get("MEASUREMENTS_SCHEMA", "dev")}
+        {'schema': environ.get("POSTGRES_SCHEMA", "measurements")}
     )
 
     def __repr__(self):

app/database/models/measurement.py

@@ -5,5 +5,5 @@
 
 class Number(Base):
     __tablename__ = 'numbers'
-    __table_args__ = {'schema': environ.get("MEASUREMENTS_SCHEMA", "dev")}
+    __table_args__ = {'schema': environ.get("POSTGRES_SCHEMA", "measurements")}
     number = Column(Integer, primary_key=True)

app/database/models/number.py

@@ -8,7 +8,7 @@ class CalculatorService:
     def __init__(self):
         engine_ = create_engine(environ.get("DATABASE_URL", engine.URL.create(
             "postgres",
-            database=environ.get("MEASUREMENTS_DB", "measurements"),
+            database=environ.get("POSTGRES_DB", "dev"),
             username=environ.get("POSTGRES_USER", "user"),
             password=environ.get("POSTGRES_PASSWORD", "1234"),
             host=environ.get("POSTGRES_HOST", "sql"),

app/service/calculator_service.py

@@ -25,7 +25,7 @@
 
 dbUrl = environ.get("DATABASE_URL", engine.URL.create(
         "postgres",
-        database=environ.get("MEASUREMENTS_DB", "measurements"),
+        database=environ.get("POSTGRES_DB", "dev"),
         username=environ.get("POSTGRES_USER", "user"),
         password=environ.get("POSTGRES_PASSWORD", "1234"),
         host=environ.get("POSTGRES_HOST", "sql"),