porsche/vmis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: skip NC/Mail steps for manager tenant in account scheduler

Browse Source 
Manager tenant accounts don't have an NC container, so NC user
creation and Mail setup should be skipped (marked as success).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
VMIS Developer
2026-03-15 21:18:56 +08:00
parent 4abc0cdb9f
commit c96057c1b3
1 changed files with 94 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/app/services/scheduler/schedule_account.py
View File

@@ -77,6 +77,13 @@ def run_account_check(schedule_log_id: int, db: Session):
result.mailbox_done_at = now_tw() result.mailbox_done_at = now_tw()
fail_reasons.append(f"mailbox: {e}") fail_reasons.append(f"mailbox: {e}")
# [3] NC user + Mail（manager 租戶無 NC container，跳過）
if tenant.is_manager:
result.nc_result = True
result.nc_done_at = now_tw()
result.nc_mail_result = True
result.nc_mail_done_at = now_tw()
else:
# [3] NC user check # [3] NC user check
try: try:
from app.core.config import settings as _cfg from app.core.config import settings as _cfg
@@ -97,7 +104,6 @@ def run_account_check(schedule_log_id: int, db: Session):
fail_reasons.append(f"nc: {e}") fail_reasons.append(f"nc: {e}")
# [3.5] NC 台灣國定假日行事曆訂閱 # [3.5] NC 台灣國定假日行事曆訂閱
# 前置條件：NC 帳號已存在；MKCALENDAR 為 idempotent（已存在回傳 405 視為成功）
TW_HOLIDAYS_ICS_URL = "https://www.officeholidays.com/ics-clean/taiwan" TW_HOLIDAYS_ICS_URL = "https://www.officeholidays.com/ics-clean/taiwan"
if result.nc_result: if result.nc_result:
try: try:
@@ -116,7 +122,6 @@ def run_account_check(schedule_log_id: int, db: Session):
logger.warning(f"NC calendar subscribe error [{account.sso_account}]: {e}") logger.warning(f"NC calendar subscribe error [{account.sso_account}]: {e}")
# [4] NC Mail 帳號設定 # [4] NC Mail 帳號設定
# 前置條件：NC 帳號已建立 + mailbox 已建立
try: try:
if result.nc_result and result.mailbox_result: if result.nc_result and result.mailbox_result:
import paramiko import paramiko
@@ -130,7 +135,6 @@ def run_account_check(schedule_log_id: int, db: Session):
ssh.connect(_cfg.DOCKER_SSH_HOST, username=_cfg.DOCKER_SSH_USER, timeout=15) ssh.connect(_cfg.DOCKER_SSH_HOST, username=_cfg.DOCKER_SSH_USER, timeout=15)
def _ssh_run(cmd, timeout=60): def _ssh_run(cmd, timeout=60):
"""執行 SSH 指令並回傳輸出，超時返回空字串"""
_, stdout, _ = ssh.exec_command(cmd) _, stdout, _ = ssh.exec_command(cmd)
stdout.channel.settimeout(timeout) stdout.channel.settimeout(timeout)
try: try:
@@ -139,7 +143,6 @@ def run_account_check(schedule_log_id: int, db: Session):
out = "" out = ""
return out return out
# 確認是否已設定（occ mail:account:export 回傳帳號列表）
export_out = _ssh_run( export_out = _ssh_run(
f"docker exec -u www-data {nc_container} " f"docker exec -u www-data {nc_container} "
f"php /var/www/html/occ mail:account:export {account.sso_account} 2>/dev/null" f"php /var/www/html/occ mail:account:export {account.sso_account} 2>/dev/null"