utilise postgres db

Author: 0nebody

api/app/crud.py

@@ -0,0 +1,36 @@
+from sqlalchemy.orm import Session
+
+from . import models, schemas
+
+
+def get_user(db: Session, user_id: int):
+    return db.query(models.User).filter(models.User.id == user_id).first()
+
+
+def get_user_by_email(db: Session, email: str):
+    return db.query(models.User).filter(models.User.email == email).first()
+
+
+def get_users(db: Session, skip: int = 0, limit: int = 100):
+    return db.query(models.User).offset(skip).limit(limit).all()
+
+
+def create_user(db: Session, user: schemas.UserCreate):
+    fake_hashed_password = user.password + "notreallyhashed"
+    db_user = models.User(email=user.email, hashed_password=fake_hashed_password)
+    db.add(db_user)
+    db.commit()
+    db.refresh(db_user)
+    return db_user
+
+
+def get_items(db: Session, skip: int = 0, limit: int = 100):
+    return db.query(models.Item).offset(skip).limit(limit).all()
+
+
+def create_user_item(db: Session, item: schemas.ItemCreate, user_id: int):
+    db_item = models.Item(**item.dict(), owner_id=user_id)
+    db.add(db_item)
+    db.commit()
+    db.refresh(db_item)
+    return db_item

api/app/database.py

@@ -0,0 +1,20 @@
+import os
+
+from sqlalchemy import create_engine
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker
+
+POSTGRES_USER = os.getenv("POSTGRES_USER")
+POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD")
+POSTGRES_SERVER = os.getenv("POSTGRES_SERVER", "db")
+POSTGRES_DB = os.getenv("POSTGRES_DB", "example")
+
+SQLALCHEMY_DATABASE_URL = f"postgresql://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_SERVER}/{POSTGRES_DB}"
+
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL, connect_args={}
+)
+
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+Base = declarative_base()

api/app/main.py

@@ -1,15 +1,53 @@
-from typing import Union
+from fastapi import Depends, FastAPI, HTTPException
+from sqlalchemy.orm import Session
 
-from fastapi import FastAPI
+from . import crud, models, schemas
+from .database import SessionLocal, engine
+
+models.Base.metadata.create_all(bind=engine)
 
 app = FastAPI()
 
 
-@app.get("/")
-def read_root():
-    return {"Hello": "World"}
+# Dependency
+def get_db():
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()
+
+
+@app.post("/users/", response_model=schemas.User)
+def create_user(user: schemas.UserCreate, db: Session = Depends(get_db)):
+    db_user = crud.get_user_by_email(db, email=user.email)
+    if db_user:
+        raise HTTPException(status_code=400, detail="Email already registered")
+    return crud.create_user(db=db, user=user)
+
+
+@app.get("/users/", response_model=list[schemas.User])
+def read_users(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
+    users = crud.get_users(db, skip=skip, limit=limit)
+    return users
+
+
+@app.get("/users/{user_id}", response_model=schemas.User)
+def read_user(user_id: int, db: Session = Depends(get_db)):
+    db_user = crud.get_user(db, user_id=user_id)
+    if db_user is None:
+        raise HTTPException(status_code=404, detail="User not found")
+    return db_user
+
+
+@app.post("/users/{user_id}/items/", response_model=schemas.Item)
+def create_item_for_user(
+    user_id: int, item: schemas.ItemCreate, db: Session = Depends(get_db)
+):
+    return crud.create_user_item(db=db, item=item, user_id=user_id)
 
 
-@app.get("/items/{item_id}")
-def read_item(item_id: int, q: Union[str, None] = None):
-    return {"item_id": item_id, "q": q}
+@app.get("/items/", response_model=list[schemas.Item])
+def read_items(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
+    items = crud.get_items(db, skip=skip, limit=limit)
+    return items

api/app/models.py

@@ -0,0 +1,26 @@
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
+from sqlalchemy.orm import relationship
+
+from .database import Base
+
+
+class User(Base):
+    __tablename__ = "users"
+
+    id = Column(Integer, primary_key=True, index=True)
+    email = Column(String, unique=True, index=True)
+    hashed_password = Column(String)
+    is_active = Column(Boolean, default=True)
+
+    items = relationship("Item", back_populates="owner")
+
+
+class Item(Base):
+    __tablename__ = "items"
+
+    id = Column(Integer, primary_key=True, index=True)
+    title = Column(String, index=True)
+    description = Column(String, index=True)
+    owner_id = Column(Integer, ForeignKey("users.id"))
+
+    owner = relationship("User", back_populates="items")

api/app/schemas.py

@@ -0,0 +1,35 @@
+from pydantic import BaseModel
+
+
+class ItemBase(BaseModel):
+    title: str
+    description: str | None = None
+
+
+class ItemCreate(ItemBase):
+    pass
+
+
+class Item(ItemBase):
+    id: int
+    owner_id: int
+
+    class Config:
+        orm_mode = True
+
+
+class UserBase(BaseModel):
+    email: str
+
+
+class UserCreate(UserBase):
+    password: str
+
+
+class User(UserBase):
+    id: int
+    is_active: bool
+    items: list[Item] = []
+
+    class Config:
+        orm_mode = True

api/requirements.txt

@@ -1,3 +1,5 @@
 fastapi
+psycopg2
 pydantic
+SQLAlchemy
 uvicorn

docker-compose.yaml

@@ -6,8 +6,10 @@ services:
     ports:
       - "8000:80"
     environment:
+      API_URL: http://api:80
       ENVIRONMENT: dev
-      API_URL: localhost:5000
+      FLASK_DEBUG: 1
+      SECRET_KEY: "0cX78ltAhxMlwTDAQQYdlXvapcJMWA=="
     volumes:
       - ./web/app:/code/app
     links:
@@ -19,7 +21,21 @@ services:
       - "5000:80"
     environment:
       ENVIRONMENT: dev
-      WEB_URL: localhost:8000
+      POSTGRES_DB: example
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+      WEB_URL: web:8000
     volumes:
       - ./api/app:/code/app
-      - ./db:/code/app/db
+    links:
+      - db
+  db:
+    image: postgres:15
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_DB: example
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+    volumes:
+      - ./db:/var/lib/postgresql/data

web/app/main.py

@@ -1,8 +1,34 @@
-from flask import Flask
+import os
+import requests
 
-app = Flask(__name__)
+from flask import Flask, render_template, request, flash, redirect, url_for
 
+app = Flask(__name__)
+app.config['SECRET_KEY'] = os.environ.get("SECRET_KEY")
 
 @app.route("/")
 def root():
-    return "Hello, world."
+    api_url = os.environ.get("API_URL")
+    request_url = f'{api_url}/users/'
+    response = requests.get(request_url)
+    users = response.json()
+
+    return render_template("index.jinja2", users=users)
+
+@app.route("/add", methods=['GET', 'POST'])
+def add_user():
+    if request.method == 'POST':
+        email = request.form.get('email', "")
+        password = request.form.get('password', "")
+
+        if not email:
+            flash('Email is required!')
+        elif not password:
+            flash('Password is required!')
+        else:
+            api_url = os.environ.get("API_URL")
+            request_url = f'{api_url}/users/'
+            response = requests.post(request_url, json=request.form)
+            return redirect(url_for('root'))
+    else:
+        return render_template ("add.jinja2")

web/app/templates/add.jinja2

@@ -0,0 +1,23 @@
+{% extends 'base.jinja2' %}
+
+{% block content %}
+    <h1>{% block title %} Add User {% endblock %}</h1>
+
+    {% for message in get_flashed_messages() %}
+        <div class="alert">{{ message }}</div>
+    {% endfor %}
+
+    <form method="post">
+        <div class="form">
+            <label for="email">Enter email address: </label>
+            <input type="text" name="email" id="email" required>
+        </div>
+        <div class="form">
+            <label for="password">Enter your password: </label>
+            <input type="password" name="password" id="password" required>
+        </div>
+        <div class="form">
+            <input type="submit" value="Submit">
+        </div>
+    </form>
+{% endblock %}

web/app/templates/base.jinja2

@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>{% block title %} {% endblock %}</title>
+  </head>
+  <body>
+    <nav class="navbar navbar-expand-md navbar-light bg-light">
+    </nav>
+    <div class="container">
+        {% block content %} {% endblock %}
+    </div>
+  </body>
+</html>