adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-08 00:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix api url

Browse Source
This commit is contained in:
Constantin Graf
2024-10-09 17:19:26 +02:00
committed by Constantin Graf
parent ddf11b394d
commit d9925d632e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/V1/TimeEntryController.php
View File

@@ -453,8 +453,8 @@ class TimeEntryController extends Controller
->whereIn('id', $ids) ->whereIn('id', $ids)
->get(); ->get();
$success = new Collection(); $success = new Collection;
$error = new Collection(); $error = new Collection;
foreach ($ids as $id) { foreach ($ids as $id) {
/** @var TimeEntry|null $timeEntry */ /** @var TimeEntry|null $timeEntry */

6
app/Service/ApiService.php
View File

@@ -18,7 +18,7 @@ use Log;
class ApiService class ApiService
{ {
private const string API_URL = 'https://app.solidtime.io/api'; private const string API_URL = 'https://app.solidtime.io/api/v1';
public function checkForUpdate(): ?string public function checkForUpdate(): ?string
{ {
@@ -26,7 +26,7 @@ class ApiService
$response = Http::asJson() $response = Http::asJson()
->timeout(3) ->timeout(3)
->connectTimeout(2) ->connectTimeout(2)
->post(self::API_URL.'/check-for-update', [ ->post(self::API_URL.'/ping/version', [
'version' => config('app.version'), 'version' => config('app.version'),
'build' => config('app.build'), 'build' => config('app.build'),
'url' => config('app.url'), 'url' => config('app.url'),
@@ -57,7 +57,7 @@ class ApiService
$response = Http::asJson() $response = Http::asJson()
->timeout(3) ->timeout(3)
->connectTimeout(2) ->connectTimeout(2)
->post(self::API_URL.'/telemetry', [ ->post(self::API_URL.'/ping/telemetry', [
'version' => config('app.version'), 'version' => config('app.version'),
'build' => config('app.build'), 'build' => config('app.build'),
'url' => config('app.url'), 'url' => config('app.url'),

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

@@ -24,7 +24,7 @@ class SelfHostCheckForUpdateCommandTest extends TestCase
{ {
// Arrange // Arrange
Http::fake([ Http::fake([
'https://app.solidtime.io/api/check-for-update' => Http::response(['version' => '1.2.3'], 200), 'https://app.solidtime.io/api/v1/ping/version' => Http::response(['version' => '1.2.3'], 200),
]); ]);
// Act // Act
@@ -40,7 +40,7 @@ class SelfHostCheckForUpdateCommandTest extends TestCase
{ {
// Arrange // Arrange
Http::fake([ Http::fake([
'https://app.solidtime.io/api/check-for-update' => Http::response(null, 500), 'https://app.solidtime.io/api/v1/ping/version' => Http::response(null, 500),
]); ]);
// Act // Act
@@ -56,7 +56,7 @@ class SelfHostCheckForUpdateCommandTest extends TestCase
{ {
// Arrange // Arrange
Http::fake([ Http::fake([
'https://app.solidtime.io/api/check-for-update' => function (): void { 'https://app.solidtime.io/api/v1/ping/version' => function (): void {
throw new ConnectionException('Connection timed out'); throw new ConnectionException('Connection timed out');
}, },
]); ]);

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

@@ -23,7 +23,7 @@ class SelfHostTelemetryCommandTest extends TestCase
{ {
// Arrange // Arrange
Http::fake([ Http::fake([
'https://app.solidtime.io/api/telemetry' => Http::response(['success' => true], 200), 'https://app.solidtime.io/api/v1/ping/telemetry' => Http::response(['success' => true], 200),
]); ]);
// Act // Act
@@ -39,7 +39,7 @@ class SelfHostTelemetryCommandTest extends TestCase
{ {
// Arrange // Arrange
Http::fake([ Http::fake([
'https://app.solidtime.io/api/telemetry' => Http::response(null, 500), 'https://app.solidtime.io/api/v1/ping/telemetry' => Http::response(null, 500),
]); ]);
// Act // Act
@@ -55,7 +55,7 @@ class SelfHostTelemetryCommandTest extends TestCase
{ {
// Arrange // Arrange
Http::fake([ Http::fake([
'https://app.solidtime.io/api/telemetry' => function (): void { 'https://app.solidtime.io/api/v1/ping/telemetry' => function (): void {
throw new ConnectionException('Connection timed out'); throw new ConnectionException('Connection timed out');
}, },
]); ]);