Correct resource response

digitale-kultur · Apr 3, 2022 · 9d3838c · 9d3838c
1 parent fb29b06
commit 9d3838c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Http/Controllers/Api/ProfileController.php b/src/Http/Controllers/Api/ProfileController.php
@@ -216,7 +216,7 @@ public function vote_live($api_token)
 
         return response()->json([
             'data'    => VoteEntryResource::collection($entries->load('competition'))
-                                      ->toArrayRecursive(),
+                                          ->toArrayRecursive(),
             'status'  => 200,
             'message' => 'Livevotes loaded',
         ]);
@@ -233,6 +233,8 @@ public function vote_entries(Request $request, $api_token)
         $visitor = Visitor::where('api_token', $api_token)
                           ->first();
 
+        Session::put('visitor', $visitor->id);
+
         if (is_null($visitor)) {
             return response()->json([
                 'status'  => 404,
@@ -257,12 +259,14 @@ public function vote_entries(Request $request, $api_token)
                           ->pluck('id');
 
         $entries = Entry::whereIn('id', $entryIds)
+                        ->orderBy('competition_id', 'ASC')
+                        ->orderBy('sort_position', 'ASC')
                         ->get();
 
         return response()->json([
             'status'  => 200,
             'message' => 'Votes loaded',
-            'data'    => EntryResource::collection($entries),
+            'data'    => VoteEntryResource::collection($entries),
         ]);
     }