Merge pull request #37 from HE-Arc/dev

Dev to main
HE-Arc · Oct 31, 2023 · 651a6d0 · 651a6d0
2 parents 62cd0f9 + d7c946f
commit 651a6d0
Show file tree

Hide file tree

Showing 12 changed files with 320 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,6 @@ yarn-error.log
 /.fleet
 /.idea
 /.vscode
+app/Http/Controllers/TestController.php
+resources/views/test.blade.php
+
diff --git a/app/Models/Api.php b/app/Models/Api.php
@@ -14,6 +14,7 @@ public static function getFilmDetails($id)
     {
         $apiKey = env('API_KEY');
         $url = env('API_URL');
+        $url_image = env('API_IMAGE_URL');
 
         $response = Http::withHeaders([
             'Authorization' => $apiKey,
@@ -22,12 +23,20 @@ public static function getFilmDetails($id)
         $jsonData = json_decode($response);
 
         if ($jsonData) {
-            $film = new Film();
+            $film = Film::where('id', $jsonData->id)->first();
 
-            $film->id = $jsonData->id;
+            if ($film === null) {
+                // Si le film n'existe pas, ajoutez-le à la base de données
+                $film = new Film();
+                $film->id = $jsonData->id;
+            }
+
+            // Mettez à jour les propriétés du film avec les nouvelles données
             $film->nom = $jsonData->title;
             $film->date_sortie = $jsonData->release_date;
-            $film->urlImage = $jsonData->poster_path;
+            $film->urlImage = $url_image . $jsonData->poster_path;
+
+            $film->save();
 
             return $film;
         }
@@ -39,6 +48,7 @@ public static function getSerieDetails($id)
     {
         $apiKey = env('API_KEY');
         $url = env('API_URL');
+        $url_image = env('API_IMAGE_URL');
 
         $response = Http::withHeaders([
             'Authorization' => $apiKey,
@@ -47,12 +57,20 @@ public static function getSerieDetails($id)
         $jsonData = json_decode($response);
 
         if ($jsonData) {
-            $serie = new Serie();
+            $serie = Serie::where('id', $jsonData->id)->first();
 
-            $serie->id = $jsonData->id;
+            if ($serie === null) {
+                // Si la serie n'existe pas, ajoutez-le à la base de données
+                $serie = new Serie();
+                $serie->id = $jsonData->id;
+            }
+
+            // Mettez à jour les propriétés du film avec les nouvelles données
             $serie->nom = $jsonData->name;
             $serie->date_sortie = $jsonData->first_air_date;
-            $serie->urlImage = $jsonData->poster_path;
+            $serie->urlImage = $url_image . $jsonData->poster_path;
+
+            $serie->save();
 
             return $serie;
         }

diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -12,11 +12,12 @@ class DatabaseSeeder extends Seeder
      */
     public function run(): void
     {
-        // \App\Models\User::factory(10)->create();
 
-        // \App\Models\User::factory()->create([
-        //     'name' => 'Test User',
-        //     'email' => '[email protected]',
-        // ]);
+        $this->call(UsersTableSeeder::class);
+        $this->call(FilmsTableSeeder::class);
+        $this->call(SeriesTableSeeder::class);
+        $this->call(ListesTableSeeder::class);
+        $this->call(SerieListeTableSeeder::class);
+        $this->call(FilmListeTableSeeder::class);
     }
 }
diff --git a/database/seeders/FilmListeTableSeeder.php b/database/seeders/FilmListeTableSeeder.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+use App\Models\FilmListe;
+
+class FilmListeTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run()
+    {
+        FilmListe::create([
+            'liste_id' => 1,
+            'film_id' => 1,
+        ]);
+
+        FilmListe::create([
+            'liste_id' => 1,
+            'film_id' => 2,
+        ]);
+
+        FilmListe::create([
+            'liste_id' => 2,
+            'film_id' => 3,
+        ]);
+
+        FilmListe::create([
+            'liste_id' => 3,
+            'film_id' => 1,
+        ]);
+
+        FilmListe::create([
+            'liste_id' => 3,
+            'film_id' => 2,
+        ]);
+
+        FilmListe::create([
+            'liste_id' => 3,
+            'film_id' => 3,
+        ]);
+    }
+}
diff --git a/database/seeders/FilmsTableSeeder.php b/database/seeders/FilmsTableSeeder.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+use App\Models\Film;
+
+class FilmsTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run()
+    {
+        Film::create([
+            'nom' => 'Film trop cool',
+            'date_sortie' => '2023-10-08',
+            'urlImage' => 'https://picsum.photos/200/300',
+            'created_at' => '2023-10-17 14:34:43',
+            'updated_at' => '2023-10-18 14:34:43',
+        ]);
+
+        Film::create([
+            'nom' => 'Film assez bien',
+            'date_sortie' => '2023-10-08',
+            'urlImage' => 'https://picsum.photos/200/300',
+            'created_at' => '2023-10-17 14:34:43',
+            'updated_at' => '2023-10-18 14:34:43',
+        ]);
+
+        Film::create([
+            'nom' => 'Film bof',
+            'date_sortie' => '2023-10-08',
+            'urlImage' => 'https://picsum.photos/200/300',
+            'created_at' => '2023-10-17 14:34:43',
+            'updated_at' => '2023-10-18 14:34:43',
+        ]);
+    }
+}
diff --git a/database/seeders/ListesTableSeeder.php b/database/seeders/ListesTableSeeder.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+use App\Models\Liste;
+
+class ListesTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run()
+    {
+        Liste::create([
+            'nom' => 'SuperListe',
+            'urlImage' => 'https://picsum.photos/200',
+            'user_id' => 1,
+        ]);
+
+        Liste::create([
+            'nom' => 'Franchement nul',
+            'urlImage' => 'https://picsum.photos/200',
+            'user_id' => 1,
+        ]);
+
+        Liste::create([
+            'nom' => 'A regarder',
+            'urlImage' => 'https://picsum.photos/200',
+            'user_id' => 2,
+        ]);
+    }
+}
diff --git a/database/seeders/SerieListeTableSeeder.php b/database/seeders/SerieListeTableSeeder.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+use App\Models\SerieListe;
+
+class SerieListeTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run()
+    {
+        SerieListe::create([
+            'liste_id' => 1,
+            'serie_id' => 1,
+        ]);
+
+        SerieListe::create([
+            'liste_id' => 2,
+            'serie_id' => 2,
+        ]);
+
+        SerieListe::create([
+            'liste_id' => 2,
+            'serie_id' => 3,
+        ]);
+
+        SerieListe::create([
+            'liste_id' => 3,
+            'serie_id' => 1,
+        ]);
+
+        SerieListe::create([
+            'liste_id' => 3,
+            'serie_id' => 2,
+        ]);
+
+        SerieListe::create([
+            'liste_id' => 3,
+            'serie_id' => 3,
+        ]);
+    }
+}
diff --git a/database/seeders/SeriesTableSeeder.php b/database/seeders/SeriesTableSeeder.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+use App\Models\Serie;
+
+class SeriesTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run()
+    {
+        Serie::create([
+            'nom' => 'Serie sympa',
+            'date_sortie' => '2023-10-04',
+            'urlImage' => 'https://picsum.photos/200/300',
+            'created_at' => '2023-10-09 14:38:20',
+            'updated_at' => '2023-10-11 14:38:20',
+        ]);
+
+        Serie::create([
+            'nom' => 'Serie machin',
+            'date_sortie' => '2023-10-04',
+            'urlImage' => 'https://picsum.photos/200/300',
+            'created_at' => '2023-10-09 14:38:20',
+            'updated_at' => '2023-10-11 14:38:20',
+        ]);
+
+        Serie::create([
+            'nom' => 'Serie truc',
+            'date_sortie' => '2023-10-04',
+            'urlImage' => 'https://picsum.photos/200/300',
+            'created_at' => '2023-10-09 14:38:20',
+            'updated_at' => '2023-10-11 14:38:20',
+        ]);
+    }
+}
diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+use App\Models\User;
+
+class UsersTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        User::create([
+            'name' => 'Admini',
+            'email' => '[email protected]',
+            'password' => bcrypt('admin1234'),
+            'created_at' => '2023-10-30 16:57:38',
+            'updated_at' => '2023-10-30 16:57:38',
+            'firstname' => 'Admini',
+            'lastname' => 'Strator',
+            'username' => 'admin',
+        ]);
+
+        User::create([
+            'name' => 'Utili',
+            'email' => '[email protected]',
+            'password' => bcrypt('user1234'),
+            'created_at' => '2023-10-30 17:00:23',
+            'updated_at' => '2023-10-30 17:00:23',
+            'firstname' => 'Utili',
+            'lastname' => 'Sateur',
+            'username' => 'user',
+        ]);
+    }
+}
diff --git a/resources/views/films/details.blade.php b/resources/views/films/details.blade.php
@@ -0,0 +1,19 @@
+@extends("layout.app")
+
+@section("content")
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-md-4">
+			<img alt="{{$film->nom}}" class="img-fluid h-100" src="{{$film->urlImage}}" />
+		</div>
+		<div class="col-md-8">
+			<h3>
+				{{$film->nom}}
+			</h3>
+			<p>
+                {{$film->date_sortie}}
+            </p>
+		</div>
+	</div>
+</div>
+@endsection
diff --git a/resources/views/series/details.blade.php b/resources/views/series/details.blade.php
@@ -0,0 +1,19 @@
+@extends("layout.app")
+
+@section("content")
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-md-4">
+			<img alt="{{$serie->nom}}" class="img-fluid h-100" src="{{$serie->urlImage}}" />
+		</div>
+		<div class="col-md-8">
+			<h3>
+				{{$serie->nom}}
+			</h3>
+			<p>
+                {{$serie->date_sortie}}
+            </p>
+		</div>
+	</div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
@@ -5,6 +5,8 @@
 use App\Http\Controllers\HomeController;
 use App\Http\Controllers\ListController;
 use App\Http\Controllers\RegisterController;
+
+//use App\Http\Controllers\TestController;
 use App\Http\Controllers\UserController;
 
 /*
@@ -34,3 +36,6 @@
 
 Route::get('/logout',[UserController::class,'logout'])->name('logout');
 
+//Route::get('/test/film', [TestController::class, 'showFilm'])->name('testFilm');
+//oute::get('/test/serie', [TestController::class, 'showSerie'])->name('testSerie');
+