diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2019-12-30 21:12:22 +0100 |
---|---|---|
committer | Igor Scheller <igor.scheller@igorshp.de> | 2019-12-30 21:12:22 +0100 |
commit | 61977f5da92ac35185c2622597d8e2251e0431d4 (patch) | |
tree | 91ca6b24c2706288c3be59f7556294d34a30a5ae | |
parent | 395f6706d6fe7b59df5caa4158d5e8ff268368ef (diff) |
Metrics: Fixed message count
-rw-r--r-- | src/Controllers/Metrics/Stats.php | 6 | ||||
-rw-r--r-- | tests/Unit/Controllers/Metrics/StatsTest.php | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/Controllers/Metrics/Stats.php b/src/Controllers/Metrics/Stats.php index 718bcb39..8129f27c 100644 --- a/src/Controllers/Metrics/Stats.php +++ b/src/Controllers/Metrics/Stats.php @@ -8,6 +8,7 @@ use Carbon\Carbon; use Engelsystem\Database\Database; use Engelsystem\Models\EventConfig; use Engelsystem\Models\LogEntry; +use Engelsystem\Models\Message; use Engelsystem\Models\News; use Engelsystem\Models\Question; use Engelsystem\Models\User\PasswordReset; @@ -239,13 +240,10 @@ class Stats /** * @return int - * @codeCoverageIgnore */ public function messages(): int { - return $this - ->getQuery('Messages') - ->count(); + return Message::query()->count(); } /** diff --git a/tests/Unit/Controllers/Metrics/StatsTest.php b/tests/Unit/Controllers/Metrics/StatsTest.php index d13c2693..15447be8 100644 --- a/tests/Unit/Controllers/Metrics/StatsTest.php +++ b/tests/Unit/Controllers/Metrics/StatsTest.php @@ -5,6 +5,7 @@ namespace Engelsystem\Test\Unit\Controllers\Metrics; use Carbon\Carbon; use Engelsystem\Controllers\Metrics\Stats; use Engelsystem\Models\LogEntry; +use Engelsystem\Models\Message; use Engelsystem\Models\News; use Engelsystem\Models\Question; use Engelsystem\Models\User\PasswordReset; @@ -132,6 +133,21 @@ class StatsTest extends TestCase } /** + * @covers \Engelsystem\Controllers\Metrics\Stats::messages + */ + public function testMessages() + { + $this->addUsers(); + + (new Message(['user_id' => 1, 'receiver_id' => 2, 'text' => 'Ohi?']))->save(); + (new Message(['user_id' => 4, 'receiver_id' => 1, 'text' => 'Testing stuff?']))->save(); + (new Message(['user_id' => 2, 'receiver_id' => 3, 'text' => 'Nope!', 'read' => true]))->save(); + + $stats = new Stats($this->database); + $this->assertEquals(3, $stats->messages()); + } + + /** * @covers \Engelsystem\Controllers\Metrics\Stats::sessions */ public function testSessions() |