Skip to content

Commit b550a79

Browse files
Update models
1 parent 85c975d commit b550a79

File tree

4 files changed

+52
-15
lines changed

4 files changed

+52
-15
lines changed

solapi/message_service.py

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ def send(
5353
request.allow_duplicates = request_config.allow_duplicates
5454
request.show_message_list = request_config.show_message_list
5555

56-
if (
57-
request_config.scheduled_date is not None
58-
and request_config.scheduled_date != ""
59-
and isinstance(request_config.scheduled_date, datetime)
56+
if request_config.scheduled_date is not None and (
57+
request_config.scheduled_date != ""
58+
or isinstance(request_config.scheduled_date, datetime)
6059
):
6160
request.scheduled_date = format_with_transfer(
6261
request_config.scheduled_date
6362
)
6463

64+
print(request.model_dump(exclude_none=True, by_alias=True))
6565
response = default_fetcher(
6666
self.auth_info,
6767
request={
@@ -105,3 +105,25 @@ def upload_file(
105105
response
106106
)
107107
return deserialized_response
108+
109+
# TODO: 조회 기능들 개발해야 함
110+
def get_groups(self):
111+
return ""
112+
113+
def get_group(self, group_id: str):
114+
return group_id
115+
116+
def get_group_messages(self, group_id: str):
117+
return group_id
118+
119+
def get_messages(self):
120+
return ""
121+
122+
def get_message(self, message_id: str):
123+
return message_id
124+
125+
def get_naver_templates(self):
126+
return ""
127+
128+
def get_balance(self):
129+
return ""

solapi/model/rcs/rcs_options.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
from typing import Optional
2+
3+
from pydantic import BaseModel, ConfigDict
4+
from pydantic.alias_generators import to_camel
5+
6+
7+
class RcsOptions(BaseModel):
8+
brand_id: Optional[str] = None
9+
template_id: Optional[str] = None
10+
copy_allowed: Optional[bool] = None
11+
variables: Optional[dict[str, str]] = None
12+
mms_type: Optional[str] = None
13+
14+
model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)

solapi/model/request/send_message_request.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
from datetime import datetime
33
from typing import Optional, Union
44

5-
from pydantic import BaseModel, Field
5+
from pydantic import BaseModel, ConfigDict, Field
6+
from pydantic.alias_generators import to_camel
67

78
from solapi.model.message import Message
89

910

1011
class SendRequestConfig(BaseModel):
11-
app_id: Optional[str] = Field(default=None, serialization_alias="appId")
12-
allow_duplicates: bool = Field(default=False, serialization_alias="allowDuplicates")
13-
show_message_list: bool = Field(
14-
default=False, serialization_alias="showMessageList"
15-
)
16-
scheduled_date: Optional[Union[str, datetime]] = Field(
17-
default=None, serialization_alias="scheduledDate"
12+
app_id: Optional[str] = None
13+
allow_duplicates: bool = False
14+
show_message_list: bool = False
15+
scheduled_date: Optional[Union[str, datetime]] = None
16+
17+
model_config = ConfigDict(
18+
alias_generator=to_camel, extra="ignore", populate_by_name=True
1819
)
1920

2021

solapi/model/response/common_response.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ class AppResponse(BaseModel):
5454

5555
class GroupMessageResponse(BaseModel):
5656
count: CountResponse
57-
count_for_charge: CountForChargeResponse
57+
count_for_charge: Any
5858
balance: CommonCashResponse
5959
point: CommonCashResponse
60-
app: AppResponse
61-
log: list[dict[str, str]]
60+
app: Any
61+
log: Any
6262
status: str
6363
allow_duplicates: bool
6464
is_refunded: bool

0 commit comments

Comments
 (0)