validacion amigable del crear usuario con licencia

n3w63n · Jul 1, 2022 · daefbbf · daefbbf
1 parent e75ea7d
commit daefbbf
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.php
@@ -34,16 +34,18 @@ public function store(Request $request)
 
         $validator = Validator::make($request->all(), [
             'UserID' => 'required|unique:users|max:255',
-            'UserName' => 'required',
+            'UserName' => 'required|unique:users|max:255',
             'password' => 'required',
             'UserContactNumber' => 'required',
             'licence' => 'required'
         ]);
 
         if ($validator->fails()) {
-            $errors = $validator;
+            foreach($validator->errors()->all() as $error){
+                $errors[] = $error;
+            }
         }
-
+       
         $user = new User();
         $user->UserID = $request->UserID;
         $user->UserName = $request->UserName;
@@ -54,9 +56,8 @@ public function store(Request $request)
 
         $licence = Licence::where('LicenseKey', $request->licence)->whereNull('user_id')->first();
 
-        if($licence){
-
-            if($licence->ExpirationDate > now()){
+        if($licence && $validator->fails() == false){
+            if($licence->ExpirationDate == null || (now()->diffInSeconds($licence->ExpirationDate, false) > 0)){
                     $user->save();
                     $licence->user_id = $user->id;
                     $licence->UserID = $user->UserID;