Merge pull request #114 from dbarzin/dev

Dev
dbarzin · Aug 4, 2024 · 48f0e9d · 48f0e9d
2 parents 0099bce + d6a3683
commit 48f0e9d
Show file tree

Hide file tree

Showing 7 changed files with 195 additions and 174 deletions.
diff --git a/INSTALL.fr.md b/INSTALL.fr.md
@@ -108,7 +108,12 @@ Pour importer la base de données avec les attributs de sécurité de la norme 2
 
     LANG=fr php artisan db:seed --class=AttributeSeeder
 
-Démarrer l'application avec php
+Peupler la base de données avec la norme ISO 27001:2022 et générer un jeu de tests (optionel)
+
+    php artisan deming:import-framework ./storage/app/repository/ISO27001-2022.fr.xlsx --clean
+    php artisan deming:generate-tests
+
+Démarrer l'application avec PHP
 
     php artisan serve
 
@@ -236,8 +241,10 @@ Voici la commande pour recréer la DB :
 
     php artisan migrate:fresh --seed
 
-Puis pour peupler la DB avec la 27001:2022
+Puis importer les attributs
 
     php artisan db:seed --class=AttributeSeeder
-    php artisan db:seed --class=DomainSeeder
-    php artisan db:seed --class=MeasureSeeder
+
+Peupler la base de données avec la norme ISO 27001:2022
+
+    php artisan deming:import-framework ./storage/app/repository/ISO27001-2022.fr.xlsx
diff --git a/INSTALL.md b/INSTALL.md
@@ -100,10 +100,15 @@ Create storage link
 
     php artisan storage:link
 
-To import the database with 27001:2022 attributes (optional)
+Import attributes
 
     php artisan db:seed --class=AttributeSeeder
 
+Then populate the database with 27001:2022 and generated tests data
+
+    php artisan deming:import-framework ./storage/app/repository/ISO27001-2022.en.xlsx --clean
+    php artisan deming:generate-tests
+
 Start application with php
 
     php artisan serve
@@ -232,8 +237,10 @@ Here's the command to recreate the DB:
 
     php artisan migrate:fresh --seed
 
-Then to populate the DB with 27001:2022
+Import attributes
 
     php artisan db:seed --class=AttributeSeeder
-    php artisan db:seed --class=DomainSeeder
-    php artisan db:seed --class=MeasureSeeder
+
+Then to populate the database with 27001:2022
+
+    php artisan deming:import-framework ./storage/app/repository/ISO27001-2022.en.xlsx
diff --git a/app/Console/Commands/GenerateTestData.php b/app/Console/Commands/GenerateTestData.php
@@ -16,7 +16,7 @@ class GenerateTestData extends Command
      *
      * @var string
      */
-    protected $signature = 'deming:generateTests';
+    protected $signature = 'deming:generate-tests';
 
     /**
      * The console command description.

diff --git a/app/Http/Controllers/MeasureController.php b/app/Http/Controllers/MeasureController.php
@@ -401,17 +401,6 @@ public function plan(Request $request)
             '403 Forbidden'
         );
 
-        $this->validate(
-            $request,
-            [
-                'name' => 'required|min:3|max:255',
-                'scope' => 'max:32',
-                'objective' => 'required',
-                'plan_date' => 'required',
-                'periodicity' => 'required|integer',
-            ]
-        );
-
         $measure = Measure::find($request->id);
 
         // Control not found