Merge branch 'develop' into feature/controllers-and-services

avlima · avlima · commit c5380822e588 · 2018-02-07T20:02:32.000-02:00
diff --git a/README.md b/README.md
@@ -1,2 +1,8 @@
 # uds-desafio-back-end
 Teste para candidatos à vaga de backend
+
+php artisan create-db
+
+php artisan migrate:install
+
+php artisan migrate
diff --git a/composer.json b/composer.json
@@ -8,8 +8,8 @@
         "php": ">=7.0.0",
         "fideloper/proxy": "~3.3",
         "laravel/framework": "5.5.*",
-        "laravel/tinker": "~1.0",
         "soapbox/laravel-formatter": "^2.0"
+        "webpatser/laravel-uuid": "^3.0"
     },
     "require-dev": {
         "filp/whoops": "~2.0",
diff --git a/composer.lock b/composer.lock
diff --git a/config/database.php b/config/database.php
@@ -43,12 +43,12 @@
             'driver' => 'mysql',
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
+            'database' => env('DB_DATABASE', 'uds_desafio'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
             'unix_socket' => env('DB_SOCKET', ''),
-            'charset' => 'utf8mb4',
-            'collation' => 'utf8mb4_unicode_ci',
+            'charset' => 'utf8',
+            'collation' => 'utf8_unicode_ci',
             'prefix' => '',
             'strict' => true,
             'engine' => null,
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
diff --git a/database/migrations/2018_02_07_013133_create_product_table.php b/database/migrations/2018_02_07_013133_create_product_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateProductTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('produto', function (Blueprint $table) {
+            $table->uuid('id')->unique();
+            $table->primary('id');
+            $table->string('codigo')->unique();
+            $table->string('nome')->unique();
+            $table->double('preco_unitario', 8, 2);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('produto');
+    }
+}
diff --git a/database/migrations/2018_02_07_014214_create_person_table.php b/database/migrations/2018_02_07_014214_create_person_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreatePasswordResetsTable extends Migration
+class CreatePersonTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,10 +13,12 @@ class CreatePasswordResetsTable extends Migration
      */
     public function up()
     {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->string('email')->index();
-            $table->string('token');
-            $table->timestamp('created_at')->nullable();
+        Schema::create('pessoa', function (Blueprint $table) {
+            $table->uuid('id')->unique();
+            $table->primary('id');
+            $table->string('nome')->unique();
+            $table->string('cpf');
+            $table->date('data_nascimento');
         });
     }
 
@@ -27,6 +29,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('password_resets');
+        Schema::dropIfExists('pessoa');
     }
 }
diff --git a/database/migrations/2018_02_07_015007_create_order_table.php b/database/migrations/2018_02_07_015007_create_order_table.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateOrderTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('pedido', function (Blueprint $table) {
+            $table->uuid('id')->unique();
+            $table->char('cliente', 36)
+                  ->index('pedido_pessoa_id_foreign');
+            $table->foreign('cliente')->references('id')->on('pessoa');
+            $table->integer('numero', true, false);
+            $table->date('emissao');
+            $table->double('total', 8, 2);
+        });
+
+//        DB::unprepared('ALTER TABLE pedido DROP PRIMARY KEY');
+//        DB::unprepared('ALTER TABLE pedido ADD PRIMARY KEY (id)');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('pedido', function ($table) {
+            $table->dropForeign('pedido_pessoa_id_foreign');
+        });
+        Schema::dropIfExists('pedido');
+    }
+}
diff --git a/database/migrations/2018_02_07_022803_create_order_item_table.php b/database/migrations/2018_02_07_022803_create_order_item_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateOrderItemTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('item_pedido', function (Blueprint $table) {
+            $table->uuid('id')->unique();
+            $table->primary('id');
+            $table->char('produto', 36)
+                  ->index('item_pedido_produto_id_foreign');
+            $table->foreign('produto')->references('id')->on('produto');
+            $table->double('preco_unitario', 8, 2);
+            $table->double('desconto', 8, 2);
+            $table->double('total', 8, 2);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('item_pedido', function ($table) {
+            $table->dropForeign('item_pedido_produto_id_foreign');
+        });
+        Schema::dropIfExists('item_pedido');
+    }
+}
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -79,7 +79,7 @@
 
             <div class="content">
                 <div class="title m-b-md">
-                    Laravel
+                    Laravel {{app()::VERSION}}
                 </div>
 
                 <div class="links">
diff --git a/routes/console.php b/routes/console.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Foundation\Inspiring;
+use Illuminate\Support\Facades\DB;
 
 /*
 |--------------------------------------------------------------------------
@@ -16,3 +17,21 @@
 Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
 })->describe('Display an inspiring quote');
+
+Artisan::command('create-db', function () {
+    try {
+        if (DB::statement('CREATE DATABASE uds_desafio CHARACTER SET utf8 COLLATE utf8_general_ci;')) {
+            $path = base_path('.env');
+
+            if (file_exists($path)) {
+                file_put_contents($path, str_replace(
+                    'DB_DATABASE=', 'DB_DATABASE=uds_desafio', file_get_contents($path)
+                ));
+            }
+            $this->comment('Successfully created database');
+        }
+    } catch (\Exception $e) {
+        $this->comment($e->getMessage());
+    }
+
+})->describe('Create database');

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`use Illuminate\Database\Schema\Blueprint;`
`5`	`5`	`use Illuminate\Database\Migrations\Migration;`
`6`	`6`
`7`		`-class CreatePasswordResetsTable extends Migration`
	`7`	`+class CreatePersonTable extends Migration`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Run the migrations.`
`@@ -13,10 +13,12 @@ class CreatePasswordResetsTable extends Migration`
`13`	`13`	`*/`
`14`	`14`	`public function up()`
`15`	`15`	`{`
`16`		`- Schema::create('password_resets', function (Blueprint $table) {`
`17`		`- $table->string('email')->index();`
`18`		`- $table->string('token');`
`19`		`- $table->timestamp('created_at')->nullable();`
	`16`	`+ Schema::create('pessoa', function (Blueprint $table) {`
	`17`	`+ $table->uuid('id')->unique();`
	`18`	`+ $table->primary('id');`
	`19`	`+ $table->string('nome')->unique();`
	`20`	`+ $table->string('cpf');`
	`21`	`+ $table->date('data_nascimento');`
`20`	`22`	`});`
`21`	`23`	`}`
`22`	`24`
`@@ -27,6 +29,6 @@ public function up()`
`27`	`29`	`*/`
`28`	`30`	`public function down()`
`29`	`31`	`{`
`30`		`- Schema::dropIfExists('password_resets');`
	`32`	`+ Schema::dropIfExists('pessoa');`
`31`	`33`	`}`
`32`	`34`	`}`