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.

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: 예치금 조회 기능 오류 (#107) #108

Merged
merged 2 commits into from
Mar 10, 2024
Merged

Conversation

an14700
Copy link
Contributor

@an14700 an14700 commented Mar 5, 2024

인덱스 오류를 수정했습니다.

@an14700 an14700 requested a review from roeniss as a code owner March 5, 2024 07:22
@roeniss
Copy link
Owner

roeniss commented Mar 5, 2024

#107 에서 논의중 파악 완료

@roeniss roeniss added the bug Something isn't working label Mar 5, 2024
@roeniss
Copy link
Owner

roeniss commented Mar 6, 2024

@an14700 #107 에서 얘기 나눈대로, 가상계좌 설정 유무에 따라 UI 가 다르게 나타나는 것 같습니다. 해당 조건을 파악하여 분기를 생성하는 쪽으로 코드 변경을 부탁드려도 될까요?

@an14700
Copy link
Contributor Author

an14700 commented Mar 6, 2024

'간편충전 계좌번호' 또는 '입금용 계좌번호' 유무에 따라 분기를 추가해보았습니다.
간편충전 계좌가 없는 제 계정에서 tbl_total_account_number_top 테이블의 '간편충전 계좌번호' 항목이 빈 값이였습니다.

<div class="box money">
        <div class="head">
                <h4>회원님의 <strong>예치금 현황</strong>입니다.</h4>
                <a class="link_common" href="/myPage.do?method=depositListView">자세히 보기</a>
        </div>
        <p class="total_new"><span>총 예치금</span><strong>40,000</strong><span>원</span></p>
        <div class="total_account_number" style="height:47px;">
                <table class="tbl_total_account_number_top">
                <caption>입금용 계좌번호, 계좌주명</caption>
                <colgroup>
                        <col style="width:150px">
                        <col>
                </colgroup>
                <tbody>


                        <tr>
                                <th scope="row">간편충전 계좌번호
                                        <div class="wrap_help">
                                                <a href="#helpEc" class="ico_help" aria-labelledby="helpEc">간편충전 계좌번호</a>
                                                <div id="helpEc" class="box_help"><p class="p_txt_black">예치금 간편 충전 용으로 [충전하기] 화면에서 등록한 케이뱅크 연결계좌번호입니다</p>
                                        </div>
                                </th>
                                <td class="ta_right"></td>
                        </tr>
<!-- <tr>
                                <th scope="row"></th>
                                <td class="ta_right"><div class="total_account_number_btn"><a href="/payment.do?method=payment">예치금충전 화면 이동</a></div></td>
                        </tr> -->

                </tbody>
        </table>
        </div>

        <table class="tbl_total_account_number" style="font-size:11.5px">
                <caption>구매가능금액, 구매불가능금액, 누적구매금액, 출금신청중 금액 등 예치금 현황 정보</caption>
                <colgroup>
                        <col style="width:120px">
                        <col>
                        <col style="width:122px">
                        <col>
                </colgroup>
                <tbody>
                        <tr>
                                <th scope="row">
                                        구매가능금액
                                        <div class="wrap_help">
                                                <a href="#help1" class="ico_help" aria-labelledby="help1">구매가능금액이란?</a>
                                                <div id="help1" class="box_help"><p>복권구매가 가능한 금액 입니다.</p></div>
                                        </div>
                                </th>
                                <td class="ta_right" colspan="3">40,000 원
                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

                                        <a class="btn_common sml" href="/payment.do?method=payment">충전</a>
                                        <a class="btn_common sml" href="/userSsl.do?method=refundView">출금</a>

                                </td>

                        </tr>

                        <tr>
                                <th scope="row">
                                        예약구매금액
                                        <div class="wrap_help">
                                                <a href="#help3" class="ico_help" aria-labelledby="help3">예약구매금액이란?</a>
                                                <div id="help3" class="box_help"><p>예약 구매를 신청한 금액입니다</p></div>
                                        </div>  
                                </th>
                                <td class="ta_right">
                                0 원
                                </td>
                                <th scope="row">
                                        <!-- <a class="btn_common sml" href="/payment.do?method=payReqForm&payTypeCode=DI46">신용카드충전</a> -->
                                        출금신청중금액
                                        <div class="wrap_help">
                                                <a href="#help3" class="ico_help" aria-labelledby="help3">출금신청중금액이란?</a>
                                                <div id="help3" class="box_help"><p>출금 신청 접수된 예치금입니다.</p></div>
                                        </div>  
                                </th>
                                <td class="ta_right">
                                0 원
                                </td>
                        </tr>

                        <tr>
                                <th scope="row">
                                        구매불가능금액
                                        <div class="wrap_help">
                                                <a href="#help2" class="ico_help" aria-labelledby="help2">구매불가능금액이란?</a>
                                                <div id="help2" class="box_help"><p>(예약구매금액 + 출금신청중 금액)</p></div>

                                        </div> 
                                </th>
                                <td class="ta_right" colspan="3">
                                (예약구매금액 + 출금신청중 금액) &nbsp;
                                0 원
                                </td>

                        </tr>
                        <tr>
                                <th scope="row">
                                        누적구매금액
                                        <div class="wrap_help">
                                                <a href="#help4" class="ico_help" aria-labelledby="help4">누적구매금액이란?</a>
                                                <div id="help4" class="box_help"><p>당월 총 구매 금액입니다.</p></div>

                                        </div> 
                                </th>
                                <td class="ta_right" colspan="3">
                                0 원
                                </td>
                        </tr>


                </tbody>
        </table>
        <p class="prgrp_common prgrp_note">복권의 1인 1회 구매한도는 10만원을 초과할 수 없습니다.</p>
        <div class="btn_bottom" style="bottom:5px;">
                <a class="btn_common mid blu" href="/gameInfo.do?method=game720Method">연금복권720+ 구매하기</a>
                <a class="btn_common mid blu" href="/gameInfo.do?method=inetbokBuyInfo">전자복권 구매하기</a>
        </div>
</div>

@an14700 an14700 removed their assignment Mar 6, 2024
@roeniss
Copy link
Owner

roeniss commented Mar 10, 2024

@an14700 우선 코드는 확인하였습니다. 감사합니다.

다만 위 CI 과정이 실패했기 때문에, 로컬에서 다음과 같은 작업을 처리한 후 commit & push 해주시길 부탁드리고 싶습니다.

pip install black pylint # 커밋 후 uninstall 하시면 될 것 같습니다
make lintfmt

제가 로컬에서 돌렸을 때 아래와 같은 결과를 확인했습니다.

$ make lintfmt
black src/**
reformatted /Users/roeniss/workspace/dhlottery-api/src/dhapi/endpoint/lottery_email_sender.py
reformatted /Users/roeniss/workspace/dhlottery-api/src/dhapi/port/lottery_client.py

All done! ✨ 🍰 ✨
2 files reformatted, 22 files left unchanged.
pylint src

l
************* Module dhapi.port.lottery_client
src/dhapi/port/lottery_client.py:183:15: C0121: Comparison 'has_bank_account == True' should be 'has_bank_account is True' if checking for the singleton value True, or 'has_bank_account' if testing for truthiness (singleton-comparison)

-------------------------------------------------------------------
Your code has been rated at 9.98/10 (previous run: 10.00/10, -0.02)

make: *** [lintfmt] Error 16
  • black 은 lint 를 자동으로 해줍니다. 따라서 커밋만 붙이면 되시고..
  • pylint 는 알려주만 줍니다. 문제점을 보시고 수정해주시면 될 것 같습니다. (make lintfmt 결과에서 "Your code has been rated at 10.00/10" 이 보이면 완료된 것입니다)

@an14700
Copy link
Contributor Author

an14700 commented Mar 10, 2024

@roeniss 말씀하신 내용 수정했습니다. 확인 부탁드립니다.

@roeniss
Copy link
Owner

roeniss commented Mar 10, 2024

@an14700 수고하셨습니다. 기여 감사합니다!

@roeniss roeniss enabled auto-merge March 10, 2024 12:36
@roeniss roeniss merged commit e08114b into roeniss:main Mar 10, 2024
1 check passed
@roeniss
Copy link
Owner

roeniss commented Mar 10, 2024

(approve 누르는걸 깜빡했네요 😅)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants