Skip to content

Commit 6dd71b1

Browse files
committed
chore(slack): update default config in docker and base test
- add merge migration - update icon for withdrawn project
1 parent d77d282 commit 6dd71b1

File tree

6 files changed

+28
-6
lines changed

6 files changed

+28
-6
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Generated by Django 5.2.5 on 2025-10-08 11:21
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('project', '0006_alter_project_slack_progress_notifications'),
10+
('project', '0008_alter_project_unique_project_name'),
11+
]
12+
13+
operations = [
14+
]

apps/project/slack_messages.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def format_project_status(status_enum: ProjectStatusEnum):
3131
status_to_icon: dict[ProjectStatusEnum, str] = {
3232
Project.Status.PUBLISHED: ":mega:",
3333
Project.Status.PAUSED: ":hand:",
34-
Project.Status.WITHDRAWN: ":archived:",
34+
Project.Status.WITHDRAWN: ":package:",
3535
}
3636
# FIXME: better way to concatenate this
3737
return f"{status_enum.label} {status_to_icon.get(status_enum, '')}".strip()
@@ -216,7 +216,6 @@ def get_message_for_project_publish(
216216
"text": SlackMessage.format_project_name(project),
217217
},
218218
},
219-
{"type": "divider"},
220219
SlackMessage.get_project_information_block(project),
221220
{"type": "divider"},
222221
{

docker-compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ services:
172172
FIREBASE_EMULATOR_PROJECT_ID: dev-mapswipe
173173
FIREBASE_EMULATOR_DATABASE_HOST: firebase-test:9000
174174
FIREBASE_EMULATOR_TEST_HOST: firebase-test:9000
175+
SLACK_BOT_ENABLED: false
176+
SLACK_FALLBACK_TO_CONSOLE: true
175177
depends_on:
176178
- db
177179
- redis

main/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
if settings.IS_TESTING:
1515
assert settings.FIREBASE_EMULATOR_USE is True, "Always use firebase emulator while TESTING"
16+
assert settings.SLACK_BOT_ENABLED is False, "Always disable slack bot when TESTING"
1617

1718

1819
class Config:

main/tests/base_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
CACHES=TEST_CACHES,
4949
CELERY_TASK_ALWAYS_EAGER=True,
5050
CELERY_TASK_EAGER_PROPAGATES=True,
51+
SLACK_BOT_ENABLED=False,
5152
SLACK_FALLBACK_TO_CONSOLE=True,
5253
)
5354
class TestCase(BaseTestCase):

utils/slack.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import json
12
import logging
23
import typing
34

@@ -36,8 +37,10 @@ def send_slack_message(
3637
) -> str | None:
3738
if not self.client:
3839
logger.info("Sending message on slack for thread %s", thread_ts)
39-
logger.info(text)
40-
logger.info(blocks)
40+
logger.info(json.dumps({
41+
"text": text,
42+
"blocks": blocks,
43+
}))
4144
return None
4245

4346
res = self.client.chat_postMessage(
@@ -58,8 +61,10 @@ def update_slack_message(
5861
) -> str | None:
5962
if not self.client:
6063
logger.info("Sending message on slack for thread %s", ts)
61-
logger.info(text)
62-
logger.info(blocks)
64+
logger.info(json.dumps({
65+
"text": text,
66+
"blocks": blocks,
67+
}))
6368
return None
6469

6570
res = self.client.chat_update(

0 commit comments

Comments
 (0)