Adjust ScanCallbackResponse to new enhanced format

app/Http/Controllers/ScanController.php

@@ -30,6 +30,7 @@ public function callback(ScanResult $result, Request $request)
         ]);
 
         if ($result->scan->isFinished() === true) {
+            $result->scan->update(['finished_at' => now()]);
             $this->dispatch(new NotifyCallbacksJob($result->scan));
         }
     }

app/Http/Responses/ScanCallbackResponse.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Responses;
+
+use App\Scan;
+use Illuminate\Database\Eloquent\Model;
+
+class ScanCallbackResponse extends Model
+{
+    public function __construct(Scan $scan)
+    {
+        $this->url = $scan->url;
+        $this->dangerLevel = $scan->dangerLevel;
+        $this->started_at = $scan->created_at->toDateTimeString();
+        $this->finished_at = now()->toDateTimeString();
+        $this->results = $this->getFormattedResults($scan);
+    }
+
+    public function getFormattedResults(Scan $scan)
+    {
+        $results = collect();
+
+        foreach ($scan->results as $result) {
+            $results->push(array_merge([
+                'started_at' => $result->created_at->toDateTimeString(),
+                'finished_at' => $result->updated_at->toDateTimeString(),
+            ], $result->result->toArray()));
+        }
+
+        return $results;
+    }
+}

app/Jobs/NotifyCallbacksJob.php

@@ -10,6 +10,7 @@
 use App\Scan;
 use App\HTTPClient;
 use Illuminate\Support\Facades\Log;
+use App\Http\Responses\ScanCallbackResponse;
 
 class NotifyCallbacksJob implements ShouldQueue
 {
@@ -42,7 +43,7 @@ public function handle()
         foreach ($this->scan->callbackurls as $callbackurl) {
             try {
                 $response = $client->request('POST', $callbackurl, [
-                    'json' => $this->scan->results
+                    'json' => (new ScanCallbackResponse($this->scan))
                 ]);
 
                 if ($response->getStatusCode() === 200) {

app/Jobs/StartScannerJob.php

@@ -39,6 +39,10 @@ public function __construct(Scan $scan, string $scannerCode, string $scannerUrl,
      */
     public function handle()
     {
+        if ($this->scan->started_at == null) {
+            $this->scan->update(['started_at' => now()]);
+        }
+
         $client = $this->client ?: new HTTPClient();
         $logInfo = PHP_EOL . 'Scan ID: ' . $this->scan->id . PHP_EOL . 'Scan URL: ' . $this->scan->url . PHP_EOL . 'Scanner: ' . $this->scannerCode . PHP_EOL . 'Scanner-URL: ' . $this->scannerUrl;
 

app/Scan.php

@@ -8,7 +8,7 @@
 class Scan extends Model
 {
     protected $fillable = [
-        'url', 'callbackurls', 'dangerLevel'
+        'url', 'callbackurls', 'dangerLevel', 'started_at', 'finished_at'
     ];
 
     protected $dates = [

tests/Unit/NotifyCallbacksJobTest.php

@@ -24,6 +24,7 @@ public function setUp(): void
 
         Log::swap(new LogFake);
         $this->scan = $this->generateScanWithResult();
+        $this->scan->update(['finished_at' => now()]);
     }
 
     /** @test */

tests/Unit/ScanCallbackResponseTest.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\Unit;
+
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use App\Http\Responses\ScanCallbackResponse;
+use Carbon\Carbon;
+
+class ScanCallbackResponseTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $knownDate = Carbon::create(2019, 5, 7, 11, 55, 15);
+        Carbon::setTestNow($knownDate);
+    }
+
+    /** @test */
+    public function the_scanCallbackResponse_has_the_defined_format()
+    {
+        $scan = $this->generateScanWithResult();
+        $scan->update([
+            'dangerLevel' => 7,
+            'started_at' => now()
+        ]);
+
+        $response = new ScanCallbackResponse($scan->refresh());
+
+        $this->assertEquals(json_encode([
+            'url' => 'https://example.org',
+            'dangerLevel' => '7',
+            'started_at' => '2019-05-07 11:55:15',
+            'finished_at' => '2019-05-07 11:55:15',
+            'results' => [
+                [
+                    'started_at' => now()->toDateTimeString(),
+                    'finished_at' => now()->toDateTimeString(),
+                    "name" => "INI_S",
+                    "version" => "1.0.0",
+                    "hasError" => false,
+                    "errorMessage" => null,
+                    "score" => 100,
+                    "tests" => [
+                        [
+                            "name" => "PHISHING",
+                            "hasError" => false,
+                            "errorMessage" => null,
+                            "score" => 100,
+                            "scoreType" => "success",
+                            "testDetails" => []
+                        ],
+                        [
+                            "name" => "SPAM",
+                            "hasError" => false,
+                            "errorMessage" => null,
+                            "score" => 100,
+                            "scoreType" => "success",
+                            "testDetails" => []
+                        ],
+                        [
+                            "name" => "MALWARE",
+                            "hasError" => false,
+                            "errorMessage" => null,
+                            "score" => 100,
+                            "scoreType" => "success",
+                            "testDetails" => []
+                        ]
+                    ]
+                ]
+            ]
+        ]), $response->toJson());
+    }
+}