API - store media attachment content type

Author: SamR1

fittrackee/config.py

@@ -7,6 +7,7 @@
 from flask import current_app
 
 from fittrackee import DEFAULT_PRIVACY_POLICY_DATA, VERSION
+from fittrackee.constants import IMAGE_CONTENT_TYPES
 from fittrackee.languages import SUPPORTED_LANGUAGES
 from fittrackee.workouts.constants import WORKOUT_ALLOWED_EXTENSIONS
 
@@ -34,7 +35,7 @@ class BaseConfig:
     UPLOAD_FOLDER = os.path.join(
         os.getenv("UPLOAD_FOLDER", current_app.root_path), "uploads"
     )
-    PICTURE_ALLOWED_EXTENSIONS = {"jpeg", "jpg", "png", "gif", "webp"}
+    PICTURE_ALLOWED_EXTENSIONS = set(IMAGE_CONTENT_TYPES.keys())
     WORKOUT_ALLOWED_EXTENSIONS = {"zip"}.union(WORKOUT_ALLOWED_EXTENSIONS)
     TILE_SERVER = {
         "URL": os.environ.get(

fittrackee/constants.py

@@ -21,3 +21,12 @@ class PaceSpeedDisplay(str, Enum):
     PACE = "pace"  # min/km
     SPEED = "speed"
     PACE_AND_SPEED = "pace_and_speed"
+
+
+IMAGE_CONTENT_TYPES = {
+    "gif": "image/gif",
+    "jpeg": "image/jpeg",
+    "jpg": "image/jpeg",
+    "png": "image/png",
+    "webp": "image/webp",
+}

fittrackee/media/media_service.py

@@ -8,6 +8,7 @@
 from PIL import Image, ImageOps
 
 from fittrackee import db
+from fittrackee.constants import IMAGE_CONTENT_TYPES
 from fittrackee.files import get_absolute_file_path, get_file_extension
 
 from .exceptions import MediaException
@@ -108,6 +109,7 @@ def create_image_media(self) -> "Media":
             user_id=self.auth_user.id,
             file_name=new_filename,
             file_size=self.media_file.stream.tell(),
+            file_content_type=IMAGE_CONTENT_TYPES[extension],
         )
         media.meta = {
             "coordinates": gps_info,

fittrackee/media/models.py

@@ -47,6 +47,9 @@ class Media(BaseModel):
         db.String(255), nullable=False, index=True, unique=True
     )
     file_size: Mapped[int] = mapped_column()
+    file_content_type: Mapped[str] = mapped_column(
+        db.String(10), nullable=False
+    )
     description: Mapped[Optional[str]] = mapped_column(
         db.String(MEDIA_DESCRIPTION_MAX_CHARACTERS),
         nullable=False,
@@ -61,12 +64,14 @@ def __init__(
         user_id: int,
         file_name: str,
         file_size: int,
+        file_content_type: str,
         created_at: Optional[datetime] = None,
         workout_id: Optional[int] = None,
     ):
         self.user_id = user_id
         self.file_name = file_name
         self.file_size = file_size
+        self.file_content_type = file_content_type
         self.created_at = (
             created_at if created_at else datetime.now(timezone.utc)
         )

fittrackee/migrations/versions/75_c9d5209ffbcd_add_media.py

@@ -26,6 +26,7 @@ def upgrade():
     sa.Column('created_at', TZDateTime(), nullable=False),
     sa.Column('file_name', sa.String(length=255), nullable=False),
     sa.Column('file_size', sa.Integer(), nullable=False),
+    sa.Column('file_content_type', sa.String(length=10), nullable=False),
     sa.Column('description', sa.String(length=1500), server_default=sa.text("''"), nullable=False),
     sa.Column('meta', postgresql.JSONB(astext_type=sa.Text()), server_default='{}', nullable=False),
     sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),

fittrackee/tests/media/test_media_models.py

@@ -31,12 +31,14 @@ def test_it_creates_media_in_database_with_minimal_data(
                 user_id=user_1.id,
                 file_name="img.jpg",
                 file_size=1024,
+                file_content_type="image/jpeg",
             )
         db.session.add(media)
         db.session.commit()
 
         assert media.created_at == now
         assert media.description == ""
+        assert media.file_content_type == "image/jpeg"
         assert media.file_size == 1024
         assert media.user_id == user_1.id
         assert media.workout_id is None
@@ -50,6 +52,7 @@ def test_it_creates_media_with_all_data(
             user_id=user_1.id,
             file_name="img.gif",
             file_size=1024,
+            file_content_type="image/jpeg",
             created_at=now,
             workout_id=workout_cycling_user_1.id,
         )
@@ -58,6 +61,7 @@ def test_it_creates_media_with_all_data(
 
         assert media.created_at == now
         assert media.description == ""
+        assert media.file_content_type == "image/jpeg"
         assert media.file_size == 1024
         assert media.user_id == user_1.id
         assert media.workout_id == workout_cycling_user_1.id

fittrackee/tests/mixins.py

@@ -708,6 +708,7 @@ def create_media(
             user_id=user.id,
             file_name=file_name if file_name else f"{uuid4().hex}.jpg",
             file_size=file_size,
+            file_content_type="image/jpeg",
         )
         db.session.add(media)
         media.workout_id = workout_id