Add Docker configuration and PostgreSQL integration

Author: violetaperezandrade

.env.dist

@@ -0,0 +1,6 @@
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+POSTGRES_DB=
+POSTGRES_HOST=
+POSTGRES_PORT=
+DATABASE_URL=

app/docker/Dockerfile

@@ -0,0 +1,16 @@
+FROM postgres:16
+
+WORKDIR /
+
+ARG USE_POSTGIS=false
+
+RUN apt-get update \
+    && apt-get install -f -y --no-install-recommends \
+    ca-certificates \
+    software-properties-common \
+    build-essential \
+    pkg-config \
+    git \
+    postgresql-server-dev-15 \
+    && add-apt-repository "deb http://ftp.debian.org/debian testing main contrib" \
+    && apt-get update 

app/docker/tablas.sql

@@ -0,0 +1,12 @@
+CREATE SCHEMA IF NOT EXISTS dev;
+
+CREATE TABLE IF NOT EXISTS dev.users (
+    id SERIAL PRIMARY KEY, name VARCHAR(255) NOT NULL
+);
+
+INSERT INTO
+    dev.users (name)
+VALUES ('Agus'),
+    ('Pach'),
+    ('Sofi'),
+    ('Violeta');

app/main.py

@@ -2,6 +2,7 @@
 from controller.Users import UsersController
 from service.Users import UsersService
 from repository.Users import UsersRepository
+# from repository.UsersLocal import UsersRepository
 from schemas.Schemas import CreateUserSchema
 
 

app/models/database.py

@@ -0,0 +1,3 @@
+from sqlalchemy.ext.declarative import declarative_base
+
+Base = declarative_base()

app/models/users.py

@@ -0,0 +1,9 @@
+from sqlalchemy import Column, Integer, String
+from models.database import Base
+
+
+class User(Base):
+    __tablename__ = "users"
+    __table_args__ = {'schema': 'dev'}
+    id = Column(Integer, primary_key=True, index=True, autoincrement=True)
+    name = Column(String, nullable=False)

app/repository/Users.py

@@ -1,29 +1,47 @@
-from schemas.Schemas import UserSchema
+from sqlalchemy import create_engine, engine
+from sqlalchemy.orm import Session
+import os
+from models.users import User
 
 
 class UsersRepository:
+    db_url = engine.URL.create(
+        "postgresql",
+        database=os.environ["POSTGRES_DB"],
+        username=os.environ["POSTGRES_USER"],
+        password=os.environ["POSTGRES_PASSWORD"],
+        host=os.environ["POSTGRES_HOST"],
+        port=os.environ["POSTGRES_PORT"]
+    )
+
+    engine = create_engine(db_url)
+
     def __init__(self):
-        self.db = {}
-        self._populate_default_users()
-
-    def _populate_default_users(self):
-        default_users_data = [
-            {"id": 1, "name": "John"},
-            {"id": 2, "name": "Alice"},
-            {"id": 3, "name": "Bob"},
-        ]
-        for user_data in default_users_data:
-            user = UserSchema(**user_data)
-            self.db[user.id] = user
-
-    def get_user(self, user_id):
-        return self.db.get(user_id)
+        self.conn = self.engine.connect()
+        self.session = Session(self.engine)
+
+    def shutdown(self):
+        self.conn.close()
+        self.session.close()
+
+    def rollback(self):
+        self.session.rollback()
+
+    def get_user(self, user_id: int):
+        user = self.session.query(User).filter_by(id=user_id).first()
+        return user.__dict__
 
     def get_all_users(self):
-        return list(self.db.values())
+        users = self.session.query(User).all()
+        return self.__parse_result(users)
 
     def create_user(self, name: str):
-        new_user_id = max(self.db.keys()) + 1
-        new_user = UserSchema(id=new_user_id, name=name)
-        self.db[new_user_id] = new_user
-        return new_user
+        new_user = User(name=name)
+        self.session.add(new_user)
+        self.session.commit()
+        return
+
+    def __parse_result(self, result):
+        if not result:
+            return []
+        return [r.__dict__ for r in result]

app/repository/UsersLocal.py

@@ -0,0 +1,29 @@
+from schemas.Schemas import UserSchema
+
+
+class UsersRepository:
+    def __init__(self):
+        self.db = {}
+        self._populate_default_users()
+
+    def _populate_default_users(self):
+        default_users_data = [
+            {"id": 1, "name": "John"},
+            {"id": 2, "name": "Alice"},
+            {"id": 3, "name": "Bob"},
+        ]
+        for user_data in default_users_data:
+            user = UserSchema(**user_data)
+            self.db[user.id] = user
+
+    def get_user(self, user_id):
+        return self.db.get(user_id)
+
+    def get_all_users(self):
+        return list(self.db.values())
+
+    def create_user(self, name: str):
+        new_user_id = max(self.db.keys()) + 1
+        new_user = UserSchema(id=new_user_id, name=name)
+        self.db[new_user_id] = new_user
+        return new_user

app/service/Users.py

@@ -1,5 +1,6 @@
 from exceptions.UserException import UserNotFound
 from repository.Users import UsersRepository
+# from repository.UsersLocal import UsersRepository
 
 
 class UsersService:

docker-compose.yaml

@@ -10,6 +10,39 @@ services:
       - .env
     ports:
       - "8080:8080"
+    depends_on:
+      sql:
+        condition: service_healthy
     volumes:
       - ./app:/app
     tty: true
+
+  sql:
+    build:
+      context: ./app/docker
+      dockerfile: Dockerfile
+    env_file:
+      - .env
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./app/docker:/docker-entrypoint-initdb.d
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "pg_isready",
+          "-h",
+          "localhost",
+          "-p",
+          "5432",
+          "-q",
+          "-U",
+          "${POSTGRES_USER}",
+          "-d",
+          "${POSTGRES_DB}"
+        ]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 50s

requirements.txt

@@ -3,3 +3,4 @@ uvicorn
 python-dotenv
 flake8
 psycopg2-binary
+SQLAlchemy