adminnistrateur
/
walletservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Gender to identification payload

This commit is contained in:
Djery-Tom 2021-11-02 17:24:46 +01:00
parent b70c4ed6b5
commit 556a94c705
5 changed files with 69 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ Homestead.yaml
/resources/views/vendor /resources/views/vendor
/storage/api-docs /storage/api-docs
/public/swagger-ui-assets /public/swagger-ui-assets
/public/documents

9
app/Http/Controllers/UserController.php
View File

@ -12,6 +12,7 @@ use App\Traits\Helper;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\File;
use Illuminate\Support\Str;
class UserController extends Controller class UserController extends Controller
{ {
@ -85,9 +86,9 @@ class UserController extends Controller
} }
// dd($request->all()); // dd($request->all());
$this->validate($request, [ $this->validate($request, [
'document_image_front' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6048', 'document_image_front' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6144',
'document_image_back' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6048', 'document_image_back' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6144',
'user_image' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6048', 'user_image' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6144',
]); ]);
$identification->document_image_front = $this->uploadImage($request, 'document_image_front', 'D-F', "documents"); $identification->document_image_front = $this->uploadImage($request, 'document_image_front', 'D-F', "documents");
@ -171,7 +172,7 @@ class UserController extends Controller
$original_filename = $request->file($key)->getClientOriginalName(); $original_filename = $request->file($key)->getClientOriginalName();
$original_filename_arr = explode('.', $original_filename); $original_filename_arr = explode('.', $original_filename);
$file_ext = end($original_filename_arr); $file_ext = end($original_filename_arr);
$image = $imageCode . '-' . time() . '.' . $file_ext; $image = $imageCode . '-' . Str::uuid() . '.' . $file_ext;
//Check if the directory already exists. //Check if the directory already exists.
$directoryName = './' . $folderName; $directoryName = './' . $folderName;

14
app/Http/Controllers/UserGroupController.php
View File

@ -164,7 +164,7 @@ class UserGroupController extends Controller
if ($group->actif) if ($group->actif)
return $this->errorResponse(trans('errors.group_already_active')); return $this->errorResponse(trans('errors.group_already_active'));
$datetime = $this->getCurrentTimeByCountryCode($sponsor->network->country->code_country);; $datetime = $this->getCurrentTimeByCountryCode($sponsor->network->country->code_country);
++$group->nombre_validation; ++$group->nombre_validation;
++$group->nombre_utilisateurs; ++$group->nombre_utilisateurs;
@ -183,7 +183,7 @@ class UserGroupController extends Controller
// Notififier le createur // Notififier le createur
$data = new \stdClass(); $data = new \stdClass();
$data->screen = "notificationview"; $data->screen = "notificationview";
$data->data = new \stdClass();; $data->data = new \stdClass();
$data->data->id = $request->id_demande; $data->data->id = $request->id_demande;
$this->sendPushNotificationToUser($group->createur->user_code, $this->sendPushNotificationToUser($group->createur->user_code,
trans('notifications.accepted_group_validation_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation); trans('notifications.accepted_group_validation_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation);
@ -216,7 +216,7 @@ class UserGroupController extends Controller
// Notififier le createur // Notififier le createur
$data = new \stdClass(); $data = new \stdClass();
$data->screen = "notificationview"; $data->screen = "notificationview";
$data->data = new \stdClass();; $data->data = new \stdClass();
$data->data->id = $request->id_demande; $data->data->id = $request->id_demande;
if ($demande->type == 'creation') { if ($demande->type == 'creation') {
@ -248,6 +248,8 @@ class UserGroupController extends Controller
return $this->successResponse(trans('messages.successful_canceled_nano_credit_request')); return $this->successResponse(trans('messages.successful_canceled_nano_credit_request'));
} }
return $this->errorResponse(trans('errors.unexpected_error'));
} }
public function updateGroup(Request $request) public function updateGroup(Request $request)
@ -473,7 +475,7 @@ ug.date_creation as date_creation_groupe , ug.createur , ug.sponsor1 , ug.sponso
// Notififier l'utilisateur // Notififier l'utilisateur
$data = new \stdClass(); $data = new \stdClass();
$data->screen = "notificationview"; $data->screen = "notificationview";
$data->data = new \stdClass();; $data->data = new \stdClass();
$data->data->id = $request->id_demande; $data->data->id = $request->id_demande;
$this->sendPushNotificationToUser($user->user_code, $this->sendPushNotificationToUser($user->user_code,
trans('notifications.accepted_group_membership_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation); trans('notifications.accepted_group_membership_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation);
@ -532,7 +534,7 @@ ug.date_creation as date_creation_groupe , ug.createur , ug.sponsor1 , ug.sponso
// Notififier le createur // Notififier le createur
$data = new \stdClass(); $data = new \stdClass();
$data->screen = "notificationview"; $data->screen = "notificationview";
$data->data = new \stdClass();; $data->data = new \stdClass();
$data->data->id = $request->id_demande; $data->data->id = $request->id_demande;
$this->sendPushNotificationToUser($group->createur->user_code, $this->sendPushNotificationToUser($group->createur->user_code,
trans('notifications.accepted_group_deleting_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation); trans('notifications.accepted_group_deleting_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation);
@ -616,7 +618,7 @@ ug.date_creation , ug.createur , ug.sponsor1 , ug.sponsor2 , ug.sponsor3, ug.cou
// Notififier l'utilisateur // Notififier l'utilisateur
$data = new \stdClass(); $data = new \stdClass();
$data->screen = "notificationview"; $data->screen = "notificationview";
$data->data = new \stdClass();; $data->data = new \stdClass();
$data->data->id = $request->id_demande; $data->data->id = $request->id_demande;
$this->sendPushNotificationToUser($user->user_code, trans('notifications.accepted_group_nano_credit_request'), $data, $demande->date_validation); $this->sendPushNotificationToUser($user->user_code, trans('notifications.accepted_group_nano_credit_request'), $data, $demande->date_validation);

43
app/Models/Identification.php
View File

@ -16,6 +16,7 @@ use Illuminate\Database\Eloquent\Model;
* @property string $firstname * @property string $firstname
* @property string $lastname * @property string $lastname
* @property Carbon $birth_date * @property Carbon $birth_date
* @property string $gender
* @property string $town * @property string $town
* @property string $country * @property string $country
* @property string $identity_document * @property string $identity_document
@ -54,19 +55,20 @@ class Identification extends Model
]; ];
protected $fillable = [ protected $fillable = [
'firstname', 'firstname',
'lastname', 'lastname',
'birth_date', 'birth_date',
'town', 'gender',
'country', 'town',
'identity_document', 'country',
'id_identity_document', 'identity_document',
'expiry_date_document', 'id_identity_document',
'id_user', 'expiry_date_document',
'status', 'id_user',
'createdAt', 'status',
'user_image', 'createdAt',
'document_image_front', 'user_image',
'document_image_front',
'document_image_back', 'document_image_back',
'idNetwork', 'idNetwork',
'country_id' 'country_id'
@ -90,13 +92,14 @@ class Identification extends Model
public function rules() public function rules()
{ {
return [ return [
'lastname'=>'required', 'lastname' => 'required',
'birth_date'=> 'required|date|before_or_equal:today', 'birth_date' => 'required|date|before_or_equal:today',
'town'=>'required', 'gender' => 'required|in:M,F',
'country'=> 'required', 'town' => 'required',
'identity_document'=> 'required', 'country' => 'required',
'id_identity_document'=> 'required', 'identity_document' => 'required',
'expiry_date_document'=>'required|date|after_or_equal:today', 'id_identity_document' => 'required',
'expiry_date_document' => 'required|date|after_or_equal:today',
'id_user' => 'required_without_all:phone_number|integer|min:0|not_in:0', 'id_user' => 'required_without_all:phone_number|integer|min:0|not_in:0',
'phone_number' => 'required_without_all:id_user' 'phone_number' => 'required_without_all:id_user'
]; ];

32
database/migrations/2021_11_02_160624_add_gender_in_identifications_table.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddGenderInIdentificationsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('identifications', function (Blueprint $table) {
$table->enum('gender', ['M', 'F'])->default('M')->after('birth_date');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('identifications', function (Blueprint $table) {
$table->dropColumn('gender');
});
}
}