Merge pull request #19 from arekbauer/trmnl-vct

Add TRMNL service integration with API endpoints and models

Author: arekbauer

Personal_Portfolio/urls.py

@@ -17,13 +17,18 @@
 from django.contrib import admin
 from django.urls import path
 from django.conf.urls.static import static
+from django.urls import path, include
 from django.conf import settings
 from portfolio import views 
 
 urlpatterns = [
+    # Website URLs
     path('api/now-playing/', views.get_now_playing, name='now-playing'),
     path('secret-admin/', admin.site.urls),
     path('', views.home, name = 'home'),
+    
+    # Include TRMNL service URLs
+    path('api/trmnl/', include('trmnl_service.urls')),
 ]
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

trmnl_service/__init__.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

trmnl_service/admin.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class TrmnlServiceConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'trmnl_service'

trmnl_service/apps.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

trmnl_service/migrations/__init__.py

@@ -0,0 +1,116 @@
+import requests
+from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
+
+class VLRService:
+    MATCHES_URL = "https://vlr.orlandomm.net/api/v1/matches"
+    RESULTS_URL = "https://vlr.orlandomm.net/api/v1/results"
+    WHITELIST = "VCT 2026"
+    LONDON_TZ = ZoneInfo("Europe/London")
+    TIME_OFFSET_HOURS = 6
+
+    @classmethod
+    def get_vct_dashboard_data(cls):
+        """Main entry point: Orchestrates the data flow."""
+        now = datetime.now(cls.LONDON_TZ)
+        
+        # 1. Fetch raw data
+        raw_matches = cls._fetch_data(cls.MATCHES_URL)
+        raw_results = cls._fetch_data(cls.RESULTS_URL, params={"page": "1"})
+
+        # 2. Process and Filter
+        # We split these so you can debug 'Matches' and 'Results' independently.
+        matches = cls._process_matches(raw_matches, now)
+        results = cls._process_results(raw_results, now)
+
+        return {
+            **results, # Contains y_res and t_res
+            **matches, # Contains live, t_up, and tom_up
+            "last_updated": now.strftime("%H:%M")
+        }
+
+    # --- Private Logic: Processing ---
+
+    @classmethod
+    def _process_matches(cls, raw_data, now):
+        """Handles LIVE and UPCOMING match logic."""
+        buckets = {"live": [], "t_up": [], "tom_up": []}
+        
+        for item in raw_data:
+            if not cls._is_whitelisted(item): continue
+            
+            match = cls._normalize_item(item)
+            utc_date = item.get('utc', '')
+            status = item.get('status', '').upper()
+
+            if cls._is_date(utc_date, now): # Today
+                if status == "LIVE":
+                    buckets["live"].append(match)
+                else:
+                    buckets["t_up"].append(match)
+            elif cls._is_date(utc_date, now + timedelta(days=1)): # Tomorrow
+                buckets["tom_up"].append(match)
+                
+        return buckets
+
+    @classmethod
+    def _process_results(cls, raw_data, now):
+        """Handles COMPLETED match logic using the 'ago' field."""
+        buckets = {"y_res": [], "t_res": []}
+        
+        for item in raw_data:
+            if not cls._is_whitelisted(item): continue
+            
+            match = cls._normalize_item(item)
+            ago_str = item.get('ago', '') # Results use 'ago' instead of 'utc'
+
+            if 'd' not in ago_str: # Happened today
+                buckets["t_res"].append(match)
+            elif '1d' in ago_str: # Happened yesterday
+                buckets["y_res"].append(match)
+                
+        return buckets
+
+    # --- Private Logic: Helpers (The "Readable" Part) ---
+
+    @staticmethod
+    def _fetch_data(url, params=None):
+        """Simple wrapper for requests to handle the API wrapper key."""
+        try:
+            resp = requests.get(url, params=params, timeout=10)
+            return resp.json().get('data', [])
+        except Exception:
+            return []
+
+    @staticmethod
+    def _is_whitelisted(item):
+        """Centralized check for your tournament whitelist."""
+        return VLRService.WHITELIST in item.get('tournament', '')
+
+    @staticmethod
+    def _is_date(utc_string, target_dt):
+        """Check if the API's UTC string matches our target date string."""
+        return target_dt.strftime('%Y-%m-%d') in utc_string
+
+    @staticmethod
+    def _normalize_item(data):
+        """Turns messy API objects into clean, display-ready dictionaries."""
+        ts = data.get('timestamp')
+        time_str = ""
+
+        if ts:
+            corrected_ts = ts + (VLRService.TIME_OFFSET_HOURS * 3600)
+            dt_utc = datetime.fromtimestamp(corrected_ts, tz=ZoneInfo("UTC"))
+            dt_london = dt_utc.astimezone(VLRService.LONDON_TZ)
+            time_str = dt_london.strftime("%H:%M")
+            
+        return {
+            "t1": data['teams'][0]['name'],
+            "s1": data['teams'][0].get('score'),
+            "t2": data['teams'][1]['name'],
+            "s2": data['teams'][1].get('score'),
+            "tournament": data.get('tournament'),
+            "event": data.get('event'),
+            "status": data.get('status'),
+            "time": time_str
+        }

trmnl_service/models.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

trmnl_service/services.py

@@ -0,0 +1,6 @@
+from django.urls import path
+from .views import vct_ticker_view
+
+urlpatterns = [
+    path('vct-ticker/', vct_ticker_view, name='trmnl_vct_ticker'),
+]

trmnl_service/tests.py

@@ -0,0 +1,11 @@
+from django.http import JsonResponse
+from .services import VLRService
+
+def vct_ticker_view(request):
+    """
+    Endpoint for the TRMNL device to poll.
+    """
+    data = VLRService.get_vct_dashboard_data()
+    
+    status_code = 200 if "error" not in data else 502
+    return JsonResponse(data, status=status_code)