From dfbabd25c763e77e04f5e0e97f0eb55ae33c10ec Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 21 Oct 2021 18:02:24 +0200
Subject: [PATCH] wip #4830 @1.5

---
 .../Admin/AssetThemesCrudController.php       | 28 +++++++++++++++++++
 ...roller.php => ResourcesCrudController.php} | 14 ++++++----
 .../Controllers/Admin/TourCrudController.php  | 28 +++++++++++++++++++
 app/Http/Controllers/Tools/Search.php         | 11 ++++++++
 .../{Admin => }/ToolsController.php           | 10 ++-----
 app/Jobs/ProcessFluidbook.php                 |  5 +++-
 app/Jobs/SearchIndex.php                      | 10 +------
 7 files changed, 82 insertions(+), 24 deletions(-)
 create mode 100644 app/Http/Controllers/Admin/AssetThemesCrudController.php
 rename app/Http/Controllers/Admin/{CrudController.php => ResourcesCrudController.php} (63%)
 create mode 100644 app/Http/Controllers/Admin/TourCrudController.php
 create mode 100644 app/Http/Controllers/Tools/Search.php
 rename app/Http/Controllers/{Admin => }/ToolsController.php (58%)

diff --git a/app/Http/Controllers/Admin/AssetThemesCrudController.php b/app/Http/Controllers/Admin/AssetThemesCrudController.php
new file mode 100644
index 0000000..3c2c489
--- /dev/null
+++ b/app/Http/Controllers/Admin/AssetThemesCrudController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class AssetThemesCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+{
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
+	use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+	use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+	use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+	
+
+
+    /*
+	__('Thème de la médiathèque')
+	__('Thèmes de la médiathèque')
+	*/
+
+    protected $_modelNamespace = 'App\Models\AssetTheme';
+    protected $_routeURL = 'asset_themes';
+    protected $_singular = 'Thème de la médiathèque';
+    protected $_plural = 'Thèmes de la médiathèque';
+    protected $_oneInstance= false;
+}
diff --git a/app/Http/Controllers/Admin/CrudController.php b/app/Http/Controllers/Admin/ResourcesCrudController.php
similarity index 63%
rename from app/Http/Controllers/Admin/CrudController.php
rename to app/Http/Controllers/Admin/ResourcesCrudController.php
index df975e6..57ddd13 100644
--- a/app/Http/Controllers/Admin/CrudController.php
+++ b/app/Http/Controllers/Admin/ResourcesCrudController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-class CrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+class ResourcesCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
 {
     use \Cubist\Backpack\Magic\Operations\CreateOperation;
 	use \Cubist\Backpack\Magic\Operations\UpdateOperation;
@@ -16,11 +16,13 @@ class CrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicContr
 
 
     /*
+	__('ressource')
+	__('ressources')
 	*/
 
-    protected $_modelNamespace = 'App\Models\User';
-    protected $_routeURL = '';
-    protected $_singular = '';
-    protected $_plural = '';
-    protected $_oneInstance= false;
+    protected $_modelNamespace = 'App\Models\Resource';
+    protected $_routeURL = 'resources';
+    protected $_singular = 'ressource';
+    protected $_plural = 'ressources';
+    protected $_oneInstance= true;
 }
diff --git a/app/Http/Controllers/Admin/TourCrudController.php b/app/Http/Controllers/Admin/TourCrudController.php
new file mode 100644
index 0000000..cd27d30
--- /dev/null
+++ b/app/Http/Controllers/Admin/TourCrudController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class TourCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+{
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
+	use \Cubist\Backpack\Magic\Operations\UpdateOperation;
+	use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+	use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+	
+
+
+    /*
+	__('visite guidée')
+	__('visites guidées')
+	*/
+
+    protected $_modelNamespace = 'App\Models\Tour';
+    protected $_routeURL = 'tour';
+    protected $_singular = 'visite guidée';
+    protected $_plural = 'visites guidées';
+    protected $_oneInstance= true;
+}
diff --git a/app/Http/Controllers/Tools/Search.php b/app/Http/Controllers/Tools/Search.php
new file mode 100644
index 0000000..c31c018
--- /dev/null
+++ b/app/Http/Controllers/Tools/Search.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers\Tools;
+
+trait Search
+{
+    protected function fluidbookconvert($args)
+    {
+        return view('tools.search');
+    }
+}
diff --git a/app/Http/Controllers/Admin/ToolsController.php b/app/Http/Controllers/ToolsController.php
similarity index 58%
rename from app/Http/Controllers/Admin/ToolsController.php
rename to app/Http/Controllers/ToolsController.php
index fa7210f..5f68511 100644
--- a/app/Http/Controllers/Admin/ToolsController.php
+++ b/app/Http/Controllers/ToolsController.php
@@ -1,18 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\Http\Controllers\Tools\FluidbookConvert;
-use App\Http\Controllers\Tools\FluidbookPreview;
-use App\Http\Controllers\Tools\Search;
-use Cubist\Socialite\User;
-use Illuminate\Support\Facades\Auth;
 
-class ToolsController extends Controller
+class ToolsController
 {
     use FluidbookConvert;
-    use FluidbookPreview;
 
     protected function index($tool, $args = '')
     {
diff --git a/app/Jobs/ProcessFluidbook.php b/app/Jobs/ProcessFluidbook.php
index 3bbf098..f473af4 100644
--- a/app/Jobs/ProcessFluidbook.php
+++ b/app/Jobs/ProcessFluidbook.php
@@ -20,6 +20,9 @@ class ProcessFluidbook extends Compiler
     public function __construct()
     {
         $this->pub = Publication::find(1);
+        if (null === $this->pub) {
+            return;
+        }
 
         /** @var Media $media */
         $media = $this->pub->getMediaInField($this->pub->getAttributeValue('document'))->first();
@@ -66,7 +69,7 @@ class ProcessFluidbook extends Compiler
     protected function _getAssetCollection($id)
     {
         /** @var Asset $asset */
-        $asset = Asset::find($id);
+        $asset = Asset::createdok()->find($id);
         if (null === $asset) {
             throw new \Exception('L\'élement ' . $id . ' n\'existe pas dans la médiathèque');
         }
diff --git a/app/Jobs/SearchIndex.php b/app/Jobs/SearchIndex.php
index 517612d..110d110 100644
--- a/app/Jobs/SearchIndex.php
+++ b/app/Jobs/SearchIndex.php
@@ -34,17 +34,9 @@ class SearchIndex extends Index
 
     public function indexLibrary()
     {
-        $indexableTypes = ['audio', 'video'];
-
-        $assets = Asset::all();
+        $assets = Asset::createdok()->whereNotNull('theme')->whereIn('type', ['audio', 'video']);
         foreach ($assets as $asset) {
             $data = $asset->getPageData();
-            if (!in_array($data->get('type'), $indexableTypes)) {
-                continue;
-            }
-            if (!$data->get('theme')) {
-                continue;
-            }
             $doc = new Document();
             $doc->setType($data->get('type'));
             $doc->setId('media_' . $data->get('type') . '_' . $data->get('id'));
-- 
2.39.5