Skip to content

Commit 3392f70

Browse files
[Chore] Update files
1 parent 66590ae commit 3392f70

File tree

6 files changed

+19
-22
lines changed

6 files changed

+19
-22
lines changed

examples/sms/sms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
from solapi.message_service import SolapiMessageService
33
from solapi.model.message import Message
44

5-
test = SolapiMessageService(api_key="", api_secret="")
5+
test = SolapiMessageService(api_key="YOUR_API_KEY", api_secret="YOUR_API_SECRET")
66
test2 = Message(
7-
from_="029302266",
7+
from_="01012345678",
88
to="01012345678",
99
text="test"
1010
)

solapi/lib/string_date_transfer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import re
22
from datetime import datetime
3+
from typing import Union
34

45

56
class InvalidDateError(Exception):
@@ -60,7 +61,7 @@ def parse_iso(date_string: str) -> datetime:
6061
raise InvalidDateError("Invalid Date") from e
6162

6263

63-
def string_date_transfer(value: str | datetime):
64+
def string_date_transfer(value: Union[str, datetime]):
6465
"""
6566
일반 문자열 날짜가 있을 경우 datetime 타입으로 변환해주는 함수
6667

solapi/message_service.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,19 @@ def send(
3333
raise ValueError("데이터가 반드시 1건 이상 기입되어 있어야 합니다.")
3434

3535
request = SendMessageRequest(
36-
messages=payload,
37-
app_id=request_config.app_id,
38-
allow_duplicates=request_config.allow_duplicates,
39-
show_message_list=request_config.show_message_list,
36+
messages=payload
4037
)
41-
# TODO: 일어나면 여기부터 시작!
42-
if request_config.scheduled_date != "":
43-
request.scheduled_date = format_with_transfer(request_config.scheduled_date)
38+
if request_config is not None:
39+
request.app_id = request_config["app_id"]
40+
request.allow_duplicates = request_config["allow_duplicates"]
41+
request.show_message_list = request_config["show_message_list"]
42+
43+
if request_config.scheduled_date != "":
44+
request.scheduled_date = format_with_transfer(request_config.scheduled_date)
45+
46+
print(request.model_dump(exclude_none=True, by_alias=True))
4447

4548
return default_fetcher(self._auth_info, request={
4649
"method": RequestMethod.POST,
4750
"url": f"{self.baseUrl}/messages/v4/send-many/detail"
48-
}, data=request.model_dump())
51+
}, data=request.model_dump(exclude_none=True, by_alias=True))

solapi/model/fax.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

solapi/model/message.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
from pydantic import BaseModel, Field
66

7-
from solapi.model.fax import FileIdsType
8-
97

108
class MessageType(Enum):
119
"""
@@ -42,6 +40,8 @@ class MessageType(Enum):
4240
FAX = "FAX"
4341
VOICE = "VOICE"
4442

43+
class FileIdsType(BaseModel):
44+
file_ids: list[str]
4545

4646
class Message(BaseModel):
4747
from_: Optional[str] = Field(default=None, serialization_alias="from")
@@ -52,7 +52,7 @@ class Message(BaseModel):
5252
message_id: Optional[str] = Field(default=None, serialization_alias="messageId")
5353
group_id: Optional[str] = Field(default=None, serialization_alias="groupId")
5454
type: Optional[MessageType] = None
55-
auto_type_detect: Optional[bool] = Field(default=False, serialization_alias="autoTypeDetect")
55+
auto_type_detect: Optional[bool] = Field(default=True, serialization_alias="autoTypeDetect")
5656
date_created: Optional[datetime] = Field(default=None, serialization_alias="dateCreated")
5757
date_updated: Optional[datetime] = Field(default=None, serialization_alias="dateUpdated")
5858
subject: Optional[str] = None
@@ -64,5 +64,3 @@ class Message(BaseModel):
6464
kakao_options: Optional[dict[str, Any]] = Field(default=None, serialization_alias="kakaoOptions")
6565
rcs_options: Optional[dict[str, Any]] = Field(default=None, serialization_alias="rcsOptions")
6666
fax_options: Optional[FileIdsType] = Field(default=None, serialization_alias="faxOptions")
67-
68-

solapi/model/request/send_message_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class SendRequestConfig(BaseModel):
1515

1616
class SendMessageRequest(BaseModel):
1717
messages: list[Message]
18-
scheduled_date: Optional[str] = Field(default=None, serialization_alias="scheduled_date")
18+
scheduled_date: Optional[str] = Field(default=None, serialization_alias="scheduledDate")
1919
show_message_list: Optional[bool] = Field(default=False, serialization_alias="showMessageList")
2020
allow_duplicates: bool = Field(default=False, serialization_alias="allowDuplicates")
2121
app_id: Optional[str] = Field(default=None, serialization_alias="appId")

0 commit comments

Comments
 (0)