adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-10-16 17:53:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add check for premium to telemetry and update lookup

Browse Source
This commit is contained in:
Constantin Graf
2026-09-22 14:12:03 +02:00
committed by Constantin Graf
parent 06a2048771
commit 12cc3f27f8
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Service/ApiService.php
View File

@@ -15,12 +15,18 @@ use App\Models\User;
use Exception; use Exception;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Log; use Log;
use Nwidart\Modules\Facades\Module;
use Throwable; use Throwable;
class ApiService class ApiService
{ {
private const string API_URL = 'https://app.solidtime.io/api/v1'; private const string API_URL = 'https://app.solidtime.io/api/v1';
private function isPremium(): bool
{
return Module::has('Invoicing');
}
public function checkForUpdate(): ?string public function checkForUpdate(): ?string
{ {
try { try {
@@ -31,6 +37,7 @@ class ApiService
'version' => config('app.version'), 'version' => config('app.version'),
'build' => config('app.build'), 'build' => config('app.build'),
'url' => config('app.url'), 'url' => config('app.url'),
'is_premium' => $this->isPremium(),
]); ]);
if ($response->status() === 200 && isset($response->json()['version']) && is_string($response->json()['version'])) { if ($response->status() === 200 && isset($response->json()['version']) && is_string($response->json()['version'])) {
@@ -62,6 +69,7 @@ class ApiService
'version' => config('app.version'), 'version' => config('app.version'),
'build' => config('app.build'), 'build' => config('app.build'),
'url' => config('app.url'), 'url' => config('app.url'),
'is_premium' => $this->isPremium(),
// telemetry data // telemetry data
'user_count' => User::count(), 'user_count' => User::count(),
'organization_count' => Organization::count(), 'organization_count' => Organization::count(),

6
tests/Unit/Console/Commands/SelfHost/SelfHostCheckForUpdateCommandTest.php
View File

@@ -9,6 +9,7 @@ use App\Service\ApiService;
use Cache; use Cache;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Http\Client\ConnectionException; use Illuminate\Http\Client\ConnectionException;
use Illuminate\Http\Client\Request;
use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
@@ -32,6 +33,11 @@ class SelfHostCheckForUpdateCommandTest extends TestCase
$this->assertSame(Command::SUCCESS, $exitCode); $this->assertSame(Command::SUCCESS, $exitCode);
$output = Artisan::output(); $output = Artisan::output();
$this->assertSame('1.2.3', Cache::get('latest_version')); $this->assertSame('1.2.3', Cache::get('latest_version'));
Http::assertSent(function (Request $request): bool {
$data = $request->data();
return array_key_exists('is_premium', $data) && is_bool($data['is_premium']);
});
} }
public function test_checks_for_update_fails_gracefully_if_response_has_error_status_code(): void public function test_checks_for_update_fails_gracefully_if_response_has_error_status_code(): void

6
tests/Unit/Console/Commands/SelfHost/SelfHostTelemetryCommandTest.php
View File

@@ -8,6 +8,7 @@ use App\Console\Commands\SelfHost\SelfHostTelemetryCommand;
use App\Service\ApiService; use App\Service\ApiService;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Http\Client\ConnectionException; use Illuminate\Http\Client\ConnectionException;
use Illuminate\Http\Client\Request;
use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
@@ -31,6 +32,11 @@ class SelfHostTelemetryCommandTest extends TestCase
$this->assertSame(Command::SUCCESS, $exitCode); $this->assertSame(Command::SUCCESS, $exitCode);
$output = Artisan::output(); $output = Artisan::output();
$this->assertSame('', $output); $this->assertSame('', $output);
Http::assertSent(function (Request $request): bool {
$data = $request->data();
return array_key_exists('is_premium', $data) && is_bool($data['is_premium']);
});
} }
public function test_telemetry_sends_fails_gracefully_if_response_has_error_status_code(): void public function test_telemetry_sends_fails_gracefully_if_response_has_error_status_code(): void