Merge branch 'group_nullable' into dev

app/Http/Resources/API/AssetRequirementResource.php

@@ -17,7 +17,7 @@ class AssetRequirementResource extends JsonResource
         return [
             'id' => $this->id,
             'priority' => $this->priority,
-            'requirement_group_id' => $this->requirement_group_id,
+            'requirement_group_id' => $this->requirement_group_id ?? 0,
             'requirement_group' => new RequirementGroupParentResource($this->group),
             'title' => $this->title,
             'created_by' => new UserProfileResource($this->createdBy),

app/Http/Resources/API/AssetResource.php

@@ -23,7 +23,7 @@ class AssetResource extends JsonResource
             'created_by' => $this->created_by,
             'owner' => $this->owner,
             'address' => $this->address,
-            'group_id' => $this->group_id,
+            'group_id' => $this->group_id ?? 0,
             'geo_address_code' => $this->geo_address_code,
             'acl' => $this->acl,
             'whitelist' => $this->whitelist,