fix: company service serializer expand/fields/relations logic fix (#254)

Signed-off-by: romanetar <[email protected]>

Author: romanetar

app/ModelSerializers/Marketplace/CompanyServiceSerializer.php

@@ -34,7 +34,9 @@ class CompanyServiceSerializer extends SilverStripeSerializer
     ];
 
     protected static $allowed_relations = [
+        'company',
         'reviews',
+        'type',
     ];
 
     /**
@@ -53,28 +55,30 @@ public function serialize($expand = null, array $fields = [], array $relations =
         if (!empty($expand)) {
             $exp_expand = explode(',', $expand);
             foreach ($exp_expand as $relation) {
-                switch (trim($relation)) {
-                    case 'company': {
-                        unset($values['company_id']);
-                        $values['company'] = SerializerRegistry::getInstance()->getSerializer($company_service->getCompany())->serialize(null, [], ['none']);;
-                    }
-                    break;
-                    case 'type': {
-                        unset($values['type_id']);
-                        $values['type'] = SerializerRegistry::getInstance()->getSerializer($company_service->getType())->serialize(null, [], ['none']);;
-                    }
-                    break;
+                $relation = trim($relation);
+                if (!in_array($relation, $relations)) continue;
+                switch ($relation) {
+                    case 'company':
+                        {
+                            unset($values['company_id']);
+                            $values['company'] = SerializerRegistry::getInstance()->getSerializer($company_service->getCompany())->serialize(null, [], ['none']);
+                        }
+                        break;
+                    case 'type':
+                        {
+                            unset($values['type_id']);
+                            $values['type'] = SerializerRegistry::getInstance()->getSerializer($company_service->getType())->serialize(null, [], ['none']);
+                        }
+                        break;
                     case 'reviews':
-                    {
-                        if(in_array('reviews', $relations)){
+                        {
                             $reviews = [];
                             foreach ($company_service->getApprovedReviews() as $r) {
                                 $reviews[] = SerializerRegistry::getInstance()->getSerializer($r)->serialize();
                             }
                             $values['reviews'] = $reviews;
                         }
-                    }
-                    break;
+                        break;
                 }
             }
         }

app/Models/Foundation/Main/Companies/Company.php

@@ -634,7 +634,7 @@ public function getSponsorships(){
     /**
      * @return string
      */
-    public function getUrlSegment(): string{
+    public function getUrlSegment(): ?string{
         return $this->url_segment;
     }