Merge pull request rrze-mmz#60 from rrze-mmz/increase-test-coverage

Add more tests to increase test coverage

.env.testing

@@ -95,12 +95,16 @@ [email protected]:/tides/tides.git
 DEPLOY_BRANCH=testing
 DEPLOY_BASE_DIR=/srv/www
 
+
 ADMIN_MAIL_ADDRESS=[email protected]
 DEV_MAIL_ADDRESS=[email protected]
 SUPPORT_MAIL_ADDRESS=[email protected]
 
 CHECK_FAUTV_VIDEOLINKS=true
 FAUTV_USER_IP=127.0.0.1
+DEFAULT_IMAGE_ID=1
+CDN_SERVER_URL=http://localhost/
+CDN_SERVER_SECRET='YOUR_SERVER_SECRET'
 
 FEEDS_DEFAULT_OWNER_NAME = Tides
 FEEDS_DEFAULT_OWNER_EMAIL = [email protected]

app/Console/Commands/CheckTimeAvailabilityClips.php

@@ -74,19 +74,15 @@ public function handle(): int
                         "ClipID: {$clip->id} / Title:{$clip->episode} {$clip->title} is still available for users"
                     );
                 }
-            } elseif ($now->lessThan($clip->time_availability_start)) {
-                if ($clip->is_public) {
-                    $clip->is_public = false;
-                    $this->info(
-                        "ClipID: {$clip->id} / Title:{$clip->episode} {$clip->title} will be withdrawn for users"
-                    );
-                } else {
-                    $this->info("ClipID: {$clip->id} / Title:{$clip->episode} {$clip->title} should remain offline");
-                }
+            } elseif ($now->lessThan($clip->time_availability_start) && $clip->is_public) {
+                $clip->is_public = false;
+                $this->info(
+                    "ClipID: {$clip->id} / Title:{$clip->episode} {$clip->title} will be withdrawn for users"
+                );
             } else {
                 $this
-                    ->info("ClipID: {$clip->id} / Title:{$clip->episode} {$clip->title} does not
-                        met the criteria for checks");
+                    ->info("ClipID: {$clip->id} / Title:{$clip->episode} {$clip->title} does not met the criteria".
+                    'for checks');
             }
 
             $clip->save();

app/Console/Commands/FetchOpencastAssets.php

@@ -5,7 +5,6 @@
 use App\Http\Controllers\Backend\Traits\Transferable;
 use App\Models\Clip;
 use App\Services\OpencastService;
-use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
@@ -63,7 +62,7 @@ public function handle(OpencastService $opencastService): int
                 $events = $opencastService->getProcessedEventsBySeriesID($clip->series->opencast_series_id);
 
                 $events->each(function ($event) use ($clip, $opencastService) {
-                    if ($clip->created_at->format('Y-m-d') === Carbon::parse($event['created'])->format('Y-m-d')) {
+                    if ($clip->opencast_event_id === $event['identifier']) {
                         $this->checkOpencastAssetsForClipUpload($clip, $event['identifier'], $opencastService);
                         $this->info("Videos from Clip {$clip->title} is online");
                     } else {

app/Console/Commands/OpencastMutlipleIngest.php → app/Console/Commands/OpencastMultipleIngest.php

@@ -8,10 +8,10 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
-class OpencastMutlipleIngest extends Command
+class OpencastMultipleIngest extends Command
 {
     /**
-     * The name and signature of the consoleq command.
+     * The name and signature of the console command.
      *
      * @var string
      */

app/Http/Controllers/Backend/AssetsTransferController.php

@@ -4,8 +4,8 @@
 
 use App\Http\Controllers\Backend\Traits\Transferable;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\UploadAssetRequest;
 use App\Models\Clip;
+use App\Models\Traits\UploadAssetRequest;
 use App\Services\OpencastService;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

app/Http/Controllers/Backend/TriggerSmilFilesController.php

@@ -19,8 +19,6 @@ class TriggerSmilFilesController extends Controller
      */
     public function __invoke(Clip $clip, WowzaService $wowzaService): RedirectResponse
     {
-        $this->authorize('edit', $clip);
-
         $wowzaService->createSmilFile($clip);
 
         session()->flash('flashMessage', "{$clip->title} smil files created successfully");

app/Models/Notification.php

@@ -2,11 +2,14 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Notifications\DatabaseNotification;
 
 class Notification extends DatabaseNotification
 {
+    use HasFactory;
+
     public function users(): BelongsTo
     {
         return $this->belongsTo(User::class, 'notifiable_id');

app/Http/Requests/UploadAssetRequest.php → app/Models/Traits/UploadAssetRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Models\Traits;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Gate;

app/helpers.php

@@ -206,8 +206,8 @@ function findUserByOpencastRole(string $opencastRole): User|string
 function getProtectedUrl(string $filePath): string
 {
     $filePath = '/'.$filePath;
-    $secret = 'emsJue5Rtv7';
-    $cdn = 'https://vp-cdn-balance.rrze.de/media_bu/';
+    $secret = config('settings.portal.cdn_server_secret');
+    $cdn = config('settings.portal.cdn_server_url');
     $hexTime = dechex(time());
     $userIP = (App::environment(['testing', 'local'])) ? env('FAUTV_USER_IP') : $_SERVER['REMOTE_ADDR'];
     $token = md5($secret.$filePath.$hexTime.$userIP);

config/settings.php

@@ -13,6 +13,8 @@
         'deploy_repo' => env('DEPLOY_REPO', '[email protected]/mmz/tides'),
         'deploy_branch' => env('DEPLOY_BRANCH', 'main'),
         'admin_main_address' => env('ADMIN_MAIL_ADDRESS', '[email protected]'),
+        'cdn_server_url' => env('CDN_SERVER_URL', 'http://localhost/'),
+        'cdn_server_secret' => env('CDN_SERVER_SECRET', 'dsnJ23fjeq!'),
     ],
     'user' => [
         'accept_use_terms' => false,

database/factories/AssetFactory.php

@@ -20,10 +20,8 @@ class AssetFactory extends Factory
 
     /**
      * Define the model's default state.
-     *
-     * @return array
      */
-    public function definition()
+    public function definition(): array
     {
         $uploadedFile = UploadedFile::fake()->create('video.mp4', '10000', 'video/mp4');
 

database/factories/LivestreamFactory.php

@@ -18,8 +18,13 @@ class LivestreamFactory extends Factory
     public function definition(): array
     {
         return [
-            'name' => $this->faker->title,
-            'url' => $this->faker->url,
+            'clip_id' => null,
+            'name' => 'test-lecture-hall',
+            'url' => 'wowza_livestream_url',
+            'content_path' => 'wowza_content_path',
+            'file_path' => 'wowza_file_path',
+            'active' => false,
+            'app_name' => 'test-lecture-hall',
         ];
     }
 }

database/factories/NotificationFactory.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\Notification;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<Notification>
+ */
+class NotificationFactory extends Factory
+{
+    protected $model = Notification::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'id' => '1',
+            'type' => 'notification_type',
+            'notifiable_type' => 'user',
+            'notifiable_id' => User::factory()->create()->id,
+            'data' => 'data',
+        ];
+    }
+}