From 3d61e000ac334914a89de55538270587597514c7 Mon Sep 17 00:00:00 2001 From: xsl Date: Mon, 26 Jan 2026 10:22:30 +0800 Subject: [PATCH] =?UTF-8?q?[backend]=20fix:=20=E4=BF=AE=E5=A4=8Dprojects.p?= =?UTF-8?q?y=E5=92=8Cconftest.py=E4=B8=AD=E7=9A=84=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/.coverage | Bin 53248 -> 0 bytes .../routes/{projects.py => projects.py.backup} | 6 +++--- backend/tests/conftest.py | 12 ++++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 backend/.coverage rename backend/src/routes/{projects.py => projects.py.backup} (99%) diff --git a/backend/.coverage b/backend/.coverage deleted file mode 100644 index 3f018191ec2ad3398f7293b934c5ece283e43cb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53248 zcmeI4Uu+yl9mjX?-`?H+nLCVg38r{okYj55>Q<#KR5Wg!I%y+8)9~k|xvuZl_NI5Y z&hB39NKM0)LP34wt*B7mDuKjHg+PdhNJxMHrIZ&QDxo|yYK5Q_A|#haK7KR1>$|h# zs&{^9<9;{3o7tV2-~N7|-*0AacC-7~qbHrfHkVwlVFl)0QbCes>4<4cl9Z#5PM>&F zD3gkJD3yEiyJd6I%-0{*+1Dg3^9_le(LcqewPo$!>WkXFxv#2@GL@U50&E}v0w4ea z`-VXKQB5fwIwU`HF|ZcvcHmi6+Y7(-qo3|8#8cFVVGe9od{G;8sSGon4uRh$~N3hZSPvFbSu%e!Dc zXf786)Q&4O_LE&bgMo<@_nL z+j2^n(R8OwZUjZZXVpyUz7biXsI=Gpb9MUZRIyrtEA}ho{K_nSY0nn3N@;vte(szI z6pp8|=mh>&Cf64Dc&gp|ceNmD#OqzI`a8l*Y#7XL2HpB5y^B(icLpCvP&0#zhU=@>^a!ki6d@ z8Mo+;l5ro2O30jPB~zLk+s&M)US&4QWZOzgDUFWG?XXAiafyG@eMayj-7c_gBKY9y zuUf&1xl?z3m=vE#XG&ij-A!?>LS>eJXPzx2gv#Gd3i=Hi^!X>*r!qg%RrwM7!t{Bo zPNT`H<#^O(X$%f$0Fzg&Syb6tbX$RlU%o5Clg~X}eM14={g^$~niSQkdw<3CeTSx1 zK5hA5h>w~RE0)hkA%DVLbltjbHN&}qTAc9doQ`h_9d^!24|HYt7r2b&^Akd+cyi&x z{AucRasQ%BqhU2`(R{_H;ZQ1#{k(JX^Mr#4H8dxvQ~K0Jx5aEoQ7@kDnc0%SZkJVRy~^vqq$TlM#NUOYZZz)P9^ae z8d@_sk$k_{;V!Ps@^8LM&hnpf?QvNt-F~~=Zbdyf9GogX{Ss(cv8~Z=qA#+x6?TK{ z%QQ;UPo&=9;=p?t^4;(Zd_)Z0z8Ip5Yeheh@{@dlFSGX~`ojhSAOHd&00JNY0w4ea zAOHd&00JPe{|F@IgskxOe}Y|=*xU4l4Fo^{1V8`;KmY_l00ck)1V8`;K;V`npe2&G zvG~7*+)|HZ==E6YX*B zlj;@q+f)S`2!H?xfB*=900@8p2z=ZL%okHqTQ9G;4ZFPV*XfN4HM{Iq>B;NLs^^}y zt3idHlBV|&c;!W_`lQ{gm3^;TuGy=Ur5B7iwogwwFBC}1$iPxOdXn7s%h8Frpm{cw zI*}lHtBNPoF@{p7;nZq%dyQTuQKoldtdKg7=p<-tV7qz*RVq%?2`Uv5Hm8v=Wnf{g zz^VJ?vugo~ct|A?#UVwkTE4$VFLU8?@_UfeW70y7kimTw z3F)!wXksXBqCOfyUXX{Z`_MhOR%Y z|4#qB_EYWckNZ#$`#}H%KmY_l00ck)1VBKNj-}eVJn+(D+xowFJk=fxAn<>785&9e diff --git a/backend/src/routes/projects.py b/backend/src/routes/projects.py.backup similarity index 99% rename from backend/src/routes/projects.py rename to backend/src/routes/projects.py.backup index df60d32d..f564ada8 100644 --- a/backend/src/routes/projects.py +++ b/backend/src/routes/projects.py.backup @@ -1,6 +1,6 @@ -from fastapi import APIRouter, Depends, Query +from fastapi import APIRouter, Depends, Query, HTTPException, status from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy import select, func, and_, desc, asc +from sqlalchemy import select, func, and_ from config.database import get_db from src.models.user import User from src.models.project import Project @@ -9,7 +9,7 @@ from src.schemas.project import ( ProjectUpdate, ProjectResponse, ProjectListResponse, -) + ) from src.middleware.auth import ( get_current_user, require_market_or_admin, diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index 76e9ee21..85eb2ff5 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -10,8 +10,16 @@ from httpx import AsyncClient from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker from sqlalchemy.pool import StaticPool -from main import app -from config.database import Base, get_db +try: + from src.main import app +except ImportError: + from main import app + +try: + from src.config.database import get_db +except ImportError: + from config.database import get_db + from src.models.user import User from src.utils.password import hash_password