fix: adjust what criteria is required for sorting

Author: jaredhendrickson13

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/Model.inc

@@ -214,22 +214,22 @@ class Model {
     public int|null $placement = null;
 
     /**
-     * @var int|null $sort_order
+     * @var int $sort_order
      * For $many enabled Models, this property can be used to set the PHP sort option used when writing Model objects to
      * config. This property is only applicable if the $sort_by_field property is also defined. This property only applies
      * to Models with a $config_path defined. For valid value options for this property, refer to:
      * https://www.php.net/manual/en/function.array-multisort.php
      */
-    public int|null $sort_order = null;
+    public int $sort_order = SORT_ASC;
 
     /**
-     * @var int|null $sort_flags
+     * @var int $sort_flags
      * For $many enabled Models, this property can be used to set the PHP sort flags used when writing Model objects to
      * config. This property is only applicable if the $sort_by_field property is also defined. This property only applies
      * to Models with a $config_path defined. For valid value options for this property, refer to:
      * https://www.php.net/manual/en/function.array-multisort.php
      */
-    public int|null $sort_flags = null;
+    public int $sort_flags = SORT_REGULAR;
 
     /**
      * @var array|null $sort_by
@@ -1698,8 +1698,8 @@ class Model {
      * internal objects must be written in a specific order.
      */
     protected function sort(): void {
-        # Do not sort if there is no `sort_order` or `sort_by` set
-        if (!$this->sort_order or !$this->sort_by) {
+        # Do not sort if there is no `sort_by` fields set
+        if (!$this->sort_by) {
             return;
         }
 

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Schemas/GraphQLSchema.inc

@@ -216,7 +216,7 @@ class GraphQLSchema extends Schema {
         foreach ($model->get_fields() as $field) {
             # For NestedModelFields, ensure we pass the Type for the nested Model
             if ($model->$field instanceof NestedModelField) {
-                $nested_model_type = $this->get_model_object_type($model->$field->model_class);
+                $nested_model_type = $this->get_model_input_object_type($model->$field->model_class);
                 $fields[$field]['type'] = $this->field_to_type(field: $model->$field, type: $nested_model_type);
                 $fields[$field]['description'] = $model->$field->help_text;
                 continue;