From 2f5243c1f3b9fc93598a61cd1c3e80e0a385371d Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Fri, 10 Aug 2018 15:31:35 +0530 Subject: [PATCH] Fixed migrations and seeders --- app/Api/v1/InstallerApiController.php | 7 +++- .../Installer/helpdesk/InstallController.php | 2 +- ...7_26_094753_create_mail_services_table.php | 24 +++++------ ..._26_095020_create_queue_services_table.php | 32 +++++---------- ...08_16_104539_alter_ticket_source_table.php | 27 +++---------- ...r_users_table_add_user_language_column.php | 9 +++-- database/seeds/DatabaseSeeder.php | 8 ++-- database/seeds/OutboundMailSeeder.php | 40 +++++++++++++++++++ database/seeds/TicketSourceSeeder.php | 28 +++++++++++++ vendor/composer/autoload_classmap.php | 2 + vendor/composer/autoload_static.php | 2 + 11 files changed, 112 insertions(+), 69 deletions(-) create mode 100644 database/seeds/OutboundMailSeeder.php create mode 100644 database/seeds/TicketSourceSeeder.php diff --git a/app/Api/v1/InstallerApiController.php b/app/Api/v1/InstallerApiController.php index 0ecc9f6de..b64214b3b 100644 --- a/app/Api/v1/InstallerApiController.php +++ b/app/Api/v1/InstallerApiController.php @@ -98,7 +98,10 @@ class InstallerApiController extends Controller $ENV['CACHE_DRIVER'] = 'file'; $ENV['SESSION_DRIVER'] = 'file'; $ENV['QUEUE_DRIVER'] = 'sync'; - + $ENV['JWT_TTL'] = 4; + $ENV['FCM_SERVER_KEY'] = 'AIzaSyCyx5OFnsRFUmDLTMbPV50ZMDUGSG-bLw4'; + $ENV['FCM_SENDER_ID'] = '661051343223'; + $ENV['REDIS_DATABASE'] = '0'; $config = ''; foreach ($ENV as $key => $val) { @@ -168,7 +171,7 @@ class InstallerApiController extends Controller Artisan::call('migrate', ['--force' => true]); Artisan::call('db:seed', ['--force' => true]); Artisan::call('key:generate'); - + Artisan::call('jwt:secret'); // checking requested timezone for the admin and system $timezones = Timezones::where('name', '=', $timezone)->first(); if ($timezones == null) { diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index 4b387c622..251a54615 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -443,7 +443,7 @@ class InstallController extends Controller $ENV['SESSION_DRIVER'] = 'file'; $ENV['SESSION_COOKIE_NAME'] = 'faveo_'.rand(0, 10000); $ENV['QUEUE_DRIVER'] = 'sync'; - + $ENV['JWT_TTL'] = 4; $ENV['FCM_SERVER_KEY'] = 'AIzaSyCyx5OFnsRFUmDLTMbPV50ZMDUGSG-bLw4'; $ENV['FCM_SENDER_ID'] = '661051343223'; $ENV['REDIS_DATABASE'] = '0'; diff --git a/database/migrations/2016_07_26_094753_create_mail_services_table.php b/database/migrations/2016_07_26_094753_create_mail_services_table.php index 8384fd14c..3dfc28812 100644 --- a/database/migrations/2016_07_26_094753_create_mail_services_table.php +++ b/database/migrations/2016_07_26_094753_create_mail_services_table.php @@ -13,21 +13,15 @@ class CreateMailServicesTable extends Migration */ public function up() { - Schema::create('mail_services', function (Blueprint $table) { - $table->increments('id'); - $table->string('name'); - $table->string('short_name'); - $table->timestamps(); - }); - - $mail = new MailService(); - $services = ['smtp'=>'SMTP', 'mail'=>'Php Mail', 'sendmail'=>'Send Mail', 'mailgun'=>'Mailgun', 'mandrill'=>'Mandrill', 'log'=>'Log file']; - foreach ($services as $key=>$value) { - $mail->create([ - 'name' => $value, - 'short_name'=> $key, - ]); - } + Schema::create( + 'mail_services', + function (Blueprint $table) { + $table->increments('id'); + $table->string('name'); + $table->string('short_name'); + $table->timestamps(); + } + ); } /** diff --git a/database/migrations/2016_07_26_095020_create_queue_services_table.php b/database/migrations/2016_07_26_095020_create_queue_services_table.php index a975ab6be..091de35df 100644 --- a/database/migrations/2016_07_26_095020_create_queue_services_table.php +++ b/database/migrations/2016_07_26_095020_create_queue_services_table.php @@ -13,28 +13,16 @@ class CreateQueueServicesTable extends Migration */ public function up() { - Schema::create('queue_services', function (Blueprint $table) { - $table->increments('id'); - $table->string('name'); - $table->string('short_name'); - $table->integer('status'); - $table->timestamps(); - }); - - $queue = new QueueService(); - $services = ['sync'=>'Sync', 'database'=>'Database', 'beanstalkd'=>'Beanstalkd', 'sqs'=>'SQS', 'iron'=>'Iron', 'redis'=>'Redis']; - foreach ($services as $key=>$value) { - $queue->create([ - 'name' => $value, - 'short_name'=> $key, - 'status' => 0, - ]); - } - $q = $queue->where('short_name', 'sync')->first(); - if ($q) { - $q->status = 1; - $q->save(); - } + Schema::create( + 'queue_services', + function (Blueprint $table) { + $table->increments('id'); + $table->string('name'); + $table->string('short_name'); + $table->integer('status'); + $table->timestamps(); + } + ); } /** diff --git a/database/migrations/2016_08_16_104539_alter_ticket_source_table.php b/database/migrations/2016_08_16_104539_alter_ticket_source_table.php index e3900767f..2d1637760 100644 --- a/database/migrations/2016_08_16_104539_alter_ticket_source_table.php +++ b/database/migrations/2016_08_16_104539_alter_ticket_source_table.php @@ -13,28 +13,13 @@ class AlterTicketSourceTable extends Migration public function up() { if (!Schema::hasColumn('ticket_source', 'css_class')) { - Schema::table('ticket_source', function (Blueprint $table) { - $table->string('css_class'); - }); + Schema::table( + 'ticket_source', + function (Blueprint $table) { + $table->string('css_class'); + } + ); } - DB::table('ticket_source')->delete(); - $values = $this->values(); - foreach ($values as $value) { - DB::table('ticket_source')->insert($value); - } - } - - public function values() - { - return[ - ['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer'], - ['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope'], - ['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope'], - ['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook'], - ['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter'], - ['name' => 'call', 'value' => 'Call', 'css_class' => 'fa fa-phone'], - ['name' => 'chat', 'value' => 'Chat', 'css_class' => 'fa fa-comment'], - ]; } /** diff --git a/database/migrations/2018_08_08_094653_alter_users_table_add_user_language_column.php b/database/migrations/2018_08_08_094653_alter_users_table_add_user_language_column.php index 0ba4f23ae..153d67eeb 100644 --- a/database/migrations/2018_08_08_094653_alter_users_table_add_user_language_column.php +++ b/database/migrations/2018_08_08_094653_alter_users_table_add_user_language_column.php @@ -13,9 +13,12 @@ class AlterUsersTableAddUserLanguageColumn extends Migration */ public function up() { - Schema::table('users', function (Blueprint $table) { - $table->string('user_language', 10)->default(null)->nullable(); - }); + Schema::table( + 'users', + function (Blueprint $table) { + $table->string('user_language', 10)->default(null)->nullable(); + } + ); } /** diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index bbd9ba365..9b9bac9df 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -20,7 +20,6 @@ use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Settings\Ticket; use App\Model\helpdesk\Theme\Widgets; use App\Model\helpdesk\Ticket\Ticket_Priority; -use App\Model\helpdesk\Ticket\Ticket_source; use App\Model\helpdesk\Ticket\Ticket_Status; use App\Model\helpdesk\Utility\CountryCode; use App\Model\helpdesk\Utility\Date_format; @@ -272,10 +271,7 @@ class DatabaseSeeder extends Seeder Responder::create(['id' => '1', 'new_ticket' => '1', 'agent_new_ticket' => '1']); System::create(['id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32']); Ticket::create(['num_format' => '$$$$-####-####', 'num_sequence' => 'sequence', 'collision_avoid' => '2', 'priority' => '1', 'sla' => '2', 'help_topic' => '1', 'status' => '1']); - /* Ticket source */ - Ticket_source::create(['name' => 'web', 'value' => 'Web']); - Ticket_source::create(['name' => 'email', 'value' => 'E-mail']); - Ticket_source::create(['name' => 'agent', 'value' => 'Agent Panel']); + /* Version check */ Version_Check::create(['id' => '1']); /* System widgets */ @@ -2029,5 +2025,7 @@ class DatabaseSeeder extends Seeder Limit_Login::create(['id' => '1']); $this->call(UserSeeder::class); + $this->call(TicketSourceSeeder::class); + $this->call(OutboundMailSeeder::class); } } diff --git a/database/seeds/OutboundMailSeeder.php b/database/seeds/OutboundMailSeeder.php new file mode 100644 index 000000000..3a7e1b5c2 --- /dev/null +++ b/database/seeds/OutboundMailSeeder.php @@ -0,0 +1,40 @@ + 'SMTP', 'mail' => 'Php Mail', 'sendmail' => 'Send Mail', 'mailgun' => 'Mailgun', 'mandrill' => 'Mandrill', 'log' => 'Log file']; + foreach ($mail_services as $key => $value) { + $mail->create([ + 'name' => $value, + 'short_name' => $key, + ]); + } + + $queue = new QueueService(); + $services = ['sync' => 'Sync', 'database' => 'Database', 'beanstalkd' => 'Beanstalkd', 'sqs' => 'SQS', 'iron' => 'Iron', 'redis' => 'Redis']; + foreach ($services as $key => $value) { + $queue->create([ + 'name' => $value, + 'short_name' => $key, + 'status' => 0, + ]); + } + $q = $queue->where('short_name', 'sync')->first(); + if ($q) { + $q->status = 1; + $q->save(); + } + } +} diff --git a/database/seeds/TicketSourceSeeder.php b/database/seeds/TicketSourceSeeder.php new file mode 100644 index 000000000..c5e7ae548 --- /dev/null +++ b/database/seeds/TicketSourceSeeder.php @@ -0,0 +1,28 @@ + 'Web', 'value' => 'Web', 'css_class' => 'fa fa-globe',]); + Ticket_source::create(['name' => 'Email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope',]); + Ticket_source::create(['name' => 'Agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-user',]); + Ticket_source::create(['name' => 'Facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook',]); + Ticket_source::create(['name' => 'Twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter',]); + Ticket_source::create(['name' => 'Call', 'value' => 'Call', 'css_class' => 'fa fa-phone',]); + Ticket_source::create(['name' => 'Chat', 'value' => 'Chat', 'css_class' => 'fa fa-comment',]); + } + +} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 2777719b1..e614ba84c 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -212,6 +212,7 @@ return array( 'Null_Frame_Decorator' => $vendorDir . '/dompdf/dompdf/include/null_frame_decorator.cls.php', 'Null_Frame_Reflower' => $vendorDir . '/dompdf/dompdf/include/null_frame_reflower.cls.php', 'Null_Positioner' => $vendorDir . '/dompdf/dompdf/include/null_positioner.cls.php', + 'OutboundMailSeeder' => $baseDir . '/database/seeds/OutboundMailSeeder.php', 'PDFLib_Adapter' => $vendorDir . '/dompdf/dompdf/include/pdflib_adapter.cls.php', 'PHPUnit\\Exception' => $vendorDir . '/phpunit/phpunit/src/Exception.php', 'PHPUnit\\Framework\\Assert' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert.php', @@ -777,6 +778,7 @@ return array( 'TheSeer\\Tokenizer\\TokenCollectionException' => $vendorDir . '/theseer/tokenizer/src/TokenCollectionException.php', 'TheSeer\\Tokenizer\\Tokenizer' => $vendorDir . '/theseer/tokenizer/src/Tokenizer.php', 'TheSeer\\Tokenizer\\XMLSerializer' => $vendorDir . '/theseer/tokenizer/src/XMLSerializer.php', + 'TicketSourceSeeder' => $baseDir . '/database/seeds/TicketSourceSeeder.php', 'UserSeeder' => $baseDir . '/database/seeds/UserSeeder.php', 'Version1079table' => $baseDir . '/database/migrations/2016_06_28_141613_version1079table.php', ); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 5fb2473a2..9ffa36cce 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -871,6 +871,7 @@ class ComposerStaticInit598add4b9b35c76d3599603201ccdd6d 'Null_Frame_Decorator' => __DIR__ . '/..' . '/dompdf/dompdf/include/null_frame_decorator.cls.php', 'Null_Frame_Reflower' => __DIR__ . '/..' . '/dompdf/dompdf/include/null_frame_reflower.cls.php', 'Null_Positioner' => __DIR__ . '/..' . '/dompdf/dompdf/include/null_positioner.cls.php', + 'OutboundMailSeeder' => __DIR__ . '/../..' . '/database/seeds/OutboundMailSeeder.php', 'PDFLib_Adapter' => __DIR__ . '/..' . '/dompdf/dompdf/include/pdflib_adapter.cls.php', 'PHPUnit\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Exception.php', 'PHPUnit\\Framework\\Assert' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Assert.php', @@ -1436,6 +1437,7 @@ class ComposerStaticInit598add4b9b35c76d3599603201ccdd6d 'TheSeer\\Tokenizer\\TokenCollectionException' => __DIR__ . '/..' . '/theseer/tokenizer/src/TokenCollectionException.php', 'TheSeer\\Tokenizer\\Tokenizer' => __DIR__ . '/..' . '/theseer/tokenizer/src/Tokenizer.php', 'TheSeer\\Tokenizer\\XMLSerializer' => __DIR__ . '/..' . '/theseer/tokenizer/src/XMLSerializer.php', + 'TicketSourceSeeder' => __DIR__ . '/../..' . '/database/seeds/TicketSourceSeeder.php', 'UserSeeder' => __DIR__ . '/../..' . '/database/seeds/UserSeeder.php', 'Version1079table' => __DIR__ . '/../..' . '/database/migrations/2016_06_28_141613_version1079table.php', );