From 5a953b33b6118b3333c0b3447e4f1110641be24c Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Wed, 19 Aug 2020 19:46:52 +0100
Subject: [PATCH] + Fix bug on create groupe

---
 app/Http/Controllers/NanoCreditController.php |  5 ++-
 app/Http/Controllers/UserGroupController.php  |  8 +++--
 app/Traits/Helper.php                         |  2 ++
 .../2020_08_18_073304_create_jobs_table.php   | 36 +++++++++++++++++++
 ..._08_18_073307_create_failed_jobs_table.php | 35 ++++++++++++++++++
 5 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 database/migrations/2020_08_18_073304_create_jobs_table.php
 create mode 100644 database/migrations/2020_08_18_073307_create_failed_jobs_table.php

diff --git a/app/Http/Controllers/NanoCreditController.php b/app/Http/Controllers/NanoCreditController.php
index 071aeef..3f58100 100755
--- a/app/Http/Controllers/NanoCreditController.php
+++ b/app/Http/Controllers/NanoCreditController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\AgentPlus;
 use App\Models\CodeGenerer;
 use App\Models\ConfigWallet;
+use App\Models\Identification;
 use App\Models\NetworksAgent;
 use App\Models\UsersDemandesCredit;
 use App\Models\UsersGroup;
@@ -48,7 +49,9 @@ class NanoCreditController extends Controller
         if (!$this->checkPassword($request->password, $user->encrypted_password, $user->salt))
             return $this->errorResponse(trans('messages.incorrect_user_password'));
 
-        $this->checkMyIdentification($request->id_user);
+        $identfication = $this->checkMyIdentification($request->id_user);
+        if (!($identfication instanceof Identification))
+            return $identfication;
 
         $init_country = $user->network->country->id;
         $result = ConfigWallet::join('networks', 'networks.id', '=', 'configWallet.id_network')
diff --git a/app/Http/Controllers/UserGroupController.php b/app/Http/Controllers/UserGroupController.php
index 0f2b9f8..b3b677b 100755
--- a/app/Http/Controllers/UserGroupController.php
+++ b/app/Http/Controllers/UserGroupController.php
@@ -48,7 +48,9 @@ class UserGroupController extends Controller
         if (!$this->checkPassword($request->password, $user->encrypted_password, $user->salt))
             return $this->errorResponse(trans('messages.incorrect_user_password'));
 
-        $this->checkMyIdentification($request->id_user);
+        $identfication = $this->checkMyIdentification($request->id_user);
+        if (!($identfication instanceof Identification))
+            return $identfication;
 
         //Verifier s'il appartient a un groupe
         if (isset($user->group_id))
@@ -397,7 +399,9 @@ ug.date_creation , ug.createur , ug.sponsor1 , ug.sponsor2 , ug.sponsor3, ug.cou
         if ($country_user != $country_sponsor)
             return $this->errorResponse(trans('errors.not_registered_in_same_country'));
 
-        $this->checkMyIdentification($request->id_user);
+        $identfication = $this->checkMyIdentification($request->id_user);
+        if (!($identfication instanceof Identification))
+            return $identfication;
 
         $user->group_id = $group->id;
         $user->date_adhesion = new \DateTime();
diff --git a/app/Traits/Helper.php b/app/Traits/Helper.php
index 4d1f21f..adb04e3 100644
--- a/app/Traits/Helper.php
+++ b/app/Traits/Helper.php
@@ -212,6 +212,8 @@ trait Helper
         if (isset($identification)) {
             if ($identification->status == 0)
                 return $this->errorResponse(trans('errors.validation_identification_required'));
+            else
+                return $identification;
         } else {
             return $this->errorResponse(trans('errors.identification_required'));
         }
diff --git a/database/migrations/2020_08_18_073304_create_jobs_table.php b/database/migrations/2020_08_18_073304_create_jobs_table.php
new file mode 100644
index 0000000..1be9e8a
--- /dev/null
+++ b/database/migrations/2020_08_18_073304_create_jobs_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('jobs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('queue')->index();
+            $table->longText('payload');
+            $table->unsignedTinyInteger('attempts');
+            $table->unsignedInteger('reserved_at')->nullable();
+            $table->unsignedInteger('available_at');
+            $table->unsignedInteger('created_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('jobs');
+    }
+}
diff --git a/database/migrations/2020_08_18_073307_create_failed_jobs_table.php b/database/migrations/2020_08_18_073307_create_failed_jobs_table.php
new file mode 100644
index 0000000..389bdf7
--- /dev/null
+++ b/database/migrations/2020_08_18_073307_create_failed_jobs_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateFailedJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('failed_jobs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->text('connection');
+            $table->text('queue');
+            $table->longText('payload');
+            $table->longText('exception');
+            $table->timestamp('failed_at')->useCurrent();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('failed_jobs');
+    }
+}