updated

wpcodevo · wpcodevo · commit 5882201d80a0 · 2022-11-10T20:12:47.000Z
diff --git a/.env b/.env
@@ -0,0 +1,6 @@
+DATABASE_PORT=6500
+POSTGRES_PASSWORD=password123
+POSTGRES_USER=postgres
+POSTGRES_DB=fastapi
+POSTGRES_HOST=postgres
+POSTGRES_HOSTNAME=127.0.0.1
diff --git a/app/config.py b/app/config.py
@@ -0,0 +1,16 @@
+from pydantic import BaseSettings
+
+
+class Settings(BaseSettings):
+    DATABASE_PORT: int
+    POSTGRES_PASSWORD: str
+    POSTGRES_USER: str
+    POSTGRES_DB: str
+    POSTGRES_HOST: str
+    POSTGRES_HOSTNAME: str
+
+    class Config:
+        env_file = './.env'
+
+
+settings = Settings()
diff --git a/app/database.py b/app/database.py
@@ -2,8 +2,10 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
+SQLITE_DATABASE_URL = "sqlite:///./note.db"
+
 engine = create_engine(
-    "sqlite:///./note.db", echo=True, connect_args={"check_same_thread": False}
+    SQLITE_DATABASE_URL, echo=True, connect_args={"check_same_thread": False}
 )
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
diff --git a/app/models.py b/app/models.py
@@ -1,16 +1,17 @@
 from .database import Base
 from sqlalchemy import TIMESTAMP, Column, String, Boolean
 from sqlalchemy.sql import func
-from fastapi_utils.guid_type import GUID, GUID_DEFAULT_SQLITE
+from fastapi_utils.guid_type import GUID, GUID_SERVER_DEFAULT_POSTGRESQL
 
 
 class Note(Base):
     __tablename__ = 'notes'
-    id = Column(GUID, primary_key=True, default=GUID_DEFAULT_SQLITE)
+    id = Column(GUID, primary_key=True,
+                server_default=GUID_SERVER_DEFAULT_POSTGRESQL)
     title = Column(String, nullable=False)
     content = Column(String, nullable=False)
     category = Column(String, nullable=True)
-    published = Column(Boolean, nullable=False, default=True)
+    published = Column(Boolean, nullable=False, server_default='True')
     createdAt = Column(TIMESTAMP(timezone=True),
                        nullable=False, server_default=func.now())
     updatedAt = Column(TIMESTAMP(timezone=True),
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '3'
+services:
+  postgres:
+    image: postgres
+    container_name: postgres
+    ports:
+      - '6500:5432'
+    restart: always
+    env_file:
+      - ./.env
+    volumes:
+      - postgres-db:/var/lib/postgresql/data
+volumes:
+  postgres-db:
