Feature/distribute crawl

.gitignore

@@ -102,7 +102,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+*.env
 .venv
 env/
 venv/

backend/apis/version1/route_cafes.py

@@ -15,9 +15,10 @@
     update_cafe_by_id,
 )
 from fastapi import APIRouter, Depends, HTTPException, status
-from schemas.cafes import CafeCreate, ShowCafe, CommentCreate, ShowComment
+from schemas.cafes import CafeCreate, CafeUpdate, ShowCafe, CommentCreate, ShowComment
 from sqlalchemy.orm import Session
 
+
 router = APIRouter()
 
 
@@ -27,7 +28,15 @@ def __init__(self, offset: int = 0, limit: int = 5):
         self.limit = limit
 
 
-@router.post("/create", response_model=ShowCafe)
+@router.get("", response_model=List[ShowCafe])
+def read_cafes(
+    db: Session = Depends(get_db), params: LimitParams = Depends(LimitParams)
+):
+    cafes = get_all_cafes(db=db, limit=params.limit)
+    return cafes
+
+
+@router.post("", response_model=ShowCafe)
 def create_cafe(
     cafe: CafeCreate,
     db: Session = Depends(get_db),
@@ -42,7 +51,28 @@ def create_cafe(
     return cafe
 
 
-@router.get("/get/{id}", response_model=ShowCafe)
+@router.get("/search", response_model=List[ShowCafe])
+def searching_cafe(
+    cafename: str = None,
+    location: str = None,
+    db: Session = Depends(get_db),
+    params: LimitParams = Depends(LimitParams),
+):
+    if not cafename and not location:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Must Input Cafe Name or Location",
+        )
+    cafes = search_cafe(db, params.limit, cafename=cafename, location=location)
+    if not cafes:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Can't find Cafe",
+        )
+    return cafes
+
+
+@router.get("/{id}", response_model=ShowCafe)
 def read_cafe(id: int, db: Session = Depends(get_db)):
     cafe = get_cafe_by_id(id=id, db=db)
     if not cafe:
@@ -53,22 +83,13 @@ def read_cafe(id: int, db: Session = Depends(get_db)):
     return cafe
 
 
-@router.get("/all", response_model=List[ShowCafe])
-def read_cafes(
-    db: Session = Depends(get_db), params: LimitParams = Depends(LimitParams)
-):
-    cafes = get_all_cafes(db=db, limit=params.limit)
-    return cafes
-
-
-@router.post("/update/{id}")
+@router.post("/{id}")
 def update_cafe(
     id: int,
-    cafe: CafeCreate,
+    cafe: CafeUpdate,
     db: Session = Depends(get_db),
     current_user: User = Depends(get_current_user_from_token),
 ):
-    print("Current User : ", current_user.is_superuser)
     if not current_user.is_superuser:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -82,28 +103,7 @@ def update_cafe(
     return {"msg": "Updated Successfully"}
 
 
-@router.get("/search", response_model=List[ShowCafe])
-def searching_cafe(
-    cafename: str = None,
-    location: str = None,
-    db: Session = Depends(get_db),
-    params: LimitParams = Depends(LimitParams),
-):
-    if not cafename and not location:
-        return HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Must Input Cafe Name or Location",
-        )
-    cafes = search_cafe(cafename, location, db)
-    if not cafes:
-        return HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Can't find Cafe",
-        )
-    return cafes[params.offest : params.offset + params.limit]
-
-
-@router.delete("/delete/{id}")
+@router.delete("/{id}")
 def delete_cafe(
     id: int,
     db: Session = Depends(get_db),
@@ -138,21 +138,21 @@ def add_comment(
     return comment
 
 
-@router.get("/{cafeid}/comments", response_model=List[ShowComment])
+@router.get("/{cafeid}/comment", response_model=List[ShowComment])
 def read_comments(
     cafeid: int,
     db: Session = Depends(get_db),
     current_user: User = Depends(get_current_user_from_token),
 ):
     comments = get_comments_by_cafeid(cafeid=cafeid, db=db)
     if not comments:
-        return HTTPException(
+        raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="Can't Find Comment"
         )
     return comments
 
 
-@router.delete("/comments/{commentid}/delete")
+@router.delete("/{cafeid}/comment/{commentid}")
 def delete_comment(
     commentid: int,
     db: Session = Depends(get_db),

backend/apis/version1/route_login.py

@@ -6,7 +6,7 @@
 from db.logics.login import create_access_token
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordRequestForm, OAuth2PasswordBearer
-from jose import JWTError, jwt
+from jose import ExpiredSignatureError, JWTError, jwt
 from schemas.tokens import Token
 from sqlalchemy.orm import Session
 
@@ -37,21 +37,28 @@ def login_for_access_token(
 def get_current_user_from_token(
     token: str = Depends(oauth2_scheme), db: Session = Depends(get_db)
 ):
-    authorize_exception = HTTPException(
-        status_code=status.HTTP_401_UNAUTHORIZED, detail="Can't Validate Token"
-    )
-
     try:
         payload = jwt.decode(
             token, settings.SECRET_KEY, algorithms=[settings.SECRET_ALGORITHM]
         )
         username: str = payload.get("sub")
         if username is None:
-            raise authorize_exception
+            raise HTTPException(
+                status_code=status.HTTP_401_UNAUTHORIZED,
+                detail="Expiration Time Passed.",
+            )
+    except ExpiredSignatureError:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED, detail="Expiration Time Passed."
+        )
     except JWTError:
-        raise authorize_exception
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED, detail="Can't Validate Token"
+        )
 
     user = get_user(username=username, db=db)
     if user is None:
-        raise authorize_exception
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED, detail="Can't Validate Token"
+        )
     return user

backend/apis/version1/route_users.py

@@ -1,13 +1,25 @@
+from apis.version1.route_login import get_current_user_from_token
 from db.session import get_db
-from db.logics.users import create_new_user
+from db.models.users import User
+from db.logics.users import create_new_user, delete_user
 from fastapi import APIRouter, Depends, status
 from schemas.users import UserCreate, ShowUser
 from sqlalchemy.orm import Session
 
+
 router = APIRouter()
 
 
 @router.post("/", response_model=ShowUser, status_code=status.HTTP_201_CREATED)
 def create_user(user: UserCreate, db: Session = Depends(get_db)):
     user = create_new_user(user=user, db=db)
     return user
+
+
+@router.delete("/")
+def delete_user(
+    db: Session = Depends(get_db),
+    current_user: User = Depends(get_current_user_from_token),
+):
+    delete_user(user=current_user, db=db)
+    return {"msg": "Deleted"}

backend/core/config.py

@@ -25,23 +25,26 @@ class Config:
 
 
 class TestSettings(BaseSettings):
+    PROJECT_NAME: str = "Cafe Search"
+    PROJECT_VERSION: str = "1.0.0"
+
     DB_USERNAME: str
     DB_PASSWORD: SecretStr
     DB_HOST: str
     DB_PORT: int
-    DB_NAME = "test"
+    DB_NAME: str
 
     TEST_USER_EMAIL = "sbjo@naver.com"
     TEST_USER_PASSWORD = "sbjo"
     TEST_ADMIN_EMAIL = "admin@naver.com"
     TEST_SECOND_USER_EMAIL = "sb@naver.com"
 
-    SECRET_KEY: str = "secret"
+    SECRET_KEY: str
     SECRET_ALGORITHM = "HS256"
     ACCESS_TOKEN_EXPIRE_MINUTES = 30
 
     class Config:
-        env_file = str(BASE_DIR / ".env")
+        env_file = str(BASE_DIR / "dev.env")
         env_file_encoding = "utf-8"
 
 

backend/core/hashing.py

@@ -2,6 +2,7 @@
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
+
 class Hasher:
     @staticmethod
     def verify_password(plain_password, hashed_password):