Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@

메시지를 직접 치는 대신, 빅챗 소개글의 더보기 메뉴(`⋮`) > `새로운 빅챗 만들기` 로 폼(모달)을 띄워 만들 수도 있다. 스레드 안의 답글에서 실행해도 스레드 첫 글 기준으로 동작한다.

만들어진 시트는 [구글 스프레드시트](https://docs.google.com/spreadsheets/d/1FtKRO4gmlVg-Si0_CHt-tkpVd3LDTXdsoZ0u98MYd0k)에 추가되고, 그 링크가 달린 답글이 스레드에 올라간다. 이 답글의 링크가 아래 참여 흐름의 앵커다.
만들어진 시트는 [구글 스프레드시트](https://docs.google.com/spreadsheets/d/1FtKRO4gmlVg-Si0_CHt-tkpVd3LDTXdsoZ0u98MYd0k)에 추가되고, 그 링크가 달린 답글이 스레드에 올라간다. 시트 생성 시 모집글과 시트의 연결도 함께 저장하며, 참여·취소는 이 연결을 사용한다. 스레드에 임의의 시트 링크를 붙이는 것만으로 신청 대상을 바꿀 수 없다.

### 2. 참여 신청

모집글(스레드 첫 글)에 :gogo: 이모지를 달면 시트에 등록된다. 이모지를 떼면 등록이 취소된다.

신청은 Slack 사용자 ID로 식별해 중복을 방지한다. 취소하면 해당 신청의 네 칸만 비운다. 배포 후 새로 만든 빅챗만 신청·취소를 지원하며, 기존 시트의 데이터는 그대로 보존한다.

- 등록되면 본인에게만 보이는 안내와 함께 **Google Calendar 추가 / .ics 다운로드** 버튼이 뜬다.
- 시트가 만들어지기 **전에** 이모지를 눌러둔 사람도 시트 생성 직후 자동으로 일괄 등록된다.

Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ requires-python = ">=3.15"
dependencies = [
"flask~=3.1.3",
"gspread~=6.2.1",
"gspread-formatting~=1.2.1",
"gunicorn~=26.2.0",
"pydantic~=2.14.1",
"pydantic-settings~=2.16.1",
Expand Down
14 changes: 8 additions & 6 deletions src/anna.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from features.members.services.directory import MemberManager
from features.questions.handlers.question_response import QuestionResponse
from http_routes import register_http_routes
from integrations.bigchat_store import BigchatStore
from integrations.github import GithubClient
from integrations.google_sheets import GoogleSpreadsheetClient
from integrations.qa import QAClient
Expand All @@ -57,6 +58,9 @@ def sheets(self) -> GoogleSpreadsheetClient:
# 기존처럼 사용 시 생성한다. 도움말과 잘못된 캘린더 토큰에는 인증이 필요 없다.
return GoogleSpreadsheetClient(settings=self.settings)

def bigchats(self) -> BigchatStore:
return BigchatStore(self.sheets())

def members(self) -> MemberManager:
with self._members_lock:
if self._members is None:
Expand Down Expand Up @@ -120,7 +124,7 @@ def build_slack_handlers(services: Services) -> SlackHandlers:
"create_bigchat": lambda ctx: CreateBigchatSheet(
ctx.event,
ctx.slack_client,
services.sheets(),
services.bigchats(),
services.members(),
settings.JOIN_BIGCHAT_EMOJI,
),
Expand All @@ -137,18 +141,16 @@ def build_slack_handlers(services: Services) -> SlackHandlers:
ctx.event,
settings.JOIN_BIGCHAT_EMOJI,
ctx.slack_client,
services.sheets(),
services.bigchats(),
services.members(),
loading_emoji=ctx.loading_emoji,
settings=settings,
),
abandon_bigchat=lambda ctx: AbandonBigchat(
ctx.event,
settings.ANNA_ID,
settings.JOIN_BIGCHAT_EMOJI,
ctx.slack_client,
services.members(),
services.sheets(),
services.bigchats(),
loading_emoji=ctx.loading_emoji,
),
announce_new_channel_created=lambda ctx: AnnounceNewChannelCreated(
Expand All @@ -164,7 +166,7 @@ def build_slack_handlers(services: Services) -> SlackHandlers:
ctx.event,
ctx.ack,
ctx.slack_client,
services.sheets(),
services.bigchats(),
services.members(),
settings.JOIN_BIGCHAT_EMOJI,
),
Expand Down
33 changes: 6 additions & 27 deletions src/features/bigchat/handlers/abandon_bigchat.py
Original file line number Diff line number Diff line change
@@ -1,44 +1,34 @@
from contextlib import nullcontext

from features.bigchat.services.sheet_link import extract_worksheet_id
from features.members.services.directory import MemberLackInfo, MemberNotFound
from integrations.google_sheets import WorksheetNotFound


class AbandonBigchat:
def __init__(
self,
event,
anna,
target_emoji,
slack_client,
member_manager,
gs_client,
bigchats,
loading_emoji=None,
):
"""loading_emoji: 실제 취소 작업만 감쌀 컨텍스트 매니저. 넘기지 않으면 이모지를 붙이지 않는다."""
self.anna = anna
self.type = event["type"]
self.reaction = event["reaction"]
self.channel = event["item"]["channel"]
self.ts = event["item"]["ts"]
self.user = event["user"]
self.target_emoji = target_emoji
self.slack_client = slack_client
self.member_manager = member_manager
self.gs_client = gs_client
self.bigchats = bigchats
self.loading_emoji = loading_emoji or nullcontext()

def run(self):
if self.type != "reaction_removed" or self.reaction != self.target_emoji:
return False

messages = self.slack_client.get_replies(channel=self.channel, ts=self.ts)
if messages[0].ts != self.ts:
return False

worksheet_id = extract_worksheet_id(message.text for message in messages)
if not worksheet_id:
worksheet_id = self.bigchats.find(channel=self.channel, thread_ts=self.ts)
if worksheet_id is None:
return False

# 여기부터가 실제 동작이다. 위 검사들에서 걸러진 이벤트(관심 없는 이모지, 빅챗 글이
Expand All @@ -48,20 +38,9 @@ def run(self):

def _abandon(self, worksheet_id: int) -> bool:
try:
member = self.member_manager.find(self.user)
except MemberNotFound:
self.slack_client.send_message(
msg=f"<@{self.user}>, 네 정보를 찾지 못했어.", ts=self.ts
self.bigchats.cancel(
worksheet_id, self.user, channel=self.channel, thread_ts=self.ts
)
return False
except MemberLackInfo:
self.slack_client.send_message(
msg=f"<@{self.user}>, 네 정보에 누락된 값이 있어.", ts=self.ts
)
return False

try:
self.gs_client.delete_row(worksheet_id, member.email)
except WorksheetNotFound:
self.slack_client.send_message(
msg=f"<@{self.user}>, 이 빅챗의 신청 시트를 찾을 수 없어서 등록을 취소하지 못했어. "
Expand Down
12 changes: 6 additions & 6 deletions src/features/bigchat/handlers/create_bigchat_modal.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
bot_not_in_channel_message,
)
from features.bigchat.services.creation import register_early_reacted_users
from integrations.bigchat_repository import SpreadsheetBigchatRepository

# 슬랙 단축메뉴에 등록한 callback ID
CREATE_BIGCHAT_SHORTCUT_ID = "create_bigchat"
Expand Down Expand Up @@ -107,7 +106,7 @@ def normalize_view_body(body):

class SubmitCreateBigchatModal:
def __init__(
self, event, ack, slack_client, gs_client, member_manager, target_emoji
self, event, ack, slack_client, bigchats, member_manager, target_emoji
):
metadata = json.loads(event["view"]["private_metadata"])
values = event["view"]["state"]["values"]
Expand All @@ -120,10 +119,9 @@ def __init__(
self.end = values[END_BLOCK][ACTION_ID]["selected_time"] # HH:mm
self.ack = ack
self.slack_client = slack_client
self.gs_client = gs_client
self.bigchats = bigchats
self.member_manager = member_manager
self.target_emoji = target_emoji
self._bigchats = SpreadsheetBigchatRepository(gs_client)

def run(self):
sheet_name = f"{self.name} {self.date[2:]} {self.start}~{self.end}"
Expand Down Expand Up @@ -153,7 +151,9 @@ def _validate_fields(self) -> dict[str, str]:
return errors

def _create_and_notify(self, command: CreateBigchatCommand) -> bool:
created = self._bigchats.create(command.sheet_name)
created = self.bigchats.create(
command.sheet_name, channel=self.channel, thread_ts=self.thread_ts
)
try:
self.slack_client.send_thread_message(
msg=bigchat_created_message(created.sheet_url, created.sheet_name),
Expand All @@ -169,7 +169,7 @@ def _create_and_notify(self, command: CreateBigchatCommand) -> bool:

register_early_reacted_users(
self.slack_client,
self.gs_client,
self.bigchats,
self.member_manager,
self.target_emoji,
created.worksheet_id,
Expand Down
14 changes: 8 additions & 6 deletions src/features/bigchat/handlers/create_bigchat_sheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,21 @@
invalid_bigchat_name_message,
)
from features.bigchat.services.creation import register_early_reacted_users
from integrations.bigchat_repository import SpreadsheetBigchatRepository
from shared.mention_handler import MentionHandler
from slack_router import matches_mention


class CreateBigchatSheet(MentionHandler):
def __init__(self, event, slack_client, gs_client, member_manager, target_emoji):
def __init__(self, event, slack_client, bigchats, member_manager, target_emoji):
self.text = event["text"]
self.ts = event["ts"]
self.thread_ts = event.get("thread_ts")
self.channel = event["channel"]
self.user = event["user"]
self.slack_client = slack_client
self.gs_client = gs_client
self.bigchats = bigchats
self.member_manager = member_manager
self.target_emoji = target_emoji
self._bigchats = SpreadsheetBigchatRepository(gs_client)

def handle_mention(self):
if not self.can_handle():
Expand All @@ -44,14 +42,18 @@ def handle_mention(self):
)
return False

created = self._bigchats.create(command.sheet_name)
created = self.bigchats.create(
command.sheet_name,
channel=self.channel,
thread_ts=self.thread_ts or self.ts,
)
self.slack_client.send_message(
msg=bigchat_created_message(created.sheet_url, created.sheet_name),
ts=self.ts,
)
register_early_reacted_users(
self.slack_client,
self.gs_client,
self.bigchats,
self.member_manager,
self.target_emoji,
created.worksheet_id,
Expand Down
24 changes: 13 additions & 11 deletions src/features/bigchat/handlers/join_bigchat.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
to_gcal_link_truncated,
)
from features.bigchat.presentation.messages import build_registration_info_message
from features.bigchat.services.sheet_link import extract_worksheet_id
from features.members.services.directory import MemberLackInfo, MemberNotFound
from integrations.google_sheets import WorksheetNotFound
from integrations.slack import Message
Expand All @@ -24,7 +23,7 @@ def __init__(
event,
target_emoji,
slack_client,
gs_client,
bigchats,
member_manager,
loading_emoji=None,
*,
Expand All @@ -39,7 +38,7 @@ def __init__(
self.target_emoji = target_emoji
self.settings = settings
self.slack_client = slack_client
self.gs_client = gs_client
self.bigchats = bigchats
self.member_manager = member_manager
self.loading_emoji = loading_emoji or nullcontext()

Expand All @@ -56,7 +55,7 @@ def _build_calendar_blocks(
ics에는 서버가 클릭 시점에 읽은 소개글 전문을 넣는다.
"""
try:
sheet_name = self.gs_client.get_worksheet_title(worksheet_id)
sheet_name = self.bigchats.get_sheet(worksheet_id).sheet_name
event = parse_sheet_name(sheet_name)
except Exception as ex: # noqa: BLE001
logger.warning("Failed to build calendar buttons: %s", ex)
Expand Down Expand Up @@ -110,12 +109,11 @@ def run(self):
if self.type != "reaction_added" or self.reaction != self.target_emoji:
return False

messages = self.slack_client.get_replies(channel=self.channel, ts=self.ts)
if messages[0].ts != self.ts:
worksheet_id = self.bigchats.find(channel=self.channel, thread_ts=self.ts)
if worksheet_id is None:
return False

worksheet_id = extract_worksheet_id(message.text for message in messages)
if not worksheet_id:
messages = self.slack_client.get_replies(channel=self.channel, ts=self.ts)
if not messages or messages[0].ts != self.ts:
return False

# 여기부터가 실제 동작이다. 위 검사들에서 걸러진 이벤트(관심 없는 이모지, 빅챗 글이
Expand All @@ -140,8 +138,12 @@ def _register(self, worksheet_id: int, messages: list[Message]) -> bool:
return False

try:
added = self.gs_client.append_row_if_absent(
worksheet_id, member.transform_for_spreadsheet()
added = self.bigchats.register(
worksheet_id,
self.user,
member.transform_for_spreadsheet(),
channel=self.channel,
thread_ts=self.ts,
)
except WorksheetNotFound:
self.slack_client.send_message(
Expand Down
2 changes: 1 addition & 1 deletion src/features/bigchat/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def __post_init__(self):


@dataclass(frozen=True)
class BigchatCreated:
class BigchatSheet:
worksheet_id: int
sheet_name: str
sheet_url: str
Expand Down
4 changes: 2 additions & 2 deletions src/features/bigchat/presentation/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


def bigchat_created_message(sheet_url: str, sheet_name: str) -> str:
# 참여 신청은 이 답글의 시트 ID를 기준으로 처리한다.
# URL은 사용자 안내용이다. 참여 대상은 저장된 스레드 연결로 조회한다.
return f"새로운 빅챗, 등록 완료! <{sheet_url}|{sheet_name}> :google_spreadsheets:"


Expand All @@ -20,7 +20,7 @@ def bot_not_in_channel_message(sheet_url: str, sheet_name: str) -> str:
return strip_multiline(
f"""
시트(<{sheet_url}|{sheet_name}>)는 만들었는데, 내가 이 채널에 없어서 스레드에 답글을 못 달았어.
나를 채널에 초대한 뒤 위 시트 링크를 스레드에 공유해줘. 그래야 이모지로 참여 신청을 받을 수 있어!"""
나를 채널에 초대하면 모집글에서 이모지로 참여 신청을 받을 수 있어!"""
)


Expand Down
10 changes: 7 additions & 3 deletions src/features/bigchat/services/creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

def register_early_reacted_users(
slack_client,
gs_client,
bigchats,
member_manager,
target_emoji,
worksheet_id,
Expand Down Expand Up @@ -45,8 +45,12 @@ def register_early_reacted_users(
ts=thread_ts,
)
else:
if gs_client.append_row_if_absent(
worksheet_id, member.transform_for_spreadsheet()
if bigchats.register(
worksheet_id,
user,
member.transform_for_spreadsheet(),
channel=channel,
thread_ts=thread_ts,
):
registered.append((user, member))

Expand Down
14 changes: 0 additions & 14 deletions src/features/bigchat/services/sheet_link.py

This file was deleted.

15 changes: 0 additions & 15 deletions src/integrations/bigchat_repository.py

This file was deleted.

Loading