Update for new ProcessAnnotatedFile job of biigle/largo

Author: mzur

app/Jobs/CloneImagesOrVideos.php

@@ -8,8 +8,8 @@
 use Biigle\ImageAnnotation;
 use Biigle\ImageAnnotationLabel;
 use Biigle\ImageLabel;
-use Biigle\Modules\Largo\Jobs\GenerateImageAnnotationPatch;
-use Biigle\Modules\Largo\Jobs\GenerateVideoAnnotationPatch;
+use Biigle\Modules\Largo\Jobs\ProcessAnnotatedImage;
+use Biigle\Modules\Largo\Jobs\ProcessAnnotatedVideo;
 use Biigle\Project;
 use Biigle\Traits\ChecksMetadataStrings;
 use Biigle\Video;
@@ -162,24 +162,18 @@ public function postProcessCloning($volume)
     {
         ProcessNewVolumeFiles::dispatch($volume);
 
-        if (class_exists(GenerateImageAnnotationPatch::class)) {
-            ImageAnnotation::join('images', 'images.id', '=', 'image_annotations.image_id')
-                ->where('images.volume_id', "=", $volume->id)
-                ->select('image_annotations.id')
-                ->eachById(function ($annotation) {
-                    GenerateImageAnnotationPatch::dispatch($annotation)
-                        ->onQueue(config('largo.generate_annotation_patch_queue'));
-                }, 1000, 'image_annotations.id', 'id');
+        if (class_exists(ProcessAnnotatedImage::class)) {
+            $volume->images()->whereHas('annotations')->eachById(function ($image) {
+                ProcessAnnotatedImage::dispatch($image)
+                    ->onQueue(config('largo.generate_annotation_patch_queue'));
+            });
         }
 
-        if (class_exists(GenerateVideoAnnotationPatch::class)) {
-            VideoAnnotation::join('videos', 'videos.id', '=', 'video_annotations.video_id')
-                ->where('videos.volume_id', "=", $volume->id)
-                ->select('video_annotations.id')
-                ->eachById(function ($annotation) {
-                    GenerateVideoAnnotationPatch::dispatch($annotation)
-                        ->onQueue(config('largo.generate_annotation_patch_queue'));
-                }, 1000, 'video_annotations.id', 'id');
+        if (class_exists(ProcessAnnotatedVideo::class)) {
+            $volume->videos()->whereHas('annotations')->eachById(function ($video) {
+                ProcessAnnotatedVideo::dispatch($video)
+                    ->onQueue(config('largo.generate_annotation_patch_queue'));
+            });
         }
     }
 

tests/php/Jobs/CloneImagesOrVideosTest.php

@@ -5,8 +5,8 @@
 use Biigle\Jobs\CloneImagesOrVideos;
 use Biigle\Jobs\ProcessNewVolumeFiles;
 use Biigle\MediaType;
-use Biigle\Modules\Largo\Jobs\GenerateImageAnnotationPatch;
-use Biigle\Modules\Largo\Jobs\GenerateVideoAnnotationPatch;
+use Biigle\Modules\Largo\Jobs\ProcessAnnotatedImage;
+use Biigle\Modules\Largo\Jobs\ProcessAnnotatedVideo;
 use Biigle\Tests\ImageAnnotationLabelTest;
 use Biigle\Tests\ImageAnnotationTest;
 use Biigle\Tests\ImageLabelTest;
@@ -616,13 +616,13 @@ public function testHandleVolumeImages()
         (new CloneImagesOrVideos($request, $copy))->handle();
 
         Queue::assertPushed(ProcessNewVolumeFiles::class);
-        Queue::assertNotPushed(GenerateImageAnnotationPatch::class);
+        Queue::assertNotPushed(ProcessAnnotatedImage::class);
     }
 
     public function testHandleImageAnnotationPatches()
     {
-        if (!class_exists(GenerateImageAnnotationPatch::class)) {
-            $this->markTestSkipped('Requires '.GenerateImageAnnotationPatch::class);
+        if (!class_exists(ProcessAnnotatedImage::class)) {
+            $this->markTestSkipped('Requires '.ProcessAnnotatedImage::class);
         }
 
         // The target project.
@@ -647,15 +647,15 @@ public function testHandleImageAnnotationPatches()
         ]);
         (new CloneImagesOrVideos($request, $copy))->handle();
 
-        // One job for the creation of the annotation and one job for GenerateImageAnnotationPatch
+        // One job for the creation of the annotation and one job for ProcessAnnotatedImage
         Queue::assertPushed(ProcessNewVolumeFiles::class);
-        Queue::assertPushed(GenerateImageAnnotationPatch::class);
+        Queue::assertPushed(ProcessAnnotatedImage::class);
     }
 
     public function testHandleVideoAnnotationPatches()
     {
-        if (!class_exists(GenerateVideoAnnotationPatch::class)) {
-            $this->markTestSkipped('Requires '.GenerateVideoAnnotationPatch::class);
+        if (!class_exists(ProcessAnnotatedVideo::class)) {
+            $this->markTestSkipped('Requires '.ProcessAnnotatedVideo::class);
         }
 
         // The target project.
@@ -680,8 +680,8 @@ public function testHandleVideoAnnotationPatches()
         ]);
         (new CloneImagesOrVideos($request, $copy))->handle();
 
-        // One job for the creation of the annotation and one job for GenerateVideoAnnotationPatch
+        // One job for the creation of the annotation and one job for ProcessAnnotatedVideo
         Queue::assertPushed(ProcessNewVolumeFiles::class);
-        Queue::assertPushed(GenerateVideoAnnotationPatch::class);
+        Queue::assertPushed(ProcessAnnotatedVideo::class);
     }
 }