From fce5ee0e7fbac196e5a1e40c29fb446085ca0988 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sun, 25 Mar 2018 17:17:33 +0200
Subject: [PATCH] Renamed listening end_date to creation_date
---
api/funkwhale_api/history/admin.py | 2 +-
.../migrations/0002_auto_20180325_1433.py | 22 +++++++++++++++++++
api/funkwhale_api/history/models.py | 5 +++--
api/funkwhale_api/history/serializers.py | 4 ++--
api/tests/history/test_activity.py | 2 +-
5 files changed, 29 insertions(+), 6 deletions(-)
create mode 100644 api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py
diff --git a/api/funkwhale_api/history/admin.py b/api/funkwhale_api/history/admin.py
index 6d0480e73..5ddfb8998 100644
--- a/api/funkwhale_api/history/admin.py
+++ b/api/funkwhale_api/history/admin.py
@@ -4,7 +4,7 @@ from . import models
@admin.register(models.Listening)
class ListeningAdmin(admin.ModelAdmin):
- list_display = ['track', 'end_date', 'user', 'session_key']
+ list_display = ['track', 'creation_date', 'user', 'session_key']
search_fields = ['track__name', 'user__username']
list_select_related = [
'user',
diff --git a/api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py b/api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py
new file mode 100644
index 000000000..d83dbb0a4
--- /dev/null
+++ b/api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.0.3 on 2018-03-25 14:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('history', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='listening',
+ options={'ordering': ('-creation_date',)},
+ ),
+ migrations.RenameField(
+ model_name='listening',
+ old_name='end_date',
+ new_name='creation_date',
+ ),
+ ]
diff --git a/api/funkwhale_api/history/models.py b/api/funkwhale_api/history/models.py
index 56310ddc0..762d5bf7b 100644
--- a/api/funkwhale_api/history/models.py
+++ b/api/funkwhale_api/history/models.py
@@ -6,7 +6,8 @@ from funkwhale_api.music.models import Track
class Listening(models.Model):
- end_date = models.DateTimeField(default=timezone.now, null=True, blank=True)
+ creation_date = models.DateTimeField(
+ default=timezone.now, null=True, blank=True)
track = models.ForeignKey(
Track, related_name="listenings", on_delete=models.CASCADE)
user = models.ForeignKey(
@@ -18,7 +19,7 @@ class Listening(models.Model):
session_key = models.CharField(max_length=100, null=True, blank=True)
class Meta:
- ordering = ('-end_date',)
+ ordering = ('-creation_date',)
def save(self, **kwargs):
if not self.user and not self.session_key:
diff --git a/api/funkwhale_api/history/serializers.py b/api/funkwhale_api/history/serializers.py
index 7a2280cea..8fe6fa6e0 100644
--- a/api/funkwhale_api/history/serializers.py
+++ b/api/funkwhale_api/history/serializers.py
@@ -12,7 +12,7 @@ class ListeningActivitySerializer(activity_serializers.ModelSerializer):
type = serializers.SerializerMethodField()
object = TrackActivitySerializer(source='track')
actor = UserActivitySerializer(source='user')
- published = serializers.DateTimeField(source='end_date')
+ published = serializers.DateTimeField(source='creation_date')
class Meta:
model = models.Listening
@@ -36,7 +36,7 @@ class ListeningSerializer(serializers.ModelSerializer):
class Meta:
model = models.Listening
- fields = ('id', 'user', 'session_key', 'track', 'end_date')
+ fields = ('id', 'user', 'session_key', 'track', 'creation_date')
def create(self, validated_data):
diff --git a/api/tests/history/test_activity.py b/api/tests/history/test_activity.py
index b5ab07b82..04000604b 100644
--- a/api/tests/history/test_activity.py
+++ b/api/tests/history/test_activity.py
@@ -23,7 +23,7 @@ def test_activity_listening_serializer(factories):
"id": listening.get_activity_url(),
"actor": actor,
"object": TrackActivitySerializer(listening.track).data,
- "published": field.to_representation(listening.end_date),
+ "published": field.to_representation(listening.creation_date),
}
data = serializers.ListeningActivitySerializer(listening).data
--
GitLab