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

Jump to bottom

pydantic migration #156

Merged
merged 2 commits into from
Sep 14, 2023
Merged

pydantic migration #156

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
752b0c8
pydantic migration
LeoQuote Sep 14, 2023
2b93573
fix notification render error
LeoQuote Sep 14, 2023
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
55 changes: 29 additions & 26 deletions helpdesk/libs/notification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ class MailNotification(Notification):
method = 'mail'

async def get_mail_addrs(self):
email_addrs = [ADMIN_EMAIL_ADDRS] + [get_user_email(cc) for cc in self.ticket.ccs] + self.ticket.annotation.get("approvers").split(',')
email_addrs = [ADMIN_EMAIL_ADDRS] + [get_user_email(cc) for cc in self.ticket.ccs] + self.ticket.annotation.get(
"approvers").split(',')
email_addrs += [get_user_email(approver) for approver in await self.ticket.get_rule_actions('approver')]
if self.phase.value in ('approval', 'mark'):
email_addrs += [get_user_email(self.ticket.submitter)]
Expand Down Expand Up @@ -146,10 +147,11 @@ def render(self):
notify_people = approvers
for index, node in enumerate(nodes):
if self.ticket.annotation.get("current_node") == node.get("name"):
next_node = nodes[index+1].get("name") if (index != len(nodes)-1) else ""
next_node = nodes[index + 1].get("name") if (index != len(nodes) - 1) else ""
notify_type = node.get("node_type")

if self.phase.value in (TicketPhase.APPROVAL.value, TicketPhase.MARK.value) or (self.phase.value == 'request' and self.ticket.status == "closed"):
if self.phase.value in (TicketPhase.APPROVAL.value, TicketPhase.MARK.value) or (
self.phase.value == 'request' and self.ticket.status == "closed"):
notify_type = NodeType.CC
if notify_type == NodeType.CC:
if self.phase.value == TicketPhase.MARK.value or approvers == "":
Expand All @@ -160,34 +162,35 @@ def render(self):
approval_log = copy.deepcopy(self.ticket.annotation.get("approval_log"))
for log in approval_log:
format = '%Y-%m-%d %H:%M:%S'
log["operated_at"] = timezone('Etc/UTC').localize(datetime.strptime(log.get("operated_at"), format)).astimezone(timezone(TIME_ZONE)).strftime(format)

return NotifyMessage(
phase=self.phase.value,
title=self.ticket.title,
ticket_url=self.ticket.web_url,
status=self.ticket.status,
is_approved=self.ticket.is_approved or False,
submitter=self.ticket.submitter,
params=self.ticket.params,
request_time=timezone('Etc/UTC').localize(self.ticket.created_at).astimezone(timezone(TIME_ZONE)),
reason=self.ticket.reason or "",
approval_flow=self.ticket.annotation.get("policy"),
current_node=self.ticket.annotation.get("current_node"),
approvers=approvers,
next_node=next_node,
approval_log=approval_log,
notify_type=notify_type,
notify_people=notify_people,
comfirmed_by=self.ticket.confirmed_by or ""
)
log["operated_at"] = timezone('Etc/UTC').localize(
datetime.strptime(log.get("operated_at"), format)).astimezone(timezone(TIME_ZONE)).strftime(format)

return NotifyMessage.model_validate({
"phase": self.phase.value,
"title": self.ticket.title,
"ticket_url": self.ticket.web_url,
"status": self.ticket.status,
"is_approved": self.ticket.is_approved or False,
"submitter": self.ticket.submitter,
"params": self.ticket.params,
"request_time": timezone('Etc/UTC').localize(self.ticket.created_at).astimezone(timezone(TIME_ZONE)),
"reason": self.ticket.reason or "",
"approval_flow": self.ticket.annotation.get("policy"),
"current_node": self.ticket.annotation.get("current_node"),
"approvers": approvers,
"next_node": next_node,
"approval_log": approval_log,
"notify_type": notify_type,
"notify_people": notify_people,
"comfirmed_by": self.ticket.confirmed_by or "",
})

async def send(self):
if not WEBHOOK_EVENT_URL:
return
message = self.render()
r = requests.post(WEBHOOK_EVENT_URL, message.json())
r = requests.post(WEBHOOK_EVENT_URL, message.model_dump_json())
if r.status_code == 200:
return
else:
report()
report()
14 changes: 7 additions & 7 deletions helpdesk/views/api/schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ class QeuryKey(str, Enum):


class ParamRule(BaseModel):
id: Optional[int]
title: Optional[str]
provider_object: Optional[str]
rule: Optional[str]
is_auto_approval: Optional[bool]
approver: Optional[str]
id: Optional[int] = None
title: Optional[str] = None
provider_object: Optional[str] = None
rule: Optional[str] = None
is_auto_approval: Optional[bool] = None
approver: Optional[str] = None


class OperateTicket(BaseModel):
"""
操作工单的请求体
"""
reason: Optional[str]
reason: Optional[str] = None


class PolicyFlowResp(BaseModel):
Expand Down
Loading