Fixes for tasks status column

app/Http/Controllers/TaskStatusController.php

@@ -42,8 +42,8 @@ class TaskStatusController extends BaseController
 
     /**
      *      @OA\Get(
-     *      path="/api/v1/task_status",
-     *      operationId="getTaskStatuss",
+     *      path="/api/v1/task_statuses",
+     *      operationId="getTaskStatuses",
      *      tags={"task_status"},
      *      summary="Gets a list of task statuses",
      *      description="Lists task statuses",
@@ -137,7 +137,7 @@ class TaskStatusController extends BaseController
      *
      *
      * @OA\Post(
-     *      path="/api/v1/task_status",
+     *      path="/api/v1/task_statuses",
      *      operationId="storeTaskStatus",
      *      tags={"task_status"},
      *      summary="Adds a TaskStatus",

app/Http/Requests/Expense/StoreExpenseRequest.php

@@ -54,6 +54,10 @@ class StoreExpenseRequest extends Request
 
         $input = $this->decodePrimaryKeys($input);
 
+        if (array_key_exists('category_id', $input) && is_string($input['category_id'])) {
+            $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
+        }
+
         $this->replace($input);
     }
 

app/Http/Requests/Expense/UpdateExpenseRequest.php

@@ -65,6 +65,10 @@ class UpdateExpenseRequest extends Request
 
         $input = $this->decodePrimaryKeys($input);
 
+        if (array_key_exists('category_id', $input) && is_string($input['category_id'])) {
+            $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
+        }
+
         $this->replace($input);
     }
 }

app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php

@@ -33,7 +33,15 @@ class StoreExpenseCategoryRequest extends Request
 
         $rules['name'] = 'required|unique:expense_categories,name,null,null,company_id,'.auth()->user()->companyId();
 
-        return $rules;
+        return $this->globalRules($rules);
     }
 
+    protected function prepareForValidation()
+    {
+        $input = $this->all();
+
+        $input = $this->decodePrimaryKeys($input);
+
+        $this->replace($input);
+    }
 }

database/migrations/2020_10_28_224711_status_sort_order.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class StatusSortOrder extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('tasks', function ($t){
+            $t->renameColumn('sort_order', 'status_sort_order');
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}