[REFACTORING] Note to src

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/"
     	}
     },

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;

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>

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
 {

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
 {

modules/notes/Models/NoteModel.php → 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

modules/notes/Models/NoteModelAbstract.php → 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;
     }
-
 }

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;