Make it so combatlogs are currently not retained after upload.

OSCR_django/urls.py

@@ -15,7 +15,8 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 
-# from django.contrib import admin
+from django.conf import settings
+from django.contrib import admin
 from django.urls import include, path
 from drf_yasg.views import get_schema_view
 
@@ -29,10 +30,12 @@
 
 
 urlpatterns = [
-    # path("admin/", admin.site.urls),
-    # path("swagger/", schema_view.with_ui("swagger")),
     # path("", include("user.urls")),
     path("", include("combatlog.urls.combatlog")),
     path("", include("ladder.urls.ladder")),
     path("", include("ladder.urls.ladder_entry")),
 ]
+
+if settings.ENABLE_DEBUG:
+    urlpatterns.append(path("admin/", admin.site.urls))
+    urlpatterns.append(path("swagger/", schema_view.with_ui("swagger")))

combatlog/migrations/0005_remove_combatlog_data.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.9 on 2024-02-24 03:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("combatlog", "0004_metadata_date_time"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="combatlog",
+            name="data",
+        ),
+    ]

combatlog/models/combatlog.py

@@ -20,8 +20,6 @@
 class CombatLog(BaseModel):
     """CombatLog Model"""
 
-    data = models.BinaryField(null=True, default=None)
-
     metadata = models.ForeignKey(
         Metadata,
         on_delete=models.CASCADE,
@@ -138,13 +136,17 @@ def update_metadata_file(self, file):
 
         return results
 
-    def update_metadata(self):
+    def update_metadata(self, data):
         """Parse the Combat Log and create Metadata"""
         with tempfile.NamedTemporaryFile() as file:
-            file.write(self.data)
+            file.write(data)
             file.flush()
             return self.update_metadata_file(file)
 
+    def data(self):
+        """Fetch the Combat Log data"""
+        return b""
+
     def __str__(self):
         if not self.metadata:
             return f"Combat Log without Metadata ({self.pk})"

combatlog/serializers/combatlog.py

@@ -1,8 +1,9 @@
 """ CombatLog Serializers """
 
-from combatlog.models import CombatLog
 from rest_framework import serializers
 
+from combatlog.models import CombatLog
+
 from .metadata import MetadataSerializer
 
 
@@ -13,9 +14,7 @@ class CombatLogSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = CombatLog
-        exclude = [
-            "data",
-        ]
+        fields = "__all__"
 
 
 class CombatLogUploadSerializer(serializers.Serializer):

combatlog/views/combatlog.py

@@ -2,13 +2,6 @@
 
 import logging
 
-from combatlog.models import CombatLog
-from combatlog.serializers import (
-    CombatLogSerializer,
-    CombatLogUploadResponseSerializer,
-    CombatLogUploadSerializer,
-)
-from core.pagination import PageNumberPagination
 from django.db import transaction
 from django.http import HttpResponse
 from drf_yasg import openapi
@@ -19,6 +12,14 @@
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
+from combatlog.models import CombatLog
+from combatlog.serializers import (
+    CombatLogSerializer,
+    CombatLogUploadResponseSerializer,
+    CombatLogUploadSerializer,
+)
+from core.pagination import PageNumberPagination
+
 LOGGER = logging.getLogger("django")
 
 
@@ -56,8 +57,8 @@ def upload(self, request):
         data = serializer.validated_data["file"].read()
 
         with transaction.atomic():
-            instance = CombatLog.objects.create(data=data)
-            res = instance.update_metadata()
+            instance = CombatLog.objects.create()
+            res = instance.update_metadata(data)
             serializer = CombatLogUploadResponseSerializer(data=res, many=True)
             serializer.is_valid(raise_exception=True)
 
@@ -83,9 +84,10 @@ def download(self, request, pk=None):
         """
 
         instance = self.get_object()
+        data = instance.data()
 
         response = HttpResponse()
         response["Content-Disposition"] = f'attachment; filename="{instance}.log"'
         response["Content-Transfer-Encoding"] = "binary"
-        response.write(instance.data)
+        response.write(data)
         return response

requirements.txt

@@ -2,6 +2,6 @@ Django==4.2.9
 djangorestframework==3.14.0
 drf_yasg==1.21.7
 django_filter==23.5
-STO-OSCR==2024.2b201
+STO-OSCR>=2024.2b201
 whitenoise==6.6.0
 psycopg[binary,pool]==3.1.18