Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Change _assign_virtual_account_1/2 URIs #126

Merged
merged 2 commits into from
Jan 9, 2025
Merged

fix: Change _assign_virtual_account_1/2 URIs #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2b7578
fix: Change _assign_virtual_account_1/2 URIs
dhoon-dev Jan 8, 2025
1eb326b
chore: lintfmt
dhoon-dev Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dhapi/endpoint/lottery_stdout_printer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def print_result_of_assign_virtual_account(self, 전용가상계좌, 결제신

console.print(table)

def print_result_of_show_balance(self, 총예치금, 구매가능금액, 예약구매금액, 출금신청중금액, 구매불가능금액, 이번달누적구매금액):
def print_result_of_show_balance(self, *, 총예치금, 구매가능금액, 예약구매금액, 출금신청중금액, 구매불가능금액, 이번달누적구매금액):
console = Console()

console.print("✅ 예치금 현황을 조회했습니다.")
Expand Down
13 changes: 10 additions & 3 deletions src/dhapi/port/lottery_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class LotteryClient:
_round_info_url = "https://www.dhlottery.co.kr/common.do?method=main"
_ready_socket = "https://ol.dhlottery.co.kr/olotto/game/egovUserReadySocket.json"
_cash_balance = "https://dhlottery.co.kr/userSsl.do?method=myPage"
_assign_virtual_account_1 = "https://dhlottery.co.kr/nicePay.do?method=nicePayInit"
_assign_virtual_account_2 = "https://dhlottery.co.kr/nicePay.do?method=nicePayProcess"
_assign_virtual_account_1 = "https://dhlottery.co.kr/kbank.do?method=kbankInit"
_assign_virtual_account_2 = "https://dhlottery.co.kr/kbank.do?method=kbankProcess"

def __init__(self, user_profile: User, lottery_endpoint):
self._user_id = user_profile.username
Expand Down Expand Up @@ -205,7 +205,14 @@ def show_balance(self):
구매불가능금액 = self._parse_digit(elem.select("td.ta_right")[4].contents[0]) # (예약구매금액 + 출금신청중금액)
이번달누적구매금액 = self._parse_digit(elem.select("td.ta_right")[5].contents[0])

self._lottery_endpoint.print_result_of_show_balance(총예치금, 구매가능금액, 예약구매금액, 출금신청중금액, 구매불가능금액, 이번달누적구매금액)
self._lottery_endpoint.print_result_of_show_balance(
총예치금=총예치금,
구매가능금액=구매가능금액,
예약구매금액=예약구매금액,
출금신청중금액=출금신청중금액,
구매불가능금액=구매불가능금액,
이번달누적구매금액=이번달누적구매금액,
)

except Exception:
raise RuntimeError("❗ 예치금 현황을 조회하지 못했습니다.")
Expand Down
22 changes: 11 additions & 11 deletions src/dhapi/router/router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ def version_callback(show_version: Optional[bool]):
""",
)
def assign_virtual_account(
amount: Annotated[
int, typer.Argument(help="입금할 금액을 지정합니다 (5천원, 1만원, 2만원, 3만원, 5만원, 10만원, 20만원, 30만원, 50만원, 70만원, 100만원 중 하나)", metavar="amount")
] = 50000,
profile: Annotated[str, typer.Option("-p", "--profile", help="프로필을 지정합니다", metavar="")] = "default",
_debug: Annotated[bool, typer.Option("-d", "--debug", help="debug 로그를 활성화합니다.", callback=logger_callback)] = False,
amount: Annotated[
int, typer.Argument(help="입금할 금액을 지정합니다 (5천원, 1만원, 2만원, 3만원, 5만원, 10만원, 20만원, 30만원, 50만원, 70만원, 100만원 중 하나)", metavar="amount")
] = 50000,
profile: Annotated[str, typer.Option("-p", "--profile", help="프로필을 지정합니다", metavar="")] = "default",
_debug: Annotated[bool, typer.Option("-d", "--debug", help="debug 로그를 활성화합니다.", callback=logger_callback)] = False,
):
user = CredentialsProvider(profile).get_user()
deposit = Deposit(amount)
Expand All @@ -57,8 +57,8 @@ def assign_virtual_account(
"""
)
def show_balance(
profile: Annotated[str, typer.Option("-p", "--profile", help="프로필을 지정합니다", metavar="")] = "default",
_debug: Annotated[bool, typer.Option("-d", "--debug", help="debug 로그를 활성화합니다.", callback=logger_callback)] = False,
profile: Annotated[str, typer.Option("-p", "--profile", help="프로필을 지정합니다", metavar="")] = "default",
_debug: Annotated[bool, typer.Option("-d", "--debug", help="debug 로그를 활성화합니다.", callback=logger_callback)] = False,
):
user = CredentialsProvider(profile).get_user()

Expand Down Expand Up @@ -88,10 +88,10 @@ def show_balance(
"""
)
def buy_lotto645(
tickets: Annotated[List[str], typer.Argument(help="구매할 번호를 입력합니다. 생략 시 자동모드로 5장 구매합니다.", metavar="tickets", show_default=False)] = None,
always_yes: Annotated[bool, typer.Option("-y", "--yes", help="구매 전 확인 절차를 스킵합니다.")] = False,
profile: Annotated[str, typer.Option("-p", "--profile", help="프로필을 지정합니다", metavar="")] = "default",
_debug: Annotated[bool, typer.Option("-d", "--debug", help="debug 로그를 활성화합니다.", callback=logger_callback)] = False,
tickets: Annotated[List[str], typer.Argument(help="구매할 번호를 입력합니다. 생략 시 자동모드로 5장 구매합니다.", metavar="tickets", show_default=False)] = None,
always_yes: Annotated[bool, typer.Option("-y", "--yes", help="구매 전 확인 절차를 스킵합니다.")] = False,
profile: Annotated[str, typer.Option("-p", "--profile", help="프로필을 지정합니다", metavar="")] = "default",
_debug: Annotated[bool, typer.Option("-d", "--debug", help="debug 로그를 활성화합니다.", callback=logger_callback)] = False,
):
cred = CredentialsProvider(profile)
user = cred.get_user()
Expand Down
Loading