diff --git a/core/Models/ValidatorModel.php b/core/Models/ValidatorModel.php
deleted file mode 100755
index c021c0aac324730e235ccd3be3cba6682741c61a..0000000000000000000000000000000000000000
--- a/core/Models/ValidatorModel.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/**
-* Copyright Maarch since 2008 under licence GPLv3.
-* See LICENCE.txt file at the root folder for more details.
-* This file is part of Maarch software.
-*
-*/
-
-/**
-* @brief Validator Model
-* @author dev@maarch.org
-* @ingroup core
-*/
-
-namespace Core\Models;
-
-use Respect\Validation\Validator;
-
-class ValidatorModel
-{
- public static function notEmpty(array $aArgs, $aKeys)
- {
- if (!Validator::arrayType()->notEmpty()->validate($aArgs)) {
- throw new \Exception('First argument must be a non empty array');
- }
- foreach ($aKeys as $key) {
- if (!Validator::notEmpty()->validate($aArgs[$key])) {
- throw new \Exception("Argument {$key} is empty");
- }
- }
- }
-
- public static function intVal(array $aArgs, $aKeys)
- {
- foreach ($aKeys as $key) {
- if (empty($aArgs[$key])) {
- continue;
- }
- if (!Validator::intVal()->validate($aArgs[$key])) {
- throw new \Exception("Argument {$key} is not an integer (value)");
- }
- }
- }
-
- public static function intType(array $aArgs, $aKeys)
- {
- foreach ($aKeys as $key) {
- if (empty($aArgs[$key])) {
- continue;
- }
- if (!Validator::intType()->validate($aArgs[$key])) {
- throw new \Exception("Argument {$key} is not an integer (type)");
- }
- }
- }
-
- public static function stringType(array $aArgs, $aKeys)
- {
- foreach ($aKeys as $key) {
- if (empty($aArgs[$key])) {
- continue;
- }
- if (!Validator::stringType()->validate($aArgs[$key])) {
- throw new \Exception("Argument {$key} is not a string (type)");
- }
- }
- }
-
- public static function arrayType(array $aArgs, $aKeys)
- {
- foreach ($aKeys as $key) {
- if (empty($aArgs[$key])) {
- continue;
- }
- if (!Validator::arrayType()->validate($aArgs[$key])) {
- throw new \Exception("Argument {$key} is not an array (type)");
- }
- }
- }
-
- public static function boolType(array $aArgs, $aKeys)
- {
- foreach ($aKeys as $key) {
- if (empty($aArgs[$key])) {
- continue;
- }
- if (!Validator::boolType()->validate($aArgs[$key])) {
- throw new \Exception("Argument {$key} is not a boolean (type)");
- }
- }
- }
-
-}
diff --git a/core/Test/ContactControllerTest.php b/core/Test/ContactControllerTest.php
index 10ca06eb3457445b4125185afc4e7a9c2b64a844..efefe7ea876970a05222f251213ab2e5ff1e6939 100644
--- a/core/Test/ContactControllerTest.php
+++ b/core/Test/ContactControllerTest.php
@@ -102,10 +102,10 @@ class ContactControllerTest extends TestCase
// READ
$contact = \Contact\models\ContactModel::getById(['id' => self::$id]);
$this->assertInternalType('array', $contact);
- $this->assertEmpty(null, $contact);
+ $this->assertEmpty($contact);
$contact = \Contact\models\ContactModel::getByAddressId(['addressId' => self::$addressId]);
$this->assertInternalType('array', $contact);
- $this->assertEmpty(null, $contact);
+ $this->assertEmpty($contact);
}
}
diff --git a/modules/convert/Models/ProcessConvertModelAbstract.php b/modules/convert/Models/ProcessConvertModelAbstract.php
index 67e9e0bc8c5ab594734e8519a4d3547d85ed068a..e4e17b99b30ac65f743cdd62aa4a98a496376c41 100644
--- a/modules/convert/Models/ProcessConvertModelAbstract.php
+++ b/modules/convert/Models/ProcessConvertModelAbstract.php
@@ -15,9 +15,9 @@
namespace Convert\Models;
-use Core\Models\ValidatorModel;
use History\controllers\HistoryController;
use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class ProcessConvertModelAbstract
{
diff --git a/modules/convert/Models/ProcessFulltextModelAbstract.php b/modules/convert/Models/ProcessFulltextModelAbstract.php
index 14a1c8626bf4094487d025f576b31a320035ba9a..1bb191d8c826495ea6663f74be17b487fdd2fa4f 100644
--- a/modules/convert/Models/ProcessFulltextModelAbstract.php
+++ b/modules/convert/Models/ProcessFulltextModelAbstract.php
@@ -15,9 +15,9 @@
namespace Convert\Models;
-use Core\Models\ValidatorModel;
use History\controllers\HistoryController;
use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class ProcessFulltextModelAbstract
{
diff --git a/modules/convert/Models/ProcessThumbnailsModelAbstract.php b/modules/convert/Models/ProcessThumbnailsModelAbstract.php
index f5e5e6be10206afb57fc14c787587048215b99f9..77aba37e90c206eb722e8a349d1af842b6d58da8 100644
--- a/modules/convert/Models/ProcessThumbnailsModelAbstract.php
+++ b/modules/convert/Models/ProcessThumbnailsModelAbstract.php
@@ -15,9 +15,9 @@
namespace Convert\Models;
-use Core\Models\ValidatorModel;
use History\controllers\HistoryController;
use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class ProcessThumbnailsModelAbstract
{
diff --git a/modules/visa/Controllers/VisaController.php b/modules/visa/Controllers/VisaController.php
index 54119c5cbf66b1ec967effc5f34858eda7b37243..d2aed0ffc7c5a1051e897541d0e808b4e5baafb0 100755
--- a/modules/visa/Controllers/VisaController.php
+++ b/modules/visa/Controllers/VisaController.php
@@ -19,8 +19,8 @@ use Action\models\ActionModel;
use Contact\models\ContactModel;
use Core\Models\LangModel;
use Docserver\models\DocserverModel;
-use Core\Models\ServiceModel;
use Entity\models\ListInstanceModel;
+use Group\models\ServiceModel;
use Link\models\LinkModel;
use Note\models\NoteModel;
use Psr\Http\Message\RequestInterface;
diff --git a/modules/visa/Models/VisaModelAbstract.php b/modules/visa/Models/VisaModelAbstract.php
index 3f0ce0d83709eb6988e6da85da7e75a61ebd89cc..330413e117f087a6648f666d4c382575ff650d78 100755
--- a/modules/visa/Models/VisaModelAbstract.php
+++ b/modules/visa/Models/VisaModelAbstract.php
@@ -9,8 +9,8 @@
namespace Visa\Models;
-use Core\Models\ValidatorModel;
use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class VisaModelAbstract
{
diff --git a/phpunit.xml b/phpunit.xml
index aee9cda8f0b1c6ada532af25fdab857a585e9266..8df87220d6d39895d39f2be899bcc2ffa4ec2dbd 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -27,7 +27,6 @@
<whitelist>
<directory suffix="Test.php">core/Test</directory>
<directory suffix=".php">src</directory>
- <directory suffix=".php">core/Models</directory>
<directory suffix=".php">modules/visa/Controllers</directory>
<directory suffix=".php">modules/visa/Models</directory>
<directory suffix=".php">modules/convert/Controllers</directory>
diff --git a/src/app/action/controllers/ActionController.php b/src/app/action/controllers/ActionController.php
index a7d49d97bc83d3356bdc2307af39cfe274b30bc1..5f2785a6e435f7adee154b6ef4457cea80e10437 100644
--- a/src/app/action/controllers/ActionController.php
+++ b/src/app/action/controllers/ActionController.php
@@ -16,7 +16,7 @@ use Respect\Validation\Validator;
use Action\models\ActionModel;
use SrcCore\models\CoreConfigModel;
use Status\models\StatusModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
diff --git a/src/app/attachment/models/AttachmentModelAbstract.php b/src/app/attachment/models/AttachmentModelAbstract.php
index e96d5be5bc90e3ebb63f54e3dd24a3972ea19a4f..953380669bc1b2723f83cb10961127f75305e405 100644
--- a/src/app/attachment/models/AttachmentModelAbstract.php
+++ b/src/app/attachment/models/AttachmentModelAbstract.php
@@ -14,9 +14,9 @@
namespace Attachment\models;
-use Core\Models\ValidatorModel;
use SrcCore\models\CoreConfigModel;
use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class AttachmentModelAbstract
{
diff --git a/src/app/basket/controllers/BasketController.php b/src/app/basket/controllers/BasketController.php
index 5393f3a05963f112cb9f2f00017ed2cf511d2875..b1d38b1ddcad739d0931b02237b8b0d56a1f9903 100644
--- a/src/app/basket/controllers/BasketController.php
+++ b/src/app/basket/controllers/BasketController.php
@@ -16,7 +16,7 @@ namespace Basket\controllers;
use Basket\models\BasketModel;
use Action\models\ActionModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use SrcCore\models\ValidatorModel;
use Group\models\GroupModel;
use History\controllers\HistoryController;
diff --git a/src/app/docserver/controllers/DocserverController.php b/src/app/docserver/controllers/DocserverController.php
index d70edfe302d6bbd20e91582380cfd41b1535d0e7..ff6035323231fb2727a8909fd4c11b6650331525 100644
--- a/src/app/docserver/controllers/DocserverController.php
+++ b/src/app/docserver/controllers/DocserverController.php
@@ -14,7 +14,7 @@
namespace Docserver\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\models\ValidatorModel;
diff --git a/src/app/docserver/controllers/DocserverTypeController.php b/src/app/docserver/controllers/DocserverTypeController.php
index 39a35bc0a8bddf9c79b150f049d496429b34e0a5..0766d2ab446c769842425db1e1767b3208163fef 100644
--- a/src/app/docserver/controllers/DocserverTypeController.php
+++ b/src/app/docserver/controllers/DocserverTypeController.php
@@ -14,7 +14,7 @@
namespace Docserver\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Docserver\models\DocserverTypeModel;
use Slim\Http\Request;
use Slim\Http\Response;
diff --git a/src/app/doctype/controllers/DoctypeController.php b/src/app/doctype/controllers/DoctypeController.php
index 44eca38ea8b788277e2e1383ee54956fc8b91592..bc8eda744cbabb25893730e0334428f9fdf1d531 100644
--- a/src/app/doctype/controllers/DoctypeController.php
+++ b/src/app/doctype/controllers/DoctypeController.php
@@ -19,7 +19,7 @@ use Doctype\models\DoctypeModel;
use Doctype\models\DoctypeExtModel;
use Doctype\models\DoctypeIndexesModel;
use Doctype\models\TemplateDoctypeModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Template\models\TemplateModel;
use Slim\Http\Request;
use Slim\Http\Response;
diff --git a/src/app/doctype/controllers/FirstLevelController.php b/src/app/doctype/controllers/FirstLevelController.php
index 9bc7a6383499a75e913077cd2d3a4fa8e6de3c4f..1059867be355fffb18fbf04317e280ee8b8198ab 100644
--- a/src/app/doctype/controllers/FirstLevelController.php
+++ b/src/app/doctype/controllers/FirstLevelController.php
@@ -17,7 +17,7 @@ use Doctype\models\FirstLevelModel;
use Doctype\models\SecondLevelModel;
use Doctype\models\DoctypeModel;
use Folder\models\FolderTypeModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
use Template\models\TemplateModel;
diff --git a/src/app/doctype/controllers/SecondLevelController.php b/src/app/doctype/controllers/SecondLevelController.php
index 8c495e8f3c881e45abd17ad2f386543bded1762f..196f499ba49fc8729308ce7f79b3e2b4bccde6ec 100644
--- a/src/app/doctype/controllers/SecondLevelController.php
+++ b/src/app/doctype/controllers/SecondLevelController.php
@@ -17,7 +17,7 @@ use Respect\Validation\Validator;
use Doctype\models\FirstLevelModel;
use Doctype\models\SecondLevelModel;
use Doctype\models\DoctypeModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
diff --git a/src/app/entity/controllers/EntityController.php b/src/app/entity/controllers/EntityController.php
index 47601df20d61c45a22976818057ff1ced482a266..e4f542fd0327eab20d7ec51a490f6df53d8bcdd0 100644
--- a/src/app/entity/controllers/EntityController.php
+++ b/src/app/entity/controllers/EntityController.php
@@ -15,11 +15,11 @@
namespace Entity\controllers;
use Basket\models\BasketModel;
-use Core\Models\ServiceModel;
use Entity\models\EntityModel;
use Entity\models\ListInstanceModel;
use Entity\models\ListTemplateModel;
use Entity\models\UserEntityModel;
+use Group\models\ServiceModel;
use History\controllers\HistoryController;
use Resource\models\ResModel;
use Respect\Validation\Validator;
diff --git a/src/app/entity/controllers/ListTemplateController.php b/src/app/entity/controllers/ListTemplateController.php
index cbe4b4797bbb455da842b77d1596a68b38e783ac..98b2c558865c23e1fce15677e7ddfd7c184b1089 100644
--- a/src/app/entity/controllers/ListTemplateController.php
+++ b/src/app/entity/controllers/ListTemplateController.php
@@ -14,7 +14,7 @@
namespace Entity\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use SrcCore\models\ValidatorModel;
use Entity\models\EntityModel;
use Entity\models\ListTemplateModel;
diff --git a/src/app/group/controllers/GroupController.php b/src/app/group/controllers/GroupController.php
index 52f8d2c2c990c9907a51400d15a41e167c2d5e94..10e517f762f2f8400f7b77dbfd60cddb03c85cae 100644
--- a/src/app/group/controllers/GroupController.php
+++ b/src/app/group/controllers/GroupController.php
@@ -2,7 +2,7 @@
namespace Group\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Group\models\GroupModel;
use Respect\Validation\Validator;
use Slim\Http\Request;
diff --git a/src/app/group/models/GroupModelAbstract.php b/src/app/group/models/GroupModelAbstract.php
index 70a1f0b2dd3db40b7f1e65df60f112d9380b07a3..f16efba93439ba89a1bd343bff04cd512fee4433 100644
--- a/src/app/group/models/GroupModelAbstract.php
+++ b/src/app/group/models/GroupModelAbstract.php
@@ -14,7 +14,7 @@
namespace Group\models;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Group\controllers\GroupController;
use SrcCore\models\DatabaseModel;
use SrcCore\models\ValidatorModel;
diff --git a/core/Models/ServiceModel.php b/src/app/group/models/ServiceModel.php
old mode 100755
new mode 100644
similarity index 78%
rename from core/Models/ServiceModel.php
rename to src/app/group/models/ServiceModel.php
index 3b326f569b8cc21e5d66f4b55be7a16a514c5e4e..fcb29eb9d703db9be058a60ec8b8c1d7f003ceec
--- a/core/Models/ServiceModel.php
+++ b/src/app/group/models/ServiceModel.php
@@ -10,12 +10,10 @@
/**
* @brief Service Model
* @author dev@maarch.org
-* @ingroup core
*/
-namespace Core\Models;
+namespace Group\models;
class ServiceModel extends ServiceModelAbstract
{
- // Do your stuff in this class
}
diff --git a/core/Models/ServiceModelAbstract.php b/src/app/group/models/ServiceModelAbstract.php
old mode 100755
new mode 100644
similarity index 93%
rename from core/Models/ServiceModelAbstract.php
rename to src/app/group/models/ServiceModelAbstract.php
index b5038d0103bd89e13d2d1aae5ed0b2934a0ba624..a7667d0b5654d494b85ae9ba8b8fcde849af03d6
--- a/core/Models/ServiceModelAbstract.php
+++ b/src/app/group/models/ServiceModelAbstract.php
@@ -10,13 +10,13 @@
* @brief Service Model
*
* @author dev@maarch.org
- * @ingroup core
*/
-namespace Core\Models;
+namespace Group\models;
use SrcCore\models\CoreConfigModel;
-use User\models\UserModel;
+use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class ServiceModelAbstract
{
@@ -252,16 +252,14 @@ class ServiceModelAbstract
if ($path) {
$xmlfile = simplexml_load_file($path);
foreach ($xmlfile->MENU as $value) {
- $id = (string) $value->id;
-
$label = defined((string) $value->libconst) ? constant((string) $value->libconst) : (string) $value->libconst;
$modulesServices['menuList'][] = [
- 'id' => (string) $value->id,
- 'label' => $label,
- 'link' => (string) $value->url,
- 'icon' => (string) $value->style,
- 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
+ 'id' => (string) $value->id,
+ 'label' => $label,
+ 'link' => (string) $value->url,
+ 'icon' => (string) $value->style,
+ 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
];
}
}
@@ -270,7 +268,7 @@ class ServiceModelAbstract
return $modulesServices;
}
- public static function getApplicationAdministrationMenuByUserServices(array $aArgs = [])
+ public static function getApplicationAdministrationMenuByUserServices(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['userServices']);
ValidatorModel::arrayType($aArgs, ['userServices']);
@@ -341,7 +339,7 @@ class ServiceModelAbstract
ValidatorModel::notEmpty($aArgs, ['userId']);
ValidatorModel::stringType($aArgs, ['userId']);
- $rawServicesStoredInDB = UserModel::getServicesById(['userId' => $aArgs['userId']]);
+ $rawServicesStoredInDB = ServiceModel::getByUserId(['userId' => $aArgs['userId']]);
$servicesStoredInDB = [];
foreach ($rawServicesStoredInDB as $value) {
$servicesStoredInDB[] = $value['service_id'];
@@ -358,6 +356,21 @@ class ServiceModelAbstract
return $administration;
}
+ public static function getByUserId(array $aArgs)
+ {
+ ValidatorModel::notEmpty($aArgs, ['userId']);
+ ValidatorModel::stringType($aArgs, ['userId']);
+
+ $aServices = DatabaseModel::select([
+ 'select' => ['usergroups_services.service_id'],
+ 'table' => ['usergroup_content, usergroups_services'],
+ 'where' => ['usergroup_content.group_id = usergroups_services.group_id', 'usergroup_content.user_id = ?'],
+ 'data' => [$aArgs['userId']]
+ ]);
+
+ return $aServices;
+ }
+
public static function hasService(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['id', 'userId', 'location', 'type']);
@@ -366,7 +379,7 @@ class ServiceModelAbstract
if ($aArgs['userId'] == 'superadmin') {
return true;
}
- $rawServicesStoredInDB = UserModel::getServicesById(['userId' => $aArgs['userId']]);
+ $rawServicesStoredInDB = ServiceModel::getByUserId(['userId' => $aArgs['userId']]);
$servicesStoredInDB = [];
foreach ($rawServicesStoredInDB as $value) {
$servicesStoredInDB[] = $value['service_id'];
diff --git a/src/app/history/controllers/HistoryController.php b/src/app/history/controllers/HistoryController.php
index ee854eedaf3b1df78ec2eb00dc962b52f0e0aecc..68882e3ab2cd59cfdcff83446c9d22125edeb6e8 100644
--- a/src/app/history/controllers/HistoryController.php
+++ b/src/app/history/controllers/HistoryController.php
@@ -14,7 +14,7 @@
namespace History\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use SrcCore\models\TextFormatModel;
use SrcCore\models\ValidatorModel;
use History\models\HistoryModel;
diff --git a/src/app/notification/controllers/NotificationController.php b/src/app/notification/controllers/NotificationController.php
index f1fc61ab09f83e85bbc1bd1e591863506dfbc967..3c45e59ed6a235a584636d32023de5a335f8ec60 100644
--- a/src/app/notification/controllers/NotificationController.php
+++ b/src/app/notification/controllers/NotificationController.php
@@ -19,7 +19,7 @@ use History\controllers\HistoryController;
use Respect\Validation\Validator;
use Notification\models\NotificationModel;
use Notification\models\NotificationScheduleModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\models\CoreConfigModel;
diff --git a/src/app/notification/controllers/NotificationScheduleController.php b/src/app/notification/controllers/NotificationScheduleController.php
index 6a92e0074f4755c9190898ac424df2e38ce6482d..ef0da3f79e72411eb617833cb787a38bfa514ff1 100644
--- a/src/app/notification/controllers/NotificationScheduleController.php
+++ b/src/app/notification/controllers/NotificationScheduleController.php
@@ -18,7 +18,7 @@ namespace Notification\controllers;
use Respect\Validation\Validator;
use Notification\models\NotificationModel;
use Notification\models\NotificationScheduleModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\models\CoreConfigModel;
diff --git a/src/app/parameter/controllers/ParameterController.php b/src/app/parameter/controllers/ParameterController.php
index 261d73c742d18967ea5a13ecd89139ef1273b539..a9676789d238aab2b5004734d647368d2b78d97f 100644
--- a/src/app/parameter/controllers/ParameterController.php
+++ b/src/app/parameter/controllers/ParameterController.php
@@ -17,7 +17,7 @@
namespace Parameter\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use History\controllers\HistoryController;
use Parameter\models\ParameterModel;
use Respect\Validation\Validator;
diff --git a/src/app/priority/controllers/PriorityController.php b/src/app/priority/controllers/PriorityController.php
index 24ac49d6b3da54a7cb007e433d6acd7841465af7..880ab5e60f07d0b9fa5666a9cf60be435e9aca2c 100644
--- a/src/app/priority/controllers/PriorityController.php
+++ b/src/app/priority/controllers/PriorityController.php
@@ -2,7 +2,7 @@
namespace Priority\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use History\controllers\HistoryController;
use Priority\models\PriorityModel;
use Respect\Validation\Validator;
diff --git a/src/app/report/controllers/ReportController.php b/src/app/report/controllers/ReportController.php
index c2326b2c1e74fa562070fbb9daa1ee7eb39ef7a7..6af4bdceff9eaa2a04bdc6f2dd535ffb26c073a0 100644
--- a/src/app/report/controllers/ReportController.php
+++ b/src/app/report/controllers/ReportController.php
@@ -14,7 +14,7 @@
namespace Report\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Group\models\GroupModel;
use History\controllers\HistoryController;
use Report\models\ReportModel;
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 8c1f7dccf16993ae5ad13b7358000efd2827d8c8..5c912a91e84b13a642dc57c2979f71abdfb2d13a 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -17,7 +17,7 @@ namespace Resource\controllers;
use Basket\models\BasketModel;
use Note\models\NoteModel;
use SrcCore\controllers\StoreController;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Status\models\StatusModel;
use SrcCore\models\ValidatorModel;
use History\controllers\HistoryController;
diff --git a/src/app/status/controllers/StatusController.php b/src/app/status/controllers/StatusController.php
index 939948fb5b38f749c747e14541975c64a686b6a5..f29985a904405c1a8cb9786354ebec86d9c54a1c 100755
--- a/src/app/status/controllers/StatusController.php
+++ b/src/app/status/controllers/StatusController.php
@@ -15,11 +15,11 @@
namespace Status\controllers;
+use Group\models\ServiceModel;
use History\controllers\HistoryController;
use Respect\Validation\Validator;
use Status\models\StatusModel;
use Status\models\StatusImagesModel;
-use Core\Models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index eb99d0b60852b114480d821a185b9ca026e547be..e86117126df23feae4eca34bbd3a27944d1331f7 100644
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -15,7 +15,7 @@
namespace User\controllers;
use Basket\models\BasketModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Entity\models\EntityModel;
use Entity\models\ListTemplateModel;
use Group\models\GroupModel;
diff --git a/src/app/user/models/UserModelAbstract.php b/src/app/user/models/UserModelAbstract.php
index 2f0511eaa4a712d606c615869e791e38a3d4d264..9da6e5f9f70507a365e754419ce8a04515a0d9a2 100644
--- a/src/app/user/models/UserModelAbstract.php
+++ b/src/app/user/models/UserModelAbstract.php
@@ -513,21 +513,6 @@ class UserModelAbstract
return $aEntities;
}
- public static function getServicesById(array $aArgs = [])
- {
- ValidatorModel::notEmpty($aArgs, ['userId']);
- ValidatorModel::stringType($aArgs, ['userId']);
-
- $aServices = DatabaseModel::select([
- 'select' => ['usergroups_services.service_id'],
- 'table' => ['usergroup_content, usergroups_services'],
- 'where' => ['usergroup_content.group_id = usergroups_services.group_id', 'usergroup_content.user_id = ?'],
- 'data' => [$aArgs['userId']]
- ]);
-
- return $aServices;
- }
-
public static function updateStatus(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['id', 'status']);
diff --git a/src/core/controllers/AutoCompleteController.php b/src/core/controllers/AutoCompleteController.php
index c1eda78876d42ae2082e907d3a841eb4b31368d9..ea5162adbccf8c903efa307a8d2f57cc210df3a5 100644
--- a/src/core/controllers/AutoCompleteController.php
+++ b/src/core/controllers/AutoCompleteController.php
@@ -14,7 +14,7 @@
namespace SrcCore\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
use Entity\models\EntityModel;
diff --git a/src/core/controllers/CoreController.php b/src/core/controllers/CoreController.php
index 49020c9edbbd40685a3d5529ea82c6c3a610cd7c..ed68d240ae15ee2c3709bb08cc7a4c931256a2e9 100644
--- a/src/core/controllers/CoreController.php
+++ b/src/core/controllers/CoreController.php
@@ -15,7 +15,7 @@
namespace SrcCore\controllers;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\models\CoreConfigModel;