Fix InstaGetTopMediasJob forgotten truncate table

- Replace Raw Guzzle usage with Illuminate Http Client

.dockerignore

@@ -1,2 +0,0 @@
-.git
-*.md

.env.example

@@ -18,7 +18,7 @@ DB_PASSWORD=
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 FILESYSTEM_DISK=local
-QUEUE_CONNECTION=database
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
@@ -32,10 +32,7 @@ MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
 FACEBOOK_GRAPH_ACCESS_TOKEN=""
-FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_HASHTAGID=
+FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_IGHASHTAGID=
 FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_USERID=
 # The amount of media to acquire
 FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_NBMEDIA=
-
-# Sentry
-SENTRY_LARAVEL_DSN=

.gitlab-ci.yml

@@ -11,9 +11,14 @@ include:
   - project: 'ldc-web/shared-ci'
     ref: 'main'
     file: 'test/test.yml'
+  - project: 'ldc-web/shared-ci'
+    ref: 'main'
+    file: 'deploy/deploy.yml'
+
 
 stages:
     - lint
     - security
     - build
     - test
+    - deploy

Dockerfile

@@ -1,7 +0,0 @@
-FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.2:latest
-COPY --chown=www-data:www-data . /app/srcs
-COPY --chown=www-data:www-data ./public/build /app/srcs/public/build
-COPY --chown=www-data:www-data ./vendor /app/srcs/vendor
-USER root
-RUN chmod -R 755 /app/srcs/storage
-USER www-data

README.md

@@ -12,12 +12,15 @@ php artisan migrate
 .env
 ```
 FACEBOOK_GRAPH_ACCESS_TOKEN=""
-FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_HASHTAGID=
+FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_IGHASHTAGID=
 FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_USERID=
-# The amount of media to acquire
-FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_NBMEDIA=
 ```
 
+Commande :
+```
+php artisan insta:get-top-medias
+```
+cette commande appelle le Job : InstaGetTopMediasJob
+
 ### TODO:
 - Permettre la recherche d'un hashtag et d'utiliser son id pour topMediaList
-- Refresh le token en automatique si detection expired

app/Exceptions/Handler.php

@@ -40,9 +40,6 @@ class Handler extends ExceptionHandler
     public function register()
     {
         $this->reportable(function (Throwable $e) {
-            if (app()->bound('sentry')) {
-                app('sentry')->captureException($e);
-            }
         });
     }
 }

app/Http/Controllers/Bo/TopMediaController.php

@@ -41,7 +41,9 @@ class TopMediaController extends Controller
             );
         } //end if
 
+        $this->sortQuery($topMediaList);
         $searchFields = trans('Id Instagram, Participant, Lien');
+        $topMediaList->orderBy('updated_at', 'DESC');
         $topMediaList = $topMediaList->paginate();
 
         return \view('bo.pages.top-media.index', \compact('topMediaList', 'searchFields', 'ranking'));

app/Http/Controllers/Fo/HomeController.php

@@ -3,16 +3,17 @@
 namespace App\Http\Controllers\Fo;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\View\View;
 
 class HomeController extends Controller
 {
     /**
-     * Redirect to BO
+     * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Contracts\View\View
      */
-    public function index(): \Illuminate\Http\RedirectResponse
+    public function index(): View
     {
-        return \redirect()->route('bo.dashboard');
+        return view('fo.pages.home');
     }
 }

config/logging.php

@@ -126,22 +126,6 @@ return [
         'emergency' => [
             'path' => storage_path('logs/laravel.log'),
         ],
-
-        'stdout' => [
-            'driver' => 'monolog',
-            'level' => env('LOG_LEVEL', 'debug'),
-            'handler' => StreamHandler::class,
-            'formatter' => env('LOG_STDOUT_FORMATTER'),
-            'with' => [
-                'stream' => 'php://stdout',
-            ],
-        ],
-
-        'k8s' => [
-            'driver' => 'stack',
-            'channels' => ['daily', 'stdout'],
-            'ignore_exceptions' => false,
-        ],
     ],
 
 ];

public/robots.txt

@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: /
+Disallow:

resources/views/bo/pages/top-media/indexList.blade.php

@@ -2,46 +2,48 @@
     <table class="table fix-action">
         <thead>
             @php
-            $cols = [
+                $cols = [
-            'id' => __('Classement'),
+                    'id' => __('Classement'),
-            'username' => __('Participant'),
+                    'username' => __('Participant'),
-            'timestamp' => __('Date de création du post')];
+                    'timestamp' => __('Date de création du post')];
-            $routeName = request()->route()->getName();
+                $routeName = request()->route()->getName();
-            $rst = !is_null(request()->rst) || !Session::has("$routeName.sorted");
+                $rst = !is_null(request()->rst) || !Session::has("$routeName.sorted");
-            $noOrder = Session::get("$routeName.sort_col") !== 'order' and (Session::has("$routeName.sort_col") or Session::has("$routeName.sort_way"));
+                $noOrder = Session::get("$routeName.sort_col") !== 'order' and (Session::has("$routeName.sort_col") or Session::has("$routeName.sort_way"));
-            $noOrder = Session::get("$routeName.sort_col") !== '' and (Session::has("$routeName.sort_col") or Session::has("$routeName.sort_way"));
+                $noOrder = Session::get("$routeName.sort_col") !== '' and (Session::has("$routeName.sort_col") or Session::has("$routeName.sort_way"));
             @endphp
-            <th>Classement</th>
+            @include('modules.table-col-sorter', [
-            <th>Participant</th>
+                'cols' => $cols,
-            <th>Date de création du post</th>
+                'ignore' => ['total', 'timeslot_date', 'shop'],
-            <th></th>
+                'mobileHide' => ['shop'],
+            ])
         </thead>
         <tbody>
             @if ($topMediaList->count())
-            @foreach ($topMediaList as $topMediaModel)
+                @foreach ($topMediaList as $topMediaModel)
-            <tr>
+                    <tr>
-                <td>
+                        <td>
-                    <strong class="fs-{{ $ranking->get($topMediaModel->insta_id) + 1 }}">#{{ $ranking->get($topMediaModel->insta_id) + 1 }}</strong>
+                            <strong class="fs-{{ $ranking->get($topMediaModel->insta_id) + 1 }}">#{{ $ranking->get($topMediaModel->insta_id) + 1 }}</strong>
-                </td>
+                        </td>
-                <td>{{ $topMediaModel->username }}</td>
+                        <td>{{ $topMediaModel->username }}</td>
-                <td>
+                        <td>
-                    {{ $topMediaModel->timestamp->isoFormat('LLLL') }}
+                            {{ $topMediaModel->timestamp->isoFormat('LLLL') }}
-                </td>
+                        </td>
-                <td>
+                        <td>
-                    <a href="{{ $topMediaModel->permalink }}" title="{{ __('Voir le media sur instagram') }}" target="_blank" data-bs-toggle="tooltip">
+                            <a href="{{ $topMediaModel->permalink }}" title="{{ __('Voir le media sur instagram') }}" target="_blank" data-bs-toggle="tooltip">
-                        <i class="fa-solid fa-arrow-up-right-from-square"></i>
+                                <i class="fa-solid fa-arrow-up-right-from-square"></i>
-                    </a>
+                            </a>
-                </td>
+                        </td>
-            </tr>
+                    </tr>
-            @endforeach
+                @endforeach
             @else
-            <tr>
+                <tr>
-                <td colspan="11" class="text-center">
+                    <td colspan="11" class="text-center">
-                    <span class="h3">{{ __('Aucun résultat pour les :models', ['models' => __('models.classes.insta_media')]) }}
+                        <span
-                    </span>
+                            class="h3">{{ __('Aucun résultat pour les :models', ['models' => __('models.classes.insta_media')]) }}
-                </td>
+                        </span>
-            </tr>
+                    </td>
+                </tr>
             @endif
         </tbody>
     </table>
-</div>
+</div>