Merge pull request #32 from alizul01/qa-test

Qa test
alizul01 · Jun 17, 2023 · f1421a8 · f1421a8
2 parents da14a91 + 585fe77
commit f1421a8
Show file tree

Hide file tree

Showing 50 changed files with 467 additions and 548 deletions.
diff --git a/.env.cypress b/.env.cypress
diff --git a/.env.testing b/.env.testing
@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=base64:hzQmAqI80nKjrSO3Tvka4MFUpW/HZHDSkkDFUkzoBtk=
+APP_KEY=base64:BFzc3nu9K6xIcbL7zf4hCvAAKNYuqytP5ytdQgNmCTc=
 APP_DEBUG=true
 APP_URL=http://localhost
 
@@ -10,10 +10,10 @@ LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
-DB_PORT=3307
-DB_DATABASE=polarysdb_test
+DB_PORT=3306
+DB_DATABASE=polarysdb_testing
 DB_USERNAME=root
-DB_PASSWORD=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -34,7 +34,7 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="alizulfikar032@gmail.com"
+MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -9,50 +9,54 @@
 
 class AuthController extends Controller
 {
-    public function login(Request $request)
-    {
-        $credentials = $request->only('email', 'password');
-
-        if (Auth::attempt($credentials)) {
-            $request->session()->regenerate();
-            toast()->success('Login success');
-            return redirect()->route('index');
-        } else {
-            return back()->withErrors([
-                'email' => 'The provided credentials do not match our records.',
-            ]);
-        }
-    }
-
-    public function register(Request $request)
-    {
-        $request->validate([
-            'name' => 'required|string|max:255',
-            'email' => 'required|string|email|max:255|unique:users',
-            'password' => 'required|string|min:8|confirmed',
-            'password_confirmation' => 'required|string|min:8',
-            'identity' => 'required|file|mimes:jpg,png,jpeg|max:2048',
-        ]);
-
-        $user = User::create([
-            'name' => $request->name,
-            'email' => $request->email,
-            'password' => Hash::make($request->password),
-            'identity' => $request->file('identity')->store('public/identity'),
-        ]);
-
-        Auth::login($user);
-
-        toast()->success('Register success');
-        return redirect()->route('index');
-    }
-
-    public function logout(Request $request)
-    {
-        Auth::logout();
-        $request->session()->invalidate();
-        $request->session()->regenerateToken();
-        toast()->success('Logout success');
-        return redirect()->route('login');
+  public function login(Request $request)
+  {
+    $request->validate([
+      'email' => 'required|email',
+      'password' => 'required',
+    ]);
+
+    $credentials = $request->only('email', 'password');
+
+    if (Auth::attempt($credentials)) {
+      $request->session()->regenerate();
+      toast()->success('Login success');
+      return redirect()->route('index');
+    } else {
+      return back()->withErrors([
+        'email' => 'The provided credentials do not match our records.',
+      ]);
     }
+  }
+
+
+  public function register(Request $request)
+  {
+    $request->validate([
+      'name' => 'required|string|max:255',
+      'email' => 'required|string|email|max:255|unique:users',
+      'password' => 'required|string|min:8|confirmed',
+      'password_confirmation' => 'required|string|min:8',
+      // 'identity' => 'required|file|mimes:jpg,png,jpeg|max:2048',
+    ]);
+
+    $user = User::create([
+      'name' => $request->name,
+      'email' => $request->email,
+      'password' => Hash::make($request->password),
+      // 'identity' => $request->file('identity')->store('public/identity'),
+    ]);
+
+    toast()->success('Register success');
+    return redirect()->route('login');
+  }
+
+  public function logout(Request $request)
+  {
+    Auth::logout();
+    $request->session()->invalidate();
+    $request->session()->regenerateToken();
+    toast()->success('Logout success');
+    return redirect()->route('login');
+  }
 }
diff --git a/app/Http/Controllers/ReportingController.php b/app/Http/Controllers/ReportingController.php
@@ -59,8 +59,6 @@ private function generateDocumentFromTemplate($template_path, $values)
   {
     $phpWord = new \PhpOffice\PhpWord\TemplateProcessor($template_path);
     $phpWord->setValues($values);
-
-    // Your code to generate the document here...
     $phpWord->setValues($values);
     $phpWord->setImageValue('img', [
       'path' => 'https://logodownload.org/wp-content/uploads/2017/10/Starbucks-logo.png',

diff --git a/app/Http/Controllers/RoomReservationController.php b/app/Http/Controllers/RoomReservationController.php
@@ -24,7 +24,7 @@ public function postStep1(Request $request)
       'start_date' => 'required',
       'start_time' => 'required',
       'end_time' => 'required|after:start_time',
-      'participant' => 'required',
+      'participant' => 'required|min:1',
       'keterangan' => 'required',
     ]);
     $validatedData['user_id'] = auth()->user()->id;

diff --git a/cypress/downloads/360046_Pertemuan penting.docx b/cypress/downloads/360046_Pertemuan penting.docx
diff --git a/cypress/downloads/494189_Pertemuan penting.docx b/cypress/downloads/494189_Pertemuan penting.docx
diff --git a/database/migrations/2023_05_03_075637_create_users_table.php b/database/migrations/2023_05_03_075637_create_users_table.php
@@ -16,8 +16,8 @@ public function up(): void
             $table->string('name');
             $table->string('email');
             $table->string("password");
-            $table->enum('role', ['admin', 'user', 'superadmin', 'bem', 'kajur', 'hmti']);
-            $table->string('identity');
+            $table->enum('role', ['user', 'superadmin', 'bem', 'kajur', 'hmti'])->default('user');
+            $table->string('identity')->nullable();
             $table->foreignId('organization_id')->nullable();
             $table->timestamps();
         });

diff --git a/database/seeders/RoomReservationSeeder.php b/database/seeders/RoomReservationSeeder.php
@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Models\RoomReservation;
+use Carbon\Carbon;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 
@@ -13,6 +14,18 @@ class RoomReservationSeeder extends Seeder
    */
   public function run(): void
   {
+    $reservations = [
+      'user_id' => 5,
+      'room_id' => 1,
+      'start_date' => Carbon::now(),
+      'start_time' => '09:00:00',
+      'end_time' => '12:00:00',
+      'keterangan' => 'Pertemuan penting',
+      'participant' => 35,
+      'created_at' => Carbon::now(),
+      'updated_at' => Carbon::now(),
+    ];
 
+    RoomReservation::create($reservations);
   }
 }
diff --git a/package.json b/package.json
@@ -7,8 +7,7 @@
     "devDependencies": {
         "autoprefixer": "^10.4.14",
         "axios": "^1.4.0",
-        "cypress": "^12.13.0",
-        "cypress-file-upload": "^5.0.8",
+        "cypress": "^12.14.0",
         "flowbite": "^1.6.5",
         "laravel-vite-plugin": "^0.7.8",
         "postcss": "^8.4.24",
@@ -18,6 +17,7 @@
         "vite": "^4.3.9"
     },
     "dependencies": {
+        "cypress-file-upload": "^5.0.8",
         "sweetalert2": "^11.7.12"
     }
 }