django: assign composite data to events

server/django/sensordata/admin.py

@@ -44,25 +44,33 @@ def get_model_perms(self, request):
         }
 
 
+class EventResourceInline(admin.TabularInline):
+    model = EventResource
+    extra = 0
+    can_delete = False
+    readonly_fields = ('resource',)
+
 @admin.register(Resource)
 class ResourceAdmin(admin.ModelAdmin):
-    list_display = ('endpoint', 'resource_type', 'timestamp')
+    list_display = ('endpoint', 'resource_type', 'timestamp_created')
     search_fields = ('endpoint__endpoint', 'resource_type__name')
-    list_filter = ('endpoint', 'resource_type', 'timestamp')
-
+    list_filter = ('endpoint__endpoint', 'resource_type', 'timestamp_created')
+    readonly_fields = ('timestamp_created',)
 
 @admin.register(Event)
 class EventAdmin(admin.ModelAdmin):
-    list_display = ('endpoint', 'event_type', 'start_time', 'end_time')
-    search_fields = ('endpoint__endpoint', 'event_type')
+    list_display = ('endpoint', 'event_type', 'time')
+    search_fields = ('endpoint', 'event_type')
     list_filter = ('endpoint', 'event_type')
-
+    readonly_fields = ('endpoint', 'event_type', 'time')
+    inlines = [EventResourceInline]
 
 @admin.register(EventResource)
 class EventResourceAdmin(admin.ModelAdmin):
     list_display = ('event', 'resource')
     search_fields = ('event__event_type', 'resource__resource_type__name')
     list_filter = ('event', 'resource__resource_type')
+    readonly_fields = ('event', 'resource')
 
 
 @admin.register(EndpointOperation)

server/django/sensordata/migrations/0007_rename_end_time_event_time_remove_event_start_time.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.0.6 on 2024-06-14 12:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sensordata", "0006_alter_endpointoperation_last_attempt_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="event",
+            old_name="end_time",
+            new_name="time",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="start_time",
+        ),
+    ]

server/django/sensordata/migrations/0008_alter_resource_unique_together_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.0.6 on 2024-06-14 13:46
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sensordata", "0007_rename_end_time_event_time_remove_event_start_time"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="resource",
+            unique_together=set(),
+        ),
+        migrations.AddField(
+            model_name="resource",
+            name="timestamp_created",
+            field=models.DateTimeField(
+                auto_now_add=True, default=django.utils.timezone.now
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="event",
+            name="time",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.RemoveField(
+            model_name="resource",
+            name="timestamp",
+        ),
+    ]

server/django/sensordata/models.py

@@ -45,13 +45,10 @@ class Resource(models.Model):
     int_value = models.IntegerField(null=True, blank=True)
     float_value = models.FloatField(null=True, blank=True)
     str_value = models.CharField(max_length=512, null=True, blank=True)
-    timestamp = models.DateTimeField()
-
-    class Meta:
-        unique_together = ('endpoint', 'resource_type', 'timestamp')
+    timestamp_created = models.DateTimeField(auto_now_add=True, blank=True)
 
     def __str__(self):
-        return f"{self.endpoint} - {self.resource_type} - {self.timestamp}"
+        return f"{self.endpoint} - {self.resource_type} - {self.timestamp_created}"
 
     # Gets the correct value field, based on the linked ResourceType
     def get_value(self):
@@ -67,11 +64,10 @@ class Event(models.Model):
     """
     endpoint = models.ForeignKey(Endpoint, on_delete=models.PROTECT)
     event_type = models.CharField(max_length=100)
-    start_time = models.DateTimeField()
-    end_time = models.DateTimeField()
+    time = models.DateTimeField(auto_now_add=True, blank=True)
 
     def __str__(self):
-        return f"{self.event_type} from {self.start_time} to {self.end_time} for {self.endpoint}"
+        return f"{self.endpoint} - {self.event_type} - {self.time}"
 
 class EventResource(models.Model):
     """Acts as a many-to-many bridge table that links resources to their respective events."""
@@ -98,7 +94,7 @@ class Status(models.TextChoices):
         default=Status.QUEUED,
     )
     transmit_counter = models.IntegerField(default=0)
-    timestamp_created = models.DateTimeField(auto_now_add=True)
+    timestamp_created = models.DateTimeField(auto_now_add=True, blank=True)
     last_attempt = models.DateTimeField(auto_now_add=False, null=True)
 
 class Firmware(models.Model):

server/django/sensordata/serializers/base.py

@@ -1,6 +1,5 @@
 from rest_framework import serializers
-from ..models import ResourceType, Resource
-from django.utils import timezone
+from ..models import ResourceType, Resource, Event, EventResource
 from ..tasks import process_pending_operations
 import logging
 
@@ -31,14 +30,30 @@ class ResourceDataSerializer(serializers.Serializer):
 
 
 class HandleResourceMixin:
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.event = None
 
-    def handle_resource(self, endpoint, obj_id, resource):
+
+    def create_event(self, endpoint, event_type):
+        """
+        Create an Event instance for the given endpoint and event type. If no event
+        is created, the resource data won't be associated with any event.
+        """
+        event_data = {
+            'endpoint': endpoint,
+            'event_type': event_type,
+        }
+        self.event = Event.objects.create(**event_data)
+
+
+    def handle_resource(self, endpoint, obj_id, res):
         # Some LwM2M Resources are currently unsupported, we can skip them for now.
-        if resource['kind'] == 'multiResource':
+        if res['kind'] == 'multiResource':
             logging.error(f"multiResource currently not supported, skipping...")
             return
 
-        res_id = resource['id']
+        res_id = res['id']
         # Fetch resource information from Database
         resource_type = ResourceType.objects.get(object_id=obj_id, resource_id=res_id)
         if not resource_type:
@@ -47,10 +62,10 @@ def handle_resource(self, endpoint, obj_id, resource):
             raise serializers.ValidationError(err)
 
         # Validate that datatype is matching the resource type
-        data_type = dict(ResourceType.TYPE_CHOICES).get(resource['type'])
+        data_type = dict(ResourceType.TYPE_CHOICES).get(res['type'])
         res_data_type = dict(ResourceType.TYPE_CHOICES).get(resource_type.data_type)
         if not data_type:
-            err = f"Unsupported data type '{resource['type']}', skipping..."
+            err = f"Unsupported data type '{res['type']}', skipping..."
             logger.error(err)
             raise serializers.ValidationError(err)
         if data_type != res_data_type:
@@ -64,11 +79,15 @@ def handle_resource(self, endpoint, obj_id, resource):
         resource_data = {
             'endpoint': endpoint,
             'resource_type': resource_type,
-            'timestamp': timezone.now(),
-            data_type: resource['value']
+            data_type: res['value']
         }
 
-        Resource.objects.create(**resource_data)
+        created_res = Resource.objects.create(**resource_data)
+
+        # Create EventResource linking the event and the resource
+        if self.event is not None:
+            EventResource.objects.create(event=self.event, resource=created_res)
+            logger.debug(f"Added EventResource: {self.event} - {created_res}")
 
         # Update the registration status if the resource is a registration resource
         if resource_type.name == 'ep_registered':

server/django/sensordata/serializers/composite_resource_serializer.py

@@ -59,6 +59,7 @@ def create(self, validated_data):
 
         for _, obj in val.items():
             obj_id = obj.get('id')
+            self.create_event(endpoint, obj_id)
             for instance in obj['instances']:
                 for resource in instance['resources']:
                     try: