Skip to content

Commit

Permalink
api.schedule.ProposalC3VOCPublishingWebhook: add option to set thumbn…
Browse files Browse the repository at this point in the history 
…ail as well
  • Loading branch information
@Kunsi @russss
Kunsi authored and russss committed Sep 1, 2024
1 parent 4e2ed32 commit 7cb8728
Show file tree
Hide file tree
Showing 2 changed files with 168 additions and 2 deletions.
14 changes: 14 additions & 0 deletions apps/api/schedule.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,20 @@ def post(self):
)
proposal.c3voc_url = None

if payload["voctoweb"]["thumb_path"]:
path = payload["voctoweb"]["thumb_path"]
if path.startswith("/static.media.ccc.de"):
path = "https://static.media.ccc.de/media" + path[len("/static.media.ccc.de"):]
if not path.startswith("https://"):
abort(406, message="voctoweb thumb_path must start with https:// or /static.media.ccc.de")
app.logger.info(f"C3VOC webhook set thumbnail_url for {proposal.id=} to {path}")
proposal.thumbnail_url = path
else:
app.logger.warning(
f"C3VOC webhook cleared thumbnail_url for {proposal.id=}, was {proposal.thumbnail_url}"
)
proposal.thumbnail_url = None

if payload["youtube"]["enabled"]:
if payload["youtube"]["urls"]:
# Please do not overwrite existing youtube urls
Expand Down
156 changes: 154 additions & 2 deletions tests/test_api_c3voc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ def proposal(db, user):
return proposal


def clean_proposal(db, proposal, c3voc_url=None, youtube_url=None, video_recording_lost=True):
def clean_proposal(db, proposal, c3voc_url=None, youtube_url=None, thumbnail_url=None, video_recording_lost=True):
proposal.c3voc_url = c3voc_url
proposal.youtube_url = youtube_url
proposal.thumbnail_url = thumbnail_url
proposal.video_recording_lost = video_recording_lost
proposal.youtube_url = youtube_url
db.session.add(proposal)
db.session.commit()

Expand Down Expand Up @@ -167,6 +168,7 @@ def test_request_voctoweb_update_voctoweb_correct_url(client, app, db, proposal)
"voctoweb": {
"enabled": True,
"frontend_url": "https://media.ccc.de/",
"thumb_path": "",
},
"youtube": {
"enabled": False,
Expand Down Expand Up @@ -204,6 +206,7 @@ def test_request_voctoweb_update_voctoweb_wrong_url(client, app, db, proposal):
"voctoweb": {
"enabled": True,
"frontend_url": "https://example.org",
"thumb_path": "",
},
"youtube": {
"enabled": False,
Expand Down Expand Up @@ -241,6 +244,81 @@ def test_request_voctoweb_clears_voctoweb(client, app, db, proposal):
"voctoweb": {
"enabled": True,
"frontend_url": "",
"thumb_path": "",
},
"youtube": {
"enabled": False,
},
},
)
assert rv.status_code == 204

proposal = Proposal.query.get(proposal.id)
assert proposal.c3voc_url is None


def test_request_thumbnail_update_thumbnail_correct_path(client, app, db, proposal):
app.config.update(
{
"VIDEO_API_KEY": "api-key",
}
)

clean_proposal(db, proposal)

rv = client.post(
f"/api/proposal/c3voc-publishing-webhook",
headers={
"Authorization": "Bearer api-key",
},
json={
"is_master": True,
"fahrplan": {
"conference": f"emf{event_year()}",
"id": proposal.id,
},
"voctoweb": {
"enabled": True,
"frontend_url": "",
"thumb_path": "/static.media.ccc.de/thumb.jpg",
},
"youtube": {
"enabled": False,
},
},
)
assert rv.status_code == 204

proposal = Proposal.query.get(proposal.id)
assert proposal.thumbnail_url == "https://static.media.ccc.de/media/thumb.jpg"
assert proposal.c3voc_url is None
assert proposal.youtube_url is None


def test_request_thumbnail_update_thumbnail_correct_url(client, app, db, proposal):
app.config.update(
{
"VIDEO_API_KEY": "api-key",
}
)

clean_proposal(db, proposal)

rv = client.post(
f"/api/proposal/c3voc-publishing-webhook",
headers={
"Authorization": "Bearer api-key",
},
json={
"is_master": True,
"fahrplan": {
"conference": f"emf{event_year()}",
"id": proposal.id,
},
"voctoweb": {
"enabled": True,
"frontend_url": "",
"thumb_path": "https://example.com/thumb.jpg",
},
"youtube": {
"enabled": False,
Expand All @@ -250,7 +328,81 @@ def test_request_voctoweb_clears_voctoweb(client, app, db, proposal):
assert rv.status_code == 204

proposal = Proposal.query.get(proposal.id)
assert proposal.thumbnail_url == "https://example.com/thumb.jpg"
assert proposal.c3voc_url is None
assert proposal.youtube_url is None


def test_request_thumbnail_update_thumbnail_not_url(client, app, db, proposal):
app.config.update(
{
"VIDEO_API_KEY": "api-key",
}
)

clean_proposal(db, proposal, thumbnail_url="https://example.com/thumb.jpg")

rv = client.post(
f"/api/proposal/c3voc-publishing-webhook",
headers={
"Authorization": "Bearer api-key",
},
json={
"is_master": True,
"fahrplan": {
"conference": f"emf{event_year()}",
"id": proposal.id,
},
"voctoweb": {
"enabled": True,
"frontend_url": "",
"thumb_path": "gopher://example.com/thumb.jpg",
},
"youtube": {
"enabled": False,
},
},
)
assert rv.status_code == 406

proposal = Proposal.query.get(proposal.id)
assert proposal.thumbnail_url == "https://example.com/thumb.jpg"


def test_request_thumbnail_clears_thumbnail(client, app, db, proposal):
app.config.update(
{
"VIDEO_API_KEY": "api-key",
}
)

clean_proposal(db, proposal, thumbnail_url="https://example.com/thumb.jpg")

rv = client.post(
f"/api/proposal/c3voc-publishing-webhook",
headers={
"Authorization": "Bearer api-key",
},
json={
"is_master": True,
"fahrplan": {
"conference": f"emf{event_year()}",
"id": proposal.id,
},
"voctoweb": {
"enabled": True,
"frontend_url": "",
"thumb_path": "",
},
"youtube": {
"enabled": False,
},
},
)
assert rv.status_code == 204

proposal = Proposal.query.get(proposal.id)
assert proposal.thumbnail_url is None


def test_request_youtube_update_youtube_correct_url(client, app, db, proposal):
Expand Down

0 comments on commit 7cb8728

Please sign in to comment.