Added genres to all responses.

Author: galli-leo

app/Helpers/Helper.php

@@ -37,6 +37,8 @@ public static function get_from_imdb_py($path, $selection, $rememberMinutes = 60
           foreach ($movies as $movie)
           {
               $movie->genres = explode(",", $movie->genres);
+              $movie->adult = $movie->adult == 1;
+              unset($movie->type);
               $with_genres[] = $movie;
           }
 

app/Http/Controllers/API/DiscoverController.php

@@ -57,7 +57,7 @@ public function recommendations(Request $request) {
       {
           abort(422, "Please add some movies before using our recommendation engine :)");
       }
-      $movies_db = DB::select("SELECT mo.id, mo.popularity, mo.imdb_id, mo.title, mo.overview, mo.vote_average, mo.vote_count, mo.tagline, mo.poster_path, mo.release_date, mo.release_year, mo.trailer_key, mo.trailer_site, mo.backdrop_path, mo.homepage, mo.runtime, mo.countO FROM ( SELECT m.*, r.recommended_id, r.tmdbid, r.id as rid, count(m.id) as countO FROM movies m, recommendations r WHERE m.id = r.recommended_id AND r.tmdbid in ($ids) AND r.recommended_id not in ($ids$ignoredIds) AND m.adult = 0 GROUP BY m.id ) as mo;");
+      $movies_db = DB::select("SELECT mo.id, mo.popularity, mo.imdb_id, mo.title, mo.overview, mo.vote_average, mo.vote_count, mo.tagline, mo.poster_path, mo.release_date, mo.release_year, mo.trailer_key, mo.trailer_site, mo.backdrop_path, mo.homepage, mo.runtime, mo.countO, mo.genres, mo.runtime, mo.adult FROM ( SELECT m.*, r.recommended_id, r.tmdbid, r.id as rid, count(m.id) as countO FROM movies m, recommendations r WHERE m.id = r.recommended_id AND r.tmdbid in ($ids) AND r.recommended_id not in ($ids$ignoredIds) AND m.adult = 0 GROUP BY m.id ) as mo;");
       $movies = json_decode(json_encode($movies_db), true);
 
       $this->count_max = maximum($movies, "countO");
@@ -67,8 +67,17 @@ public function recommendations(Request $request) {
       usort($movies, array($this, "compare_score"));
 
       $movies = array_slice($movies, 0, 30);
+      $resp = [];
 
-      return response()->json($movies);
+      foreach ($movies as $movie) {
+          unset($movie["countO"]);
+          $movie["genres"] = explode(",", $movie["genres"]);
+          $movie["adult"] = $movie["adult"] == 1;
+          $resp[] = $movie;
+      }
+
+
+      return response()->json($resp);
    }
 
    function score ($elem)

app/Mapping.php

@@ -82,7 +82,7 @@ public function vote($direction = 1)
         {
             return;
         }
-        
+
         $ip = md5($_SERVER['REMOTE_ADDR']);
         if (Event::whereIn("type", [EventType::AddedMapping, EventType::ApproveMapping, EventType::DisapproveMapping])->where("mappings_id", "=", $this->id)->where("ip", "=", $ip)->whereBetween("date", array(Carbon::now()->addDays(-1), Carbon::now()))->first())
         {

app/Movie.php

@@ -35,8 +35,8 @@ public function toArray()
             $arr["physical_release"] = $physical_release->release_date;
             $arr["physical_release_note"] = $physical_release->note;
         }
-        $arr["genre_ids"] = explode(",", $this->genres);
-        unset($arr["genres"]);
+        $arr["genres"] = explode(",", $this->genres);
+        //unset($arr["genres"]);
         return $arr;
     }