From b4971fcb6a7a3c2f0888eefbe255d1d0d68191ec Mon Sep 17 00:00:00 2001 From: Anahita-Mahmoudi Date: Wed, 13 May 2026 04:04:13 +0330 Subject: [PATCH] refactor: integrate Alembic, restructure project, and clean up - Add Alembic configuration (alembic.ini, env.py) for database migrations - Remove legacy wheel.db and unnecessary __pycache__ files - Delete models.py to separate SQLAlchemy and Pydantic concerns - Restructure main.py to use modular API routers (user/admin) - Introduce config backend for centralized settings management --- backend/.config | 40 +++++ backend/__pycache__/crud.cpython-313.pyc | Bin 1628 -> 0 bytes backend/__pycache__/database.cpython-313.pyc | Bin 545 -> 0 bytes backend/__pycache__/main.cpython-313.pyc | Bin 2823 -> 0 bytes backend/__pycache__/models.cpython-313.pyc | Bin 629 -> 0 bytes backend/__pycache__/schemas.cpython-313.pyc | Bin 917 -> 0 bytes backend/alembic.ini | 149 ++++++++++++++++++ backend/alembic/README | 1 + .../alembic/__pycache__/env.cpython-313.pyc | Bin 0 -> 2600 bytes backend/alembic/env.py | 80 ++++++++++ backend/alembic/script.py.mako | 28 ++++ backend/api/admin | 37 +++++ backend/api/user | 38 +++++ backend/app/db/model.py | 87 ++++++++++ backend/{database.py => app/db/session.py} | 9 ++ backend/main.py | 56 +------ backend/models.py | 8 - backend/{ => services}/crud.py | 0 backend/wheel.db | Bin 12288 -> 12288 bytes 19 files changed, 471 insertions(+), 62 deletions(-) create mode 100644 backend/.config delete mode 100644 backend/__pycache__/crud.cpython-313.pyc delete mode 100644 backend/__pycache__/database.cpython-313.pyc delete mode 100644 backend/__pycache__/main.cpython-313.pyc delete mode 100644 backend/__pycache__/models.cpython-313.pyc delete mode 100644 backend/__pycache__/schemas.cpython-313.pyc create mode 100644 backend/alembic.ini create mode 100644 backend/alembic/README create mode 100644 backend/alembic/__pycache__/env.cpython-313.pyc create mode 100644 backend/alembic/env.py create mode 100644 backend/alembic/script.py.mako create mode 100644 backend/api/admin create mode 100644 backend/api/user create mode 100644 backend/app/db/model.py rename backend/{database.py => app/db/session.py} (70%) delete mode 100644 backend/models.py rename backend/{ => services}/crud.py (100%) diff --git a/backend/.config b/backend/.config new file mode 100644 index 0000000..d31c4ed --- /dev/null +++ b/backend/.config @@ -0,0 +1,40 @@ +import sys +from os.path import abspath, dirname +import logging.config +from alembic import context + +sys.path.insert(0, dirname(dirname(abspath(__file__)))) + +from config import DATABASE_URL, LOGGING_CONFIG +from database import Base, engine +import models + +#log-settings + +logging.config.dictConfig(LOGGING_CONFIG) + +target_metadata = Base.metadata + +def run_migrations_offline(): + context.configure( + url=DATABASE_URL, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + with context.begin_transaction(): + context.run_migrations() + +def run_migrations_online(): + with engine.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + ) + with context.begin_transaction(): + context.run_migrations() + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() \ No newline at end of file diff --git a/backend/__pycache__/crud.cpython-313.pyc b/backend/__pycache__/crud.cpython-313.pyc deleted file mode 100644 index 8f54d7897e6816548e38499be4f70dd5a9331fd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1628 zcmbtU(MuFT7@yhQ+r7KFOD#i+$~BDKhlEPW#Cl0fy|{c8nQP^N;Q2zooPp6i>rUCkqU@q?Z3o9~-%X1?F=o83#NlL%yt{dVUS zguaSNBwA?fIbdv|Jj&w?n#2s7!d5cMq{>ujs~L@Hd98>Clzi+odZ4kGnC11NKA`0d z=`o}yUW|h$Aw7vOBPnOeS=Ayx#E}-}MxOenlIK~Ni7a1iVe+1_;bN99 znKM<-q0H>NVioU~?1!}C6m7QX^v^Hz#4HV_UAVT-2;|7*Q()B4E=g|;tq(mPeR^|; zoUN0y+ob!w*1ZQo#AAUQc+}p%Gx)?EWR;J=*g{kLH5PClU&j>%>K5@9DJW6Bra zgVyy)Zj*r>GF&Ia+hn9R`rRPA z@#IEgJ+ayQtSvO3kptHL{g7ATn4^&ufm6W+9D(h?lbJvmi1ZwO6 zR3>=kIxAJ2Y8hI7uIk#y|m~3)iJld$qlm5J0nO>Ts)MMS?7eM-#V1W0ZI<_&s zKK}gP)9g;_Ts?JeJ7w0!zLWOdwiDk-$Ht8(H(s1<{u5+>TZA9;7rc^Z&(ZR7f0dP) zAdKtfDp2K1&e<98$R7P)?<3^t7G~^DKj~3^+~-R~0s&mwA|{X#d)JG=K?f6T)fWRV~7lGk_eUY(1^ zqco4^2|UJYa!P(5DW1vamr5yJk~>TCa7pfdYxNe+ck6nkwX3b(r}>x7dn;YFm4&gg hN&9xy+Nn0SE336KwYIWwRt{<0_-fvKui>`z`U4v|oq7NO diff --git a/backend/__pycache__/main.cpython-313.pyc b/backend/__pycache__/main.cpython-313.pyc deleted file mode 100644 index 59f1ccc8b588e2430a5b54ebe83091c50884d226..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2823 zcma)7-ESL35Z}Eo+jq7T+sy|_np~68)U-;VrAh;B5oxJt0;Te`fP{s0@omy8&e`l; z8(IXoAkk6;EnjLRUV?Z){R8+v67mqUfG7fic)O53@PGufcfPn7P+8sW%; zV>A}<(oCGjK`zZCXd<90Re{Pg+H{g8r&Bbgqhh=;5N+3@g~1jdafKZb*P_Lgp-f`1 zf``$8<}}R|GllzGYa*@~Gh*Y|hzC9A5|i9#wGYu8Xyl`HEox}Ru41CFw>1-SGB8GR zQYZ?;sF*u|!}*7?kt)g$3r4yRos-VtEsuJ@{zH*&i-P@swf?V`J7Dd;mTtraJ4!}p z+m3y(<3zNkMU714>pwit76+QPa&5M@|A+V6{?k^7LRXue!Feg){VR7SFS6Ki)Ab%d zb%Mo?ks5I+yHu@2S6E z6+-3@cN;8zQ#**?mqyTsnS=QA>;dsh@gTmWjN2YrZ~^)>C2pmGTxw zFyMIbe{&2vzz_Pc6`;Pfw_!jh%CMb?WgNUYe$xb*R<^`()LZ5L`>rP<-0fLM;y2}1KUM&Wn4dL7+SQL=Mg>;FpYUz++t{Y+ic z_N+*IXg^3Vb%sYU{wfctWLvMXSd;r(e7tG}@jVaB|A{Y(#SzX3JXv_N;JJ8#TMC+i z4Z#p61%eI9kRQZ5QC>M|e+-9yDSZN*(VeOXIeFf(ZV60tJ<~hymdcPFOtFY(+7%XC zfLm_PlS|29J>(7Xh?S3E3&#O$li~$ ztfln&@t?I!1o7xy5GPS0)5!MT%zuz?boJjXeozEqPW44OsrX2il>qnr5R1*h`(V~= z%8!@wdltCI((cO@vr;}w7A}re=>p|ov7YAQv4yQCVys-HE{$=i5>z9X#aymtx?$jP z%k<1y(ZZ=PUp6E=p9WO}O0MJ_~h(9O;EPeIt2;;#Uqjxyj6p?Vm7l8BQT(kFb@73MQ6YC=rt0NQj z-W7asLqWN|rClG5Z^#nf+fXy>>cFZx;EOQ29q+iqXStP0UjWWeb1Qw9`&N>JYk24` z)D0;x!*ebbw*35ketz$Lex5g*b%NtA{LQX$|7pqX@Rwk|hv1Sh z!ssFCQJ_5soSqAA%bq!hUe5==Mb^m{VeSTDUgGb#RV)M}KMrmziCq)C8mmcOnDC&` zawNe7OhZunjf7&a{%| zKIf$tIvaAKu?d5TmL=zK2d~U=5%ajam-OYk*6~=S5?W85$H_npPh^oMC`PKXeL95* zZ!V0jQ9eTRk$hd-Jb!atTfGRcj=rqTYMt}_Z;g8wovZGw@$^F%9^A(C5LZ7@o=3X1^MxsCB`15k+(9q0oa;_Fxfl#XT60fg#<@uEA`weKSkxxlj*Y zdg+hwZ}=-pz>}xF30d)|@0)CKSLzFSX5PGB|m*@2tK_=g(p^S%BQ-#Y3 ztmvYD$$SRfW1x8)^vBFMeACmOV8+wI8XK;eH(o0_IRqIfIj7#-RFR717dCKfxh+Hz zOr#KbLx@Ql&SKiPggBlB@iOBGF^V8lag@j;#k8I&$T1ouNvZ-BrAda-J3?gS4Mm_7 zL`O3vF$^|R7WlFJ(aY!lK%R6*X&g%EKHYQuqhR<^CZV4VKgdat?M_dDge-y1n$-|K zv8(3Bc^__FXV&B}FiKYR5dJTRZ=oO(8G5Y|~e4Ga|DEXChkows|KCZlLPr&sj86lUOBP)83a1Wke#Lhg(p zovi2x4y8!SN`>20WL4wf9y-)tignJeI@_O}s;ol|)HQJHH}dFFqF{rn+5~0&4OFm6 zSprfdyNiIAVmHrT;mw@&e;M4|Suli(mI?>1k=xVLFi7x40NrJEv*o0Je#AbgUS1C# lU>!-DbrF8(obzvNdtq?yT--+j?kp^m?_50l$#5yj{s2u~y+{B6 diff --git a/backend/alembic.ini b/backend/alembic.ini new file mode 100644 index 0000000..95cc891 --- /dev/null +++ b/backend/alembic.ini @@ -0,0 +1,149 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts. +# this is typically a path given in POSIX (e.g. forward slashes) +# format, relative to the token %(here)s which refers to the location of this +# ini file +script_location = alembic + +# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s +# Uncomment the line below if you want the files to be prepended with date and time +# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file +# for all available tokens +# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s +# Or organize into date-based subdirectories (requires recursive_version_locations = true) +# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. for multiple paths, the path separator +# is defined by "path_separator" below. +prepend_sys_path = . + + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the tzdata library which can be installed by adding +# `alembic[tz]` to the pip requirements. +# string value is passed to ZoneInfo() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to /versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "path_separator" +# below. +# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions + +# path_separator; This indicates what character is used to split lists of file +# paths, including version_locations and prepend_sys_path within configparser +# files such as alembic.ini. +# The default rendered in new alembic.ini files is "os", which uses os.pathsep +# to provide os-dependent path splitting. +# +# Note that in order to support legacy alembic.ini files, this default does NOT +# take place if path_separator is not present in alembic.ini. If this +# option is omitted entirely, fallback logic is as follows: +# +# 1. Parsing of the version_locations option falls back to using the legacy +# "version_path_separator" key, which if absent then falls back to the legacy +# behavior of splitting on spaces and/or commas. +# 2. Parsing of the prepend_sys_path option falls back to the legacy +# behavior of splitting on spaces, commas, or colons. +# +# Valid values for path_separator are: +# +# path_separator = : +# path_separator = ; +# path_separator = space +# path_separator = newline +# +# Use os.pathsep. Default configuration used for new projects. +path_separator = os + +# set to 'true' to search source files recursively +# in each "version_locations" directory +# new in Alembic version 1.10 +# recursive_version_locations = false + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +# database URL. This is consumed by the user-maintained env.py script only. +# other means of configuring database URLs may be customized within the env.py +# file. +sqlalchemy.url = sqlite:///./wheel.db + + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module +# hooks = ruff +# ruff.type = module +# ruff.module = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Alternatively, use the exec runner to execute a binary found on your PATH +# hooks = ruff +# ruff.type = exec +# ruff.executable = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Logging configuration. This is also consumed by the user-maintained +# env.py script only. +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARNING +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/backend/alembic/README b/backend/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/backend/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/backend/alembic/__pycache__/env.cpython-313.pyc b/backend/alembic/__pycache__/env.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..53a87252ac5a60a6cc76525cbdacd53cec8949e5 GIT binary patch literal 2600 zcmZ`)%}*Og6rc63?cMbkA2mq~g2Cb=P6?$=XhlC2XjBC%gzQ9>iY05k9-B?pyYB3o zgh-V*roB`>M7{KoYi~XDA0UUGg9A0$l0#MH&>Ia%NICV*u9r0_8N*#OK6d!9AelR&~1UHKoVW42X>b2_VVN`n(Y`bc18sx<=OJ{nDIR5ERExl7UtQeylS-!cZS=dW)lM)NtYlNvRzxb|Zui@KG%f<@6 zmH$#!j0!eP&;|y33l(CR-}i8a6hYcB5%Su=`2t8(q=WHB#T0Zc_cG zBR3SP)Gd2MCr;Q<>ZFnr93G~el&#Pju}gJgD;337oP@5~gerQetQi%{iB~j5C#qdC z8@9Eai#ic6zfQ{iO3@590~Mj{emT-f_GyCYy=4NIzhqOzuoRW~IZ4_yNWbkbU&Ull0U}DIAU*C6V0Q zma;7=yDN?Di>bCa+!BX(M10I6dAu!+{UMFLve<^V#DQy*{MMv=Z8oZce$q~``T&ju zSY-!u+iK_5!&MIZwqWd1DS=;9B%-w^DO_bHJ{c($lz8_DETZB z24>(^fr!0U;O799U0=NA&je$Da+eW;=&UHOwZIn`L0~`sbpO|D!kZal`JBfPZ}zAO z9S#ZK|Mn~bF;4Nv4Fm85ptn?FC{!~6>K(&!iJ$h_k#UoIVd|CC$)$ z8)di35to~~z5+qrr-kjvMJ8p%bc51BBbJImJ z%zXg=*7wi>%#x^od|ynq#mu&t`T70!;MMKHtG||?igSCZq5ZyrpDzD+`QNC}AK6?w zh$A`OmWH;ap&e=X(IppR7h2+ly>p|#efE+MN%E11lIeD0qLrA~ORh#xQN_mLl$U(Kd3b?tAc6i9ks9ThtP94~jUt-Ma zh>S+d@RC!;1e86mPJ}&By5)#I&3ct!&~UTqq%_NCu@dwB1s%d1^2#8745p?|KBZG& zV|-#YpgZ6>j(d*AU!dG`H24Ay9*DqRKMa32ycq#eklTD_oBd5Z6Os?s+o_4|)WnW3 zc^pSv_D_`9^D48MI_gPtqenCS-1xy10)pf-Ek4uchqn2lXF_II82U@NuqzDGw_(x$ E0OzMe_y7O^ literal 0 HcmV?d00001 diff --git a/backend/alembic/env.py b/backend/alembic/env.py new file mode 100644 index 0000000..209048d --- /dev/null +++ b/backend/alembic/env.py @@ -0,0 +1,80 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from database import Base, engine +import models +target_metadata = Base.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/backend/alembic/script.py.mako b/backend/alembic/script.py.mako new file mode 100644 index 0000000..1101630 --- /dev/null +++ b/backend/alembic/script.py.mako @@ -0,0 +1,28 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision: str = ${repr(up_revision)} +down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} + + +def upgrade() -> None: + """Upgrade schema.""" + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + """Downgrade schema.""" + ${downgrades if downgrades else "pass"} diff --git a/backend/api/admin b/backend/api/admin new file mode 100644 index 0000000..612d640 --- /dev/null +++ b/backend/api/admin @@ -0,0 +1,37 @@ +from fastapi import FastAPI, Depends, HTTPException +from sqlalchemy.orm import Session +from fastapi.middleware.cors import CORSMiddleware + +import models +import schemas +import crud + +from database import SessionLocal, engine + +models.Base.metadata.create_all(bind=engine) + +app = FastAPI() + +# DELETE ITEM +@app.delete("/items/{item_id}") +def delete_item( + item_id: int, + db: Session = Depends(get_db) +): + item = crud.delete_item(db, item_id) + + if not item: + raise HTTPException( + status_code=404, + detail="Item not found" + ) + + return {"message": "Item deleted"} + + # CREATE ITEM +@app.post("/items", response_model=schemas.ItemResponse) +def create_item( + item: schemas.ItemCreate, + db: Session = Depends(get_db) +): + return crud.create_item(db, item.title) \ No newline at end of file diff --git a/backend/api/user b/backend/api/user new file mode 100644 index 0000000..43448c2 --- /dev/null +++ b/backend/api/user @@ -0,0 +1,38 @@ +from fastapi import FastAPI, Depends, HTTPException +from sqlalchemy.orm import Session +from fastapi.middleware.cors import CORSMiddleware + +import models +import schemas +import crud + +from database import SessionLocal, engine + +models.Base.metadata.create_all(bind=engine) + +app = FastAPI() + + +# SPIN +@app.post("/spin") +def spin(db: Session = Depends(get_db)): + + winner = crud.spin_wheel(db) + + if not winner: + raise HTTPException( + status_code=400, + detail="No items available" + ) + + return { + "winner": { + "id": winner.id, + "title": winner.title + } + } + + # GET ITEMS +@app.get("/items", response_model=list[schemas.ItemResponse]) +def get_items(db: Session = Depends(get_db)): + return crud.get_items(db) \ No newline at end of file diff --git a/backend/app/db/model.py b/backend/app/db/model.py new file mode 100644 index 0000000..5d0491f --- /dev/null +++ b/backend/app/db/model.py @@ -0,0 +1,87 @@ +from fastapi import FastAPI, Depends, HTTPException +from sqlalchemy.orm import Session +from fastapi.middleware.cors import CORSMiddleware + +import models +import schemas +import crud + +from database import SessionLocal, engine + +models.Base.metadata.create_all(bind=engine) + +app = FastAPI() + +# CORS +app.add_middleware( + CORSMiddleware, + allow_origins=["*"], + allow_credentials=True, + allow_methods=["*"], + allow_headers=["*"], +) + +# Database Session +def get_db(): + db = SessionLocal() + + try: + yield db + finally: + db.close() + +# GET ITEMS +@app.get("/items", response_model=list[schemas.ItemResponse]) +def get_items(db: Session = Depends(get_db)): + return crud.get_items(db) + +# CREATE ITEM +@app.post("/items", response_model=schemas.ItemResponse) +def create_item( + item: schemas.ItemCreate, + db: Session = Depends(get_db) +): + return crud.create_item(db, item.title) + +# DELETE ITEM +@app.delete("/items/{item_id}") +def delete_item( + item_id: int, + db: Session = Depends(get_db) +): + item = crud.delete_item(db, item_id) + + if not item: + raise HTTPException( + status_code=404, + detail="Item not found" + ) + + return {"message": "Item deleted"} + +# SPIN +@app.post("/spin") +def spin(db: Session = Depends(get_db)): + + winner = crud.spin_wheel(db) + + if not winner: + raise HTTPException( + status_code=400, + detail="No items available" + ) + + return { + "winner": { + "id": winner.id, + "title": winner.title + } + } + + from sqlalchemy import Column, Integer, String +from database import Base + +class Item(Base): + __tablename__ = "items" + id = Column(Integer, primary_key=True, index=True) + title = Column(String, nullable=False) \ No newline at end of file diff --git a/backend/database.py b/backend/app/db/session.py similarity index 70% rename from backend/database.py rename to backend/app/db/session.py index 3154273..0393a31 100644 --- a/backend/database.py +++ b/backend/app/db/session.py @@ -15,4 +15,13 @@ SessionLocal = sessionmaker( bind=engine ) +# Database Session +def get_db(): + db = SessionLocal() + + try: + yield db + finally: + db.close() + Base = declarative_base() \ No newline at end of file diff --git a/backend/main.py b/backend/main.py index 8fd1c0b..5e55b40 100644 --- a/backend/main.py +++ b/backend/main.py @@ -21,59 +21,7 @@ app.add_middleware( allow_headers=["*"], ) -# Database Session -def get_db(): - db = SessionLocal() - try: - yield db - finally: - db.close() -# GET ITEMS -@app.get("/items", response_model=list[schemas.ItemResponse]) -def get_items(db: Session = Depends(get_db)): - return crud.get_items(db) - -# CREATE ITEM -@app.post("/items", response_model=schemas.ItemResponse) -def create_item( - item: schemas.ItemCreate, - db: Session = Depends(get_db) -): - return crud.create_item(db, item.title) - -# DELETE ITEM -@app.delete("/items/{item_id}") -def delete_item( - item_id: int, - db: Session = Depends(get_db) -): - item = crud.delete_item(db, item_id) - - if not item: - raise HTTPException( - status_code=404, - detail="Item not found" - ) - - return {"message": "Item deleted"} - -# SPIN -@app.post("/spin") -def spin(db: Session = Depends(get_db)): - - winner = crud.spin_wheel(db) - - if not winner: - raise HTTPException( - status_code=400, - detail="No items available" - ) - - return { - "winner": { - "id": winner.id, - "title": winner.title - } - } \ No newline at end of file +app.include_router(user_router) +app.include_router(admin_router) \ No newline at end of file diff --git a/backend/models.py b/backend/models.py deleted file mode 100644 index 4f0b3bf..0000000 --- a/backend/models.py +++ /dev/null @@ -1,8 +0,0 @@ -from sqlalchemy import Column, Integer, String -from database import Base - -class Item(Base): - __tablename__ = "items" - - id = Column(Integer, primary_key=True, index=True) - title = Column(String, nullable=False) \ No newline at end of file diff --git a/backend/crud.py b/backend/services/crud.py similarity index 100% rename from backend/crud.py rename to backend/services/crud.py diff --git a/backend/wheel.db b/backend/wheel.db index 72215ed30ac20f1ca87a50a1dca77c5b2a276121..89e47641dadb1076aebde697368f697decd07b14 100644 GIT binary patch literal 12288 zcmeI#KTE?v7zXgWC~5*B-MYSGLPXHcf@cU=jH$gwq0^Dp2*Lc(HWgPL{7!x|M{~u3 zWa;Emo)_-IljDxuFVj02M|qRcW4$QTh6b$1IA<3`j4|Ghy>@I$=lxA+pE_?V&Q3l( z+xcdOV>8EgzP4?^Is_m90SG_<0uX=z1Rwwb2teT91>QY=*!O+@VK(Wk$kHM!XZc*c zW{YKBSDk1CG89QjiMWhH>MW9LnZMgqwJPae$lyvycW~xWJW43Oi=tz)%wQBx5-Emp z(mg>vKh5b@4sV2<(sei`_s@Br<((S`{jtwkUOi-Q%a@|<;#In8>UCC~&rzqH7rL)M z(w?@SdU`@Z00Izz00bZa0SG_<0uX=z1R$`h0+zlQ`u|=1y|@n+{D1hr0ad-?=VE1MWMpDuX6EDs0B?g!#sB~S