From d3e183a820f90e61b45f421b6558a76032ad395d Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 1 Mar 2018 12:19:48 +0100
Subject: [PATCH] [REFACTORING] Note to src
---
composer.json | 2 +-
modules/visa/Controllers/VisaController.php | 2 +-
phpunit.xml | 1 -
src/app/contact/models/ContactModelAbstract.php | 2 +-
src/app/group/controllers/GroupController.php | 2 +-
.../notes/Models => src/app/note/models}/NoteModel.php | 4 +---
.../Models => src/app/note/models}/NoteModelAbstract.php | 9 +++------
src/app/resource/controllers/ResController.php | 2 +-
8 files changed, 9 insertions(+), 15 deletions(-)
rename {modules/notes/Models => src/app/note/models}/NoteModel.php (78%)
mode change 100755 => 100644
rename {modules/notes/Models => src/app/note/models}/NoteModelAbstract.php (93%)
mode change 100755 => 100644
diff --git a/composer.json b/composer.json
index f4ed19926fd..7db9c232b8b 100755
--- a/composer.json
+++ b/composer.json
@@ -12,6 +12,7 @@
"Group\\" : "src/app/group/",
"History\\" : "src/app/history/",
"Link\\" : "src/app/link/",
+ "Note\\" : "src/app/note/",
"Notification\\" : "src/app/notification/",
"Parameter\\" : "src/app/parameter/",
"Priority\\" : "src/app/priority/",
@@ -24,7 +25,6 @@
"Core\\" : "core/",
"Attachments\\" : "modules/attachments/",
"Convert\\" : "modules/convert/",
- "Notes\\" : "modules/notes/",
"Visa\\" : "modules/visa/"
}
},
diff --git a/modules/visa/Controllers/VisaController.php b/modules/visa/Controllers/VisaController.php
index a1287b92a28..907c6b6d9e3 100755
--- a/modules/visa/Controllers/VisaController.php
+++ b/modules/visa/Controllers/VisaController.php
@@ -22,7 +22,7 @@ use Docserver\models\DocserverModel;
use Core\Models\ServiceModel;
use Entity\models\ListInstanceModel;
use Link\models\LinkModel;
-use Notes\Models\NoteModel;
+use Note\models\NoteModel;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Resource\controllers\ResController;
diff --git a/phpunit.xml b/phpunit.xml
index abc289c7bf7..63a8525bbb8 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -32,7 +32,6 @@
<directory suffix=".php">modules/visa/Models</directory>
<directory suffix=".php">modules/attachments/Controllers</directory>
<directory suffix=".php">modules/attachments/Models</directory>
- <directory suffix=".php">modules/notes/Models</directory>
<directory suffix=".php">modules/convert/Controllers</directory>
<directory suffix=".php">modules/convert/Models</directory>
</whitelist>
diff --git a/src/app/contact/models/ContactModelAbstract.php b/src/app/contact/models/ContactModelAbstract.php
index cb56f56293f..5b4c42f2d01 100644
--- a/src/app/contact/models/ContactModelAbstract.php
+++ b/src/app/contact/models/ContactModelAbstract.php
@@ -15,9 +15,9 @@
namespace Contact\models;
-use Core\Models\ValidatorModel;
use Resource\models\ResModel;
use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class ContactModelAbstract
{
diff --git a/src/app/group/controllers/GroupController.php b/src/app/group/controllers/GroupController.php
index 5dd74b3e007..52f8d2c2c99 100644
--- a/src/app/group/controllers/GroupController.php
+++ b/src/app/group/controllers/GroupController.php
@@ -3,12 +3,12 @@
namespace Group\controllers;
use Core\Models\ServiceModel;
-use Core\Models\ValidatorModel;
use Group\models\GroupModel;
use Respect\Validation\Validator;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\controllers\PreparedClauseController;
+use SrcCore\models\ValidatorModel;
class GroupController
{
diff --git a/modules/notes/Models/NoteModel.php b/src/app/note/models/NoteModel.php
old mode 100755
new mode 100644
similarity index 78%
rename from modules/notes/Models/NoteModel.php
rename to src/app/note/models/NoteModel.php
index ebc7fcc4ca5..4a1a8821601
--- a/modules/notes/Models/NoteModel.php
+++ b/src/app/note/models/NoteModel.php
@@ -10,12 +10,10 @@
/**
* @brief Note Model
* @author dev@maarch.org
- * @ingroup notes
*/
-namespace Notes\Models;
+namespace Note\models;
class NoteModel extends NoteModelAbstract
{
- // Do your stuff in this class
}
\ No newline at end of file
diff --git a/modules/notes/Models/NoteModelAbstract.php b/src/app/note/models/NoteModelAbstract.php
old mode 100755
new mode 100644
similarity index 93%
rename from modules/notes/Models/NoteModelAbstract.php
rename to src/app/note/models/NoteModelAbstract.php
index 5af2d59e985..c05dc6d6d80
--- a/modules/notes/Models/NoteModelAbstract.php
+++ b/src/app/note/models/NoteModelAbstract.php
@@ -10,17 +10,15 @@
/**
* @brief Note Model
* @author dev@maarch.org
- * @ingroup notes
*/
-namespace Notes\Models;
+namespace Note\models;
-use Core\Models\ValidatorModel;
use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
class NoteModelAbstract
{
-
public static function countByResId(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['resId', 'userId']);
@@ -43,7 +41,7 @@ class NoteModelAbstract
}
$aNotes = DatabaseModel::select([
- 'select' => ['notes.id','user_id', 'item_id'],
+ 'select' => ['notes.id', 'user_id', 'item_id'],
'table' => ['notes', 'note_entities'],
'left_join' => ['notes.id = note_entities.note_id'],
'where' => ['identifier = ?'],
@@ -67,5 +65,4 @@ class NoteModelAbstract
return $nb;
}
-
}
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index b3ab4d237fe..8c1f7dccf16 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -15,6 +15,7 @@
namespace Resource\controllers;
use Basket\models\BasketModel;
+use Note\models\NoteModel;
use SrcCore\controllers\StoreController;
use Core\Models\ServiceModel;
use Status\models\StatusModel;
@@ -22,7 +23,6 @@ use SrcCore\models\ValidatorModel;
use History\controllers\HistoryController;
use Resource\models\ResModel;
use Respect\Validation\Validator;
-use Notes\Models\NoteModel;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\controllers\PreparedClauseController;
--
GitLab