refactor!: split router/services

project-ait · Nov 1, 2023 · 55ceb4e · 55ceb4e
1 parent 868ccc3
commit 55ceb4e
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 15 deletions.
diff --git a/core/sql_util.py b/core/sql_util.py
@@ -4,7 +4,7 @@
 import sqlite3
 import typing
 
-from oauth.dto.user_dto import UserDto
+from service.oauth.dto.user_dto import UserDto
 
 
 def env(key):

diff --git a/main.py b/main.py
@@ -5,12 +5,9 @@
 from fastapi import FastAPI
 
 from core.sql_util import check_and_create_table
-from oauth import auth
-from routers import deepl, location
-from service.subway import subway
-from service.summary import summary
+from routers import deepl, location, subway, summary, weather, auth
+
 # from service.summary.nlp_util import update_nlp_client
-from service.weather import weather
 
 app = FastAPI()
 

diff --git a/oauth/auth.py → routers/auth.py b/oauth/auth.py → routers/auth.py
@@ -2,8 +2,8 @@
 
 from core import sql_util
 from core.response import Response, ResponseStatus
-from oauth.account_util import calculate_jwt, encode_pw, validate_pw, validate_id, validate_jwt
-from oauth.dto.return_code import IdValidateCode, PWValidateCode, JWTValidateCode
+from service.oauth.account_util import calculate_jwt, encode_pw, validate_pw, validate_id, validate_jwt
+from service.oauth.dto.return_code import IdValidateCode, PWValidateCode, JWTValidateCode
 
 router = APIRouter()
 

diff --git a/service/subway/subway.py → routers/subway.py b/service/subway/subway.py → routers/subway.py
diff --git a/service/summary/summary.py → routers/summary.py b/service/summary/summary.py → routers/summary.py
diff --git a/service/weather/weather.py → routers/weather.py b/service/weather/weather.py → routers/weather.py
diff --git a/oauth/account_util.py → service/oauth/account_util.py b/oauth/account_util.py → service/oauth/account_util.py
@@ -6,20 +6,20 @@
 import jwt
 
 from core import sql_util
-from oauth.dto.return_code import (
+from service.oauth.dto.return_code import (
     IdValidateCode as IdValid,
     PWValidateCode as PwValid,
     JWTValidateCode as JWTValid
 )
-from oauth.rule.id_rule import ALLOWED_CHAR_RE
+from service.oauth.rule.id_rule import ALLOWED_CHAR_RE
 
 _SALT = os.environ.get("AIT_PW_SALT")  # admin only
 _PEPPER = os.environ.get("AIT_PW_PEPPER")  # admin only
 
 
 # noinspection DuplicatedCode
 def validate_id(_id: str) -> IdValid:
-    from oauth.rule.id_rule import (
+    from service.oauth.rule.id_rule import (
         MAX_LENGTH, MIN_LENGTH,
         MIN_CHAR_LEN, MIN_NUMBER_LEN,
         MAX_REPEAT_TIME
@@ -48,7 +48,7 @@ def validate_id(_id: str) -> IdValid:
 
 # noinspection DuplicatedCode
 def validate_pw(_id: str, pw: str) -> PwValid:
-    from oauth.rule.pw_rule import (
+    from service.oauth.rule.pw_rule import (
         MAX_LENGTH, MIN_LENGTH,
         MIN_CHAR_LEN, MIN_NUMBER_LEN,
         MAX_REPEAT_TIME, MAX_ID_SIMILARITY

diff --git a/oauth/dto/return_code.py → service/oauth/dto/return_code.py b/oauth/dto/return_code.py → service/oauth/dto/return_code.py
diff --git a/oauth/dto/user_dto.py → service/oauth/dto/user_dto.py b/oauth/dto/user_dto.py → service/oauth/dto/user_dto.py
diff --git a/oauth/rule/id_rule.py → service/oauth/rule/id_rule.py b/oauth/rule/id_rule.py → service/oauth/rule/id_rule.py
diff --git a/oauth/rule/pw_rule.py → service/oauth/rule/pw_rule.py b/oauth/rule/pw_rule.py → service/oauth/rule/pw_rule.py
diff --git a/tests/test_auth.py b/tests/test_auth.py
@@ -1,6 +1,6 @@
-from oauth import account_util
-from oauth.dto.return_code import IdValidateCode
-from oauth.rule import id_rule
+from service.oauth import account_util
+from service.oauth.dto.return_code import IdValidateCode
+from service.oauth.rule import id_rule
 
 
 def test_is_include_not_allowed_char():