Medieteknik | v1.6

.github/workflows/tests.yml

@@ -0,0 +1,18 @@
+name: Tests
+on:
+  push:
+    branches: master
+  pull_request:
+    branches: master
+jobs:
+  jest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - name: Install dependencies
+        run: npm ci
+      - name: Run Jest
+        run: npm run test

backend/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python.analysis.autoImportCompletions": true,
+    "python.analysis.typeCheckingMode": "off"
+}

backend/Dockerfile

@@ -16,8 +16,8 @@ COPY . /app
 RUN pip install --trusted-host pypi.python.org -r requirements.txt
 COPY env/service-account-file.json /app/service-account-file.json
 
-# Expose port 80
-EXPOSE 80
+# Expose port 8080
+EXPOSE 8080
 
 # Run the application with gunicorn
 CMD ["gunicorn", "main:app"]

backend/docker-compose.yml

@@ -3,7 +3,7 @@ services:
     container_name: medieteknik_web
     build: .
     ports:
-      - "80:80"
+      - "8080:8080"
     environment:
       - DATABASE_URL=${DATABASE_URL}
     depends_on:
@@ -19,7 +19,6 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
     volumes:
       - postgres-data:/var/lib/postgresql/data
-      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
 
 volumes:
   postgres-data:

backend/gunicorn.conf.py

@@ -7,8 +7,8 @@
 from dotenv import load_dotenv
 
 loglevel = os.environ.get("LOG_LEVEL", "info")
-workers = 3 * round(multiprocessing.cpu_count() / 2) + 1
-bind = "0.0.0.0:80"
+workers = multiprocessing.cpu_count() + 1
+bind = "0.0.0.0:8080"
 timeout = 120
 
 env = os.path.join(os.getcwd(), ".env")

backend/init_db.py

@@ -22,6 +22,8 @@
 from models.content import (
     Album,  # noqa: F401
     AlbumTranslation,  # noqa: F401
+    Media,  # noqa: F401
+    MediaTranslation,  # noqa: F401
     Author,  # noqa: F401
     Document,  # noqa: F401
     DocumentTranslation,  # noqa: F401

backend/main.py

@@ -65,7 +65,6 @@
     },
 )
 
-# OIDC
 oidc.init_app(app)
 
 # Register routes (blueprints)

backend/models/committees/committee.py

@@ -1,6 +1,6 @@
 import uuid
 from typing import Any, Dict, List
-from sqlalchemy import String, Integer, Column, ForeignKey, inspect, text
+from sqlalchemy import Boolean, String, Integer, Column, ForeignKey, inspect, text
 from sqlalchemy.dialects.postgresql import UUID
 from utility.database import db
 from utility.constants import AVAILABLE_LANGUAGES
@@ -22,6 +22,8 @@ class Committee(db.Model):
     total_news = Column(Integer, nullable=False, default=0)
     total_events = Column(Integer, nullable=False, default=0)
     total_documents = Column(Integer, nullable=False, default=0)
+    total_media = Column(Integer, nullable=False, default=0)
+    hidden = Column(Boolean, nullable=False, default=False)
 
     # Foreign key
     committee_category_id = Column(
@@ -70,7 +72,6 @@ def to_dict(
             )
             translations.append(translation)
 
-        del data["committee_id"]
         del data["committee_category_id"]
 
         data["translations"] = [

backend/models/committees/committee_position.py

@@ -115,7 +115,9 @@ def to_dict(
         del data["committee_id"]
 
         data["translations"] = [
-            translation.to_dict() for translation in set(translations)
+            translation.to_dict()
+            for translation in set(translations)
+            if translation is not None
         ]
 
         if is_public_route:
@@ -262,7 +264,7 @@ def to_dict(self, provided_languages: List[str] = AVAILABLE_LANGUAGES):
         del data["committee_position_recruitment_id"]
 
         committee_position = CommitteePosition.query.get(data["committee_position_id"])
-        del data["committee_position_id"]
+        del data["committee_position_id"]   
 
         if not committee_position or not isinstance(
             committee_position, CommitteePosition

backend/models/content/__init__.py

@@ -3,6 +3,7 @@
 """
 
 from .album import Album, AlbumTranslation
+from .media import Media, MediaTranslation
 from .author import Author, AuthorResource, AuthorType
 from .base import Item, PublishedStatus
 from .calendar import Calendar
@@ -14,6 +15,8 @@
 __all__ = [
     "Album",
     "AlbumTranslation",
+    "Media",
+    "MediaTranslation",
     "Author",
     "AuthorResource",
     "AuthorType",

backend/models/content/album.py

@@ -1,46 +1,43 @@
 from typing import List
 import uuid
-from sqlalchemy.dialects.postgresql import ARRAY, UUID
-from sqlalchemy import Column, ForeignKey, Integer, String, inspect
+from sqlalchemy.dialects.postgresql import TIMESTAMP
+from sqlalchemy import (
+    UUID,
+    Column,
+    ForeignKey,
+    Integer,
+    String,
+    func,
+    inspect,
+    text,
+)
+from models.content.media import Media
 from utility.constants import AVAILABLE_LANGUAGES
-from utility.translation import get_translation
 from utility.database import db
-from models.content.base import Item
-
-
-class Album(Item):
-    """
-    Album model which inherits from the base Item model
-
-    Attributes:
-        album_id: Primary key
-        media_urls: List of media URLs (images, videos, etc.)
-    """
+from utility.translation import get_translation
 
-    album_id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
 
-    media_urls = Column(ARRAY(String))
+class Album(db.Model):
+    __tablename__ = "album"
 
-    # Foreign keys
-    item_id = Column(UUID(as_uuid=True), ForeignKey("item.item_id"))
+    album_id = Column(
+        UUID(as_uuid=True),
+        primary_key=True,
+        default=uuid.uuid4,
+        server_default=text("gen_random_uuid()"),
+    )
+    total_images = Column(Integer, default=0)
+    total_videos = Column(Integer, default=0)
+    preview_media_id = Column(UUID(as_uuid=True))
+    updated_at = Column(TIMESTAMP, default=func.now(), server_default=text("now()"))
 
     # Relationships
-    item = db.relationship("Item", back_populates="album")
     translations = db.relationship("AlbumTranslation", back_populates="album")
+    media = db.relationship("Media", back_populates="album", passive_deletes=True)
 
-    __mapper_args__ = {"polymorphic_identity": "album"}
-
-    def to_dict(
-        self, provided_languages: List[str] = AVAILABLE_LANGUAGES, is_public_route=True
-    ):
-        base_data = super().to_dict(
-            provided_languages=provided_languages, is_public_route=is_public_route
-        )
-
-        if not base_data:
-            return {}
-
-        translations = []
+    def to_dict(self, provided_languages: List[str] = AVAILABLE_LANGUAGES):
+        data = {}
+        translations: List[AlbumTranslation] = []
 
         for language_code in provided_languages:
             translation = get_translation(
@@ -51,23 +48,34 @@ def to_dict(
             )
             translations.append(translation)
 
-        del base_data["album_id"]
+        data["translations"] = [translation.to_dict() for translation in translations]
+        data["album_id"] = self.album_id
+        data["total_images"] = self.total_images
+        data["total_videos"] = self.total_videos
+        data["updated_at"] = self.updated_at
 
-        base_data["media_urls"] = self.media_urls
-        base_data["translations"] = [
-            translation.to_dict() for translation in translations
-        ]
+        if self.preview_media_id:
+            media: Media | None = Media.query.filter_by(
+                media_id=self.preview_media_id
+            ).first()
 
-        return base_data
+            if not media:
+                data["preview_media"] = None
+
+            data["preview_media"] = media.to_dict(provided_languages=provided_languages)
+
+        return data
 
 
 class AlbumTranslation(db.Model):
     __tablename__ = "album_translation"
 
-    album_translation_id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    album_translation_id = Column(
+        UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
+    )
 
     title = Column(String(255))
-    description = Column(String(2500))
+    description = Column(String(512))
 
     # Foreign keys
     album_id = Column(UUID(as_uuid=True), ForeignKey("album.album_id"))

backend/models/content/base.py

@@ -59,7 +59,7 @@ class Item(db.Model):
     created_at = Column(DateTime, default=func.now(), server_default=func.now())
     last_updated = Column(
         DateTime,
-        default=datetime.now(timezone.utc),
+        default=func.now(),
         onupdate=datetime.now(timezone.utc),
     )
     categories = Column(ARRAY(String), default=[])
@@ -77,7 +77,7 @@ class Item(db.Model):
     news = db.relationship("News", back_populates="item", passive_deletes=True)
     event = db.relationship("Event", back_populates="item", passive_deletes=True)
     document = db.relationship("Document", back_populates="item", passive_deletes=True)
-    album = db.relationship("Album", back_populates="item", passive_deletes=True)
+    media = db.relationship("Media", back_populates="item", passive_deletes=True)
 
     # Polymorphism
     type = Column(String(50))

backend/models/content/event.py

@@ -1,4 +1,3 @@
-from datetime import timedelta
 import enum
 from textwrap import dedent
 from typing import List
@@ -123,7 +122,6 @@ def to_dict(
         if not isinstance(translation, EventTranslation):
             return None
 
-        del data["event_id"]
         del data["calendar_id"]
         del data["parent_event_id"]
         del data["type"]
@@ -163,7 +161,7 @@ class EventTranslation(db.Model):
     )
 
     title = Column(String(255))
-    description = Column(String(500))
+    description = Column(String(1024))
     main_image_url = Column(String(length=2096))
     sub_image_urls = Column(ARRAY(String))