feat: {user,service} {creation,deletion,listing}

* also updated requirements.txt accordingly
This commit is contained in:
surtur 2020-08-04 23:27:13 +02:00
parent b7c6f30f06
commit 2dd2258472
Signed by: wanderer
GPG Key ID: 19CE1EC1D9E0486D
6 changed files with 204 additions and 1 deletions

46
app/crud.py Normal file

@ -0,0 +1,46 @@
import bcrypt, time
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 del_user(db: Session, user_id: int):
db.query(models.User).filter(models.User.id == user_id).delete()
db.commit()
return
def get_user_by_username(db: Session, name: str):
return db.query(models.User).filter(models.User.name == name).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):
h_et_s = bcrypt.hashpw(user.password.encode(), bcrypt.gensalt())
db_user = models.User(**user.dict())
db_user.name=user.name
db_user.password=h_et_s
db_user.created_unix = time.time()
db.add(db_user)
db.commit()
db.refresh(db_user)
return db_user
def get_services(db: Session, skip: int = 0, limit: int = 100):
return db.query(models.Service).offset(skip).limit(limit).all()
def create_service(db: Session, service: schemas.ServiceCreate):
db_item = models.Service(**service.dict())
""" inject updated+created times here """
db_item.updated_unix = time.time()
db_item.created_unix = time.time()
db.add(db_item)
db.commit()
db.refresh(db_item)
return db_item

12
app/database.py Normal file

@ -0,0 +1,12 @@
from sqlalchemy import create_engine
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker
SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db"
engine = create_engine(
SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
)
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
Base = declarative_base()

@ -1,12 +1,67 @@
# vim:fileencoding=utf-8:ft=python:foldmethod=marker # vim:fileencoding=utf-8:ft=python:foldmethod=marker
# statuspage/app/main.py # statuspage/app/main.py
from fastapi import FastAPI from typing import List
from fastapi import FastAPI, Depends, HTTPException
from pydantic import BaseModel
from sqlalchemy.orm import Session
from . import crud, models, schemas
from .database import SessionLocal, engine
models.Base.metadata.create_all(bind=engine)
app = FastAPI() app = FastAPI()
def get_db():
db = SessionLocal()
try:
yield db
finally:
db.close()
@app.get("/api/v1/ping") @app.get("/api/v1/ping")
def pong(): def pong():
return {"ping": "pong!"} return {"ping": "pong!"}
@app.get("/api/v1/service/")
async def read_services(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
return crud.get_services(db, skip=skip, limit=limit)
@app.post("/api/v1/service", response_model=schemas.Service)
async def create_service(service: schemas.ServiceCreate, db: Session = Depends(get_db)):
return crud.create_service(db=db, service=service)
@app.post("/api/v1/users", response_model=schemas.User)
async def create_user(user: schemas.UserCreate, db: Session = Depends(get_db)):
db_user = crud.get_user_by_username(db, name=user.name)
if db_user:
raise HTTPException(status_code=400, detail="username already registered")
return crud.create_user(db=db, user=user)
# @app.get("/api/v1/users", response_model=List[schemas.User])
@app.get("/api/v1/users")
async def read_users(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
return crud.get_users(db=db, skip=skip, limit=limit)
@app.get("/api/v1/users/{user_id}", response_model=schemas.User)
def read_user(user_id: int, db: Session = Depends(get_db)):
db_user = crud.get_user(db=db, user_id=user_id)
if db_user is None:
raise HTTPException(status_code=404, detail="User not found")
return db_user
@app.delete("/api/v1/users/{user_id}")
async def read_user(user_id: int, db: Session = Depends(get_db)):
db_user = crud.get_user(db=db, user_id=user_id)
if db_user is None:
raise HTTPException(status_code=404, detail="User not found")
crud.del_user(db=db, user_id=user_id)
return {"deletion":"successful"}

35
app/models.py Normal file

@ -0,0 +1,35 @@
from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, Float
from sqlalchemy.orm import relationship
from .database import Base
class Service(Base):
__tablename__ = "service"
id = Column(Integer, primary_key=True, index=True)
name = Column(String, index=True)
is_private = Column(Boolean, default=True)
description = Column(String)
service_type = Column(Integer)
url = Column(String)
owner_id = Column(Integer, ForeignKey("user.id"), index=True)
is_active = Column(Boolean, default=True, index=True)
created_unix = Column(Float)
updated_unix = Column(Float)
user = relationship("User", back_populates="service")
class User(Base):
__tablename__ = "user"
id = Column(Integer, primary_key=True, index=True)
name = Column(String, unique=True, index=True)
full_name = Column(String, index=True)
password = Column(String)
is_active = Column(Boolean, default=True, index=True)
created_unix = Column(Float)
last_login_unix = Column(Float)
service = relationship("Service", back_populates="user")

52
app/schemas.py Normal file

@ -0,0 +1,52 @@
import time
from typing import List, Optional
from pydantic import BaseModel
class ServiceBase(BaseModel):
name: str
is_private: bool = True
description: Optional[str] = None
service_type: int
url: str
owner_id: Optional[int] = None
is_active: bool = True
updated_unix: float
class Service(BaseModel):
name: str
owner_id: int
is_active: bool = True
created_unix: float
class ServiceCreate(ServiceBase):
pass
class Service(ServiceBase):
owner_id: int
class Config:
orm_mode = True
class UserBase(BaseModel):
name: str
full_name: Optional[str] = None
is_active: bool = True
class User(BaseModel):
name: str
full_name: Optional[str] = None
is_active: bool = True
last_login_unix: float
created_unix: float
class UserCreate(UserBase):
password: str
class User(UserBase):
pass
class Config:
orm_mode = True

@ -1,2 +1,5 @@
fastapi fastapi
uvicorn uvicorn
pydantic
sqlalchemy
bcrypt