Compare commits

..

No commits in common. "0f7995f0c247ed53ba223ecce625df53f0d09ed5" and "fdfb9a3e5ca32e23564bc061d6606cf24c24b919" have entirely different histories.

3 changed files with 2 additions and 6 deletions

View File

@ -53,7 +53,7 @@ Perform initial database migration. This is for automatically setting up the
database schema for the first time: database schema for the first time:
```sh ```sh
docker exec -it backend-production bash docker exec -it backend-flask-production bash
flask db upgrade flask db upgrade
exit exit
``` ```

View File

@ -10,7 +10,6 @@ from sqlalchemy_utc import UtcDateTime
from discord_webhook import DiscordWebhook from discord_webhook import DiscordWebhook
import app_db import app_db
import spec import spec
import os
class Event(app_db.BaseModel): class Event(app_db.BaseModel):
@ -102,8 +101,6 @@ class Event(app_db.BaseModel):
if ringers_needed > 0: if ringers_needed > 0:
ringers_needed_msg = f" **({ringers_needed} ringer(s) needed)**" ringers_needed_msg = f" **({ringers_needed} ringer(s) needed)**"
domain = os.environ.get("DOMAIN", "availabili.tf")
return "\n".join([ return "\n".join([
f"# {self.name}", f"# {self.name}",
"", "",
@ -114,7 +111,7 @@ class Event(app_db.BaseModel):
f"Max bipartite matching size: {matchings}" + ringers_needed_msg, f"Max bipartite matching size: {matchings}" + ringers_needed_msg,
"", "",
"[Confirm attendance here]" + "[Confirm attendance here]" +
f"(https://{domain}/team/id/{self.team.id}/events/{self.id})", f"(https://availabili.tf/team/id/{self.team.id}/events/{self.id})",
]) ])
def get_or_create_webhook(self): def get_or_create_webhook(self):

View File

@ -35,7 +35,6 @@ services:
- FLASK_CELERY_BROKER_URL=redis://redis:6379/0 - FLASK_CELERY_BROKER_URL=redis://redis:6379/0
- FLASK_CELERY_RESULT_BACKEND=redis://redis:6379/0 - FLASK_CELERY_RESULT_BACKEND=redis://redis:6379/0
- DATABASE_URI=postgresql+psycopg://postgres:password@db:5432/availabilitf - DATABASE_URI=postgresql+psycopg://postgres:password@db:5432/availabilitf
- DOMAIN=availabili.tf.sandvich.xyz
depends_on: depends_on:
- redis - redis
- db - db