From 403b87bbda057af8cf9c004261a0bcce3fc7b92c Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 16 Jan 2017 22:21:11 -0500 Subject: [PATCH] Bunch of stuff --- api/businesslogic/category/Category.php | 45 ++++++++++++++ .../category/CategoryRetriever.php | 19 ++++++ api/businesslogic/category/retriever.php | 5 ++ api/businesslogic/ticket/ticket_creator.php | 3 +- api/businesslogic/ticket_retriever.php | 1 + api/category/index.php | 58 ------------------- api/controllers/CategoryController.php | 19 ++++++ api/dao/CategoryGateway.php | 38 ++++++++++++ api/dao/Connection.php | 26 +++++++++ api/index.php | 8 +++ api/loader.php | 3 - 11 files changed, 163 insertions(+), 62 deletions(-) create mode 100644 api/businesslogic/category/Category.php create mode 100644 api/businesslogic/category/CategoryRetriever.php create mode 100644 api/businesslogic/category/retriever.php delete mode 100644 api/category/index.php create mode 100644 api/controllers/CategoryController.php create mode 100644 api/dao/CategoryGateway.php create mode 100644 api/dao/Connection.php create mode 100644 api/index.php delete mode 100644 api/loader.php diff --git a/api/businesslogic/category/Category.php b/api/businesslogic/category/Category.php new file mode 100644 index 00000000..77a6be9c --- /dev/null +++ b/api/businesslogic/category/Category.php @@ -0,0 +1,45 @@ +category) === 0) { - // TODO add support for invalid category ID + $allCategories = null; $validationModel->errorKeys[] = 'NO_CATEGORY'; } diff --git a/api/businesslogic/ticket_retriever.php b/api/businesslogic/ticket_retriever.php index eaa06d5c..282af64e 100644 --- a/api/businesslogic/ticket_retriever.php +++ b/api/businesslogic/ticket_retriever.php @@ -2,6 +2,7 @@ require_once(API_PATH . 'dao/ticket_dao.php'); function get_ticket_for_staff($hesk_settings, $user, $id = NULL) { + $tickets = get_ticket_for_id($hesk_settings, $user, $id); if ($tickets == NULL) { diff --git a/api/category/index.php b/api/category/index.php deleted file mode 100644 index 7e3b27b0..00000000 --- a/api/category/index.php +++ /dev/null @@ -1,58 +0,0 @@ -`false` otherwise - * @apiSuccess {Integer} type `0` - Public
`1` - Private - * @apiSuccess {Integer} priority Default priority of tickets created in this category - * @apiSuccess {Integer} manager User ID of the category manager, or `null` if there is no manager. - * - * @apiSuccessExample {json} Success-Response: - * HTTP/1.1 200 OK - * { - * "id": 1, - * "name": "General", - * "displayOrder": 10, - * "autoassign": true, - * "type": 0, - * "priority": 2, - * "manager": null - * } - */ -if ($request_method == 'GET') { - if (isset($_GET['id'])) { - $results = get_category($hesk_settings, $_GET['id']); - } else { - $results = get_category($hesk_settings); - } - - if ($results == NULL) { - return http_response_code(404); - } - return output($results); -} - -return http_response_code(405); diff --git a/api/controllers/CategoryController.php b/api/controllers/CategoryController.php new file mode 100644 index 00000000..46558d4e --- /dev/null +++ b/api/controllers/CategoryController.php @@ -0,0 +1,19 @@ +id = intval($row['id']); + $category->catOrder = intval($row['cat_order']); + $category->autoAssign = $row['autoassign'] == 1; + $category->type = intval($row['type']); + $category->usage = intval($row['usage']); + $category->color = $row['color']; + $category->priority = intval($row['priority']); + $category->manager = intval($row['manager']) == 0 ? NULL : intval($row['manager']); + $results[$category->id] = $category; + } + + return $results; + } +} \ No newline at end of file diff --git a/api/dao/Connection.php b/api/dao/Connection.php new file mode 100644 index 00000000..d7da3228 --- /dev/null +++ b/api/dao/Connection.php @@ -0,0 +1,26 @@ +close(); + } +} \ No newline at end of file diff --git a/api/index.php b/api/index.php new file mode 100644 index 00000000..27528b5e --- /dev/null +++ b/api/index.php @@ -0,0 +1,8 @@ +