From b8ad594a051dbb59ea564629f1641e8aca810772 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 2 Oct 2022 18:55:16 -0600
Subject: [PATCH] Update CollectionController

---
 app/Http/Controllers/CollectionController.php | 21 +++++++-----
 app/Services/CollectionService.php            | 33 ++++++++-----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php
index be18db8ab..7a6672bc4 100644
--- a/app/Http/Controllers/CollectionController.php
+++ b/app/Http/Controllers/CollectionController.php
@@ -77,6 +77,7 @@ class CollectionController extends Controller
         $collection->visibility = $request->input('visibility');
         $collection->save();
 
+        CollectionService::deleteCollection($id);
         return CollectionService::setCollection($collection->id, $collection);
     }
 
@@ -93,9 +94,9 @@ class CollectionController extends Controller
         if($collection->items()->count() == 0) {
             abort(404);
         }
-        $collection->title = e($request->input('title'));
+        $collection->title = strip_tags($request->input('title'));
         $collection->description = strip_tags($request->input('description'));
-        $collection->visibility = strip_tags($request->input('visibility'));
+        $collection->visibility = $request->input('visibility');
         $collection->published_at = now();
         $collection->save();
         return CollectionService::setCollection($collection->id, $collection);
@@ -134,6 +135,7 @@ class CollectionController extends Controller
 
         $collection = Collection::whereProfileId($profileId)->findOrFail($collectionId);
         $count = $collection->items()->count();
+        CollectionService::deleteCollection($collection->id);
 
         if($count) {
             CollectionItem::whereCollectionId($collection->id)
@@ -301,11 +303,6 @@ class CollectionController extends Controller
             ->whereIn('type', ['photo', 'photo:album', 'video'])
             ->findOrFail($postId);
 
-        CollectionService::removeItem(
-        	$collection->id,
-        	$status->id
-        );
-
         $item = CollectionItem::whereCollectionId($collection->id)
             ->whereObjectType('App\Status')
             ->whereObjectId($status->id)
@@ -313,9 +310,17 @@ class CollectionController extends Controller
 
         $item->delete();
 
+        CollectionItem::whereCollectionId($collection->id)
+            ->orderBy('created_at')
+            ->get()
+            ->each(function($item, $index) {
+                $item->order = $index;
+                $item->save();
+            });
+
         $collection->updated_at = now();
         $collection->save();
-        CollectionService::setCollection($collection->id, $collection);
+        CollectionService::deleteCollection($collection->id);
 
         return 200;
     }
diff --git a/app/Services/CollectionService.php b/app/Services/CollectionService.php
index fea4269fe..ae9ea8112 100644
--- a/app/Services/CollectionService.php
+++ b/app/Services/CollectionService.php
@@ -22,37 +22,32 @@ class CollectionService
 
 	public static function addItem($id, $sid, $score)
 	{
-		Redis::zadd(self::CACHE_KEY . 'items:' . $id, $score, $sid);
+		return Redis::zadd(self::CACHE_KEY . 'items:' . $id, $score, $sid);
 	}
 
 	public static function removeItem($id, $sid)
 	{
-		Redis::zrem(self::CACHE_KEY . 'items:' . $id, $sid);
+		return Redis::zrem(self::CACHE_KEY . 'items:' . $id, $sid);
 	}
 
 	public static function clearItems($id)
 	{
-		Redis::del(self::CACHE_KEY . 'items:' . $id);
+		return Redis::del(self::CACHE_KEY . 'items:' . $id);
 	}
 
 	public static function coldBootItems($id)
 	{
-		return Cache::remember(self::CACHE_KEY . 'items:' . $id, 86400, function() use($id) {
-			return CollectionItem::whereCollectionId($id)
-				->orderBy('order')
-				->get()
-				->filter(function($item) use($id) {
-					return StatusService::get($item->object_id) != null;
-				})
-				->each(function($item) use ($id) {
-					self::addItem($id, $item->object_id, $item->order);
-				})
-				->map(function($item) {
-					return (string) $item->object_id;
-				})
-				->values()
-				->toArray();
-		});
+		return CollectionItem::whereCollectionId($id)
+			->orderBy('order')
+			->get()
+			->each(function($item) use ($id) {
+				return self::addItem($id, $item->object_id, $item->order);
+			})
+			->map(function($item) {
+				return (string) $item->object_id;
+			})
+			->values()
+			->toArray();
 	}
 
 	public static function count($id)