Skip to content

Refactor WikiMetrics and WikiMetricsTest #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
outdooracorn wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −4
Open

Refactor WikiMetrics and WikiMetricsTest #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Metrics/App/WikiMetrics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function saveMetrics(Wiki $wiki): void {
$quarterlyActions = $this->getNumberOfActions(self::INTERVAL_QUARTERLY);
$numberOfEntities = $this->getNumberOfEntities();
$monthlyNumberOfUsersPerActivityType = $this->getNumberOfUsersPerActivityType();
$numberOfUsersPerWiki = $wiki->wikiSiteStats()->first()->users ?? 0;
$numberOfUsers = $wiki->wikiSiteStats()->first()->users ?? 0;

$dailyMetrics = new WikiDailyMetrics([
'id' => $wiki->id . '_' . date('Y-m-d'),
Expand All @@ -55,7 +55,7 @@ public function saveMetrics(Wiki $wiki): void {
'entity_schema_count' => $numberOfEntities['640'],
'monthly_casual_users' => $monthlyNumberOfUsersPerActivityType[0],
'monthly_active_users' => $monthlyNumberOfUsersPerActivityType[1],
'total_user_count' => $numberOfUsersPerWiki,
'total_user_count' => $numberOfUsers,
]);

// compare current record to old record and only save if there is a change
Expand Down
5 changes: 3 additions & 2 deletions tests/Metrics/WikiMetricsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public function testSuccessfullyAddRecords() {
$wikiDb->update(['wiki_id' => $wiki->id]);

(new WikiMetrics)->saveMetrics($wiki);
// Assert the metric is updated in the database

// Assert new record is added to the database
$this->assertDatabaseHas('wiki_daily_metrics', [
'date' => now()->toDateString(),
]);
Expand Down Expand Up @@ -96,7 +97,7 @@ public function testAddRecordsWikiIsDeleted() {
]);
}

public function testItSaveTripleCountSuccessfully() {
public function testTripleCountSavedSuccessfully() {
$wiki = Wiki::factory()->create([
'domain' => 'somewikiforunittest.wikibase.cloud',
]);
Expand Down
Loading