Skip to content

Commit

Permalink
예약대기 기능 추가 (#247)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Monsteel
Monsteel authored Sep 7, 2023
1 parent ecb9d04 commit fff1318
Show file tree
Hide file tree
Showing 3 changed files with 183 additions and 16 deletions.
166 changes: 151 additions & 15 deletions SRT/srt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
SRT_TICKETS = f"{SRT_MOBILE}/atc/selectListAtc14016_n.do"
SRT_TICKET_INFO = f"{SRT_MOBILE}/ard/selectListArd02017_n.do?"
SRT_CANCEL = f"{SRT_MOBILE}/ard/selectListArd02045_n.do"
SRT_STANDBY_OPTION = f"{SRT_MOBILE}/ata/selectListAta01135_n.do"

DEFAULT_HEADERS = {
"User-Agent": (
Expand All @@ -42,6 +43,11 @@
RESULT_SUCCESS = "SUCC"
RESULT_FAIL = "FAIL"

RESERVE_JOBID = {
"PERSONAL": "1101", # 개인예약
"STANDBY": "1102", # 예약대기
}


class SRT:
"""SRT 클라이언트 클래스
Expand Down Expand Up @@ -268,6 +274,62 @@ def reserve(
special_seat (:class:`SeatType`): 일반실/특실 선택 유형 (default: 일반실 우선)
window_seat (bool, optional): 창가 자리 우선 예약 여부
Returns:
:class:`SRTReservation`: 예약 내역
"""

return self._reserve(
RESERVE_JOBID["PERSONAL"],
train,
passengers,
special_seat,
window_seat=window_seat,
)

def reserve_standby(
self,
train: SRTTrain,
passengers: list[Passenger] | None = None,
special_seat: SeatType = SeatType.GENERAL_FIRST,
mblPhone: str | None = None,
) -> SRTReservation:
"""예약대기 신청 합니다.
>>> trains = srt.search_train("수서", "부산", "210101", "000000")
>>> srt.reserve_standby(trains[0])
Args:
train (:class:`SRTrain`): 예약할 열차
passengers (list[:class:`Passenger`], optional): 예약 인원 (default: 어른 1명)
special_seat (:class:`SeatType`): 일반실/특실 선택 유형 (default: 일반실 우선)
mblPhone (str, optional): 휴대폰 번호
Returns:
:class:`SRTReservation`: 예약 내역
"""

return self._reserve(
RESERVE_JOBID["STANDBY"], train, passengers, special_seat, mblPhone=mblPhone
)

def _reserve(
self,
jobid: str,
train: SRTTrain,
passengers: list[Passenger] | None = None,
special_seat: SeatType = SeatType.GENERAL_FIRST,
mblPhone: str | None = None,
window_seat: bool | None = None,
) -> SRTReservation:
"""예약 신청 요청 공통 함수
Args:
train (:class:`SRTrain`): 예약할 열차
passengers (list[:class:`Passenger`], optional): 예약 인원 (default: 어른 1명)
special_seat (:class:`SeatType`): 일반실/특실 선택 유형 (default: 일반실 우선)
mblPhone (str, optional): 휴대폰 번호 | jobid가 RESERVE_JOBID["STANDBY"]일 경우에만 사용
window_seat (bool, optional): 창가 자리 우선 예약 여부 | jobid가 RESERVE_JOBID["PERSONAL"]일 경우에만 사용
Returns:
:class:`SRTReservation`: 예약 내역
"""
Expand All @@ -286,6 +348,9 @@ def reserve(
passengers = [Adult()]
passengers = Passenger.combine(passengers)

if passengers is not None:
passengersCount = len(passengers)

# 일반식 / 특실 좌석 선택 옵션에 따라 결정.
is_special_seat = None
if special_seat == SeatType.GENERAL_ONLY: # 일반실만
Expand All @@ -305,29 +370,60 @@ def reserve(

url = SRT_RESERVE
data = {
"reserveType": "11",
"jobId": "1101", # 개인 예약
"jobId": jobid,
"jrnyCnt": "1",
"jrnyTpCd": "11",
"jrnySqno1": "001",
"stndFlg": "N",
"trnGpCd1": "300", # 열차그룹코드 (좌석선택은 SRT만 가능하기때문에 무조건 300을 셋팅한다)"
"stlbTrnClsfCd1": train.train_code,
"dptDt1": train.dep_date,
"dptTm1": train.dep_time,
"runDt1": train.dep_date,
"trnNo1": "%05d" % int(train.train_number),
"dptRsStnCd1": train.dep_station_code,
"dptRsStnCdNm1": train.dep_station_name,
"arvRsStnCd1": train.arr_station_code,
"arvRsStnCdNm1": train.arr_station_name,
"trnGpCd": "109", # 열차그룹코드
"grpDv": "0", # 단체 구분 (1: 단체)
"rtnDv": "0", # 편도 구분 (0: 편도, 1: 왕복)
"stlbTrnClsfCd1": train.train_code, # 역무열차종별코드1 (열차 목록 값)
"dptRsStnCd1": train.dep_station_code, # 출발역코드1 (열차 목록 값)
"dptRsStnCdNm1": train.dep_station_name, # 출발역이름1 (열차 목록 값)
"arvRsStnCd1": train.arr_station_code, # 도착역코드1 (열차 목록 값)
"arvRsStnCdNm1": train.arr_station_name, # 도착역이름1 (열차 목록 값)
"dptDt1": train.dep_date, # 출발일자1 (열차 목록 값)
"dptTm1": train.dep_time, # 출발일자1 (열차 목록 값)
"arvTm1": train.arr_time, # 도착일자1 (열차 목록 값)
"totPrnb": passengersCount, # 승차인원
"psgGridcnt": passengersCount, # 승차인원
"psgTpCd1": passengersCount, # 승차인원
"psgInfoPerPrnb1": passengersCount, # 승차인원
"trnNo1": "%05d" % int(train.train_number), # 열차번호1 (열차 목록 값)
"runDt1": train.dep_date, # 운행일자1 (열차 목록 값)
"psrmClCd1": "2" if is_special_seat is True else "1",
"dptStnConsOrdr1": train.dep_station_constitution_order, # 출발역구성순서1 (열차 목록 값)
"arvStnConsOrdr1": train.arr_station_constitution_order, # 도착역구성순서1 (열차 목록 값)
"dptStnRunOrdr1": train.dep_station_run_order, # 출발역운행순서1 (열차 목록 값)
"arvStnRunOrdr1": train.arr_station_run_order, # 도착역운행순서1 (열차 목록 값)
"smkSeatAttCd1": "000", # 흡연좌석속성코드1
"dirSeatAttCd1": "009", # 방향좌석속성코드
"locSeatAttCd1": "000", # 위치좌석속성코드1
"rqSeatAttCd1": "015", # 요구좌석속성코드1
"etcSeatAttCd1": "000", # 기타좌석속성코드1
"smkSeatAttCd2": "000", # 흡연좌석속성코드2
"dirSeatAttCd2": "009", # 방향좌석속성코드2
"rqSeatAttCd2": "015", # 요구좌석속성코드2
"mblPhone": mblPhone,
}

data.update(
Passenger.get_passenger_dict(
passengers, special_seat=is_special_seat, window_seat=window_seat
# jobid가 RESERVE_JOBID["PERSONAL"]일 경우, data에 reserveType 추가
if jobid == RESERVE_JOBID["PERSONAL"]:
data.update(
{
"reserveType": "1",
}
)

# jobid가 RESERVE_JOBID["PERSONAL"]일 경우, data에 windowSeat 추가
if jobid == RESERVE_JOBID["PERSONAL"]:
data.update(
Passenger.get_passenger_dict(
passengers, special_seat=is_special_seat, window_seat=window_seat
)
)
)

r = self._session.post(url=url, data=data)
parser = SRTResponseData(r.text)
Expand All @@ -347,6 +443,46 @@ def reserve(
# if ticket not found, it's an error
raise SRTError("Ticket not found: check reservation status")

def reserve_standby_option_settings(
self,
reservation: SRTReservation | int,
isAgreeSMS: bool,
isAgreeClassChange: bool,
telNo: str | None = None,
) -> bool:
"""예약대기 옵션을 적용 합니다.
>>> trains = srt.search_train("수서", "부산", "210101", "000000")
>>> srt.reserve_standby(trains[0])
>>> srt.reserve_standby_option_settings("1234567890", True, True, "010-1234-xxxx")
Args:
reservation (:class:`SRTReservation` or int): 예약 번호
isAgreeSMS (bool): SMS 수신 동의 여부
isAgreeClassChange (bool): 좌석등급 변경 동의 여부
telNo (str, optional): 휴대폰 번호
Returns:
bool: 예약대기 옵션 적용 성공 여부
"""
if not self.is_login:
raise SRTNotLoggedInError()

if isinstance(reservation, SRTReservation):
reservation = reservation.reservation_number

url = SRT_STANDBY_OPTION

data = {
"pnrNo": reservation,
"psrmClChgFlg": "Y" if isAgreeClassChange else "N",
"smsSndFlg": "Y" if isAgreeSMS else "N",
"telNo": telNo if isAgreeSMS else "",
}

r = self._session.post(url=url, data=data)

return r.status_code == 200

def get_reservations(self, paid_only: bool = False) -> list[SRTReservation]:
"""전체 예약 정보를 얻습니다.
Expand Down
21 changes: 21 additions & 0 deletions SRT/tests/test_srt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,27 @@ def test_get_reservations(srt):
srt.get_reservations()


def test_reserve_and_standby_option_settings(srt):
dep = "수서"
arr = "대전"
time = "000000"
time_limit = "120000"
date = (datetime.now() + timedelta(days=3)).strftime("%Y%m%d")

trains = srt.search_train(dep, arr, date, time, time_limit, available_only=False)
trains = list(filter(lambda t: t.reserve_standby_available(), trains))

assert len(trains) != 0

train = trains[0]
reservation = srt.reserve_standby(train)

if reservation is None:
pytest.warns(Warning("Empty seat not found, skipping reservation test"))

srt.reserve_standby_option_settings(reservation, True, True, "010-1234-5678")


def test_reserve_and_cancel(srt, pytestconfig):
pytestconfig.getoption("--full", skip=True)
dep = "수서"
Expand Down
12 changes: 11 additions & 1 deletion SRT/train.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ def __init__(self, data):
self.arr_station_name = STATION_NAME[self.arr_station_code]
self.general_seat_state = data["gnrmRsvPsbStr"]
self.special_seat_state = data["sprmRsvPsbStr"]
self.reserve_wait_possible_code = data["rsvWaitPsbCd"]
self.arr_station_run_order = data["arvStnRunOrdr"]
self.arr_station_constitution_order = data["arvStnConsOrdr"]
self.arr_station_constitution_order = data["arvStnConsOrdr"]
self.dep_station_run_order = data["dptStnRunOrdr"]
self.dep_station_constitution_order = data["dptStnConsOrdr"]

def __str__(self):
return self.dump()
Expand All @@ -33,7 +39,7 @@ def dump(self):
"{month}월 {day}일, "
"{dep}~{arr}"
"({dep_hour}:{dep_min}~{arr_hour}:{arr_min}) "
"특실 {special_state}, 일반실 {general_state}"
"특실 {special_state}, 일반실 {general_state}, 예약대기 {reserve_standby_state}"
).format(
name=self.train_name,
number=self.train_number,
Expand All @@ -47,6 +53,7 @@ def dump(self):
arr_min=self.arr_time[2:4],
special_state=self.special_seat_state,
general_state=self.general_seat_state,
reserve_standby_state="가능" if self.reserve_standby_available() else "불가능",
)

return d
Expand All @@ -57,5 +64,8 @@ def general_seat_available(self):
def special_seat_available(self):
return "예약가능" in self.special_seat_state

def reserve_standby_available(self):
return "9" in self.reserve_wait_possible_code # 9인 경우, 예약대기 가능한 상태임

def seat_available(self):
return self.general_seat_available() or self.special_seat_available()

0 comments on commit fff1318

Please sign in to comment.