From b1edf8542e6fe9ae2a5bfcae8462f96b4b0400dd Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Mon, 8 Jul 2019 09:40:21 +1200
Subject: [PATCH] Removed slug from query

---
 app/services/timeline_service.rb | 38 ++++++++++++++------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/app/services/timeline_service.rb b/app/services/timeline_service.rb
index 06ab0d8e3..8ed765083 100644
--- a/app/services/timeline_service.rb
+++ b/app/services/timeline_service.rb
@@ -25,8 +25,7 @@ class TimelineService
       "'planting' as event_type",
       'planted_at as event_at',
       :owner_id,
-      :crop_id,
-      :slug
+      :crop_id
     )
   end
 
@@ -36,8 +35,17 @@ class TimelineService
       "'harvest' as event_type",
       'harvested_at as event_at',
       :owner_id,
-      :crop_id,
-      :slug
+      :crop_id
+    )
+  end
+
+  def self.seeds_query
+    Seed.select(
+      :id,
+      "'seed' as event_type",
+      "seeds.created_at as event_at",
+      :owner_id,
+      :crop_id
     )
   end
 
@@ -47,8 +55,7 @@ class TimelineService
       "'post' as event_type",
       'posts.created_at as event_at',
       'author_id as owner_id',
-      'null as crop_id',
-      :slug
+      'null as crop_id'
     )
   end
 
@@ -58,8 +65,7 @@ class TimelineService
       "'comment' as event_type",
       'comments.created_at as event_at',
       'author_id as owner_id',
-      'null as crop_id',
-      'null as slug'
+      'null as crop_id'
     )
   end
 
@@ -68,20 +74,8 @@ class TimelineService
       :id,
       "'photo' as event_type",
       "photos.created_at as event_at",
-      'photos.owner_id',
-      'null as crop_id',
-      'null as slug'
-    )
-  end
-
-  def self.seeds_query
-    Seed.select(
-      :id,
-      "'seed' as event_type",
-      "seeds.created_at as event_at",
-      'seeds.owner_id',
-      'crop_id',
-      'slug'
+      :owner_id,
+      'null as crop_id'
     )
   end
 end