Skip to content
Merged
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 src/pardner/services/groupme.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ def parse_conversation_group_vertical(
associated_media = []
image_url = raw_data_dict.get('image_url', None)
if image_url:
associated_media = [AssociatedMediaSubVertical(image_url=image_url)]
associated_media = [
AssociatedMediaSubVertical(media_type='image', url=image_url)
]

is_private = None
conversation_type = raw_data_dict.get('type')
Expand Down
2 changes: 1 addition & 1 deletion src/pardner/services/strava.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def parse_social_posting_vertical(
raw_data_dict['photos'].get('primary', {}).get('urls', {}).values()
)
associated_media_list = [
AssociatedMediaSubVertical(image_url=photo_url)
AssociatedMediaSubVertical(media_type='image', url=photo_url)
for photo_url in photo_urls
]

Expand Down
13 changes: 9 additions & 4 deletions src/pardner/verticals/sub_verticals/associated_media.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
from pydantic import AnyHttpUrl
from typing import Literal

from pydantic import AnyHttpUrl, Field

from pardner.verticals.sub_verticals.base import BaseSubVertical


class AssociatedMediaSubVertical(BaseSubVertical):
"""Holds the URL for the media attached to a parent vertical."""

audio_url: AnyHttpUrl | None = None
image_url: AnyHttpUrl | None = None
video_url: AnyHttpUrl | None = None
media_type: Literal['audio', 'image', 'video'] | None = Field(
description='If media type is unknown or not one of the types defined in this '
'field, value is None.',
default=None,
)
url: AnyHttpUrl | None = None
5 changes: 2 additions & 3 deletions tests/test_transfer_services/test_groupme.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,8 @@ def test_fetch_conversation_group_vertical(groupme_transfer_service, mocker):
'created_at': datetime(2011, 4, 12, 15, 48, 48, tzinfo=timezone.utc),
'associated_media': [
{
'audio_url': None,
'image_url': AnyHttpUrl('https://i.groupme.com/123456789'),
'video_url': None,
'media_type': 'image',
'url': AnyHttpUrl('https://i.groupme.com/123456789'),
}
],
'is_private': True,
Expand Down
12 changes: 2 additions & 10 deletions tests/test_transfer_services/test_strava.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,8 @@ def test_fetch_physical_activity_vertical(mocker, strava_transfer_service):
'created_at': datetime.datetime(2018, 5, 2, 12, 15, 9),
'url': AnyHttpUrl('https://www.strava.com/activities/154504250376823'),
'associated_media': [
{
'audio_url': None,
'image_url': AnyHttpUrl('https://url1.com/'),
'video_url': None,
},
{
'audio_url': None,
'image_url': AnyHttpUrl('https://url2.com/'),
'video_url': None,
},
{'media_type': 'image', 'url': AnyHttpUrl('https://url1.com/')},
{'media_type': 'image', 'url': AnyHttpUrl('https://url2.com/')},
],
'status': 'restricted',
'text': 'mock description',
Expand Down