From 44761e8d20fef81d5f2bb5deaaef234752db88cb Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Jul 2021 20:29:41 +1000
Subject: [PATCH 1/2] Minor FIxes

---
 tests/Feature/TaskStatusApiTest.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/Feature/TaskStatusApiTest.php b/tests/Feature/TaskStatusApiTest.php
index 09f8e0a418c1..6a691c4a847b 100644
--- a/tests/Feature/TaskStatusApiTest.php
+++ b/tests/Feature/TaskStatusApiTest.php
@@ -125,9 +125,9 @@ class TaskStatusApiTest extends TestCase
 
     public function testTaskStatusDeletedFromDELETEROute()
     {
-        $data = [
-            'ids' => [$this->encodePrimaryKey($this->task_status->id)],
-        ];
+        // $data = [
+        //     'ids' => [$this->encodePrimaryKey($this->task_status->id)],
+        // ];
 
         $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
@@ -135,7 +135,8 @@ class TaskStatusApiTest extends TestCase
             ])->delete('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
 
         $arr = $response->json();
-nlog($arr);
+// nlog($arr);
+ 
         $this->assertTrue($arr['data']['is_deleted']);
     }
 

From abc94ae824fe5a7213d3739c70506dfc480e9c6a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Jul 2021 20:45:53 +1000
Subject: [PATCH 2/2] Fixes for subdomain fill

---
 app/Jobs/Util/Import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index cf7672174e5b..3517aa717765 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -336,7 +336,7 @@ class Import implements ShouldQueue
 
         $data = $this->transformCompanyData($data);
 
-        if(Ninja::isHosted() && strlen($data['subdomain']) > 1) {
+        if(Ninja::isHosted()) {
 
             if(!MultiDB::checkDomainAvailable($data['subdomain']))
                 $data['subdomain'] = MultiDB::randomSubdomainGenerator();