From 2bf5de8f3e922501e495e7eda1406a639486b1ad Mon Sep 17 00:00:00 2001 From: CheeSiong Date: Tue, 3 Nov 2020 21:03:33 +0800 Subject: [PATCH] migrate Document & Content point constant --- .../ControllerLogic/CreateUserLogic.php | 2 +- .../DataTransferObjects/CompanyObject.php | 2 +- .../Validators/CompanyValidation.php | 2 +- .../ValueObjects/Constants/CompanyType.php | 8 ++++ .../ValueObjects/Constants/DocumentTypes.php | 8 ++++ .../ValueObjects/Constants/QwnerTypes.php | 7 ++++ .../Accounts/UserAuthenticationController.php | 2 +- app/Models/Content.php | 24 +++++++++++ app/Models/Document.php | 26 ++++++++++++ .../2014_10_11_100012_create_states_table.php | 1 + ...14_10_11_100013_create_districts_table.php | 1 + ...20_11_03_122319_create_documents_table.php | 42 +++++++++++++++++++ ...020_11_03_122358_create_contents_table.php | 36 ++++++++++++++++ database/seeds/CountriesTableSeeder.php | 1 - database/seeds/CurrenciesTableSeeder.php | 1 - routes/web.php | 2 +- 16 files changed, 158 insertions(+), 7 deletions(-) create mode 100644 app/Classes/ValueObjects/Constants/CompanyType.php create mode 100644 app/Classes/ValueObjects/Constants/DocumentTypes.php create mode 100644 app/Classes/ValueObjects/Constants/QwnerTypes.php create mode 100644 app/Models/Content.php create mode 100644 app/Models/Document.php create mode 100644 database/migrations/2020_11_03_122319_create_documents_table.php create mode 100644 database/migrations/2020_11_03_122358_create_contents_table.php diff --git a/app/Classes/Modules/Accounts/ControllerLogic/CreateUserLogic.php b/app/Classes/Modules/Accounts/ControllerLogic/CreateUserLogic.php index 74e1a74c..4d3a5ce9 100644 --- a/app/Classes/Modules/Accounts/ControllerLogic/CreateUserLogic.php +++ b/app/Classes/Modules/Accounts/ControllerLogic/CreateUserLogic.php @@ -122,7 +122,7 @@ class CreateUserLogic extends AbstractControllerLogic $company_object = new CompanyObject( $request->input('company_name'), $request->input('company_reference'), - 1 + null ); $this->canCreateCompany->passes($company_object); diff --git a/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php b/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php index 02d5f2a5..da9905e9 100644 --- a/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php +++ b/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php @@ -51,7 +51,7 @@ class CompanyObject implements DataTransferObject /** * @return int */ - public function getType(): int + public function getType(): ?int { return $this->type; } diff --git a/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php b/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php index 0ecab47d..f7c6444e 100644 --- a/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php +++ b/app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php @@ -28,7 +28,7 @@ class CompanyValidation extends AbstractValidation return [ 'company_name' => 'required', 'company_reference' => '', - 'type' => 'required' + 'type' => '' ]; } diff --git a/app/Classes/ValueObjects/Constants/CompanyType.php b/app/Classes/ValueObjects/Constants/CompanyType.php new file mode 100644 index 00000000..e1a763bb --- /dev/null +++ b/app/Classes/ValueObjects/Constants/CompanyType.php @@ -0,0 +1,8 @@ +bigInteger('country_id')->unsigned()->nullable(); $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade'); $table->string('name')->nullable(); + $table->integer('status')->nullable(); $table->timestamps(); $table->softDeletes(); }); diff --git a/database/migrations/2014_10_11_100013_create_districts_table.php b/database/migrations/2014_10_11_100013_create_districts_table.php index 80f800df..42da9530 100644 --- a/database/migrations/2014_10_11_100013_create_districts_table.php +++ b/database/migrations/2014_10_11_100013_create_districts_table.php @@ -21,6 +21,7 @@ class CreateDistrictsTable extends Migration $table->foreign('state_id')->references('id')->on('states')->onDelete('cascade'); $table->string('name')->nullable(); $table->text('postcode')->nullable(); + $table->integer('status')->nullable(); $table->timestamps(); $table->softDeletes(); }); diff --git a/database/migrations/2020_11_03_122319_create_documents_table.php b/database/migrations/2020_11_03_122319_create_documents_table.php new file mode 100644 index 00000000..677c6d4c --- /dev/null +++ b/database/migrations/2020_11_03_122319_create_documents_table.php @@ -0,0 +1,42 @@ +id(); + $table->integer('owner_id')->nullable(); + $table->integer('owner_type')->nullable(); + $table->integer('document_type')->nullable(); + $table->integer('status')->nullable(); + $table->string('reference')->nullable(); + $table->bigInteger('approved_by')->unsigned(); + $table->foreign('approved_by')->references('id')->on('users')->onDelete('cascade'); + $table->timestamp('issued_date')->nullable(); + $table->timestamp('expired_date')->nullable(); + $table->timestamp('approved_date')->nullable(); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('documents'); + } +} diff --git a/database/migrations/2020_11_03_122358_create_contents_table.php b/database/migrations/2020_11_03_122358_create_contents_table.php new file mode 100644 index 00000000..4f39731a --- /dev/null +++ b/database/migrations/2020_11_03_122358_create_contents_table.php @@ -0,0 +1,36 @@ +id(); + $table->bigInteger('document_id')->unsigned(); + $table->foreign('document_id')->references('id')->on('documents')->onDelete('cascade'); + $table->text('file')->nullable(); + $table->integer('file_type_id')->nullable(); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('contents'); + } +} diff --git a/database/seeds/CountriesTableSeeder.php b/database/seeds/CountriesTableSeeder.php index a272f94f..f2548290 100644 --- a/database/seeds/CountriesTableSeeder.php +++ b/database/seeds/CountriesTableSeeder.php @@ -18,7 +18,6 @@ class CountriesTableSeeder extends Seeder 'name' => 'Malaysia', 'short_code' => 'MY', 'phone_code' => '60', - 'status' => 1, 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'), ] diff --git a/database/seeds/CurrenciesTableSeeder.php b/database/seeds/CurrenciesTableSeeder.php index c8ca2dec..dde39abf 100644 --- a/database/seeds/CurrenciesTableSeeder.php +++ b/database/seeds/CurrenciesTableSeeder.php @@ -19,7 +19,6 @@ class CurrenciesTableSeeder extends Seeder 'name' => 'Ringgit', 'short_code' => 'MYR', 'symbol' => 'RM', - 'status' => 1, 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s') ] diff --git a/routes/web.php b/routes/web.php index 6d424aff..b4758315 100644 --- a/routes/web.php +++ b/routes/web.php @@ -20,7 +20,7 @@ Route::get('', function () { Route::get('account/registration', function () { return view('pages.accounts.registration'); -})->name('login'); +})->name('registration'); Route::get('account/password/reset/{token}', function ($token){ return view('pages.accounts.authentication.reset_password',['token' => $token]);