From 1640e6ef269e92d76f15a7b7d4cd98197eac563c Mon Sep 17 00:00:00 2001
From: Hafiz <koihafiz@gmail.com>
Date: Thu, 24 Jun 2021 11:32:13 +0800
Subject: [PATCH] fixed address branch as comments

---
 .../EmailVerificationAttemptExpiration.php    | 42 -------------------
 .../Jobs/PasswordResetTokenExpiration.php     | 39 -----------------
 app/Classes/Jobs/SendResetPasswordEmail.php   | 42 -------------------
 .../Jobs/SendUserVerificationEmail.php        | 41 ------------------
 ...1_06_21_220834_create_countries_table.php} |  0
 .../2021_06_21_222722_create_states_table.php |  7 ++++
 6 files changed, 7 insertions(+), 164 deletions(-)
 delete mode 100644 app/Classes/Jobs/EmailVerificationAttemptExpiration.php
 delete mode 100644 app/Classes/Jobs/PasswordResetTokenExpiration.php
 delete mode 100644 app/Classes/Jobs/SendResetPasswordEmail.php
 delete mode 100644 app/Classes/Jobs/SendUserVerificationEmail.php
 rename database/migrations/{2021_06_21_230834_create_countries_table.php => 2021_06_21_220834_create_countries_table.php} (100%)

diff --git a/app/Classes/Jobs/EmailVerificationAttemptExpiration.php b/app/Classes/Jobs/EmailVerificationAttemptExpiration.php
deleted file mode 100644
index e327a941..00000000
--- a/app/Classes/Jobs/EmailVerificationAttemptExpiration.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\Accounts\Services\ExpiresEmailVerificationAttempt;
-use App\Classes\Modules\Accounts\Services\ExpiresPasswordReset;
-use App\Models\PasswordReset;
-use App\Models\UserEmailVerification;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class EmailVerificationAttemptExpiration implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    /** @var UserEmailVerification */
-    private $attempt;
-
-    /**
-     * EmailVerificationAttemptExpiration constructor.
-     * @param UserEmailVerification $attempt
-     */
-    public function __construct(UserEmailVerification $attempt)
-    {
-        $this->attempt = $attempt;
-    }
-
-
-    /**
-     * @throws MalformedRequestException
-     */
-    public function handle()
-    {
-        (new ExpiresEmailVerificationAttempt())->execute($this->attempt);
-
-    }
-}
diff --git a/app/Classes/Jobs/PasswordResetTokenExpiration.php b/app/Classes/Jobs/PasswordResetTokenExpiration.php
deleted file mode 100644
index d5010964..00000000
--- a/app/Classes/Jobs/PasswordResetTokenExpiration.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\Accounts\Services\ExpiresPasswordReset;
-use App\Models\PasswordReset;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class PasswordResetTokenExpiration implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    /** @var PasswordReset */
-    private $attempt;
-
-    /**
-     * PasswordResetTokenExpiration constructor.
-     * @param PasswordReset $attempt
-     */
-    public function __construct(PasswordReset $attempt)
-    {
-        $this->attempt = $attempt;
-    }
-
-
-    /**
-     * @throws MalformedRequestException
-     */
-    public function handle()
-    {
-        (new ExpiresPasswordReset())->execute($this->attempt);
-    }
-}
diff --git a/app/Classes/Jobs/SendResetPasswordEmail.php b/app/Classes/Jobs/SendResetPasswordEmail.php
deleted file mode 100644
index 1a8d2488..00000000
--- a/app/Classes/Jobs/SendResetPasswordEmail.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Notifications\ResetPasswordEmail;
-use App\Models\PasswordReset;
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class SendResetPasswordEmail implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    /** @var User */
-    private $user;
-
-    /** @var PasswordReset */
-    private $attempt;
-
-    /**
-     * SendResetPasswordEmail constructor.
-     * @param User $user
-     * @param PasswordReset $attempt
-     */
-    public function __construct(User $user, PasswordReset $attempt)
-    {
-        $this->user = $user;
-        $this->attempt = $attempt;
-    }
-
-
-    public function handle()
-    {
-        $this->user->notify(new ResetPasswordEmail($this->user, $this->attempt));
-
-    }
-}
diff --git a/app/Classes/Jobs/SendUserVerificationEmail.php b/app/Classes/Jobs/SendUserVerificationEmail.php
deleted file mode 100644
index 2bb54f47..00000000
--- a/app/Classes/Jobs/SendUserVerificationEmail.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Notifications\UserVerificationEmail;
-use App\Models\User;
-use App\Models\UserEmailVerification;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class SendUserVerificationEmail implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    /** @var User */
-    private $user;
-
-    /** @var UserEmailVerification */
-    private $attempt;
-
-    /**
-     * SendUserVerificationEmail constructor.
-     * @param User $user
-     * @param UserEmailVerification $attempt
-     */
-    public function __construct(User $user, UserEmailVerification $attempt)
-    {
-        $this->user = $user;
-        $this->attempt = $attempt;
-    }
-
-
-    public function handle()
-    {
-        $this->user->notify(new UserVerificationEmail($this->user, $this->attempt));
-    }
-}
diff --git a/database/migrations/2021_06_21_230834_create_countries_table.php b/database/migrations/2021_06_21_220834_create_countries_table.php
similarity index 100%
rename from database/migrations/2021_06_21_230834_create_countries_table.php
rename to database/migrations/2021_06_21_220834_create_countries_table.php
diff --git a/database/migrations/2021_06_21_222722_create_states_table.php b/database/migrations/2021_06_21_222722_create_states_table.php
index d734729d..63c077bf 100644
--- a/database/migrations/2021_06_21_222722_create_states_table.php
+++ b/database/migrations/2021_06_21_222722_create_states_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -15,7 +16,13 @@ class CreateStatesTable extends Migration
     {
         Schema::create('states', function (Blueprint $table) {
             $table->id();
+            $table->foreignId('country_id')->unsigned();
+            $table->string('name');
+            $table->integer('status')->default(ApprovalStatus::APPROVED);
+            $table->softDeletes();
             $table->timestamps();
+
+            $table->foreign('country_id')->references('id')->on('countries');
         });
     }