Update database URLs to use "postgres" instead of "postgresql"

Author: fjpacheco

app/database/database.py

@@ -13,13 +13,13 @@
 
 class SQLAlchemyClient():
     db_url = environ.get("HEROKU_DATABASE_URL", engine.URL.create(
-        "postgresql",
+        "postgres",
         database=environ["MEASUREMENTS_DB"],
         username=environ["POSTGRES_USER"],
         password=environ["POSTGRES_PASSWORD"],
         host=environ["POSTGRES_HOST"],
         port=environ["POSTGRES_PORT"]
-    ))
+    )).replace("postgres://", "postgresql://", 1)
 
     engine = create_engine(db_url)
 

app/service/calculator_service.py

@@ -6,14 +6,14 @@
 
 class CalculatorService:
     def __init__(self):
-        engine_ = create_engine(engine.URL.create(
-            "postgresql",
+        engine_ = create_engine(environ.get("HEROKU_DATABASE_URL", engine.URL.create(
+            "postgres",
             database=environ["MEASUREMENTS_DB"],
             username=environ["POSTGRES_USER"],
             password=environ["POSTGRES_PASSWORD"],
             host=environ["POSTGRES_HOST"],
             port=environ["POSTGRES_PORT"]
-        ), echo=True)
+        )).replace("postgres://", "postgresql://", 1), echo=True)
         self.session = Session(engine_)
 
     def add_number(self, number):

app/service/rabbitmq/consumer.py

@@ -24,13 +24,13 @@
 logging.getLogger("pika").setLevel(logging.WARNING)
 
 dbUrl = environ.get("HEROKU_DATABASE_URL", engine.URL.create(
-        "postgresql",
+        "postgres",
         database=environ["MEASUREMENTS_DB"],
         username=environ["POSTGRES_USER"],
         password=environ["POSTGRES_PASSWORD"],
         host=environ["POSTGRES_HOST"],
         port=environ["POSTGRES_PORT"]
-    ))
+    )).replace("postgres://", "postgresql://", 1)
 engine = create_engine(dbUrl, echo=True, future=True)
 session = Session(engine)