fix tests

Author: deer-wmde

app/Metrics/App/WikiMetrics.php

@@ -4,7 +4,6 @@
 
 use App\Wiki;
 use App\WikiDailyMetrics;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Arr;
 
 class WikiMetrics
@@ -75,7 +74,7 @@ protected function getNumberOfActions(string $interval): null|int
                 ]
         )) { return null; }
 
-        $wikiDb = Wiki::withTrashed()->with('wikiDb')->where('id', $this->wiki->id)->first()->wikiDb;
+        $wikiDb = $this->wiki->wikiDb;
         $tableRecentChanges = $wikiDb->name . '.' . $wikiDb->prefix . '_recentchanges';
         $tableActor = $wikiDb->name . '.' . $wikiDb->prefix . '_actor';
 

tests/Jobs/UpdateWikiDailyMetricJobTest.php

@@ -4,10 +4,12 @@
 
 use App\Jobs\UpdateWikiDailyMetricJob;
 use App\Wiki;
+use App\WikiDb;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
+use App\Jobs\ProvisionWikiDbJob;
 
 class UpdateWikiDailyMetricJobTest extends TestCase
 {
@@ -33,8 +35,23 @@ public function testRunJobForAllWikisIncludingDeletedWikis()
         $deletedWiki = Wiki::factory()->create([
             'domain' => 'deletedwiki.wikibase.cloud',
         ]);
+
+        $manager = $this->app->make('db');
+        $job = new ProvisionWikiDbJob();
+        $job2 = new ProvisionWikiDbJob();
+        $job->handle($manager);
+        $job2->handle($manager);
+
+        $wikiDbActive = WikiDb::whereDoesntHave('wiki')->first();
+        $wikiDbActive->update( ['wiki_id' => $activeWiki->id] );
+
+        $wikiDbDeleted = WikiDb::whereDoesntHave('wiki')->first();
+        $wikiDbDeleted->update( ['wiki_id' => $deletedWiki->id] );
+
         $deletedWiki->delete();
 
+
+
         (new UpdateWikiDailyMetricJob())->handle();
 
         $this->assertDatabaseHas('wiki_daily_metrics', [