Compare commits
3 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
90b0b564c2 | ||
| 003c570cfb | |||
|
|
bac6830fc3 |
@@ -1,8 +1,6 @@
|
|||||||
"""Telegram command handlers for JIGAIDO - Thin wrappers around core services."""
|
"""Telegram command handlers for JIGAIDO - Thin wrappers around core services."""
|
||||||
|
|
||||||
import time
|
import time
|
||||||
from datetime import datetime, timezone
|
|
||||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||||
@@ -22,36 +20,6 @@ TRACKING_SERVICE = TrackingService(TRACKING_STORAGE, ROOM_STORAGE)
|
|||||||
TELEGRAM_BOT_USERNAME = "your_bot_username"
|
TELEGRAM_BOT_USERNAME = "your_bot_username"
|
||||||
|
|
||||||
|
|
||||||
def format_due_date(due_date_ts: int | None, timezone_str: str) -> str:
|
|
||||||
"""Format due date as human-readable with timezone.
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
No due date: (none shown)
|
|
||||||
Date only: 4 April 2026
|
|
||||||
Date + time: 4 April 2026 14:30
|
|
||||||
With timezone: 4 April 2026 14:30 (Asia/Jakarta)
|
|
||||||
"""
|
|
||||||
if not due_date_ts:
|
|
||||||
return ""
|
|
||||||
|
|
||||||
try:
|
|
||||||
tz = ZoneInfo(timezone_str)
|
|
||||||
except (KeyError, ZoneInfoNotFoundError):
|
|
||||||
tz = ZoneInfo("UTC")
|
|
||||||
|
|
||||||
dt = datetime.fromtimestamp(due_date_ts, tz=tz)
|
|
||||||
|
|
||||||
date_str = dt.strftime("%-d %B %Y")
|
|
||||||
|
|
||||||
if dt.hour != 0 or dt.minute != 0:
|
|
||||||
date_str += f" {dt.strftime('%H:%M')}"
|
|
||||||
date_str += f" ({timezone_str})"
|
|
||||||
|
|
||||||
return date_str
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def extract_args(text: str) -> list[str]:
|
def extract_args(text: str) -> list[str]:
|
||||||
if not text:
|
if not text:
|
||||||
return []
|
return []
|
||||||
@@ -261,6 +229,7 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
user_id = get_user_id(update)
|
user_id = get_user_id(update)
|
||||||
room_id = get_room_id(update)
|
room_id = get_room_id(update)
|
||||||
|
|
||||||
|
try:
|
||||||
bounty = BOUNTY_SERVICE.add_bounty(
|
bounty = BOUNTY_SERVICE.add_bounty(
|
||||||
room_id=room_id,
|
room_id=room_id,
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
@@ -268,11 +237,16 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
link=link,
|
link=link,
|
||||||
due_date_ts=due_date_ts,
|
due_date_ts=due_date_ts,
|
||||||
)
|
)
|
||||||
|
except PermissionError as e:
|
||||||
|
await update.message.reply_text(f"⛔ {e}")
|
||||||
|
return
|
||||||
|
except ValueError as e:
|
||||||
|
await update.message.reply_text(f"⛔ {e}")
|
||||||
|
return
|
||||||
|
|
||||||
due_str = ""
|
due_str = ""
|
||||||
if due_date_ts:
|
if due_date_ts:
|
||||||
timezone_str = BOUNTY_SERVICE.get_timezone(room_id)
|
due_str = f" | Due: {time.strftime('%Y-%m-%d', time.localtime(due_date_ts))}"
|
||||||
due_str = f" | Due: {format_due_date(due_date_ts, timezone_str)}"
|
|
||||||
await update.message.reply_text(
|
await update.message.reply_text(
|
||||||
f"✅ Bounty added (#{bounty.id}){due_str}",
|
f"✅ Bounty added (#{bounty.id}){due_str}",
|
||||||
disable_web_page_preview=True,
|
disable_web_page_preview=True,
|
||||||
@@ -344,11 +318,11 @@ cmd_edit = cmd_update
|
|||||||
async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
args = extract_args(update.message.text)
|
args = extract_args(update.message.text)
|
||||||
if not args:
|
if not args:
|
||||||
await update.message.reply_text("Usage: /delete <bounty_id>")
|
await update.message.reply_text("Usage: /delete <bounty_id> [bounty_id ...]")
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
bounty_id = int(args[0])
|
bounty_ids = [int(arg) for arg in args]
|
||||||
except ValueError:
|
except ValueError:
|
||||||
await update.message.reply_text("Invalid bounty ID.")
|
await update.message.reply_text("Invalid bounty ID.")
|
||||||
return
|
return
|
||||||
@@ -357,19 +331,25 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
room_id = get_room_id(update)
|
room_id = get_room_id(update)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
success = BOUNTY_SERVICE.delete_bounty(
|
results = BOUNTY_SERVICE.delete_bounties(
|
||||||
room_id=room_id,
|
room_id=room_id,
|
||||||
bounty_id=bounty_id,
|
bounty_ids=bounty_ids,
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
)
|
)
|
||||||
except PermissionError as e:
|
except PermissionError as e:
|
||||||
await update.message.reply_text(f"⛔ {e}")
|
await update.message.reply_text(f"⛔ {e}")
|
||||||
return
|
return
|
||||||
|
|
||||||
if success:
|
response_lines = []
|
||||||
await update.message.reply_text(f"✅ Bounty #{bounty_id} deleted.")
|
for bounty_id, result in results.items():
|
||||||
else:
|
if result == "deleted":
|
||||||
await update.message.reply_text("Bounty not found.")
|
response_lines.append(f"✅ Bounty #{bounty_id} deleted.")
|
||||||
|
elif result == "not_found":
|
||||||
|
response_lines.append(f"⛔ Bounty #{bounty_id} not found.")
|
||||||
|
elif result == "permission_denied":
|
||||||
|
response_lines.append(f"⛔ Bounty #{bounty_id} permission denied.")
|
||||||
|
|
||||||
|
await update.message.reply_text("\n".join(response_lines))
|
||||||
|
|
||||||
|
|
||||||
async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
|
|||||||
@@ -210,6 +210,28 @@ class BountyService:
|
|||||||
self._storage.update_bounty(room_id, bounty)
|
self._storage.update_bounty(room_id, bounty)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
def delete_bounties(
|
||||||
|
self, room_id: int, bounty_ids: list[int], user_id: int
|
||||||
|
) -> dict[int, str]:
|
||||||
|
"""Soft delete multiple bounties. Returns dict of bounty_id -> result.
|
||||||
|
|
||||||
|
Results can be: 'deleted', 'not_found', 'permission_denied'
|
||||||
|
"""
|
||||||
|
results = {}
|
||||||
|
for bounty_id in bounty_ids:
|
||||||
|
bounty = self._storage.get_bounty(room_id, bounty_id)
|
||||||
|
if not bounty:
|
||||||
|
results[bounty_id] = "not_found"
|
||||||
|
continue
|
||||||
|
if not self.is_admin(room_id, user_id):
|
||||||
|
results[bounty_id] = "permission_denied"
|
||||||
|
continue
|
||||||
|
|
||||||
|
bounty.deleted_at = int(time.time())
|
||||||
|
self._storage.update_bounty(room_id, bounty)
|
||||||
|
results[bounty_id] = "deleted"
|
||||||
|
return results
|
||||||
|
|
||||||
|
|
||||||
class TrackingService:
|
class TrackingService:
|
||||||
"""Service for tracking bounty operations."""
|
"""Service for tracking bounty operations."""
|
||||||
|
|||||||
@@ -210,6 +210,46 @@ class TestBountyService:
|
|||||||
result = self.service.delete_bounty(-1001, 999, self.admin_user_id)
|
result = self.service.delete_bounty(-1001, 999, self.admin_user_id)
|
||||||
assert result is False
|
assert result is False
|
||||||
|
|
||||||
|
def test_delete_bounties_multi_id_success(self):
|
||||||
|
"""Test delete_bounties returns individual results for multiple bounties."""
|
||||||
|
bounty1 = self.service.add_bounty(
|
||||||
|
room_id=-1001, user_id=self.admin_user_id, text="To delete 1"
|
||||||
|
)
|
||||||
|
bounty2 = self.service.add_bounty(
|
||||||
|
room_id=-1001, user_id=self.admin_user_id, text="To delete 2"
|
||||||
|
)
|
||||||
|
results = self.service.delete_bounties(
|
||||||
|
-1001, [bounty1.id, bounty2.id], self.admin_user_id
|
||||||
|
)
|
||||||
|
assert results == {bounty1.id: "deleted", bounty2.id: "deleted"}
|
||||||
|
# Verify both are soft deleted
|
||||||
|
assert self.service.get_bounty(-1001, bounty1.id) is None
|
||||||
|
assert self.service.get_bounty(-1001, bounty2.id) is None
|
||||||
|
|
||||||
|
def test_delete_bounties_mixed_results(self):
|
||||||
|
"""Test delete_bounties returns not_found for non-existent bounties."""
|
||||||
|
bounty = self.service.add_bounty(
|
||||||
|
room_id=-1001, user_id=self.admin_user_id, text="To delete"
|
||||||
|
)
|
||||||
|
results = self.service.delete_bounties(
|
||||||
|
-1001, [bounty.id, 999, 888], self.admin_user_id
|
||||||
|
)
|
||||||
|
assert results == {bounty.id: "deleted", 999: "not_found", 888: "not_found"}
|
||||||
|
|
||||||
|
def test_delete_bounties_permission_denied(self):
|
||||||
|
"""Test delete_bounties returns permission_denied for non-admin users."""
|
||||||
|
bounty = self.service.add_bounty(
|
||||||
|
room_id=-1001, user_id=self.admin_user_id, text="To delete"
|
||||||
|
)
|
||||||
|
results = self.service.delete_bounties(
|
||||||
|
-1001,
|
||||||
|
[bounty.id],
|
||||||
|
999, # non-admin user
|
||||||
|
)
|
||||||
|
assert results == {bounty.id: "permission_denied"}
|
||||||
|
# Verify bounty was NOT deleted
|
||||||
|
assert self.service.get_bounty(-1001, bounty.id) is not None
|
||||||
|
|
||||||
|
|
||||||
class TestTrackingService:
|
class TestTrackingService:
|
||||||
"""Unit tests for TrackingService."""
|
"""Unit tests for TrackingService."""
|
||||||
|
|||||||
Reference in New Issue
Block a user