From e4989a6f8b11edaf2552713f02684585ac554832 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 25 May 2020 14:57:04 +0100
Subject: [PATCH 01/36] Docs link

- Updated our dependencies.
- Added a link to the documentation.
---
 README.md                                |  16 +-
 app/Http/Controllers/IndexController.php |   3 +-
 composer.lock                            | 266 ++++++++++++-----------
 config/api/app/version.php               |   3 +-
 4 files changed, 155 insertions(+), 133 deletions(-)

diff --git a/README.md b/README.md
index de25ed4f..f365ffd9 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,20 @@
 
 Costs to Expect is a service which focuses on tracking and forecasting expenses. 
 The Costs to Expect API is the backbone of the service and is not going to be 
-limited to expenses; however, we figured that is was an excellent place to start. 
+limited to expenses; however, we figured that it was an excellent place to start. 
+
+## Docs
+
+We are working hard to get the documentation ready, the App will not enter beta 
+until the API documentation is ready, the documentation can be found at 
+[postman.costs-to-expect.com](https://postman.costs-to-expect.com?version=latest) 
 
 ### The App
 The [alpha](https://app.costs-to-expect.com) for the service is online, we are 
- hoping to release the public alpha at the start of April 2020. Please check 
- the [app.costs-to-expect.com/roadmap](https://app.costs-to-expect.com/roadmap) 
- and changelog to see how we are getting on 
- [app.costs-to-expect.com/changelog](https://app.costs-to-expect.com/changelog) 
+ hoping to release the public beta soon(tm). Please check 
+ our [app.costs-to-expect.com/roadmap](https://app.costs-to-expect.com/roadmap) 
+ and [app.costs-to-expect.com/changelog](https://app.costs-to-expect.com/changelog) 
+ to see how we are progressing. 
 
 ### The Website
 A small part of the service is tracking the costs to raise a child in the UK, 
diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
index f941e72a..d4be6aa2 100644
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -57,7 +57,8 @@ public function index(Request $request)
                     'prefix' => $config['prefix'],
                     'release_date' => $config['release_date'],
                     'changelog' => $config['changelog'],
-                    'readme' => $config['readme']
+                    'readme' => $config['readme'],
+                    'documentation' => $config['documentation']
                 ],
                 'routes' => $routes_to_display
             ],
diff --git a/composer.lock b/composer.lock
index ffd232ee..857b9769 100644
--- a/composer.lock
+++ b/composer.lock
@@ -402,33 +402,37 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "1.3.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1"
+                "reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
-                "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7",
+                "reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.2"
+                "doctrine/coding-standard": "^7.0",
+                "phpstan/phpstan": "^0.11",
+                "phpstan/phpstan-phpunit": "^0.11",
+                "phpstan/phpstan-strict-rules": "^0.11",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
+                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -457,15 +461,21 @@
                     "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-            "homepage": "http://www.doctrine-project.org",
+            "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
+            "homepage": "https://www.doctrine-project.org/projects/inflector.html",
             "keywords": [
                 "inflection",
-                "pluralize",
-                "singularize",
-                "string"
+                "inflector",
+                "lowercase",
+                "manipulation",
+                "php",
+                "plural",
+                "singular",
+                "strings",
+                "uppercase",
+                "words"
             ],
-            "time": "2019-10-30T19:59:35+00:00"
+            "time": "2020-05-11T11:25:59+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -1002,20 +1012,20 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v7.9.2",
+            "version": "v7.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "757b155658ae6da429065ba8f22242fe599824f7"
+                "reference": "c2fff1e9879494a6f853593b3c517dc9922bbb51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/757b155658ae6da429065ba8f22242fe599824f7",
-                "reference": "757b155658ae6da429065ba8f22242fe599824f7",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/c2fff1e9879494a6f853593b3c517dc9922bbb51",
+                "reference": "c2fff1e9879494a6f853593b3c517dc9922bbb51",
                 "shasum": ""
             },
             "require": {
-                "doctrine/inflector": "^1.1",
+                "doctrine/inflector": "^1.4|^2.0",
                 "dragonmantank/cron-expression": "^2.0",
                 "egulias/email-validator": "^2.1.10",
                 "ext-json": "*",
@@ -1037,6 +1047,7 @@
                 "symfony/http-foundation": "^5.0",
                 "symfony/http-kernel": "^5.0",
                 "symfony/mime": "^5.0",
+                "symfony/polyfill-php73": "^1.17",
                 "symfony/process": "^5.0",
                 "symfony/routing": "^5.0",
                 "symfony/var-dumper": "^5.0",
@@ -1150,7 +1161,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2020-04-28T16:09:20+00:00"
+            "time": "2020-05-19T17:09:00+00:00"
         },
         {
             "name": "laravel/helpers",
@@ -1342,16 +1353,16 @@
         },
         {
             "name": "lcobucci/jwt",
-            "version": "3.3.1",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18"
+                "reference": "56f10808089e38623345e28af2f2d5e4eb579455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
-                "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/56f10808089e38623345e28af2f2d5e4eb579455",
+                "reference": "56f10808089e38623345e28af2f2d5e4eb579455",
                 "shasum": ""
             },
             "require": {
@@ -1393,20 +1404,20 @@
                 "JWS",
                 "jwt"
             ],
-            "time": "2019-05-24T18:30:49+00:00"
+            "time": "2020-05-22T08:21:12+00:00"
         },
         {
             "name": "league/commonmark",
-            "version": "1.4.2",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31"
+                "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/9e780d972185e4f737a03bade0fd34a9e67bbf31",
-                "reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/412639f7cfbc0b31ad2455b2fe965095f66ae505",
+                "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505",
                 "shasum": ""
             },
             "require": {
@@ -1467,7 +1478,7 @@
                 "md",
                 "parser"
             ],
-            "time": "2020-04-24T13:39:56+00:00"
+            "time": "2020-05-04T22:15:21+00:00"
         },
         {
             "name": "league/event",
@@ -1521,16 +1532,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.67",
+            "version": "1.0.69",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e"
+                "reference": "7106f78428a344bc4f643c233a94e48795f10967"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
-                "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
+                "reference": "7106f78428a344bc4f643c233a94e48795f10967",
                 "shasum": ""
             },
             "require": {
@@ -1601,7 +1612,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2020-04-16T13:21:26+00:00"
+            "time": "2020-05-18T15:13:39+00:00"
         },
         {
             "name": "league/oauth2-server",
@@ -1682,20 +1693,20 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.0.2",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8"
+                "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c861fcba2ca29404dc9e617eedd9eff4616986b8",
-                "reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/38914429aac460e8e4616c8cb486ecb40ec90bb1",
+                "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2",
+                "php": ">=7.2",
                 "psr/log": "^1.0.1"
             },
             "provide": {
@@ -1706,11 +1717,11 @@
                 "doctrine/couchdb": "~1.0@dev",
                 "elasticsearch/elasticsearch": "^6.0",
                 "graylog2/gelf-php": "^1.4.2",
-                "jakub-onderka/php-parallel-lint": "^0.9",
                 "php-amqplib/php-amqplib": "~2.4",
                 "php-console/php-console": "^3.1.3",
+                "php-parallel-lint/php-parallel-lint": "^1.0",
                 "phpspec/prophecy": "^1.6.1",
-                "phpunit/phpunit": "^8.3",
+                "phpunit/phpunit": "^8.5",
                 "predis/predis": "^1.1",
                 "rollbar/rollbar": "^1.3",
                 "ruflin/elastica": ">=0.90 <3.0",
@@ -1759,20 +1770,20 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2019-12-20T14:22:59+00:00"
+            "time": "2020-05-22T08:12:19+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.33.0",
+            "version": "2.34.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b"
+                "reference": "3e87404329b8072295ea11d548b47a1eefe5a162"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b",
-                "reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e87404329b8072295ea11d548b47a1eefe5a162",
+                "reference": "3e87404329b8072295ea11d548b47a1eefe5a162",
                 "shasum": ""
             },
             "require": {
@@ -1796,7 +1807,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-master": "2.x-dev",
+                    "dev-3.x": "3.x-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -1831,7 +1843,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2020-04-20T15:05:43+00:00"
+            "time": "2020-05-19T22:14:16+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -1887,16 +1899,16 @@
         },
         {
             "name": "opis/closure",
-            "version": "3.5.1",
+            "version": "3.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969"
+                "reference": "cac47092144043d5d676e2e7cf8d0d2f83fc89ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/93ebc5712cdad8d5f489b500c59d122df2e53969",
-                "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969",
+                "url": "https://api.github.com/repos/opis/closure/zipball/cac47092144043d5d676e2e7cf8d0d2f83fc89ca",
+                "reference": "cac47092144043d5d676e2e7cf8d0d2f83fc89ca",
                 "shasum": ""
             },
             "require": {
@@ -1944,7 +1956,7 @@
                 "serialization",
                 "serialize"
             ],
-            "time": "2019-11-29T22:36:02+00:00"
+            "time": "2020-05-25T09:32:45+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -2432,16 +2444,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.10.3",
+            "version": "v0.10.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "2bde2fa03e05dff0aee834598b951d6fc7c6fe02"
+                "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2bde2fa03e05dff0aee834598b951d6fc7c6fe02",
-                "reference": "2bde2fa03e05dff0aee834598b951d6fc7c6fe02",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a8aec1b2981ab66882a01cce36a49b6317dc3560",
+                "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560",
                 "shasum": ""
             },
             "require": {
@@ -2500,7 +2512,7 @@
                 "interactive",
                 "shell"
             ],
-            "time": "2020-04-07T06:44:48+00:00"
+            "time": "2020-05-03T19:32:03+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -3323,16 +3335,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
+                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
-                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
                 "shasum": ""
             },
             "require": {
@@ -3344,7 +3356,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -3377,20 +3389,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "time": "2020-05-12T16:14:59+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8"
+                "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ad6d62792bfbcfc385dd34b424d4fcf9712a32c8",
-                "reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424",
+                "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424",
                 "shasum": ""
             },
             "require": {
@@ -3402,7 +3414,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -3436,20 +3448,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-03-09T19:04:49+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
+                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
-                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
                 "shasum": ""
             },
             "require": {
@@ -3463,7 +3475,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -3498,20 +3510,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-03-09T19:04:49+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
+                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
-                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
+                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
                 "shasum": ""
             },
             "require": {
@@ -3523,7 +3535,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -3557,20 +3569,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-03-09T19:04:49+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "37b0976c78b94856543260ce09b460a7bc852747"
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
-                "reference": "37b0976c78b94856543260ce09b460a7bc852747",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
                 "shasum": ""
             },
             "require": {
@@ -3579,7 +3591,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -3612,20 +3624,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7"
+                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
-                "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
+                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
                 "shasum": ""
             },
             "require": {
@@ -3634,7 +3646,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -3670,7 +3682,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/process",
@@ -4180,20 +4192,20 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "feb6dad5ae24b1380827aee1629b730080fde500"
+                "reference": "0b32505d67c1abbfa829283c86bfc0642a661bf6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/feb6dad5ae24b1380827aee1629b730080fde500",
-                "reference": "feb6dad5ae24b1380827aee1629b730080fde500",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/0b32505d67c1abbfa829283c86bfc0642a661bf6",
+                "reference": "0b32505d67c1abbfa829283c86bfc0642a661bf6",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0",
+                "php": "^5.5.9 || ^7.0 || ^8.0",
                 "phpoption/phpoption": "^1.7.2",
                 "symfony/polyfill-ctype": "^1.9"
             },
@@ -4240,20 +4252,20 @@
                 "env",
                 "environment"
             ],
-            "time": "2020-04-12T15:20:09+00:00"
+            "time": "2020-05-23T09:43:32+00:00"
         },
         {
             "name": "voku/portable-ascii",
-            "version": "1.4.10",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "240e93829a5f985fab0984a6e55ae5e26b78a334"
+                "reference": "2d302cf7dc474d5f7f18b29b03e0e77d408922a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/240e93829a5f985fab0984a6e55ae5e26b78a334",
-                "reference": "240e93829a5f985fab0984a6e55ae5e26b78a334",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/2d302cf7dc474d5f7f18b29b03e0e77d408922a4",
+                "reference": "2d302cf7dc474d5f7f18b29b03e0e77d408922a4",
                 "shasum": ""
             },
             "require": {
@@ -4268,8 +4280,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "voku\\": "src/voku/",
-                    "voku\\tests\\": "tests/"
+                    "voku\\": "src/voku/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4289,7 +4300,7 @@
                 "clean",
                 "php"
             ],
-            "time": "2020-03-13T01:23:26+00:00"
+            "time": "2020-05-23T23:15:19+00:00"
         },
         {
             "name": "zendframework/zend-diactoros",
@@ -4463,16 +4474,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.7.1",
+            "version": "2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130"
+                "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130",
-                "reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/17d0d3f266c8f925ebd035cd36f83cf802b47d4a",
+                "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a",
                 "shasum": ""
             },
             "require": {
@@ -4520,7 +4531,7 @@
                 "throwable",
                 "whoops"
             ],
-            "time": "2020-01-15T10:00:00+00:00"
+            "time": "2020-05-05T12:28:07+00:00"
         },
         {
             "name": "fzaninotto/faker",
@@ -4622,30 +4633,33 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.3.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be"
+                "reference": "6c6a7c533469873deacf998237e7649fc6b36223"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be",
-                "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/6c6a7c533469873deacf998237e7649fc6b36223",
+                "reference": "6c6a7c533469873deacf998237e7649fc6b36223",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "~2.0",
                 "lib-pcre": ">=7.0",
-                "php": ">=5.6.0"
+                "php": "^7.3.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
+                "phpunit/phpunit": "^8.0.0 || ^9.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "1.4.x-dev"
                 }
             },
             "autoload": {
@@ -4683,7 +4697,7 @@
                 "test double",
                 "testing"
             ],
-            "time": "2019-12-26T09:49:15+00:00"
+            "time": "2020-05-19T14:25:16+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -5370,16 +5384,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.4",
+            "version": "8.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23"
+                "reference": "63dda3b212a0025d380a745f91bdb4d8c985adb7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23",
-                "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/63dda3b212a0025d380a745f91bdb4d8c985adb7",
+                "reference": "63dda3b212a0025d380a745f91bdb4d8c985adb7",
                 "shasum": ""
             },
             "require": {
@@ -5449,7 +5463,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-04-23T04:39:42+00:00"
+            "time": "2020-05-22T13:51:52+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
diff --git a/config/api/app/version.php b/config/api/app/version.php
index 1514191a..679eec07 100644
--- a/config/api/app/version.php
+++ b/config/api/app/version.php
@@ -10,5 +10,6 @@
         'api' => '/v2/changelog',
         'markdown' => 'https://github.com/costs-to-expect/api/blob/master/CHANGELOG.md'
     ],
-    'readme' => 'https://github.com/costs-to-expect/api/blob/master/README.md'
+    'readme' => 'https://github.com/costs-to-expect/api/blob/master/README.md',
+    'documentation' => 'https://postman.costs-to-expect.com/?version=latest'
 ];

From b858ddb95791e084deaa84ffc9e76f331b74da78 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 25 May 2020 15:49:10 +0100
Subject: [PATCH 02/36] Name field not showing as required

- Name field required
---
 config/api/item-type-allocated-expense/fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/api/item-type-allocated-expense/fields.php b/config/api/item-type-allocated-expense/fields.php
index 9a74a58c..fd0ddc39 100644
--- a/config/api/item-type-allocated-expense/fields.php
+++ b/config/api/item-type-allocated-expense/fields.php
@@ -11,7 +11,7 @@
         'validation' => [
             'max-length' => 255
         ],
-        'required' => false
+        'required' => true
     ],
     'description' => [
         'field' => 'description',

From 20d8e294ace44a95e325eaa05194b34513ea7faa Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 25 May 2020 22:27:19 +0100
Subject: [PATCH 03/36] Name is required

- Name is a required field.
---
 config/api/item-type-simple-expense/fields.php | 2 +-
 config/api/item-type-simple-item/fields.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/api/item-type-simple-expense/fields.php b/config/api/item-type-simple-expense/fields.php
index 8439ad5e..11eed4ec 100644
--- a/config/api/item-type-simple-expense/fields.php
+++ b/config/api/item-type-simple-expense/fields.php
@@ -11,7 +11,7 @@
         'validation' => [
             'max-length' => 255
         ],
-        'required' => false
+        'required' => true
     ],
     'description' => [
         'field' => 'description',
diff --git a/config/api/item-type-simple-item/fields.php b/config/api/item-type-simple-item/fields.php
index bb0e5d9c..3c8b2a3a 100644
--- a/config/api/item-type-simple-item/fields.php
+++ b/config/api/item-type-simple-item/fields.php
@@ -11,7 +11,7 @@
         'validation' => [
             'max-length' => 255
         ],
-        'required' => false
+        'required' => true
     ],
     'description' => [
         'field' => 'description',

From 77d4dbfa950769f91d461c75501bba41bc2ea4b8 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Tue, 26 May 2020 13:26:21 +0100
Subject: [PATCH 04/36] Version for css include

- We have added a version to the css include.
---
 resources/views/welcome.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 47e9eefa..e0d01ec5 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -28,7 +28,7 @@
     <meta property="og:description" content="The Open Source API for the Costs to Expect service, expense tracking and forecasting" />
     <title>Costs to Expect API</title>
 
-    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+    <link href="{{ asset('css/app.css?ver=' . $version) }}" rel="stylesheet">
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=UA-64736-10"></script>
     <script>

From fdd94185e2ef42600c5627192fb46063abff7ed0 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Tue, 26 May 2020 23:51:53 +0100
Subject: [PATCH 05/36] Docs

- Added a link to the docs
---
 resources/views/welcome.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index e0d01ec5..181c1a6d 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -148,6 +148,7 @@ function gtag(){dataLayer.push(arguments);}
                     <p>
                         <a href="/v2" class="btn btn-primary btn-lg" role="button" aria-pressed="true">Access API</a>
                         <a href="https://github.com/costs-to-expect/api" class="btn btn-primary alter btn-lg" role="button" aria-pressed="true">View our API on Github</a>
+                        <a href="https://postman.costs-to-expect.com" class="btn btn-primary alter btn-lg" role="button" aria-pressed="true">Documentation</a>
                     </p>
 
                     <hr />

From 7e8ce6e9c2cb619630a87c43a37582fe6a879650 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Wed, 27 May 2020 13:21:58 +0100
Subject: [PATCH 06/36] Filterable missing

- Filterable missing from OPTIONS request
---
 app/Http/Controllers/ResourceTypeItemController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/ResourceTypeItemController.php b/app/Http/Controllers/ResourceTypeItemController.php
index 0750022d..f0b59546 100644
--- a/app/Http/Controllers/ResourceTypeItemController.php
+++ b/app/Http/Controllers/ResourceTypeItemController.php
@@ -155,6 +155,7 @@ public function optionsIndex(string $resource_type_id): JsonResponse
         $get = Get::init()->
             setSortable($item_interface->sortParametersConfig())->
             setSearchable($item_interface->searchParametersConfig())->
+            setFilterable($item_interface->filterParametersConfig())->
             setPagination(true)->
             setParameters($item_interface->collectionParametersConfig())->
             setParametersData($parameters_data)->

From 9b2aa367672706fd2a158c435470287a46a560ba Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Wed, 27 May 2020 23:47:46 +0100
Subject: [PATCH 07/36] Require PHP 7.4

- Require PHP 7.4.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3dd0e558..8fdf92a8 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^7.3",
+        "php": "^7.4",
         "ext-json": "*",
         "doctrine/dbal": "^2.9",
         "fideloper/proxy": "^4.0",

From b9ae7dcf2a960e3d39f50239d741abbc99e002b8 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Thu, 28 May 2020 22:29:07 +0100
Subject: [PATCH 08/36] PHP 7.4

- Switch to PHP 7.4
---
 .docker/api/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/api/Dockerfile b/.docker/api/Dockerfile
index 8178b498..404cf6d5 100644
--- a/.docker/api/Dockerfile
+++ b/.docker/api/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:7.4-apache
 
 COPY . /var/www/html
 COPY .docker/api/vhost.conf /etc/apache2/sites-available/000-default.conf

From 97583e080c6bb23f4d797552cd83b0e18f42e8d2 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 29 May 2020 12:55:10 +0100
Subject: [PATCH 09/36] Fix namespace

- Fix namespace
---
 app/Interfaces/Item/ISummaryModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Interfaces/Item/ISummaryModel.php b/app/Interfaces/Item/ISummaryModel.php
index 0bb98bc2..a85bb774 100644
--- a/app/Interfaces/Item/ISummaryModel.php
+++ b/app/Interfaces/Item/ISummaryModel.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Interfaces\Item\ISummaryModel;
+namespace App\Interfaces\Item;
 
 /**
  * @author Dean Blackborough <dean@g3d-development.com>

From 598c8898b8b3231063851f2a61a9895529dec5ef Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 29 May 2020 16:26:48 +0100
Subject: [PATCH 10/36] Correct model name

- Case incorrect in model name
---
 app/Http/Controllers/Summary/SubcategoryController.php | 4 ++--
 app/Models/Summary/Subcategory.php                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Summary/SubcategoryController.php b/app/Http/Controllers/Summary/SubcategoryController.php
index 747d27ed..887680ec 100644
--- a/app/Http/Controllers/Summary/SubcategoryController.php
+++ b/app/Http/Controllers/Summary/SubcategoryController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Summary;
 
 use App\Http\Controllers\Controller;
-use App\Models\Summary\SubCategory;
+use App\Models\Summary\Subcategory;
 use App\Option\Get;
 use App\Utilities\Header;
 use App\Utilities\RoutePermission;
@@ -35,7 +35,7 @@ public function index($resource_type_id, $category_id): JsonResponse
             $this->permitted_resource_types
         );
 
-        $summary = (new SubCategory())->totalCount(
+        $summary = (new Subcategory())->totalCount(
             $resource_type_id,
             $category_id
         );
diff --git a/app/Models/Summary/Subcategory.php b/app/Models/Summary/Subcategory.php
index 0e8b60e1..1fd5fc7c 100644
--- a/app/Models/Summary/Subcategory.php
+++ b/app/Models/Summary/Subcategory.php
@@ -15,7 +15,7 @@
  * @copyright Dean Blackborough 2018-2020
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SubCategory extends Model
+class Subcategory extends Model
 {
     protected $table = 'sub_category';
 

From f4cefc72dee79ce840327c8337e7613f3752add0 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 29 May 2020 22:27:56 +0100
Subject: [PATCH 11/36] Fix migrations

- Migrations missing the original entries.
---
 .../2019_09_16_162438_create_item_type_allocated_expense.php    | 2 ++
 .../2019_09_16_163006_create_item_type_simple_expense.php       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/database/migrations/2019_09_16_162438_create_item_type_allocated_expense.php b/database/migrations/2019_09_16_162438_create_item_type_allocated_expense.php
index 00b5a228..77ce8b88 100644
--- a/database/migrations/2019_09_16_162438_create_item_type_allocated_expense.php
+++ b/database/migrations/2019_09_16_162438_create_item_type_allocated_expense.php
@@ -31,6 +31,8 @@ public function up()
             $table->index('effective_date');
             $table->index('publish_after');
         });
+
+        DB::statement('INSERT INTO `item_type` (`name`, `description`, `created_at`) VALUES ("allocated-expense", "Track expenses over time, additionally, an expense can be partially allocated to a resource.", NOW())');
     }
 
     /**
diff --git a/database/migrations/2019_09_16_163006_create_item_type_simple_expense.php b/database/migrations/2019_09_16_163006_create_item_type_simple_expense.php
index ccaf4207..113af6f5 100644
--- a/database/migrations/2019_09_16_163006_create_item_type_simple_expense.php
+++ b/database/migrations/2019_09_16_163006_create_item_type_simple_expense.php
@@ -26,6 +26,8 @@ public function up()
             $table->timestamps();
             $table->foreign('item_id')->references('id')->on('item');
         });
+
+        DB::statement('INSERT INTO `item_type` (`name`, `description`, `created_at`) VALUES ("simple-expense", "Track expenses for a specific event or function.", NOW())');
     }
 
     /**

From b63987e9da491529b701ab00f25e540c9a8c3ac7 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 29 May 2020 22:44:13 +0100
Subject: [PATCH 12/36] Tweak Docker settings

- Tweak Docker setup.
- Update README, post incorrect.
---
 .env.example       | 6 +++---
 README.md          | 8 ++++----
 docker-compose.yml | 3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index 70ae8a7e..cbd8c108 100644
--- a/.env.example
+++ b/.env.example
@@ -1,9 +1,9 @@
-APP_NAME=costs-to-expect
+APP_NAME=cte-api
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://api.local
-APP_REGISTRATIONS=false
+APP_URL=http://localhost:8080
+APP_REGISTRATIONS=true
 
 APP_HASH_MIN_LENGTH=
 APP_HASH_SALT_CATEGORY=
diff --git a/README.md b/README.md
index f365ffd9..ecac0b59 100644
--- a/README.md
+++ b/README.md
@@ -59,10 +59,10 @@ and then running any migrations and install Passport.
 * `docker-compose exec api php artisan key:generate`
 * `docker-compose exec api php artisan migrate`
 * `docker-compose exec api php artisan passport:install`
-* Run an OPTIONS request on `http://[your.domail.local]/v2/resource_types`, you should see a nice OPTIONS request, 
-alternatively a GET request to `http://[your.domail.local]/v1` will show all the routes.
-* You can add a development user by POSTing to `http://[your.domail.local]/v2/auth/register` and then get a bearer by 
-POSTing to `http://[your.domail.local]/v2/auth/login` - you will need a bearer for all the routes that require authentication.
+* Run an OPTIONS request on `http://[your.domail.local:8080]/v2/resource_types`, you should see a nice OPTIONS request, 
+alternatively a GET request to `http://[your.domail.local:8080]/v1` will show all the routes.
+* You can add a development user by POSTing to `http://[your.domail.local:8080]/v2/auth/register` and then get a bearer by 
+POSTing to `http://[your.domail.local:8080]/v2/auth/login` - you will need a bearer for all the routes that require authentication.
 * The API is setup to use Mailgun by default, populate `MAILGUN_DOMAIN` and `MAILGUN_SECRET` with values from your account, 
 you will also need to set `MAIL_FROM_ADDRESS` and `MAIL_TO_ADDRESS`. You may need to set `Authorized Recipients` in Mailgun. 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index de53f76c..d25cb6a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
         - WITH_XDEBUG=${WITH_XDEBUG}
         - WITH_COMPOSER=${WITH_COMPOSER}
       dockerfile: .docker/api/Dockerfile
-    image: costs-to-expect
+    image: costs-to-expect-api
     ports:
       - 8080:80
     volumes:
@@ -25,6 +25,7 @@ services:
     build:
       context: .
       dockerfile: .docker/mysql/Dockerfile
+    image: costs-to-expect-api-mysql
     ports:
       - 3308:3306
     env_file: .env

From 892856589aba7e5792b99535b61ea4430273a0b4 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sat, 30 May 2020 23:25:23 +0100
Subject: [PATCH 13/36] Populate item types

- Added migration to populate the item types table.
---
 ...62437_create_item_type_simple_expense.php} |  1 +
 ...2020_02_19_121906_add_simple_item_type.php |  2 +-
 .../2020_05_30_220655_populate-item-types.php | 36 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 rename database/migrations/{2019_09_16_163006_create_item_type_simple_expense.php => 2019_09_16_162437_create_item_type_simple_expense.php} (97%)
 create mode 100644 database/migrations/2020_05_30_220655_populate-item-types.php

diff --git a/database/migrations/2019_09_16_163006_create_item_type_simple_expense.php b/database/migrations/2019_09_16_162437_create_item_type_simple_expense.php
similarity index 97%
rename from database/migrations/2019_09_16_163006_create_item_type_simple_expense.php
rename to database/migrations/2019_09_16_162437_create_item_type_simple_expense.php
index 113af6f5..b5e2d010 100644
--- a/database/migrations/2019_09_16_163006_create_item_type_simple_expense.php
+++ b/database/migrations/2019_09_16_162437_create_item_type_simple_expense.php
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2020_02_19_121906_add_simple_item_type.php b/database/migrations/2020_02_19_121906_add_simple_item_type.php
index 79d39ef6..4a54729f 100644
--- a/database/migrations/2020_02_19_121906_add_simple_item_type.php
+++ b/database/migrations/2020_02_19_121906_add_simple_item_type.php
@@ -12,7 +12,7 @@ class AddSimpleItemType extends Migration
      */
     public function up()
     {
-        DB::statement('INSERT INTO `item_type` (`name`, `description`, `created_at`) VALUES ("simple-item", "Track a collection", NOW())');
+        DB::statement('INSERT INTO `item_type` (`name`, `description`, `created_at`) VALUES ("simple-item", "Log a list of items including their quantities.", NOW())');
     }
 
     /**
diff --git a/database/migrations/2020_05_30_220655_populate-item-types.php b/database/migrations/2020_05_30_220655_populate-item-types.php
new file mode 100644
index 00000000..095bfda3
--- /dev/null
+++ b/database/migrations/2020_05_30_220655_populate-item-types.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class PopulateItemTypes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::statement('UPDATE `item_type` SET `friendly_name` = "Items" WHERE `name` = "simple-item"');
+        DB::statement('UPDATE `item_type` SET `example` = "Examples include, stock, your lego collection or your Barry White CD collection" WHERE `name` = "simple-item"');
+
+        DB::statement('UPDATE `item_type` SET `friendly_name` = "Items" WHERE `name` = "simple-expense"');
+        DB::statement('UPDATE `item_type` SET `example` = "Track expenses for a specific event or function." WHERE `name` = "simple-expense"');
+
+        DB::statement('UPDATE `item_type` SET `friendly_name` = "Chronological expenses" WHERE `name` = "allocated-expense"');
+        DB::statement('UPDATE `item_type` SET `example` = "Examples include, the cost to raise a child and start-up expenses for your business." WHERE `name` = "allocated-item"');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

From 93a418f0f968a47d96906d3b9547738f0041ea8a Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sat, 30 May 2020 23:57:06 +0100
Subject: [PATCH 14/36] Order migrations

- Reset the migration order.
- Correct friendly name update.
---
 ... => 2019_09_16_162439_create_item_type_simple_expense.php} | 0
 database/migrations/2020_05_30_220655_populate-item-types.php | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename database/migrations/{2019_09_16_162437_create_item_type_simple_expense.php => 2019_09_16_162439_create_item_type_simple_expense.php} (100%)

diff --git a/database/migrations/2019_09_16_162437_create_item_type_simple_expense.php b/database/migrations/2019_09_16_162439_create_item_type_simple_expense.php
similarity index 100%
rename from database/migrations/2019_09_16_162437_create_item_type_simple_expense.php
rename to database/migrations/2019_09_16_162439_create_item_type_simple_expense.php
diff --git a/database/migrations/2020_05_30_220655_populate-item-types.php b/database/migrations/2020_05_30_220655_populate-item-types.php
index 095bfda3..db7de89c 100644
--- a/database/migrations/2020_05_30_220655_populate-item-types.php
+++ b/database/migrations/2020_05_30_220655_populate-item-types.php
@@ -17,7 +17,7 @@ public function up()
         DB::statement('UPDATE `item_type` SET `friendly_name` = "Items" WHERE `name` = "simple-item"');
         DB::statement('UPDATE `item_type` SET `example` = "Examples include, stock, your lego collection or your Barry White CD collection" WHERE `name` = "simple-item"');
 
-        DB::statement('UPDATE `item_type` SET `friendly_name` = "Items" WHERE `name` = "simple-expense"');
+        DB::statement('UPDATE `item_type` SET `friendly_name` = "Bucket expenses" WHERE `name` = "simple-expense"');
         DB::statement('UPDATE `item_type` SET `example` = "Track expenses for a specific event or function." WHERE `name` = "simple-expense"');
 
         DB::statement('UPDATE `item_type` SET `friendly_name` = "Chronological expenses" WHERE `name` = "allocated-expense"');
@@ -31,6 +31,6 @@ public function up()
      */
     public function down()
     {
-        //
+        // No down
     }
 }

From 183bbb08748b504d95b28f4c372d91f32d5b8cb7 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sun, 31 May 2020 00:15:34 +0100
Subject: [PATCH 15/36] Transfer multiple times

- Remove unique index, allow items to be transferred multiple times.
---
 ...5839_remove_unique_index_item_transfer.php | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 database/migrations/2020_05_30_225839_remove_unique_index_item_transfer.php

diff --git a/database/migrations/2020_05_30_225839_remove_unique_index_item_transfer.php b/database/migrations/2020_05_30_225839_remove_unique_index_item_transfer.php
new file mode 100644
index 00000000..f2aa591c
--- /dev/null
+++ b/database/migrations/2020_05_30_225839_remove_unique_index_item_transfer.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RemoveUniqueIndexItemTransfer extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('item_transfer', function (Blueprint $table) {
+            $table->dropForeign('item_transfer_from_foreign');
+            $table->dropForeign('item_transfer_item_id_foreign');
+            $table->dropForeign('item_transfer_resource_type_id_foreign');
+            $table->dropForeign('item_transfer_to_foreign');
+            $table->dropForeign('item_transfer_transferred_by_foreign');
+            $table->dropUnique('unique_item_partial_transfer');
+        });
+
+        Schema::table('item_transfer', function (Blueprint $table) {
+            $table->foreign('resource_type_id')->references('id')->on('resource_type')->onDelete('cascade');
+            $table->foreign('from')->references('id')->on('resource')->onDelete('cascade');
+            $table->foreign('to')->references('id')->on('resource')->onDelete('cascade');
+            $table->foreign('item_id')->references('id')->on('item')->onDelete('cascade');
+            $table->foreign('transferred_by')->references('id')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // No down
+    }
+}

From d56ca10f1df56fabaeb1bc10888d1db922b6968c Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sun, 31 May 2020 14:54:41 +0100
Subject: [PATCH 16/36] Namespace error

- Continuing namespace issue.
- Added comments regarding the routes we are going to remove
---
 app/Item/Summary/AbstractItem.php     | 2 +-
 app/Item/Summary/AllocatedExpense.php | 2 +-
 app/Item/Summary/SimpleExpense.php    | 2 +-
 app/Item/Summary/SimpleItem.php       | 2 +-
 routes/api/public-routes.php          | 8 ++++++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Item/Summary/AbstractItem.php b/app/Item/Summary/AbstractItem.php
index c28b06ad..b445baa3 100644
--- a/app/Item/Summary/AbstractItem.php
+++ b/app/Item/Summary/AbstractItem.php
@@ -3,7 +3,7 @@
 
 namespace App\Item\Summary;
 
-use App\Interfaces\Item\ISummaryModel\ISummaryModel;
+use App\Interfaces\Item\ISummaryModel;
 use Illuminate\Support\Facades\Config;
 
 /**
diff --git a/app/Item/Summary/AllocatedExpense.php b/app/Item/Summary/AllocatedExpense.php
index 6d079f27..ad1c18fc 100644
--- a/app/Item/Summary/AllocatedExpense.php
+++ b/app/Item/Summary/AllocatedExpense.php
@@ -3,7 +3,7 @@
 
 namespace App\Item\Summary;
 
-use App\Interfaces\Item\ISummaryModel\ISummaryModel;
+use App\Interfaces\Item\ISummaryModel;
 use App\Models\Item\Summary\AllocatedExpense as ItemModel;
 
 class AllocatedExpense extends AbstractItem
diff --git a/app/Item/Summary/SimpleExpense.php b/app/Item/Summary/SimpleExpense.php
index 7a6b3d0b..b33a050e 100644
--- a/app/Item/Summary/SimpleExpense.php
+++ b/app/Item/Summary/SimpleExpense.php
@@ -3,7 +3,7 @@
 
 namespace App\Item\Summary;
 
-use App\Interfaces\Item\ISummaryModel\ISummaryModel;
+use App\Interfaces\Item\ISummaryModel;
 use App\Models\Item\Summary\SimpleExpense as ItemModel;
 
 class SimpleExpense extends AbstractItem
diff --git a/app/Item/Summary/SimpleItem.php b/app/Item/Summary/SimpleItem.php
index 6c323fd6..100da3e2 100644
--- a/app/Item/Summary/SimpleItem.php
+++ b/app/Item/Summary/SimpleItem.php
@@ -3,7 +3,7 @@
 
 namespace App\Item\Summary;
 
-use App\Interfaces\Item\ISummaryModel\ISummaryModel;
+use App\Interfaces\Item\ISummaryModel;
 use App\Models\Item\Summary\SimpleItem as ItemModel;
 
 class SimpleItem extends AbstractItem
diff --git a/routes/api/public-routes.php b/routes/api/public-routes.php
index a27ca7f7..b10fc756 100644
--- a/routes/api/public-routes.php
+++ b/routes/api/public-routes.php
@@ -204,41 +204,49 @@ function () {
             'ItemTransferController@optionsTransfer'
         );
 
+        /*This route needs to be removed*/
         Route::get(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category',
             'ItemCategoryController@index'
         );
 
+        /*This route needs to be removed*/
         Route::options(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category',
             'ItemCategoryController@optionsIndex'
         );
 
+        /*This route needs to be removed*/
         Route::get(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}',
             'ItemCategoryController@show'
         );
 
+        /*This route needs to be removed*/
         Route::options(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}',
             'ItemCategoryController@optionsShow'
         );
 
+        /*This route needs to be removed*/
         Route::get(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory',
             'ItemSubcategoryController@index'
         );
 
+        /*This route needs to be removed*/
         Route::options(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory',
             'ItemSubcategoryController@optionsIndex'
         );
 
+        /*This route needs to be removed*/
         Route::get(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id}',
             'ItemSubcategoryController@show'
         );
 
+        /*This route needs to be removed*/
         Route::options(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id}',
             'ItemSubcategoryController@optionsShow'

From 48cef9c59009ba57a26cad1f3302b4c99bcb340e Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sun, 31 May 2020 15:25:04 +0100
Subject: [PATCH 17/36] Item categories

- We have updated the routes for item categories and item subcategories, name was singular for the collections.
- Additional namespace fixes,
- The category object includes the id of the collection item.
---
 app/Models/Item/Summary/AllocatedExpense.php     |  2 +-
 app/Models/Item/Summary/SimpleExpense.php        |  2 +-
 app/Models/Item/Summary/SimpleItem.php           |  2 +-
 .../Transformers/ItemType/AllocatedExpense.php   | 10 ++++------
 .../Transformers/ItemType/SimpleExpense.php      | 10 ++++------
 .../ResourceTypeItemType/AllocatedExpense.php    | 10 ++++------
 .../ResourceTypeItemType/SimpleExpense.php       | 10 ++++------
 routes/api/private-routes.php                    |  8 ++++----
 routes/api/public-routes.php                     | 16 ++++++++--------
 9 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/app/Models/Item/Summary/AllocatedExpense.php b/app/Models/Item/Summary/AllocatedExpense.php
index 11681f04..78d3e8d6 100644
--- a/app/Models/Item/Summary/AllocatedExpense.php
+++ b/app/Models/Item/Summary/AllocatedExpense.php
@@ -4,7 +4,7 @@
 namespace App\Models\Item\Summary;
 
 use App\Interfaces\Item\ISummaryModelCategories;
-use App\Interfaces\Item\ISummaryModel\ISummaryModel;
+use App\Interfaces\Item\ISummaryModel;
 use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Item/Summary/SimpleExpense.php b/app/Models/Item/Summary/SimpleExpense.php
index 7db0bdd3..9acbd35a 100644
--- a/app/Models/Item/Summary/SimpleExpense.php
+++ b/app/Models/Item/Summary/SimpleExpense.php
@@ -4,7 +4,7 @@
 namespace App\Models\Item\Summary;
 
 use App\Interfaces\Item\ISummaryModelCategories;
-use App\Interfaces\Item\ISummaryModel\ISummaryModel;
+use App\Interfaces\Item\ISummaryModel;
 use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder as QueryBuilder;
diff --git a/app/Models/Item/Summary/SimpleItem.php b/app/Models/Item/Summary/SimpleItem.php
index 0a4e984a..7b37d50b 100644
--- a/app/Models/Item/Summary/SimpleItem.php
+++ b/app/Models/Item/Summary/SimpleItem.php
@@ -3,7 +3,7 @@
 
 namespace App\Models\Item\Summary;
 
-use App\Interfaces\Item\ISummaryModel\ISummaryModel;
+use App\Interfaces\Item\ISummaryModel;
 use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder as QueryBuilder;
diff --git a/app/Models/Transformers/ItemType/AllocatedExpense.php b/app/Models/Transformers/ItemType/AllocatedExpense.php
index 4510e7ec..fe3a117c 100644
--- a/app/Models/Transformers/ItemType/AllocatedExpense.php
+++ b/app/Models/Transformers/ItemType/AllocatedExpense.php
@@ -43,10 +43,10 @@ public function toArray(): array
         ) {
             if ($this->item['category_id'] !== null) {
                 $item['category'] = [
+                    'item_category_id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
                     'id' => $this->hash->category()->encode($this->item['category_id']),
                     'name' => $this->item['category_name'],
-                    'description' => $this->item['category_description'],
-                    'uri' => '/category/' . $this->hash->itemCategory()->encode($this->item['item_category_id'])
+                    'description' => $this->item['category_description']
                 ];
             } else {
                 $item['category'] = null;    
@@ -58,12 +58,10 @@ public function toArray(): array
             ) {
                 if ($this->item['subcategory_id'] !== null) {
                     $item['subcategory'] = [
+                        'item_subcategory_id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
                         'id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
                         'name' => $this->item['subcategory_name'],
-                        'description' => $this->item['subcategory_description'],
-                        'uri' => '/category/' .
-                            $this->hash->itemCategory()->encode($this->item['item_category_id']) .
-                            '/subcategory/' . $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id'])
+                        'description' => $this->item['subcategory_description']
                     ];
                 } else {
                     $item['subcategory'] = null;
diff --git a/app/Models/Transformers/ItemType/SimpleExpense.php b/app/Models/Transformers/ItemType/SimpleExpense.php
index 29951e90..62627958 100644
--- a/app/Models/Transformers/ItemType/SimpleExpense.php
+++ b/app/Models/Transformers/ItemType/SimpleExpense.php
@@ -40,10 +40,10 @@ public function toArray(): array
         ) {
             if ($this->item['category_id'] !== null) {
                 $item['category'] = [
+                    'item_category_id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
                     'id' => $this->hash->category()->encode($this->item['category_id']),
                     'name' => $this->item['category_name'],
-                    'description' => $this->item['category_description'],
-                    'uri' => '/category/' . $this->hash->itemCategory()->encode($this->item['item_category_id'])
+                    'description' => $this->item['category_description']
                 ];
             } else {
                 $item['category'] = null;
@@ -55,12 +55,10 @@ public function toArray(): array
             ) {
                 if ($this->item['subcategory_id'] !== null) {
                     $item['subcategory'] = [
+                        'item_subcategory_id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
                         'id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
                         'name' => $this->item['subcategory_name'],
-                        'description' => $this->item['subcategory_description'],
-                        'uri' => '/category/' .
-                            $this->hash->itemCategory()->encode($this->item['item_category_id']) .
-                            '/subcategory/' . $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id'])
+                        'description' => $this->item['subcategory_description']
                     ];
                 } else {
                     $item['subcategory'] = null;
diff --git a/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php b/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
index 56a5595f..3a3a61e6 100644
--- a/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
+++ b/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
@@ -56,10 +56,10 @@ public function toArray(): array
         ) {
             if ($this->item['category_id'] !== null) {
                 $item['category'] = [
+                    'item_category_id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
                     'id' => $this->hash->category()->encode($this->item['category_id']),
                     'name' => $this->item['category_name'],
-                    'description' => $this->item['category_description'],
-                    'uri' => '/category/' . $this->hash->itemCategory()->encode($this->item['item_category_id'])
+                    'description' => $this->item['category_description']
                 ];
             } else {
                 $item['category'] = null;
@@ -71,12 +71,10 @@ public function toArray(): array
             ) {
                 if ($this->item['subcategory_id'] !== null) {
                     $item['subcategory'] = [
+                        'item_subcategory_id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
                         'id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
                         'name' => $this->item['subcategory_name'],
-                        'description' => $this->item['subcategory_description'],
-                        'uri' => '/category/' .
-                            $this->hash->itemCategory()->encode($this->item['item_category_id']) .
-                            '/subcategory/' . $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id'])
+                        'description' => $this->item['subcategory_description']
                     ];
                 } else {
                     $item['subcategory'] = null;
diff --git a/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php b/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
index bb141b53..685bf7a2 100644
--- a/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
+++ b/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
@@ -53,10 +53,10 @@ public function toArray(): array
         ) {
             if ($this->item['category_id'] !== null) {
                 $item['category'] = [
+                    'item_category_id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
                     'id' => $this->hash->category()->encode($this->item['category_id']),
                     'name' => $this->item['category_name'],
-                    'description' => $this->item['category_description'],
-                    'uri' => '/category/' . $this->hash->itemCategory()->encode($this->item['item_category_id'])
+                    'description' => $this->item['category_description']
                 ];
             } else {
                 $item['category'] = null;
@@ -68,12 +68,10 @@ public function toArray(): array
             ) {
                 if ($this->item['subcategory_id'] !== null) {
                     $item['subcategory'] = [
+                        'item_subcategory_id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
                         'id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
                         'name' => $this->item['subcategory_name'],
-                        'description' => $this->item['subcategory_description'],
-                        'uri' => '/category/' .
-                            $this->hash->itemCategory()->encode($this->item['item_category_id']) .
-                            '/subcategory/' . $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id'])
+                        'description' => $this->item['subcategory_description']
                     ];
                 } else {
                     $item['subcategory'] = null;
diff --git a/routes/api/private-routes.php b/routes/api/private-routes.php
index d442141d..56757dc4 100644
--- a/routes/api/private-routes.php
+++ b/routes/api/private-routes.php
@@ -43,12 +43,12 @@ function () {
         );
 
         Route::post(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories',
             'ItemCategoryController@create'
         );
 
         Route::post(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories',
             'ItemSubcategoryController@create'
         );
 
@@ -93,12 +93,12 @@ function () {
         );
 
         Route::delete(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}',
             'ItemCategoryController@delete'
         );
 
         Route::delete(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id}',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id}',
             'ItemSubcategoryController@delete'
         );
 
diff --git a/routes/api/public-routes.php b/routes/api/public-routes.php
index b10fc756..c1171088 100644
--- a/routes/api/public-routes.php
+++ b/routes/api/public-routes.php
@@ -206,49 +206,49 @@ function () {
 
         /*This route needs to be removed*/
         Route::get(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories',
             'ItemCategoryController@index'
         );
 
         /*This route needs to be removed*/
         Route::options(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories',
             'ItemCategoryController@optionsIndex'
         );
 
         /*This route needs to be removed*/
         Route::get(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}',
             'ItemCategoryController@show'
         );
 
         /*This route needs to be removed*/
         Route::options(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}',
             'ItemCategoryController@optionsShow'
         );
 
         /*This route needs to be removed*/
         Route::get(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories',
             'ItemSubcategoryController@index'
         );
 
         /*This route needs to be removed*/
         Route::options(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories',
             'ItemSubcategoryController@optionsIndex'
         );
 
         /*This route needs to be removed*/
         Route::get(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id}',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id}',
             'ItemSubcategoryController@show'
         );
 
         /*This route needs to be removed*/
         Route::options(
-            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id}',
+            'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id}',
             'ItemSubcategoryController@optionsShow'
         );
 

From 044e3a58acb806bb81103b2f2fee7d768f3cb84b Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sun, 31 May 2020 15:52:20 +0100
Subject: [PATCH 18/36] Item category objects match

- Included item category should match category
---
 app/Models/ItemCategory.php                               | 3 +++
 app/Models/ItemSubcategory.php                            | 4 ++++
 app/Models/Transformers/ItemCategory.php                  | 1 +
 app/Models/Transformers/ItemSubcategory.php               | 1 +
 app/Models/Transformers/ItemType/AllocatedExpense.php     | 8 ++++----
 app/Models/Transformers/ItemType/SimpleExpense.php        | 8 ++++----
 .../ResourceTypeItemType/AllocatedExpense.php             | 8 ++++----
 .../Transformers/ResourceTypeItemType/SimpleExpense.php   | 4 ++--
 8 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/Models/ItemCategory.php b/app/Models/ItemCategory.php
index 61d5f953..0a3b5d14 100644
--- a/app/Models/ItemCategory.php
+++ b/app/Models/ItemCategory.php
@@ -70,6 +70,7 @@ public function single(
             select(
                 'item_category.id AS item_category_id',
                 'item_category.created_at AS item_category_created_at',
+                'category.id AS item_category_category_id',
                 'category.name AS item_category_category_name',
                 'category.description AS item_category_category_description'
             )->
@@ -98,6 +99,7 @@ public function instance(
             select(
                 'item_category.id AS item_category_id',
                 'item_category.created_at AS item_category_created_at',
+                'category.id AS item_category_category_id',
                 'category.name AS item_category_category_name',
                 'category.description AS item_category_category_description'
             )->
@@ -116,6 +118,7 @@ public function instanceToArray(ItemCategory $item_category): array
         return [
             'item_category_id' => $item_category->id,
             'item_category_created_at' => $item_category->created_at->toDateTimeString(),
+            'item_category_category_id' => $item_category->category->id,
             'item_category_category_name' => $item_category->category->name,
             'item_category_category_description' => $item_category->category->description
         ];
diff --git a/app/Models/ItemSubcategory.php b/app/Models/ItemSubcategory.php
index 03bf51a2..a51ac7d0 100644
--- a/app/Models/ItemSubcategory.php
+++ b/app/Models/ItemSubcategory.php
@@ -55,6 +55,7 @@ public function paginatedCollection(
             select(
                 'item_sub_category.id AS item_sub_category_id',
                 'item_sub_category.created_at AS item_sub_category_created_at',
+                'sub_category.id AS item_sub_category_sub_category_id',
                 'sub_category.name AS item_sub_category_sub_category_name',
                 'sub_category.description AS item_sub_category_sub_category_description'
             )->
@@ -81,6 +82,7 @@ public function single(
             select(
                 'item_sub_category.id AS item_sub_category_id',
                 'item_sub_category.created_at AS item_sub_category_created_at',
+                'sub_category.id AS item_sub_category_sub_category_id',
                 'sub_category.name AS item_sub_category_sub_category_name',
                 'sub_category.description AS item_sub_category_sub_category_description'
             )->
@@ -112,6 +114,7 @@ public function instance(
             select(
                 'item_sub_category.id AS item_sub_category_id',
                 'item_sub_category.created_at AS item_sub_category_created_at',
+                'sub_category.id AS item_sub_category_sub_category_id',
                 'sub_category.name AS item_sub_category_sub_category_name',
                 'sub_category.description AS item_sub_category_sub_category_description'
             )->
@@ -130,6 +133,7 @@ public function instanceToArray(ItemSubcategory $item_sub_category): array
         return [
             'item_sub_category_id' => $item_sub_category->id,
             'item_sub_category_created_at' => $item_sub_category->created_at->toDateTimeString(),
+            'item_sub_category_sub_category_id' => $item_sub_category->sub_category->id,
             'item_sub_category_sub_category_name' => $item_sub_category->sub_category->name,
             'item_sub_category_sub_category_description' => $item_sub_category->sub_category->description
         ];
diff --git a/app/Models/Transformers/ItemCategory.php b/app/Models/Transformers/ItemCategory.php
index 37ceaaf3..8501723c 100644
--- a/app/Models/Transformers/ItemCategory.php
+++ b/app/Models/Transformers/ItemCategory.php
@@ -26,6 +26,7 @@ public function toArray(): array
         return [
             'id' => $this->hash->itemCategory()->encode($this->data_to_transform['item_category_id']),
             'category' => [
+                'id' => $this->hash->category()->encode($this->data_to_transform['item_category_category_id']),
                 'name' => $this->data_to_transform['item_category_category_name'],
                 'description' => $this->data_to_transform['item_category_category_description']
             ],
diff --git a/app/Models/Transformers/ItemSubcategory.php b/app/Models/Transformers/ItemSubcategory.php
index d283a2ed..01a947a1 100644
--- a/app/Models/Transformers/ItemSubcategory.php
+++ b/app/Models/Transformers/ItemSubcategory.php
@@ -26,6 +26,7 @@ public function toArray(): array
         return [
             'id' => $this->hash->itemSubCategory()->encode($this->data_to_transform['item_sub_category_id']),
             'subcategory' => [
+                'id' => $this->hash->subcategory()->encode($this->data_to_transform['item_sub_category_sub_category_id']),
                 'name' => $this->data_to_transform['item_sub_category_sub_category_name'],
                 'description' => $this->data_to_transform['item_sub_category_sub_category_description']
             ],
diff --git a/app/Models/Transformers/ItemType/AllocatedExpense.php b/app/Models/Transformers/ItemType/AllocatedExpense.php
index fe3a117c..c0d87de6 100644
--- a/app/Models/Transformers/ItemType/AllocatedExpense.php
+++ b/app/Models/Transformers/ItemType/AllocatedExpense.php
@@ -43,8 +43,8 @@ public function toArray(): array
         ) {
             if ($this->item['category_id'] !== null) {
                 $item['category'] = [
-                    'item_category_id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
-                    'id' => $this->hash->category()->encode($this->item['category_id']),
+                    'id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
+                    'category_id' => $this->hash->category()->encode($this->item['category_id']),
                     'name' => $this->item['category_name'],
                     'description' => $this->item['category_description']
                 ];
@@ -58,8 +58,8 @@ public function toArray(): array
             ) {
                 if ($this->item['subcategory_id'] !== null) {
                     $item['subcategory'] = [
-                        'item_subcategory_id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
-                        'id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
+                        'id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
+                        'subcategory_id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
                         'name' => $this->item['subcategory_name'],
                         'description' => $this->item['subcategory_description']
                     ];
diff --git a/app/Models/Transformers/ItemType/SimpleExpense.php b/app/Models/Transformers/ItemType/SimpleExpense.php
index 62627958..41c3773d 100644
--- a/app/Models/Transformers/ItemType/SimpleExpense.php
+++ b/app/Models/Transformers/ItemType/SimpleExpense.php
@@ -40,8 +40,8 @@ public function toArray(): array
         ) {
             if ($this->item['category_id'] !== null) {
                 $item['category'] = [
-                    'item_category_id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
-                    'id' => $this->hash->category()->encode($this->item['category_id']),
+                    'id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
+                    'category_id' => $this->hash->category()->encode($this->item['category_id']),
                     'name' => $this->item['category_name'],
                     'description' => $this->item['category_description']
                 ];
@@ -55,8 +55,8 @@ public function toArray(): array
             ) {
                 if ($this->item['subcategory_id'] !== null) {
                     $item['subcategory'] = [
-                        'item_subcategory_id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
-                        'id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
+                        'id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
+                        'subcategory_id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
                         'name' => $this->item['subcategory_name'],
                         'description' => $this->item['subcategory_description']
                     ];
diff --git a/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php b/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
index 3a3a61e6..2f59737a 100644
--- a/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
+++ b/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
@@ -56,8 +56,8 @@ public function toArray(): array
         ) {
             if ($this->item['category_id'] !== null) {
                 $item['category'] = [
-                    'item_category_id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
-                    'id' => $this->hash->category()->encode($this->item['category_id']),
+                    'id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
+                    'category_id' => $this->hash->category()->encode($this->item['category_id']),
                     'name' => $this->item['category_name'],
                     'description' => $this->item['category_description']
                 ];
@@ -71,8 +71,8 @@ public function toArray(): array
             ) {
                 if ($this->item['subcategory_id'] !== null) {
                     $item['subcategory'] = [
-                        'item_subcategory_id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
-                        'id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
+                        'id' => $this->hash->itemSubCategory()->encode($this->item['item_subcategory_id']),
+                        'subcategory_id' => $this->hash->subCategory()->encode($this->item['subcategory_id']),
                         'name' => $this->item['subcategory_name'],
                         'description' => $this->item['subcategory_description']
                     ];
diff --git a/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php b/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
index 685bf7a2..7f3e342d 100644
--- a/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
+++ b/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
@@ -53,8 +53,8 @@ public function toArray(): array
         ) {
             if ($this->item['category_id'] !== null) {
                 $item['category'] = [
-                    'item_category_id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
-                    'id' => $this->hash->category()->encode($this->item['category_id']),
+                    'id' => $this->hash->itemCategory()->encode($this->item['item_category_id']),
+                    'subcategory_id' => $this->hash->category()->encode($this->item['category_id']),
                     'name' => $this->item['category_name'],
                     'description' => $this->item['category_description']
                 ];

From 8149fe7a9004feac8b4cff41fec434c14d24fcb9 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sun, 31 May 2020 23:06:15 +0100
Subject: [PATCH 19/36] Updated routes

- Updated routes in README.
- Query not selecting id.
---
 README.md                   | 24 ++++++++++++------------
 app/Models/ItemCategory.php |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index ecac0b59..9a230593 100644
--- a/README.md
+++ b/README.md
@@ -159,18 +159,18 @@ additionally, the same is true if you are assigned to a resource type.
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
 | PATCH    | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
 | DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
-| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category |
-| OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category |
-| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category |
-| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id} |
-| OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id} |
-| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id} |
-| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory |
-| OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory |
-| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/sub_category |
-| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id} |
-| OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id} |
-| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/sub_category/{item_subcategory_id} |
+| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories |
+| OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories |
+| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories |
+| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} |
+| OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} |
+| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} |
+| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories |
+| OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories |
+| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories |
+| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} |
+| OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} |
+| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/partial-transfer |
 | POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/partial-transfer |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/transfer |
diff --git a/app/Models/ItemCategory.php b/app/Models/ItemCategory.php
index 0a3b5d14..6c69e39c 100644
--- a/app/Models/ItemCategory.php
+++ b/app/Models/ItemCategory.php
@@ -47,6 +47,7 @@ public function paginatedCollection(
             select(
                 'item_category.id AS item_category_id',
                 'item_category.created_at AS item_category_created_at',
+                'category.id AS item_category_category_id',
                 'category.name AS item_category_category_name',
                 'category.description AS item_category_category_description'
             )->

From e5a32b265ff4abfcd9ddc974b9bb51f63eedc251 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sun, 31 May 2020 23:20:39 +0100
Subject: [PATCH 20/36] Delete item updated

- Delete item doesn't delete the transfer entry
---
 app/Http/Controllers/ItemController.php |  2 ++
 app/Models/ItemTransfer.php             | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 9618b590..97711a2f 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Item\Factory;
+use App\Models\ItemTransfer;
 use App\Option\Delete;
 use App\Option\Get;
 use App\Option\Patch;
@@ -452,6 +453,7 @@ public function delete(
         }
 
         try {
+            (new ItemTransfer())->deleteTransfers($item_id);
             $item_type->delete();
             $item->delete();
 
diff --git a/app/Models/ItemTransfer.php b/app/Models/ItemTransfer.php
index 05acdb79..27d1c514 100644
--- a/app/Models/ItemTransfer.php
+++ b/app/Models/ItemTransfer.php
@@ -138,4 +138,14 @@ public function total(
 
         return $collection->count();
     }
+
+    /**
+     * @param int $item_id
+     *
+     * @return mixed
+     */
+    public function deleteTransfers(int $item_id)
+    {
+        return $this->where($this->table . '.item_id', '=', $item_id)->delete();
+    }
 }

From 3be29494660640f23b5b581b5163063cb4886787 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 1 Jun 2020 15:20:56 +0100
Subject: [PATCH 21/36] Item endpoints not showing as searchable

- Two item tyope endpoints not showing as searchable by name
---
 config/api/item-type-allocated-expense/summary-searchable.php | 1 +
 config/api/item-type-simple-expense/summary-searchable.php    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/api/item-type-allocated-expense/summary-searchable.php b/config/api/item-type-allocated-expense/summary-searchable.php
index 1d5a028d..5ebb8cc8 100644
--- a/config/api/item-type-allocated-expense/summary-searchable.php
+++ b/config/api/item-type-allocated-expense/summary-searchable.php
@@ -3,5 +3,6 @@
 declare(strict_types=1);
 
 return [
+    'name',
     'description'
 ];
diff --git a/config/api/item-type-simple-expense/summary-searchable.php b/config/api/item-type-simple-expense/summary-searchable.php
index 1d5a028d..5ebb8cc8 100644
--- a/config/api/item-type-simple-expense/summary-searchable.php
+++ b/config/api/item-type-simple-expense/summary-searchable.php
@@ -3,5 +3,6 @@
 declare(strict_types=1);
 
 return [
+    'name',
     'description'
 ];

From e13cb2fd5a60a701c895b062936cc5bce40db036 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 1 Jun 2020 15:31:56 +0100
Subject: [PATCH 22/36] - Added search

- Added search to the categories summaries endpoint.
---
 app/Http/Controllers/Summary/CategoryController.php | 9 ++++++++-
 config/api/category/summary-searchable.php          | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 config/api/category/summary-searchable.php

diff --git a/app/Http/Controllers/Summary/CategoryController.php b/app/Http/Controllers/Summary/CategoryController.php
index f0e134a8..6dfd6809 100644
--- a/app/Http/Controllers/Summary/CategoryController.php
+++ b/app/Http/Controllers/Summary/CategoryController.php
@@ -8,7 +8,9 @@
 use App\Utilities\Header;
 use App\Utilities\RoutePermission;
 use App\Validators\Route;
+use App\Validators\SearchParameters;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Summary controller for the categories routes
@@ -33,10 +35,15 @@ public function index($resource_type_id): JsonResponse
             $this->permitted_resource_types
         );
 
+        $search_parameters = SearchParameters::fetch(
+            Config::get('api.category.summary-searchable')
+        );
+
         $summary = (new Category())->total(
             $resource_type_id,
             $this->permitted_resource_types,
-            $this->include_public
+            $this->include_public,
+            $search_parameters
         );
 
         $headers = new Header();
diff --git a/config/api/category/summary-searchable.php b/config/api/category/summary-searchable.php
new file mode 100644
index 00000000..5ebb8cc8
--- /dev/null
+++ b/config/api/category/summary-searchable.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name',
+    'description'
+];

From 1b83e32f53b2e23d969c6c38424fd2bab1571710 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 1 Jun 2020 15:41:38 +0100
Subject: [PATCH 23/36] Added search to subcategories summary

- Added search to subcatgories summary endpoint
---
 app/Http/Controllers/Summary/CategoryController.php    |  1 +
 app/Http/Controllers/Summary/SubcategoryController.php | 10 +++++++++-
 config/api/subcategory/summary-searchable.php          |  8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 config/api/subcategory/summary-searchable.php

diff --git a/app/Http/Controllers/Summary/CategoryController.php b/app/Http/Controllers/Summary/CategoryController.php
index 6dfd6809..ef8116a8 100644
--- a/app/Http/Controllers/Summary/CategoryController.php
+++ b/app/Http/Controllers/Summary/CategoryController.php
@@ -82,6 +82,7 @@ public function optionsIndex($resource_type_id): JsonResponse
         $get = Get::init()->
             setDescription('route-descriptions.summary_category_GET_index')->
             setAuthenticationStatus($permissions['view'])->
+            setSearchable('api.category.summary-searchable')->
             option();
 
         return $this->optionsResponse($get, 200);
diff --git a/app/Http/Controllers/Summary/SubcategoryController.php b/app/Http/Controllers/Summary/SubcategoryController.php
index 887680ec..32addb54 100644
--- a/app/Http/Controllers/Summary/SubcategoryController.php
+++ b/app/Http/Controllers/Summary/SubcategoryController.php
@@ -8,7 +8,9 @@
 use App\Utilities\Header;
 use App\Utilities\RoutePermission;
 use App\Validators\Route;
+use App\Validators\SearchParameters;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Summary controller for the subcategories routes
@@ -35,9 +37,14 @@ public function index($resource_type_id, $category_id): JsonResponse
             $this->permitted_resource_types
         );
 
+        $search_parameters = SearchParameters::fetch(
+            Config::get('api.subcategory.summary-searchable')
+        );
+
         $summary = (new Subcategory())->totalCount(
             $resource_type_id,
-            $category_id
+            $category_id,
+            $search_parameters
         );
 
         $headers = new Header();
@@ -79,6 +86,7 @@ public function optionsIndex($resource_type_id, $category_id): JsonResponse
         $get = Get::init()->
             setDescription('route-descriptions.summary_subcategory_GET_index')->
             setAuthenticationStatus($permissions['view'])->
+            setSearchable('api.subcategory.summary-searchable')->
             option();
 
         return $this->optionsResponse($get, 200);
diff --git a/config/api/subcategory/summary-searchable.php b/config/api/subcategory/summary-searchable.php
new file mode 100644
index 00000000..5ebb8cc8
--- /dev/null
+++ b/config/api/subcategory/summary-searchable.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name',
+    'description'
+];

From acbcc7d52d26d1179a9d942dc5c6300b2709bf0d Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 1 Jun 2020 15:50:25 +0100
Subject: [PATCH 24/36] Resources summary

- Added search to resources summary
---
 app/Http/Controllers/Summary/ResourceController.php | 10 +++++++++-
 config/api/resource/summary-searchable.php          |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 config/api/resource/summary-searchable.php

diff --git a/app/Http/Controllers/Summary/ResourceController.php b/app/Http/Controllers/Summary/ResourceController.php
index c65b87f7..bd4f5f87 100644
--- a/app/Http/Controllers/Summary/ResourceController.php
+++ b/app/Http/Controllers/Summary/ResourceController.php
@@ -8,7 +8,9 @@
 use App\Utilities\RoutePermission;
 use App\Validators\Route;
 use App\Models\Summary\Resource;
+use App\Validators\SearchParameters;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Summary controller for the resource routes
@@ -33,10 +35,15 @@ public function index(string $resource_type_id): JsonResponse
             $this->permitted_resource_types
         );
 
+        $search_parameters = SearchParameters::fetch(
+            Config::get('api.resource.summary-searchable')
+        );
+
         $summary = (new Resource())->totalCount(
             $resource_type_id,
             $this->permitted_resource_types,
-            $this->include_public
+            $this->include_public,
+            $search_parameters
         );
 
         $headers = new Header();
@@ -76,6 +83,7 @@ public function optionsIndex(string $resource_type_id): JsonResponse
             setParameters('api.resource.summary-parameters')->
             setDescription('route-descriptions.summary-resource-GET-index')->
             setAuthenticationStatus($permissions['view'])->
+            setSearchable('api.resource.summary-searchable')->
             option();
 
         return $this->optionsResponse($get, 200);
diff --git a/config/api/resource/summary-searchable.php b/config/api/resource/summary-searchable.php
new file mode 100644
index 00000000..5ebb8cc8
--- /dev/null
+++ b/config/api/resource/summary-searchable.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name',
+    'description'
+];

From c4d188e451c365bc7d321b93bc1699154cacaca8 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 1 Jun 2020 15:58:32 +0100
Subject: [PATCH 25/36] Search resource type summary

- Search added resource type summary
---
 .../Controllers/Summary/ResourceTypeController.php     | 10 +++++++++-
 config/api/resource-type/summary-searchable.php        |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 config/api/resource-type/summary-searchable.php

diff --git a/app/Http/Controllers/Summary/ResourceTypeController.php b/app/Http/Controllers/Summary/ResourceTypeController.php
index 38b23211..4f452956 100644
--- a/app/Http/Controllers/Summary/ResourceTypeController.php
+++ b/app/Http/Controllers/Summary/ResourceTypeController.php
@@ -6,7 +6,9 @@
 use App\Models\Summary\ResourceType;
 use App\Option\Get;
 use App\Utilities\Header;
+use App\Validators\SearchParameters;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Summary controller for the resource-type routes
@@ -24,9 +26,14 @@ class ResourceTypeController extends Controller
      */
     public function index(): JsonResponse
     {
+        $search_parameters = SearchParameters::fetch(
+            Config::get('api.resource-type.summary-searchable')
+        );
+
         $summary = (new ResourceType())->totalCount(
             $this->permitted_resource_types,
-            $this->include_public
+            $this->include_public,
+            $search_parameters
         );
 
         $headers = new Header();
@@ -54,6 +61,7 @@ public function optionsIndex(): JsonResponse
             setParameters('api.resource-type.summary-parameters')->
             setDescription('route-descriptions.summary-resource-type-GET-index')->
             setAuthenticationStatus(($this->user_id !== null) ? true : false)->
+            setSearchable('api.resource-type.summary-searchable')->
             option();
 
         return $this->optionsResponse($get, 200);
diff --git a/config/api/resource-type/summary-searchable.php b/config/api/resource-type/summary-searchable.php
new file mode 100644
index 00000000..5ebb8cc8
--- /dev/null
+++ b/config/api/resource-type/summary-searchable.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name',
+    'description'
+];

From 11c3fcaa0a885a14d42615a8b0af8ec58c079bf9 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Mon, 1 Jun 2020 23:46:13 +0100
Subject: [PATCH 26/36] Filter transfers list

- Added the ability to filter the transfers collection by item ID
---
 .../Controllers/ItemTransferController.php    | 13 +++++++++++--
 app/Http/Middleware/ConvertGetParameters.php  |  1 +
 app/Models/ItemTransfer.php                   | 19 +++++++++++++++++--
 config/api/item-transfer/parameters.php       | 16 ++++++++++++++++
 .../lang/en/item-transfer/parameters.php      |  8 ++++++++
 5 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 config/api/item-transfer/parameters.php
 create mode 100644 resources/lang/en/item-transfer/parameters.php

diff --git a/app/Http/Controllers/ItemTransferController.php b/app/Http/Controllers/ItemTransferController.php
index ddbb1eef..8078fcb0 100644
--- a/app/Http/Controllers/ItemTransferController.php
+++ b/app/Http/Controllers/ItemTransferController.php
@@ -14,11 +14,13 @@
 use App\Utilities\Response as UtilityResponse;
 use App\Utilities\RoutePermission;
 use App\Validators\Fields\ItemTransfer as ItemTransferValidator;
+use App\Validators\Parameters;
 use App\Validators\Route;
 use Exception;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Transfer items
@@ -43,10 +45,15 @@ public function index($resource_type_id): JsonResponse
             $this->permitted_resource_types
         );
 
+        $parameters = Parameters::fetch(
+            array_keys(Config::get('api.item-transfer.parameters.collection'))
+        );
+
         $total = (new ItemTransfer())->total(
             (int) $resource_type_id,
             $this->permitted_resource_types,
-            $this->include_public
+            $this->include_public,
+            $parameters
         );
 
         $pagination = UtilityPagination::init(
@@ -62,7 +69,8 @@ public function index($resource_type_id): JsonResponse
             $this->permitted_resource_types,
             $this->include_public,
             $pagination['offset'],
-            $pagination['limit']
+            $pagination['limit'],
+            $parameters
         );
 
         $headers = new Header();
@@ -100,6 +108,7 @@ public function optionsIndex($resource_type_id): JsonResponse
         );
 
         $get = Get::init()->
+            setParameters('api.item-transfer.parameters.collection')->
             setPagination(true)->
             setAuthenticationStatus($permissions['view'])->
             setDescription('route-descriptions.item_transfer_GET_index')->
diff --git a/app/Http/Middleware/ConvertGetParameters.php b/app/Http/Middleware/ConvertGetParameters.php
index 8846f7d6..dd19f3f9 100644
--- a/app/Http/Middleware/ConvertGetParameters.php
+++ b/app/Http/Middleware/ConvertGetParameters.php
@@ -33,6 +33,7 @@ public function handle($request, Closure $next)
             'category' => new Hashids($config['category'], $min_length),
             'subcategory' => new Hashids($config['subcategory'], $min_length),
             'resource-type' => new Hashids($config['resource_type'], $min_length),
+            'item' => new Hashids($config['item'], $min_length)
         ];
 
         $params_to_convert = array_keys($parameters);
diff --git a/app/Models/ItemTransfer.php b/app/Models/ItemTransfer.php
index 27d1c514..4916b4e4 100644
--- a/app/Models/ItemTransfer.php
+++ b/app/Models/ItemTransfer.php
@@ -3,6 +3,7 @@
 
 namespace App\Models;
 
+use App\Utilities\General;
 use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Model;
@@ -29,6 +30,7 @@ class ItemTransfer extends Model
      * @param boolean $include_public
      * @param integer $offset
      * @param integer $limit
+     * @param array $parameters
      *
      * @return array
      */
@@ -37,7 +39,8 @@ public function paginatedCollection(
         array $permitted_resource_types,
         bool $include_public,
         int $offset = 0,
-        int $limit = 10
+        int $limit = 10,
+        array $parameters = []
     ): array {
         $collection = $this->select(
                 $this->table . '.id',
@@ -57,6 +60,11 @@ public function paginatedCollection(
             join("users",$this->table . ".transferred_by","users.id")->
             where($this->table .'.resource_type_id', '=', $resource_type_id);
 
+        if (array_key_exists('item', $parameters) === true &&
+            $parameters['item'] !== null) {
+            $collection->where($this->table .'.item_id', '=', $parameters['item']);
+        }
+
         $collection = ModelUtility::applyResourceTypeCollectionCondition(
             $collection,
             $permitted_resource_types,
@@ -113,13 +121,15 @@ public function single(
      * @param integer $resource_type_id
      * @param array $permitted_resource_types
      * @param boolean $include_public
+     * @param array $parameters
      *
      * @return integer
      */
     public function total(
         int $resource_type_id,
         array $permitted_resource_types,
-        bool $include_public
+        bool $include_public,
+        array $parameters = []
     ): int
     {
         $collection = $this->select($this->table . '.id')->
@@ -130,6 +140,11 @@ public function total(
             join("users",$this->table . ".transferred_by","users.id")->
             where($this->table .'.resource_type_id', '=', $resource_type_id);
 
+        if (array_key_exists('item', $parameters) === true &&
+            $parameters['item'] !== null) {
+            $collection->where($this->table .'.item_id', '=', $parameters['item']);
+        }
+
         $collection = ModelUtility::applyResourceTypeCollectionCondition(
             $collection,
             $permitted_resource_types,
diff --git a/config/api/item-transfer/parameters.php b/config/api/item-transfer/parameters.php
new file mode 100644
index 00000000..6f64a45c
--- /dev/null
+++ b/config/api/item-transfer/parameters.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'collection' => [
+        'item' => [
+            'field' => 'item',
+            'title' => 'item-transfer/parameters.title-item',
+            'description' => 'item-transfer/parameters.description-item',
+            'type' => 'boolean',
+            'required' => false
+        ]
+    ],
+    'item' => []
+];
diff --git a/resources/lang/en/item-transfer/parameters.php b/resources/lang/en/item-transfer/parameters.php
new file mode 100644
index 00000000..ba53f63f
--- /dev/null
+++ b/resources/lang/en/item-transfer/parameters.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'title-item' => 'Item',
+    'description-item' => 'Show results for the requested item only'
+];

From a1b5c10102ce51acdd1ccfe8064fcb553648a425 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Tue, 2 Jun 2020 00:03:34 +0100
Subject: [PATCH 27/36] Filter partial transfers

- Added filtering to the partial transfers collection
---
 .../ItemPartialTransferController.php         | 13 ++++-
 app/Models/ItemPartialTransfer.php            | 52 ++++++++++++-------
 .../api/item-partial-transfer/parameters.php  | 16 ++++++
 config/api/item-transfer/parameters.php       |  2 +-
 .../en/item-partial-transfer/parameters.php   |  8 +++
 5 files changed, 69 insertions(+), 22 deletions(-)
 create mode 100644 config/api/item-partial-transfer/parameters.php
 create mode 100644 resources/lang/en/item-partial-transfer/parameters.php

diff --git a/app/Http/Controllers/ItemPartialTransferController.php b/app/Http/Controllers/ItemPartialTransferController.php
index 20638202..f71fc319 100644
--- a/app/Http/Controllers/ItemPartialTransferController.php
+++ b/app/Http/Controllers/ItemPartialTransferController.php
@@ -14,11 +14,13 @@
 use App\Utilities\Response as UtilityResponse;
 use App\Utilities\RoutePermission;
 use App\Validators\Fields\ItemPartialTransfer as ItemPartialTransferValidator;
+use App\Validators\Parameters;
 use App\Validators\Route;
 use Exception;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Config;
 use Monolog\Utils;
 
 /**
@@ -44,10 +46,15 @@ public function index($resource_type_id): JsonResponse
             $this->permitted_resource_types
         );
 
+        $parameters = Parameters::fetch(
+            array_keys(Config::get('api.item-transfer.parameters.collection'))
+        );
+
         $total = (new ItemPartialTransfer())->total(
             (int) $resource_type_id,
             $this->permitted_resource_types,
-            $this->include_public
+            $this->include_public,
+            $parameters
         );
 
         $pagination = UtilityPagination::init(
@@ -63,7 +70,8 @@ public function index($resource_type_id): JsonResponse
             $this->permitted_resource_types,
             $this->include_public,
             $pagination['offset'],
-            $pagination['limit']
+            $pagination['limit'],
+            $parameters
         );
 
         $headers = new Header();
@@ -232,6 +240,7 @@ public function optionsIndex($resource_type_id): JsonResponse
         );
 
         $get = Get::init()->
+            setParameters('api.item-partial-transfer.parameters.collection')->
             setPagination(true)->
             setAuthenticationStatus($permissions['view'])->
             setDescription('route-descriptions.item_partial_transfer_GET_index')->
diff --git a/app/Models/ItemPartialTransfer.php b/app/Models/ItemPartialTransfer.php
index 66883381..08ef37a6 100644
--- a/app/Models/ItemPartialTransfer.php
+++ b/app/Models/ItemPartialTransfer.php
@@ -29,6 +29,7 @@ class ItemPartialTransfer extends Model
      * @param boolean $include_public
      * @param integer $offset
      * @param integer $limit
+     * @param array $parameters
      *
      * @return array
      */
@@ -37,26 +38,32 @@ public function paginatedCollection(
         array $permitted_resource_types,
         bool $include_public,
         int $offset = 0,
-        int $limit = 10
+        int $limit = 10,
+        array $parameters = []
     ): array {
         $collection = $this->select(
-            $this->table . '.id',
-            $this->table . '.percentage',
-            $this->table . '.item_id',
-            $this->table . '.created_at',
-            'from_resource.id AS from_resource_id',
-            'from_resource.name AS from_resource_name',
-            'to_resource.id AS to_resource_id',
-            'to_resource.name AS to_resource_name',
-            'users.id AS user_id',
-            'users.name AS user_name'
-        )->
-        join("resource_type",$this->table . ".resource_type_id","resource_type.id")->
-        join("resource AS from_resource",$this->table . ".from","from_resource.id")->
-        join("resource AS to_resource",$this->table . ".to","to_resource.id")->
-        join("item",$this->table . ".item_id","item.id")->
-        join("users",$this->table . ".transferred_by","users.id")->
-        where($this->table .'.resource_type_id', '=', $resource_type_id);
+                $this->table . '.id',
+                $this->table . '.percentage',
+                $this->table . '.item_id',
+                $this->table . '.created_at',
+                'from_resource.id AS from_resource_id',
+                'from_resource.name AS from_resource_name',
+                'to_resource.id AS to_resource_id',
+                'to_resource.name AS to_resource_name',
+                'users.id AS user_id',
+                'users.name AS user_name'
+            )->
+            join("resource_type",$this->table . ".resource_type_id","resource_type.id")->
+            join("resource AS from_resource",$this->table . ".from","from_resource.id")->
+            join("resource AS to_resource",$this->table . ".to","to_resource.id")->
+            join("item",$this->table . ".item_id","item.id")->
+            join("users",$this->table . ".transferred_by","users.id")->
+            where($this->table .'.resource_type_id', '=', $resource_type_id);
+
+        if (array_key_exists('item', $parameters) === true &&
+            $parameters['item'] !== null) {
+            $collection->where($this->table .'.item_id', '=', $parameters['item']);
+        }
 
         $collection = ModelUtility::applyResourceTypeCollectionCondition(
             $collection,
@@ -115,13 +122,15 @@ public function single(
      * @param integer $resource_type_id
      * @param array $permitted_resource_types
      * @param boolean $include_public
+     * @param array $parameters
      *
      * @return integer
      */
     public function total(
         int $resource_type_id,
         array $permitted_resource_types,
-        bool $include_public
+        bool $include_public,
+        array $parameters = []
     ): int
     {
         $collection = $this->select($this->table . '.id')->
@@ -132,6 +141,11 @@ public function total(
             join("users",$this->table . ".transferred_by","users.id")->
             where($this->table .'.resource_type_id', '=', $resource_type_id);
 
+        if (array_key_exists('item', $parameters) === true &&
+            $parameters['item'] !== null) {
+            $collection->where($this->table .'.item_id', '=', $parameters['item']);
+        }
+
         $collection = ModelUtility::applyResourceTypeCollectionCondition(
             $collection,
             $permitted_resource_types,
diff --git a/config/api/item-partial-transfer/parameters.php b/config/api/item-partial-transfer/parameters.php
new file mode 100644
index 00000000..dac8c214
--- /dev/null
+++ b/config/api/item-partial-transfer/parameters.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'collection' => [
+        'item' => [
+            'field' => 'item',
+            'title' => 'item-partial-transfer/parameters.title-item',
+            'description' => 'item-partial-transfer/parameters.description-item',
+            'type' => 'string',
+            'required' => false
+        ]
+    ],
+    'item' => []
+];
diff --git a/config/api/item-transfer/parameters.php b/config/api/item-transfer/parameters.php
index 6f64a45c..7e7f1db3 100644
--- a/config/api/item-transfer/parameters.php
+++ b/config/api/item-transfer/parameters.php
@@ -8,7 +8,7 @@
             'field' => 'item',
             'title' => 'item-transfer/parameters.title-item',
             'description' => 'item-transfer/parameters.description-item',
-            'type' => 'boolean',
+            'type' => 'string',
             'required' => false
         ]
     ],
diff --git a/resources/lang/en/item-partial-transfer/parameters.php b/resources/lang/en/item-partial-transfer/parameters.php
new file mode 100644
index 00000000..ba53f63f
--- /dev/null
+++ b/resources/lang/en/item-partial-transfer/parameters.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'title-item' => 'Item',
+    'description-item' => 'Show results for the requested item only'
+];

From 25c88966bfad42bd1495229ccbeb1cbe18f1b58b Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Tue, 2 Jun 2020 15:55:37 +0100
Subject: [PATCH 28/36] Searchable arrays

- We have updated all the searchable arrsy to show the required data type, as per filterable.
---
 config/api/category/searchable.php                        | 8 ++++++--
 config/api/item-type-allocated-expense/searchable.php     | 8 ++++++--
 config/api/item-type-simple-expense/searchable.php        | 8 ++++++--
 config/api/item-type-simple-item/searchable.php           | 8 ++++++--
 config/api/item-type/searchable.php                       | 8 ++++++--
 config/api/permitted-user/searchable.php                  | 8 ++++++--
 .../searchable.php                                        | 8 ++++++--
 .../resource-type-item-type-simple-expense/searchable.php | 8 ++++++--
 .../resource-type-item-type-simple-item/searchable.php    | 8 ++++++--
 config/api/resource-type/searchable.php                   | 8 ++++++--
 config/api/resource/searchable.php                        | 8 ++++++--
 config/api/subcategory/searchable.php                     | 8 ++++++--
 12 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/config/api/category/searchable.php b/config/api/category/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/category/searchable.php
+++ b/config/api/category/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/item-type-allocated-expense/searchable.php b/config/api/item-type-allocated-expense/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/item-type-allocated-expense/searchable.php
+++ b/config/api/item-type-allocated-expense/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/item-type-simple-expense/searchable.php b/config/api/item-type-simple-expense/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/item-type-simple-expense/searchable.php
+++ b/config/api/item-type-simple-expense/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/item-type-simple-item/searchable.php b/config/api/item-type-simple-item/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/item-type-simple-item/searchable.php
+++ b/config/api/item-type-simple-item/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/item-type/searchable.php b/config/api/item-type/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/item-type/searchable.php
+++ b/config/api/item-type/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/permitted-user/searchable.php b/config/api/permitted-user/searchable.php
index 94996e23..83b6e63a 100644
--- a/config/api/permitted-user/searchable.php
+++ b/config/api/permitted-user/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'email'
+    'name' => [
+        'type' => 'string'
+    ],
+    'email' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource-type-item-type-allocated-expense/searchable.php b/config/api/resource-type-item-type-allocated-expense/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource-type-item-type-allocated-expense/searchable.php
+++ b/config/api/resource-type-item-type-allocated-expense/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource-type-item-type-simple-expense/searchable.php b/config/api/resource-type-item-type-simple-expense/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource-type-item-type-simple-expense/searchable.php
+++ b/config/api/resource-type-item-type-simple-expense/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource-type-item-type-simple-item/searchable.php b/config/api/resource-type-item-type-simple-item/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource-type-item-type-simple-item/searchable.php
+++ b/config/api/resource-type-item-type-simple-item/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource-type/searchable.php b/config/api/resource-type/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource-type/searchable.php
+++ b/config/api/resource-type/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource/searchable.php b/config/api/resource/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource/searchable.php
+++ b/config/api/resource/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/subcategory/searchable.php b/config/api/subcategory/searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/subcategory/searchable.php
+++ b/config/api/subcategory/searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];

From 56afc1ee154356317be1cebffcbffdf39ff28617 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Wed, 3 Jun 2020 15:58:37 +0100
Subject: [PATCH 29/36] Format of searchable array changed

- The format of the searchable array changed so we only need the keys
---
 app/Http/Controllers/CategoryController.php               | 2 +-
 app/Http/Controllers/ItemTypeController.php               | 3 ++-
 app/Http/Controllers/PermittedUserController.php          | 2 +-
 app/Http/Controllers/ResourceController.php               | 2 +-
 app/Http/Controllers/ResourceTypeController.php           | 2 +-
 app/Http/Controllers/SubcategoryController.php            | 2 +-
 app/Http/Controllers/Summary/CategoryController.php       | 2 +-
 app/Http/Controllers/Summary/ResourceController.php       | 2 +-
 app/Http/Controllers/Summary/ResourceTypeController.php   | 2 +-
 app/Http/Controllers/Summary/SubcategoryController.php    | 2 +-
 app/Item/AbstractItem.php                                 | 2 +-
 app/Item/Summary/AbstractItem.php                         | 2 +-
 app/ResourceTypeItem/AbstractItem.php                     | 2 +-
 app/ResourceTypeItem/Summary/AbstractItem.php             | 2 +-
 config/api/category/summary-searchable.php                | 8 ++++++--
 .../item-type-allocated-expense/summary-searchable.php    | 8 ++++++--
 .../api/item-type-simple-expense/summary-searchable.php   | 8 ++++++--
 config/api/item-type-simple-item/summary-searchable.php   | 8 ++++++--
 .../summary-searchable.php                                | 8 ++++++--
 .../summary-searchable.php                                | 8 ++++++--
 .../summary-searchable.php                                | 8 ++++++--
 config/api/resource-type/summary-searchable.php           | 8 ++++++--
 config/api/resource/summary-searchable.php                | 8 ++++++--
 config/api/subcategory/summary-searchable.php             | 8 ++++++--
 24 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 09823cf8..330bd328 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -48,7 +48,7 @@ public function index($resource_type_id): JsonResponse
         );
 
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.category.searchable')
+            array_keys(Config::get('api.category.searchable'))
         );
 
         $total = (new Category())->total(
diff --git a/app/Http/Controllers/ItemTypeController.php b/app/Http/Controllers/ItemTypeController.php
index 7657bc5f..99bf18ef 100644
--- a/app/Http/Controllers/ItemTypeController.php
+++ b/app/Http/Controllers/ItemTypeController.php
@@ -33,7 +33,7 @@ class ItemTypeController extends Controller
     public function index(): JsonResponse
     {
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.item-type.searchable')
+            array_keys(Config::get('api.item-type.searchable'))
         );
 
         $total = (new ItemType())->totalCount($search_parameters);
@@ -52,6 +52,7 @@ public function index(): JsonResponse
             setSortParameters($sort_parameters)->
             paging();
 
+
         $item_types = (new ItemType())->paginatedCollection(
             $pagination['offset'],
             $pagination['limit'],
diff --git a/app/Http/Controllers/PermittedUserController.php b/app/Http/Controllers/PermittedUserController.php
index 644b5bc3..a4988f3e 100644
--- a/app/Http/Controllers/PermittedUserController.php
+++ b/app/Http/Controllers/PermittedUserController.php
@@ -41,7 +41,7 @@ public function index(string $resource_type_id): JsonResponse
         );
 
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.permitted-user.searchable')
+            array_keys(Config::get('api.permitted-user.searchable'))
         );
 
         $total = (new PermittedUser())->totalCount(
diff --git a/app/Http/Controllers/ResourceController.php b/app/Http/Controllers/ResourceController.php
index 8bc0e175..ec11f21b 100644
--- a/app/Http/Controllers/ResourceController.php
+++ b/app/Http/Controllers/ResourceController.php
@@ -48,7 +48,7 @@ public function index(string $resource_type_id): JsonResponse
         );
 
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.resource.searchable')
+            array_keys(Config::get('api.resource.searchable'))
         );
 
         $total = (new Resource())->totalCount(
diff --git a/app/Http/Controllers/ResourceTypeController.php b/app/Http/Controllers/ResourceTypeController.php
index c0f2e243..3eac897b 100644
--- a/app/Http/Controllers/ResourceTypeController.php
+++ b/app/Http/Controllers/ResourceTypeController.php
@@ -48,7 +48,7 @@ class ResourceTypeController extends Controller
     public function index(): JsonResponse
     {
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.resource-type.searchable')
+            array_keys(Config::get('api.resource-type.searchable'))
         );
 
         $total = (new ResourceType())->totalCount(
diff --git a/app/Http/Controllers/SubcategoryController.php b/app/Http/Controllers/SubcategoryController.php
index 511e32a1..5baef76f 100644
--- a/app/Http/Controllers/SubcategoryController.php
+++ b/app/Http/Controllers/SubcategoryController.php
@@ -50,7 +50,7 @@ public function index($resource_type_id, $category_id): JsonResponse
         );
 
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.subcategory.searchable')
+            array_keys(Config::get('api.subcategory.searchable'))
         );
 
         $total = (new Subcategory())->totalCount(
diff --git a/app/Http/Controllers/Summary/CategoryController.php b/app/Http/Controllers/Summary/CategoryController.php
index ef8116a8..152a0f70 100644
--- a/app/Http/Controllers/Summary/CategoryController.php
+++ b/app/Http/Controllers/Summary/CategoryController.php
@@ -36,7 +36,7 @@ public function index($resource_type_id): JsonResponse
         );
 
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.category.summary-searchable')
+            array_keys(Config::get('api.category.summary-searchable'))
         );
 
         $summary = (new Category())->total(
diff --git a/app/Http/Controllers/Summary/ResourceController.php b/app/Http/Controllers/Summary/ResourceController.php
index bd4f5f87..82d3cddd 100644
--- a/app/Http/Controllers/Summary/ResourceController.php
+++ b/app/Http/Controllers/Summary/ResourceController.php
@@ -36,7 +36,7 @@ public function index(string $resource_type_id): JsonResponse
         );
 
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.resource.summary-searchable')
+            array_keys(Config::get('api.resource.summary-searchable'))
         );
 
         $summary = (new Resource())->totalCount(
diff --git a/app/Http/Controllers/Summary/ResourceTypeController.php b/app/Http/Controllers/Summary/ResourceTypeController.php
index 4f452956..69a83398 100644
--- a/app/Http/Controllers/Summary/ResourceTypeController.php
+++ b/app/Http/Controllers/Summary/ResourceTypeController.php
@@ -27,7 +27,7 @@ class ResourceTypeController extends Controller
     public function index(): JsonResponse
     {
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.resource-type.summary-searchable')
+            array_keys(Config::get('api.resource-type.summary-searchable'))
         );
 
         $summary = (new ResourceType())->totalCount(
diff --git a/app/Http/Controllers/Summary/SubcategoryController.php b/app/Http/Controllers/Summary/SubcategoryController.php
index 32addb54..c45feccf 100644
--- a/app/Http/Controllers/Summary/SubcategoryController.php
+++ b/app/Http/Controllers/Summary/SubcategoryController.php
@@ -38,7 +38,7 @@ public function index($resource_type_id, $category_id): JsonResponse
         );
 
         $search_parameters = SearchParameters::fetch(
-            Config::get('api.subcategory.summary-searchable')
+            array_keys(Config::get('api.subcategory.summary-searchable'))
         );
 
         $summary = (new Subcategory())->totalCount(
diff --git a/app/Item/AbstractItem.php b/app/Item/AbstractItem.php
index a1a5158d..da62c4fc 100644
--- a/app/Item/AbstractItem.php
+++ b/app/Item/AbstractItem.php
@@ -108,7 +108,7 @@ abstract public function filterParametersConfig(): string;
      */
     public function searchParameters(): array
     {
-        return Config::get($this->searchParametersConfig());
+        return array_keys(Config::get($this->searchParametersConfig()));
     }
 
     /**
diff --git a/app/Item/Summary/AbstractItem.php b/app/Item/Summary/AbstractItem.php
index b445baa3..a77c08a8 100644
--- a/app/Item/Summary/AbstractItem.php
+++ b/app/Item/Summary/AbstractItem.php
@@ -69,7 +69,7 @@ abstract public function model(): ISummaryModel;
      */
     public function searchParameters(): array
     {
-        return Config::get($this->searchParametersConfig());
+        return array_keys(Config::get($this->searchParametersConfig()));
     }
 
     /**
diff --git a/app/ResourceTypeItem/AbstractItem.php b/app/ResourceTypeItem/AbstractItem.php
index 62e1ad3b..548d826e 100644
--- a/app/ResourceTypeItem/AbstractItem.php
+++ b/app/ResourceTypeItem/AbstractItem.php
@@ -82,7 +82,7 @@ abstract public function model(): IModel;
      */
     public function searchParameters(): array
     {
-        return Config::get($this->searchParametersConfig());
+        return array_keys(Config::get($this->searchParametersConfig()));
     }
 
     /**
diff --git a/app/ResourceTypeItem/Summary/AbstractItem.php b/app/ResourceTypeItem/Summary/AbstractItem.php
index 30d949aa..5f987def 100644
--- a/app/ResourceTypeItem/Summary/AbstractItem.php
+++ b/app/ResourceTypeItem/Summary/AbstractItem.php
@@ -69,7 +69,7 @@ abstract public function model(): ISummaryModel;
      */
     public function searchParameters(): array
     {
-        return Config::get($this->searchParametersConfig());
+        return array_keys(Config::get($this->searchParametersConfig()));
     }
 
     /**
diff --git a/config/api/category/summary-searchable.php b/config/api/category/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/category/summary-searchable.php
+++ b/config/api/category/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/item-type-allocated-expense/summary-searchable.php b/config/api/item-type-allocated-expense/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/item-type-allocated-expense/summary-searchable.php
+++ b/config/api/item-type-allocated-expense/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/item-type-simple-expense/summary-searchable.php b/config/api/item-type-simple-expense/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/item-type-simple-expense/summary-searchable.php
+++ b/config/api/item-type-simple-expense/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/item-type-simple-item/summary-searchable.php b/config/api/item-type-simple-item/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/item-type-simple-item/summary-searchable.php
+++ b/config/api/item-type-simple-item/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource-type-item-type-allocated-expense/summary-searchable.php b/config/api/resource-type-item-type-allocated-expense/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource-type-item-type-allocated-expense/summary-searchable.php
+++ b/config/api/resource-type-item-type-allocated-expense/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource-type-item-type-simple-expense/summary-searchable.php b/config/api/resource-type-item-type-simple-expense/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource-type-item-type-simple-expense/summary-searchable.php
+++ b/config/api/resource-type-item-type-simple-expense/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource-type-item-type-simple-item/summary-searchable.php b/config/api/resource-type-item-type-simple-item/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource-type-item-type-simple-item/summary-searchable.php
+++ b/config/api/resource-type-item-type-simple-item/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource-type/summary-searchable.php b/config/api/resource-type/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource-type/summary-searchable.php
+++ b/config/api/resource-type/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/resource/summary-searchable.php b/config/api/resource/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/resource/summary-searchable.php
+++ b/config/api/resource/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];
diff --git a/config/api/subcategory/summary-searchable.php b/config/api/subcategory/summary-searchable.php
index 5ebb8cc8..f1387a77 100644
--- a/config/api/subcategory/summary-searchable.php
+++ b/config/api/subcategory/summary-searchable.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
-    'name',
-    'description'
+    'name' => [
+        'type' => 'string'
+    ],
+    'description' => [
+        'type' => 'string'
+    ]
 ];

From 4918835523804664ee153b568b14aed49033a89f Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 5 Jun 2020 00:26:51 +0100
Subject: [PATCH 30/36] Don't allow delete if categories are assigned

- Stop item removal
---
 app/Http/Controllers/ItemController.php |  5 +++++
 app/Interfaces/Item/IModel.php          |  2 ++
 app/Models/Item/AllocatedExpense.php    | 18 ++++++++++++++++++
 app/Models/Item/SimpleExpense.php       | 18 ++++++++++++++++++
 app/Models/Item/SimpleItem.php          |  5 +++++
 5 files changed, 48 insertions(+)

diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 97711a2f..6e6961fb 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -452,6 +452,11 @@ public function delete(
             UtilityResponse::notFound(trans('entities.item'));
         }
 
+        if (in_array($item_interface->type(), ['allocated-expense', 'simple-expense']) &&
+            $item_model->hasCategoryAssignments($item_id) === true) {
+                UtilityResponse::foreignKeyConstraintError();
+        }
+
         try {
             (new ItemTransfer())->deleteTransfers($item_id);
             $item_type->delete();
diff --git a/app/Interfaces/Item/IModel.php b/app/Interfaces/Item/IModel.php
index b99ef736..dc1cc4a5 100644
--- a/app/Interfaces/Item/IModel.php
+++ b/app/Interfaces/Item/IModel.php
@@ -12,6 +12,8 @@
  */
 interface IModel
 {
+    public function hasCategoryAssignments(int $item_id): bool;
+
     /**
      * Return an instance of the relevant item model
      *
diff --git a/app/Models/Item/AllocatedExpense.php b/app/Models/Item/AllocatedExpense.php
index f03ff16a..89909e62 100644
--- a/app/Models/Item/AllocatedExpense.php
+++ b/app/Models/Item/AllocatedExpense.php
@@ -420,4 +420,22 @@ public function paginatedCollection(
             get()->
             toArray();
     }
+
+    public function hasCategoryAssignments(int $item_id): bool
+    {
+        $assignments = $this->from('item')->
+            leftJoin('item_category', 'item.id', '=', 'item_category.item_id')->
+            leftJoin('item_sub_category', 'item_category.id', '=', 'item_sub_category.item_category_id')->
+            where('item.id', '=', $item_id)->
+            select('item_category.id AS item_category_id', 'item_sub_category.id AS item_sub_category_id')->
+            first();
+
+        if ($assignments !== null) {
+            $categories = $assignments->toArray();
+
+            return $categories['item_category_id'] !== null || $categories['item_sub_category_id'] !== null;
+        }
+
+        return false;
+    }
 }
diff --git a/app/Models/Item/SimpleExpense.php b/app/Models/Item/SimpleExpense.php
index 36c45c78..de578d1a 100644
--- a/app/Models/Item/SimpleExpense.php
+++ b/app/Models/Item/SimpleExpense.php
@@ -320,4 +320,22 @@ public function paginatedCollection(
             get()->
             toArray();
     }
+
+    public function hasCategoryAssignments(int $item_id): bool
+    {
+        $assignments = $this->from('item')->
+        leftJoin('item_category', 'item.id', '=', 'item_category.item_id')->
+        leftJoin('item_sub_category', 'item_category.id', '=', 'item_sub_category.item_category_id')->
+        where('item.id', '=', $item_id)->
+        select('item_category.id AS item_category_id', 'item_sub_category.id AS item_sub_category_id')->
+        first();
+
+        if ($assignments !== null) {
+            $categories = $assignments->toArray();
+
+            return $categories['item_category_id'] !== null || $categories['item_sub_category_id'] !== null;
+        }
+
+        return false;
+    }
 }
diff --git a/app/Models/Item/SimpleItem.php b/app/Models/Item/SimpleItem.php
index 8f76fe61..91d21bd9 100644
--- a/app/Models/Item/SimpleItem.php
+++ b/app/Models/Item/SimpleItem.php
@@ -213,4 +213,9 @@ public function paginatedCollection(
             get()->
             toArray();
     }
+
+    public function hasCategoryAssignments(int $item_id): bool
+    {
+        return false;
+    }
 }

From 9a5c3b6aa64b30ed9f5330de1028c11782daa748 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 5 Jun 2020 00:46:59 +0100
Subject: [PATCH 31/36] Release

- Updated the changelog.
- Set the version
---
 CHANGELOG.md                      | 30 ++++++++++++++++
 config/api/app/version.php        |  4 +--
 resources/views/welcome.blade.php | 57 +++++++++++++++----------------
 3 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16e8ff84..6eee50dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,36 @@
 
 The complete changelog for the Costs to Expect REST API, our changelog follows the format defined at https://keepachangelog.com/en/1.0.0/
 
+## [v2.11.0] - 2020-06-06
+### Added
+- We have added search to the categories summary endpoint.
+- We have added search to the subcategories summary endpoint.
+- We have added search to the resources summary endpoint.
+- We have added search to the resource-types summary endpoint.
+- We have updated the transfers collection; you can filter the results by an `item` ID.
+- We have updated the partial transfers collection; you can filter the results by an `item` ID.
+
+### Changed
+- We have added the documentation URI to the README and API; the documentation for the API is work in progress; it is almost complete.
+- We have added a version query parameter to the CSS include.
+- We have removed a unique index on the `item_transfer` table; the index was limiting the ability to transfer an item multiple times.
+- We have altered the format of the category and subcategory object for item relationships; the returned object is now a closer match to a category object.
+- We have updated the URIs for item category and subcategory assignments; the URI was singular for a collection.
+- We have updated the item delete endpoint; we did not return a conflict error before removing relationships.
+
+### Fixed
+- The `name` field now displays as a required field in the items collection OPTIONS request.
+- The `filterable` array shows in the OPTIONS response for resource type items.
+- We have updated the namespace in a model.
+- We have corrected the case of a model name.
+- We have added the migrations for the original item-types, missing from the import.
+- We have added a database migration to update the `friendly_name` and `examples` data for `item-types`.
+- We have updated the delete item request; we delete the transfer log entries for the item.
+- We have updated two `item-type` summary endpoints to show they are sortable by `name`.
+
+### Removed
+- We have removed the category and subcategory item assigned URIs and replaced them with correctly named URIs for collections.
+
 ## [v2.10.4] - 2020-05-23
 ### Fixed
 - We have adjusted the lottery value to reduce session clears.
diff --git a/config/api/app/version.php b/config/api/app/version.php
index 679eec07..d7e5b482 100644
--- a/config/api/app/version.php
+++ b/config/api/app/version.php
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 return [
-    'version'=> '2.10.4',
+    'version'=> '2.11.0',
     'prefix' => 'v2',
-    'release_date' => '2020-05-23',
+    'release_date' => '2020-06-06',
     'changelog' => [
         'api' => '/v2/changelog',
         'markdown' => 'https://github.com/costs-to-expect/api/blob/master/CHANGELOG.md'
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 181c1a6d..17b7b1b2 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -205,7 +205,7 @@ function gtag(){dataLayer.push(arguments);}
 
                     <hr />
 
-                    <h2>Latest feature release [v2.10.0]</h2>
+                    <h2>Latest feature release [v2.11.0]</h2>
 
                     <p>The latest release of the Costs to Expect API is
                         {{ $version }}; we released it on the {{ date('jS M Y', strtotime($date)) }}.</p>
@@ -216,45 +216,42 @@ function gtag(){dataLayer.push(arguments);}
                     <h3>Added</h3>
 
                     <ul>
-                        <li>We have added a new route, `/resource_types/[id]/resources/[id]/items/[id]/partial-transfer`; A partial transfer allows you to transfer a percentage of the `total` for an item from one resource to another.</li>
-                        <li>We have added an `item_transfer` table; the table will log which items were transferred and by whom.</li>
-                        <li>We have added a partial transfers collection; the route is `/resource_types/[id]/partial-transfers`.</li>
-                        <li>We have added a partial transfers item view; the route is `/resource_types/[id]/partial-transfers/[id]`.</li>
-                        <li>We have added a transfers collection; the route is `/resource_types/[id]/transfers`.</li>
-                        <li>We have added a transfers item view; the route is `/resource_types/[id]/transfers/[id]`.</li>
-                        <li>We have added a delete endpoint for partial transfers.</li>
+                        <li>We have added search to the categories summary endpoint.</li>
+                        <li>We have added search to the subcategories summary endpoint.</li>
+                        <li>We have added search to the resources summary endpoint.</li>
+                        <li>We have added search to the resource-types summary endpoint.</li>
+                        <li>We have updated the transfers collection; you can filter the results by an `item` ID.</li>
+                        <li>We have updated the partial transfers collection; you can filter the results by an `item` ID.</li>
                     </ul>
 
                     <h3>Changed</h3>
 
                     <ul>
-                        <li>We have reformatted the validation rules in the configuration files; easier to read and simpler to add additional rules.</li>
-                        <li>We have switched the HTTP status code for a "Constraint error" from 500 to 409.</li>
-                        <li>We have tweaked the description for the resource field in the `/resource_types/[id]/resources/[id]/items/[id]/transfer` OPTIONS request.</li>
-                        <li>We have renamed the third parameter of the route validation methods; we changed the name from `$manage` to `$write`.</li>
-                        <li>We have renamed a response helper method; it was not clear from the name that the method is used for updates and delete.</li>
-                        <li>We have tweaked our Docker setup to allow a local API and App/Website; the ports have been changed and a network has been created.</li>
-                        <li>We have updated all item endpoints to return `updated`; this is the date and time an item was updated, not its category assignments.</li>
-                        <li>We have updated item collection and show endpoints; we are going to allow the possibility of items not having categories and subcategories. When you add the `include-categories` and `include-subcategories` parameters to a request, we will not exclude items without category assignments.</li>
-                        <li>We have updated the API to the latest release of Laravel 7.</li>
-                        <li>We have updated the front end dependencies for the welcome page.</li>
-                        <li>We have updated the `item-types` route to show additional information on each tracking method.</li>
-                        <li>We have updated all decimal fields to 13,2 rather than 10,2.</li>
-                        <li>We have updated all description fields; we have switched all the description fields from varchar(255) to text.</li>
+                        <li>We have added the documentation URI to the README and API; the documentation for the API is work in progress; it is almost complete.</li>
+                        <li>We have added a version query parameter to the CSS include.</li>
+                        <li>We have removed a unique index on the `item_transfer` table; the index was limiting the ability to transfer an item multiple times.</li>
+                        <li>We have altered the format of the category and subcategory object for item relationships; the returned object is now a closer match to a category object.</li>
+                        <li>We have updated the URIs for item category and subcategory assignments; the URI was singular for a collection.</li>
+                        <li>We have updated the item delete endpoint; we did not return a conflict error before removing relationships.</li>
                     </ul>
 
                     <h3>Fixed</h3>
 
                     <ul>
-                        <li>It is possible to set the quantity for a `simple-item` item as zero.</li>
-                        <li>It is possible to clear optional values in a PATCH request.</li>
-                        <li>We have corrected a bad link on the landing page.</li>
-                        <li>We have corrected a typo on the landing page.</li>
-                        <li>We have switched the table we look at to return created at for an item; we should be using the sub table, not the base item table.</li>
-                        <li>We have corrected the `/resource-types/` OPTIONS request; `public` is not a required field.</li>
-                        <li>We have updated the delete resource type action; we have added additional checks before we attempt to delete, it was possible to remove relationship values which made the resource type inaccessible.</li>
-                        <li>We have adjusted the lottery value to reduce session clears.</li>
-                        <li>We have updated to v3.5.1 of Jquery, v3.5.0 was bugged.</li>
+                        <li>The `name` field now displays as a required field in the items collection OPTIONS request.</li>
+                        <li>The `filterable` array shows in the OPTIONS response for resource type items.</li>
+                        <li>We have updated the namespace in a model.</li>
+                        <li>We have corrected the case of a model name.</li>
+                        <li>We have added the migrations for the original item-types, missing from the import.</li>
+                        <li>We have added a database migration to update the `friendly_name` and `examples` data for `item-types`.</li>
+                        <li>We have updated the delete item request; we delete the transfer log entries for the item.</li>
+                        <li>We have updated two `item-type` summary endpoints to show they are sortable by `name`.</li>
+                    </ul>
+
+                    <h3>Removed</h3>
+
+                    <ul>
+                        <li>We have removed the category and subcategory item assigned URIs and replaced them with correctly named URIs for collections.</li>
                     </ul>
                 </div>
             </div>

From 131b3f34805390845b34d5b66840445854b0973d Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 5 Jun 2020 12:03:39 +0100
Subject: [PATCH 32/36] Corrected show requred type for totals

- Decimal type should show as 13,2
- Also, show the decimal should be a decimal string.
- Add max length validation of 16 characters.
- Update the changelogs
---
 CHANGELOG.md                                          | 1 +
 config/api/item-type-allocated-expense/fields.php     | 2 +-
 config/api/item-type-allocated-expense/validation.php | 3 ++-
 config/api/item-type-simple-expense/fields.php        | 2 +-
 config/api/item-type-simple-expense/validation.php    | 3 ++-
 resources/views/welcome.blade.php                     | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eee50dd..418d0f3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The complete changelog for the Costs to Expect REST API, our changelog follows t
 - We have altered the format of the category and subcategory object for item relationships; the returned object is now a closer match to a category object.
 - We have updated the URIs for item category and subcategory assignments; the URI was singular for a collection.
 - We have updated the item delete endpoint; we did not return a conflict error before removing relationships.
+- We have tweaked the `type` for expense fields; we highlight that the supplied value should be a decimal string.
 
 ### Fixed
 - The `name` field now displays as a required field in the items collection OPTIONS request.
diff --git a/config/api/item-type-allocated-expense/fields.php b/config/api/item-type-allocated-expense/fields.php
index fd0ddc39..87d9295f 100644
--- a/config/api/item-type-allocated-expense/fields.php
+++ b/config/api/item-type-allocated-expense/fields.php
@@ -38,7 +38,7 @@
         'field' => 'total',
         'title' => 'item-type-allocated-expense/fields.title-total',
         'description' => 'item-type-allocated-expense/fields.description-total',
-        'type' => 'decimal (10,2)',
+        'type' => 'decimal string (13,2)',
         'required' => true
     ],
     'percentage' => [
diff --git a/config/api/item-type-allocated-expense/validation.php b/config/api/item-type-allocated-expense/validation.php
index 4cc4e505..0994b36f 100644
--- a/config/api/item-type-allocated-expense/validation.php
+++ b/config/api/item-type-allocated-expense/validation.php
@@ -25,7 +25,8 @@
             'total' => [
                 'required',
                 'string',
-                'regex:/^\d+\.\d{2}$/'
+                'regex:/^\d+\.\d{2}$/',
+                'max:16'
             ],
             'percentage' => [
                 'sometimes',
diff --git a/config/api/item-type-simple-expense/fields.php b/config/api/item-type-simple-expense/fields.php
index 11eed4ec..35f82f58 100644
--- a/config/api/item-type-simple-expense/fields.php
+++ b/config/api/item-type-simple-expense/fields.php
@@ -24,7 +24,7 @@
         'field' => 'total',
         'title' => 'item-type-simple-expense/fields.title-total',
         'description' => 'item-type-simple-expense/fields.description-total',
-        'type' => 'decimal (10,2)',
+        'type' => 'decimal string (13,2)',
         'required' => true
     ]
 ];
diff --git a/config/api/item-type-simple-expense/validation.php b/config/api/item-type-simple-expense/validation.php
index 5ed2f015..6d6c7314 100644
--- a/config/api/item-type-simple-expense/validation.php
+++ b/config/api/item-type-simple-expense/validation.php
@@ -17,7 +17,8 @@
             'total' => [
                 'required',
                 'string',
-                'regex:/^\d+\.\d{2}$/'
+                'regex:/^\d+\.\d{2}$/',
+                'max:16'
             ],
         ],
         'messages' => [
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 17b7b1b2..0bbbac1a 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -246,6 +246,7 @@ function gtag(){dataLayer.push(arguments);}
                         <li>We have added a database migration to update the `friendly_name` and `examples` data for `item-types`.</li>
                         <li>We have updated the delete item request; we delete the transfer log entries for the item.</li>
                         <li>We have updated two `item-type` summary endpoints to show they are sortable by `name`.</li>
+                        <li>We have tweaked the `type` for expense fields; we highlight that the supplied value should be a decimal string.</li>
                     </ul>
 
                     <h3>Removed</h3>

From 5e0926711bd7d5addad4d928a23c2ab70d75d921 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 5 Jun 2020 12:30:50 +0100
Subject: [PATCH 33/36] Additional filter params

- Added support for setting `total` and `actualised_total` filter params
---
 app/Validators/FilterParameters.php           | 62 +++++++++++++++----
 .../filterable.php                            |  6 ++
 2 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/app/Validators/FilterParameters.php b/app/Validators/FilterParameters.php
index d77046c9..8841580b 100644
--- a/app/Validators/FilterParameters.php
+++ b/app/Validators/FilterParameters.php
@@ -3,6 +3,7 @@
 
 namespace App\Validators;
 
+use Illuminate\Support\Facades\Validator as ValidatorFacade;
 use DateTime;
 
 /**
@@ -34,16 +35,34 @@ private static function find()
                     is_array($filter) === true &&
                     count($filter) === 3
                 ) {
-                    if (
-                        strlen($filter[1]) === 10 &&
-                        strlen($filter[2]) === 10 &&
-                        self::validateDate($filter[1]) === true &&
-                        self::validateDate($filter[2]) === true
-                    ) {
-                        self::$parameters[$filter[0]] = [
-                            'from' => $filter[1],
-                            'to' => $filter[2]
-                        ];
+                    switch ($filter[0]) {
+                        case 'effective_date':
+                            if (
+                                strlen($filter[1]) === 10 &&
+                                strlen($filter[2]) === 10 &&
+                                self::validateDate($filter[1]) === true &&
+                                self::validateDate($filter[2]) === true
+                            ) {
+                                self::$parameters[$filter[0]] = [
+                                    'from' => $filter[1],
+                                    'to' => $filter[2]
+                                ];
+                            }
+                            break;
+                        case 'total':
+                        case 'actualised_total':
+                            if (self::validateMoney($filter[1]) === false &&
+                                self::validateMoney($filter[2]) === false) {
+                                self::$parameters[$filter[0]] = [
+                                    'from' => $filter[1],
+                                    'to' => $filter[2]
+                                ];
+                            }
+                            break;
+
+                        default:
+
+                            break;
                     }
                 }
             }
@@ -96,9 +115,9 @@ public static function xHeader(): ?string
 
         if (strlen($header) > 0) {
             return ltrim($header, '|');
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     private static function validateDate($date): bool
@@ -112,4 +131,23 @@ private static function validateDate($date): bool
 
         return false;
     }
+
+    private static function validateMoney($value)
+    {
+        $validator = ValidatorFacade::make(
+            [
+                'value' => $value
+            ],
+            [
+                'value' => [
+                    'required',
+                    'string',
+                    'regex:/^\d+\.\d{2}$/',
+                    'max:16'
+                ]
+            ]
+        );
+
+        return $validator->fails();
+    }
 }
diff --git a/config/api/item-type-allocated-expense/filterable.php b/config/api/item-type-allocated-expense/filterable.php
index 4db16874..517c3d03 100644
--- a/config/api/item-type-allocated-expense/filterable.php
+++ b/config/api/item-type-allocated-expense/filterable.php
@@ -5,5 +5,11 @@
 return [
     'effective_date' => [
         'type' => 'date (yyyy-mm-dd)'
+    ],
+    'total' => [
+        'type' => 'decimal string (13,2)'
+    ],
+    'actualised_total' => [
+        'type' => 'decimal string (13,2)'
     ]
 ];

From e5f896990e4082200565ecffb2c47390f0fbdd4d Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 5 Jun 2020 15:27:46 +0100
Subject: [PATCH 34/36] Additional filtering

- Additional filtering options.
---
 .../api/item-type-allocated-expense/summary-filterable.php  | 6 ++++++
 config/api/item-type-simple-expense/filterable.php          | 6 +++++-
 config/api/item-type-simple-expense/summary-filterable.php  | 6 +++++-
 .../filterable.php                                          | 6 ++++++
 .../summary-filterable.php                                  | 6 ++++++
 .../resource-type-item-type-simple-expense/filterable.php   | 6 +++++-
 .../summary-filterable.php                                  | 6 +++++-
 7 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/config/api/item-type-allocated-expense/summary-filterable.php b/config/api/item-type-allocated-expense/summary-filterable.php
index 4db16874..517c3d03 100644
--- a/config/api/item-type-allocated-expense/summary-filterable.php
+++ b/config/api/item-type-allocated-expense/summary-filterable.php
@@ -5,5 +5,11 @@
 return [
     'effective_date' => [
         'type' => 'date (yyyy-mm-dd)'
+    ],
+    'total' => [
+        'type' => 'decimal string (13,2)'
+    ],
+    'actualised_total' => [
+        'type' => 'decimal string (13,2)'
     ]
 ];
diff --git a/config/api/item-type-simple-expense/filterable.php b/config/api/item-type-simple-expense/filterable.php
index 0dae23de..ece4df83 100644
--- a/config/api/item-type-simple-expense/filterable.php
+++ b/config/api/item-type-simple-expense/filterable.php
@@ -2,4 +2,8 @@
 
 declare(strict_types=1);
 
-return [];
+return [
+    'total' => [
+        'type' => 'decimal string (13,2)'
+    ]
+];
diff --git a/config/api/item-type-simple-expense/summary-filterable.php b/config/api/item-type-simple-expense/summary-filterable.php
index 0dae23de..ece4df83 100644
--- a/config/api/item-type-simple-expense/summary-filterable.php
+++ b/config/api/item-type-simple-expense/summary-filterable.php
@@ -2,4 +2,8 @@
 
 declare(strict_types=1);
 
-return [];
+return [
+    'total' => [
+        'type' => 'decimal string (13,2)'
+    ]
+];
diff --git a/config/api/resource-type-item-type-allocated-expense/filterable.php b/config/api/resource-type-item-type-allocated-expense/filterable.php
index 4db16874..517c3d03 100644
--- a/config/api/resource-type-item-type-allocated-expense/filterable.php
+++ b/config/api/resource-type-item-type-allocated-expense/filterable.php
@@ -5,5 +5,11 @@
 return [
     'effective_date' => [
         'type' => 'date (yyyy-mm-dd)'
+    ],
+    'total' => [
+        'type' => 'decimal string (13,2)'
+    ],
+    'actualised_total' => [
+        'type' => 'decimal string (13,2)'
     ]
 ];
diff --git a/config/api/resource-type-item-type-allocated-expense/summary-filterable.php b/config/api/resource-type-item-type-allocated-expense/summary-filterable.php
index 4db16874..517c3d03 100644
--- a/config/api/resource-type-item-type-allocated-expense/summary-filterable.php
+++ b/config/api/resource-type-item-type-allocated-expense/summary-filterable.php
@@ -5,5 +5,11 @@
 return [
     'effective_date' => [
         'type' => 'date (yyyy-mm-dd)'
+    ],
+    'total' => [
+        'type' => 'decimal string (13,2)'
+    ],
+    'actualised_total' => [
+        'type' => 'decimal string (13,2)'
     ]
 ];
diff --git a/config/api/resource-type-item-type-simple-expense/filterable.php b/config/api/resource-type-item-type-simple-expense/filterable.php
index 0dae23de..ece4df83 100644
--- a/config/api/resource-type-item-type-simple-expense/filterable.php
+++ b/config/api/resource-type-item-type-simple-expense/filterable.php
@@ -2,4 +2,8 @@
 
 declare(strict_types=1);
 
-return [];
+return [
+    'total' => [
+        'type' => 'decimal string (13,2)'
+    ]
+];
diff --git a/config/api/resource-type-item-type-simple-expense/summary-filterable.php b/config/api/resource-type-item-type-simple-expense/summary-filterable.php
index 0dae23de..ece4df83 100644
--- a/config/api/resource-type-item-type-simple-expense/summary-filterable.php
+++ b/config/api/resource-type-item-type-simple-expense/summary-filterable.php
@@ -2,4 +2,8 @@
 
 declare(strict_types=1);
 
-return [];
+return [
+    'total' => [
+        'type' => 'decimal string (13,2)'
+    ]
+];

From 2a36bb99671f8f120c9918f614ddeadae6e25022 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Fri, 5 Jun 2020 15:41:53 +0100
Subject: [PATCH 35/36] Corrected changelog

- Updated CHANGELOG
---
 CHANGELOG.md                      | 1 +
 resources/views/welcome.blade.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 418d0f3a..e72978fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The complete changelog for the Costs to Expect REST API, our changelog follows t
 - We have added search to the resource-types summary endpoint.
 - We have updated the transfers collection; you can filter the results by an `item` ID.
 - We have updated the partial transfers collection; you can filter the results by an `item` ID.
+- We have added additional filtering options for collections. We have added `total` and `actualised_total` range filtering for the `allocated-expense` item type and `total` range filtering for the `simple-expense` item type.
 
 ### Changed
 - We have added the documentation URI to the README and API; the documentation for the API is work in progress; it is almost complete.
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 0bbbac1a..ef91e8f8 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -222,6 +222,7 @@ function gtag(){dataLayer.push(arguments);}
                         <li>We have added search to the resource-types summary endpoint.</li>
                         <li>We have updated the transfers collection; you can filter the results by an `item` ID.</li>
                         <li>We have updated the partial transfers collection; you can filter the results by an `item` ID.</li>
+                        <li>We have added additional filtering options for collections. We have added `total` and `actualised_total` range filtering for the `allocated-expense` item type and `total` range filtering for the `simple-expense` item type.</li>
                     </ul>
 
                     <h3>Changed</h3>
@@ -233,6 +234,7 @@ function gtag(){dataLayer.push(arguments);}
                         <li>We have altered the format of the category and subcategory object for item relationships; the returned object is now a closer match to a category object.</li>
                         <li>We have updated the URIs for item category and subcategory assignments; the URI was singular for a collection.</li>
                         <li>We have updated the item delete endpoint; we did not return a conflict error before removing relationships.</li>
+                        <li>We have tweaked the `type` for expense fields; we highlight that the supplied value should be a decimal string.</li>
                     </ul>
 
                     <h3>Fixed</h3>
@@ -246,7 +248,6 @@ function gtag(){dataLayer.push(arguments);}
                         <li>We have added a database migration to update the `friendly_name` and `examples` data for `item-types`.</li>
                         <li>We have updated the delete item request; we delete the transfer log entries for the item.</li>
                         <li>We have updated two `item-type` summary endpoints to show they are sortable by `name`.</li>
-                        <li>We have tweaked the `type` for expense fields; we highlight that the supplied value should be a decimal string.</li>
                     </ul>
 
                     <h3>Removed</h3>

From efe6ca3cc2d66a744f770d7147e66b3231100e10 Mon Sep 17 00:00:00 2001
From: Dean Blackborough <dean@g3d-development.com>
Date: Sat, 6 Jun 2020 23:31:13 +0100
Subject: [PATCH 36/36] Update lottery setting

- Update lottery
---
 config/session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/session.php b/config/session.php
index 54aaaac4..6928067e 100644
--- a/config/session.php
+++ b/config/session.php
@@ -109,7 +109,7 @@
     |
     */
 
-    'lottery' => [2, 1000],
+    'lottery' => [2, 5000],
 
     /*
     |--------------------------------------------------------------------------