Merge pull request #132 from spatie/ohdear-monitor

Fix verify command

Author: freekmurze

src/Commands/VerifyCommand.php

@@ -24,7 +24,7 @@ public function handle()
         $this
             ->verifySdkInstalled()
             ->verifyApiToken($ohDearConfig)
-            ->verifySiteId($ohDearConfig)
+            ->verifyMonitorId($ohDearConfig)
             ->verifyConnection($ohDearConfig);
 
         render(view('schedule-monitor::alert', [
@@ -61,14 +61,14 @@ protected function verifyApiToken(array $ohDearConfig): self
         return $this;
     }
 
-    protected function verifySiteId(array $ohDearConfig): self
+    protected function verifyMonitorId(array $ohDearConfig): self
     {
         if (empty($ohDearConfig['monitor_id'])) {
-            throw new Exception('No site id found. Make sure you added an site id to the `monitor_id` key of the `schedule-monitor` config file. You can found your site id on the settings page of a site on Oh Dear.');
+            throw new Exception('No monitor id found. Make sure you added an monitor id to the `monitor_id` key of the `schedule-monitor` config file. You can found your monitor id on the settings page of a monitor on Oh Dear.');
         }
 
         render(view('schedule-monitor::alert', [
-            'message' => 'Oh Dear site id found.',
+            'message' => 'Oh Dear monitor id found.',
         ]));
 
         return $this;
@@ -78,10 +78,10 @@ protected function verifyConnection(array $ohDearConfig)
     {
         $this->comment('Trying to reach Oh Dear...');
 
-        $site = app(OhDear::class)->Monitor($ohDearConfig['monitor_id']);
+        $monitor = app(OhDear::class)->monitor($ohDearConfig['monitor_id']);
 
         render(view('schedule-monitor::alert', [
-            'message' => "Successfully connected to Oh Dear. The configured site URL is: {$site->sortUrl}",
+            'message' => "Successfully connected to Oh Dear. The configured monitor URL is: {$monitor->sortUrl}",
         ]));
 
         return $this;

src/Support/OhDear/OhDear.php

@@ -19,11 +19,9 @@ public function __construct(string $apiToken, string $baseUri = 'https://ohdear.
         $this->baseUri = rtrim($baseUri, '/');
     }
 
-    public function monitor(int $monitorId): Monitor
+    public function monitor(int $monitorId): ?array
     {
-        $monitorAttributes = $this->get("monitors/{$monitorId}");
-
-        return new Monitor($monitorAttributes, $this);
+        return $this->get("monitors/{$monitorId}");
     }
 
     public function createCronCheck(
@@ -75,10 +73,10 @@ protected function post(string $endpoint, array $data): array
             $response = Http::withToken($this->apiToken)
                 ->acceptJson()
                 ->post("{$this->baseUri}/{$endpoint}", $data);
-            
+
             $response->throw();
 
-            
+
             return $response->json();
         } catch (RequestException $e) {
             ;