From dcf612f2df219e834920ff0e2c36208bf79c12b0 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <donramonloco+github@gmail.com>
Date: Mon, 27 Aug 2018 18:05:19 +0200
Subject: [PATCH] Add related name to room entries

---
 .../src/graphql/gql/allRoomEntriesQuery.gql   |  2 +-
 client/src/graphql/gql/roomEntriesQuery.gql   |  2 +-
 .../graphql/gql/sandbox/roomEntriesQuery.gql  |  2 +-
 client/src/pages/room.vue                     |  2 +-
 .../migrations/0005_auto_20180827_1602.py     | 19 +++++++++++++++++++
 server/rooms/models.py                        |  2 +-
 server/rooms/schema.py                        |  2 +-
 7 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 server/rooms/migrations/0005_auto_20180827_1602.py

diff --git a/client/src/graphql/gql/allRoomEntriesQuery.gql b/client/src/graphql/gql/allRoomEntriesQuery.gql
index 04aae8f9..acdcbf0b 100644
--- a/client/src/graphql/gql/allRoomEntriesQuery.gql
+++ b/client/src/graphql/gql/allRoomEntriesQuery.gql
@@ -5,7 +5,7 @@ query RoomEntriesQuery($slug: String!) {
     slug
     appearance
     pk
-    roomentrySet {
+    roomEntries {
       edges {
         node {
           id
diff --git a/client/src/graphql/gql/roomEntriesQuery.gql b/client/src/graphql/gql/roomEntriesQuery.gql
index 26aa4565..fb4690cd 100644
--- a/client/src/graphql/gql/roomEntriesQuery.gql
+++ b/client/src/graphql/gql/roomEntriesQuery.gql
@@ -10,7 +10,7 @@ query RoomEntriesQuery($slug: String!) {
       name
       year
     }
-    roomentrySet {
+    roomEntries {
       edges {
         node {
           id
diff --git a/client/src/graphql/gql/sandbox/roomEntriesQuery.gql b/client/src/graphql/gql/sandbox/roomEntriesQuery.gql
index 929ca45a..2abdd98f 100644
--- a/client/src/graphql/gql/sandbox/roomEntriesQuery.gql
+++ b/client/src/graphql/gql/sandbox/roomEntriesQuery.gql
@@ -5,7 +5,7 @@ query RoomsQuery {
     slug
     appearance
     pk
-    roomentrySet {
+    roomEntries {
       edges {
         node {
           id
diff --git a/client/src/pages/room.vue b/client/src/pages/room.vue
index bf2de9e9..62d0c873 100644
--- a/client/src/pages/room.vue
+++ b/client/src/pages/room.vue
@@ -116,7 +116,7 @@
 
     computed: {
       roomEntryCount() {
-        return (this.room && this.room.roomentrySet) ? this.room.roomentrySet.length : 0
+        return (this.room && this.room.roomEntries) ? this.room.roomEntries.length : 0
       },
       roomAppearance: {
         set(value) {
diff --git a/server/rooms/migrations/0005_auto_20180827_1602.py b/server/rooms/migrations/0005_auto_20180827_1602.py
new file mode 100644
index 00000000..859efc01
--- /dev/null
+++ b/server/rooms/migrations/0005_auto_20180827_1602.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.6 on 2018-08-27 16:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rooms', '0004_auto_20180823_1336'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='roomentry',
+            name='room',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='room_entries', to='rooms.Room'),
+        ),
+    ]
diff --git a/server/rooms/models.py b/server/rooms/models.py
index 20c2ffc8..694aea1a 100644
--- a/server/rooms/models.py
+++ b/server/rooms/models.py
@@ -22,7 +22,7 @@ class RoomEntry(TitleSlugDescriptionModel):
         verbose_name = 'Raumeintrag'
         verbose_name_plural = 'Raumeinträge'
 
-    room = models.ForeignKey(Room, blank=False, null=False, on_delete=models.CASCADE)
+    room = models.ForeignKey(Room, blank=False, null=False, on_delete=models.CASCADE, related_name='room_entries')
     author = models.ForeignKey(get_user_model(), null=True, on_delete=models.CASCADE)
 
     def __str__(self):
diff --git a/server/rooms/schema.py b/server/rooms/schema.py
index 7831569b..941b8d45 100644
--- a/server/rooms/schema.py
+++ b/server/rooms/schema.py
@@ -33,7 +33,7 @@ class RoomType(DjangoObjectType):
         return self.id
 
     def resolve_entry_count(self, *args, **kwargs):
-        return self.roomentry_set.count()
+        return self.room_entries.count()
 
 
 class RoomsQuery(object):