refactor: clean up code

swisnl · Oct 24, 2024 · b082261 · b082261
1 parent 085f054
commit b082261
Showing 1 changed file with 15 additions and 33 deletions.
diff --git a/src/Descriptors/Schema/Schema.php b/src/Descriptors/Schema/Schema.php
@@ -18,13 +18,14 @@
 use LaravelJsonApi\Eloquent;
 use LaravelJsonApi\Eloquent\Fields\ArrayHash;
 use LaravelJsonApi\Eloquent\Fields\ArrayList;
+use LaravelJsonApi\Eloquent\Fields\Attribute as EloquentAttribute;
 use LaravelJsonApi\Eloquent\Fields\Boolean;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Map;
 use LaravelJsonApi\Eloquent\Fields\Number;
 use LaravelJsonApi\Eloquent\Pagination\CursorPagination;
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
-use LaravelJsonApi\NonEloquent\Fields\Attribute;
+use LaravelJsonApi\NonEloquent\Fields\Attribute as NonEloquentAttribute;
 use LaravelJsonApi\OpenApiSpec\Builders\Paths\Operation\SchemaBuilder;
 use LaravelJsonApi\OpenApiSpec\Contracts\Descriptors\Schema\PaginationDescriptor;
 use LaravelJsonApi\OpenApiSpec\Contracts\Descriptors\Schema\SortablesDescriptor;
@@ -404,24 +405,17 @@ protected function attributes(
 
               $schema = $fieldDataType->title($field->name());
 
-              try {
-                  $column = $field instanceof Eloquent\Fields\Attribute ? $field->column() : $field->name();
-
-                  if ($field instanceof Attribute) {
-                      $attributes = $example->attributes(null);
-                      if (isset($attributes[$column])) {
-                          $schema = $schema->example($attributes[$column]);
-                      }
-                  } else {
-                      if (isset($example[$column])) {
-                          $schema = $schema->example($example[$column]);
-                      }
-                      if (method_exists($field, 'isReadOnly') && $field->isReadOnly(null)) {
-                          $schema = $schema->readOnly(true);
-                      }
+              $column = $field instanceof EloquentAttribute ? $field->column() : $field->name();
+
+              if ($field instanceof NonEloquentAttribute) {
+                  $attributes = $example->attributes(null);
+                  if (isset($attributes[$column])) {
+                      $schema = $schema->example($attributes[$column]);
+                  }
+              } else {
+                  if (isset($example[$column])) {
+                      $schema = $schema->example($example[$column]);
                   }
-              } catch (\Throwable $e) {
-                  throw $e;
               }
 
               return $schema;
@@ -464,7 +458,7 @@ protected function relationship(
 
         $type = $relation->inverse();
 
-        $linkSchema = $this->relationshipLinks($relation, $example, $type);
+        $linkSchema = $this->relationshipLinks($relation, $example);
 
         $dataSchema = $this->relationshipData($relation, $example, $type);
 
@@ -525,23 +519,11 @@ protected function relationshipData(
         return $dataSchema;
     }
 
-    /**
-     * @param mixed           $relation
-     * @param JsonApiResource $example
-     * @param string          $type
-     *
-     * @return OASchema
-     */
     public function relationshipLinks(
-        $relation,
+        RelationContract $relation,
         JsonApiResource $example,
-        string $type,
     ): OASchema {
-        $name = Str::dasherize(
-            Str::plural(method_exists($relation, 'relationName')
-                ? $relation->relationName()
-                : Str::camel($relation->name()))
-        );
+        $name = Str::dasherize(Str::plural(Str::camel($relation->name())));
 
         /*
          * @todo Create real links