From e5cae87c04420eeb7334496430e67ae4cd0678d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Tue, 8 Mar 2022 11:40:52 +0100
Subject: [PATCH] Move Models into app/Models

---
 app/Aliments.php                           | 15 ---------------
 app/Console/Commands/ImportMoba.php        |  2 +-
 app/Console/Commands/MajEleveurs.php       |  2 +-
 app/Http/Controllers/AjaxController.php    | 10 +++++-----
 app/Http/Controllers/EleveurController.php |  2 +-
 app/Http/Controllers/FrontController.php   | 10 +++++-----
 app/Models/Aliments.php                    | 15 +++++++++++++++
 app/{ => Models}/Eleveur.php               | 19 +++++++++++++++++--
 app/{ => Models}/MiseEnPlace.php           |  7 ++++++-
 app/{ => Models}/Moba.php                  |  0
 app/{ => Models}/User.php                  |  0
 app/{ => Models}/VisuelLibelle.php         |  0
 12 files changed, 51 insertions(+), 31 deletions(-)
 delete mode 100644 app/Aliments.php
 create mode 100644 app/Models/Aliments.php
 rename app/{ => Models}/Eleveur.php (78%)
 rename app/{ => Models}/MiseEnPlace.php (87%)
 rename app/{ => Models}/Moba.php (100%)
 rename app/{ => Models}/User.php (100%)
 rename app/{ => Models}/VisuelLibelle.php (100%)

diff --git a/app/Aliments.php b/app/Aliments.php
deleted file mode 100644
index cef5251..0000000
--- a/app/Aliments.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Aliments extends Model
-{
-    public $timestamps = false;
-
-    /**
-     * @var string
-     */
-    protected $table = 'aliments';
-}
diff --git a/app/Console/Commands/ImportMoba.php b/app/Console/Commands/ImportMoba.php
index 7438ac3..d6b0638 100644
--- a/app/Console/Commands/ImportMoba.php
+++ b/app/Console/Commands/ImportMoba.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use App\Moba;
+use App\Models\Moba;
 use Carbon\Carbon;
 
 class ImportMoba extends Command
diff --git a/app/Console/Commands/MajEleveurs.php b/app/Console/Commands/MajEleveurs.php
index 08299bf..131828f 100644
--- a/app/Console/Commands/MajEleveurs.php
+++ b/app/Console/Commands/MajEleveurs.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use App\Moba;
+use App\Models\Moba;
 
 class MajEleveurs extends Command
 {
diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 65936f5..9358605 100644
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -3,10 +3,10 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\MiseEnPlace;
-use App\Aliments;
-use App\Eleveur;
-use App\Moba;
+use App\Models\MiseEnPlace;
+use App\Models\Aliment;
+use App\Models\Eleveur;
+use App\Models\Moba;
 use Carbon\Carbon;
 
 class AjaxController extends Controller
@@ -33,7 +33,7 @@ class AjaxController extends Controller
                     $date            = $y . '-' . $m . '-' . $d;
                     $aliment         = $data[2];
 
-                    $alim                 = new Aliments();
+                    $alim                 = new Aliment();
                     $alim->code_lot       = $codeLot;
                     $alim->date_livraison = $date;
                     $alim->type_aliment   = $aliment;
diff --git a/app/Http/Controllers/EleveurController.php b/app/Http/Controllers/EleveurController.php
index 097e097..f1ffe2c 100644
--- a/app/Http/Controllers/EleveurController.php
+++ b/app/Http/Controllers/EleveurController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Eleveur;
+use App\Models\Eleveur;
 use App\Http\Requests\MyRequest;
 use Response;
 
diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php
index 652a654..2d8c531 100644
--- a/app/Http/Controllers/FrontController.php
+++ b/app/Http/Controllers/FrontController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\Eleveur;
-use App\Aliments;
-use App\MiseEnPlace;
-use App\Moba;
+use App\Models\Eleveur;
+use App\Models\Aliment;
+use App\Models\MiseEnPlace;
+use App\Models\Moba;
 use App\VisuelLibelle;
 use Carbon\Carbon;
 
@@ -54,7 +54,7 @@ class FrontController extends Controller
 
         $mep = MiseEnPlace::whereIn('eleveurId_pondeuse', $elevId)->where('date_transfert_poulettes', '<', $datePonte)->orderBy('id', 'DESC')->first();
         if ($mep) {
-            $aliment = Aliments::where('code_lot', $mep->code_lot_pondeuse)->orderBy('id', 'DESC')->first();
+            $aliment = Aliment::where('code_lot', $mep->code_lot_pondeuse)->orderBy('id', 'DESC')->first();
         } else {
             $mep     = '';
             $aliment = "";
diff --git a/app/Models/Aliments.php b/app/Models/Aliments.php
new file mode 100644
index 0000000..93fe789
--- /dev/null
+++ b/app/Models/Aliments.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Aliment extends Model
+{
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var boolean
+     */
+    public $timestamps = false;
+}
diff --git a/app/Eleveur.php b/app/Models/Eleveur.php
similarity index 78%
rename from app/Eleveur.php
rename to app/Models/Eleveur.php
index 255c25d..452c9ae 100644
--- a/app/Eleveur.php
+++ b/app/Models/Eleveur.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -9,6 +9,11 @@ class Eleveur extends Model
 {
     use SoftDeletes;
 
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var boolean
+     */
     public $timestamps = false;
 
     /**
@@ -44,9 +49,19 @@ class Eleveur extends Model
      */
     protected $table = 'eleveurs';
 
+    /**
+     * The accessors to append to the model's array form.
+     *
+     * @var array
+     */
     protected $appends = ['questions'];
 
-    public function getQuestionsAttribute()
+    /**
+     * Questions attribute accessor
+     *
+     * @return boolean
+     */
+    public function getQuestionsAttribute(): bool
     {
         if ($this->aboutyou != null && $this->aboutyou != '') {
             return true;
diff --git a/app/MiseEnPlace.php b/app/Models/MiseEnPlace.php
similarity index 87%
rename from app/MiseEnPlace.php
rename to app/Models/MiseEnPlace.php
index 7060e70..5cd0022 100644
--- a/app/MiseEnPlace.php
+++ b/app/Models/MiseEnPlace.php
@@ -1,11 +1,16 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class MiseEnPlace extends Model
 {
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var boolean
+     */
     public $timestamps = false;
 
     /**
diff --git a/app/Moba.php b/app/Models/Moba.php
similarity index 100%
rename from app/Moba.php
rename to app/Models/Moba.php
diff --git a/app/User.php b/app/Models/User.php
similarity index 100%
rename from app/User.php
rename to app/Models/User.php
diff --git a/app/VisuelLibelle.php b/app/Models/VisuelLibelle.php
similarity index 100%
rename from app/VisuelLibelle.php
rename to app/Models/VisuelLibelle.php