1. add user_id and guard to databasestorage table.

2. update database test

migrations/2016_12_16_154403_create_shopping_cart_table.php

@@ -23,6 +23,8 @@ public function up()
         Schema::create('shopping_cart', function (Blueprint $table) {
             $table->string('key');
             $table->string('__raw_id');
+            $table->string('guard')->nullable();
+            $table->integer('user_id')->nullable();
             $table->integer('id');
             $table->string('name');
             $table->integer('qty');
@@ -32,8 +34,7 @@ public function up()
             $table->string('type')->nullable();
             $table->string('status')->nullable();
             $table->text('attributes')->nullable();
-            $table->index('key');
-            $table->index('__raw_id');
+            $table->primary(['key', '__raw_id']);
             $table->nullableTimestamps();
         });
     }

phpunit.php

@@ -15,3 +15,4 @@
 
 require __DIR__.'/tests/CartTestTrait.php';
 require __DIR__.'/tests/Product.php';
+require __DIR__.'/tests/User.php';

phpunit.xml

@@ -24,6 +24,8 @@
                 <file>./src/Exception.php</file>
                 <file>./src/Facade.php</file>
                 <file>./src/ServiceProvider.php</file>
+                <file>./src/Storage/DatabaseStorage.php</file>
+                <file>./src/Storage/SessionStorage.php</file>
             </exclude>
         </whitelist>
     </filter>

src/ServiceProvider.php

@@ -11,7 +11,7 @@
 
 namespace iBrand\Shoppingcart;
 
-use iBrand\Shoppingcart\Storage\DatabaseStorage;
+use iBrand\Shoppingcart\Storage\SessionStorage;
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
 
 /**
@@ -52,6 +52,15 @@ public function register()
         );
 
         $this->app->singleton(Cart::class, function ($app) {
+            $storage = config('ibrand.cart.storage');
+
+            $cart = new Cart(new $storage(), $app['events']);
+
+            if (SessionStorage::class == $storage) {
+                return $cart;
+            }
+
+            //The below code is used of database storage
             $currentGuard = null;
             $user = null;
 
@@ -63,13 +72,11 @@ public function register()
                 }
             }
 
-            $storage = config('ibrand.cart.storage');
-
-            $cart = new Cart(new $storage(), $app['events']);
-
-            if (DatabaseStorage::class == $storage && $user) {
-                $cart->name($currentGuard.$user->id);
-                $cart->saveFromSession();
+            if ($user) {
+                //The cart name like `cart.{guard}.{user_id}`： cart.api.1
+                $cart->name($currentGuard.'.'.$user->id);
+            }else{
+                throw new Exception('Invalid auth.');
             }
 
             return $cart;

src/Storage/DatabaseStorage.php

@@ -44,13 +44,19 @@ public function set($key, $values)
 
         $rawIds = $values->pluck('__raw_id')->toArray();
 
+        //Delete the data that has been removed from cart.
         DB::table($this->table)->whereNotIn('__raw_id', $rawIds)->where('key', $key)->delete();
 
+        $keys = explode('.', $key);
+
+        $userId = end($keys);
+        $guard = prev($keys);
+
         $values = $values->toArray();
         foreach ($values as $value) {
             $item = array_only($value, $this->filed);
             $attr = json_encode(array_except($value, $this->filed));
-            $insert = array_merge($item, ['attributes' => $attr, 'key' => $key]);
+            $insert = array_merge($item, ['attributes' => $attr, 'key' => $key, 'guard' => $guard, 'user_id' => $userId]);
             if (DB::table($this->table)->where(['key' => $key, '__raw_id' => $item['__raw_id']])->first()) {
                 DB::table($this->table)->where(['key' => $key, '__raw_id' => $item['__raw_id']])
                     ->update(array_except($insert, ['key', '__raw_id']));

tests/DatabaseCartTest.php

@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use App\Models\User;
 use iBrand\ShoppingCart\Cart;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
@@ -32,6 +33,7 @@ protected function getEnvironmentSetUp($app)
             'database' => ':memory:',
             'prefix' => '',
         ]);
+
     }
 
     protected function loadMigrationsFrom($app)
@@ -48,9 +50,27 @@ protected function setUp()
     {
         parent::setUp(); // TODO: Change the autogenerated stub
 
+
+        $user = new User([
+            'id' => 1,
+            'name' => 'ibrand'
+        ]);
+
+        $this->be($user,'api');
+
         $this->loadMigrationsFrom(__DIR__.'/database');
 
-        //dd($this->app['config']->get('database'));
         $this->cart = $this->app['cart'];
+
+    }
+
+    /**
+     * test name().
+     */
+    public function testName()
+    {
+        $this->assertEquals('cart.api.1', $this->cart->getName());
+        $this->cart->name('ibrand');
+        $this->assertEquals('cart.ibrand', $this->cart->getName());
     }
 }

tests/User.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2018/1/28
+ * Time: 22:25
+ */
+
+namespace App\Models;
+
+use Illuminate\Foundation\Auth\User as Authenticatable;
+
+class User extends Authenticatable
+{
+    protected $fillable = [
+        'id', 'name', 'email', 'password',
+    ];
+}

tests/database/2016_12_16_154403_create_shopping_cart_test_table.php

@@ -23,17 +23,18 @@ public function up()
         Schema::create('shopping_cart', function (Blueprint $table) {
             $table->string('key');
             $table->string('__raw_id');
+            $table->string('guard')->nullable();
+            $table->integer('user_id')->nullable();
             $table->integer('id');
             $table->string('name');
             $table->integer('qty');
             $table->decimal('price');
             $table->decimal('total');
             $table->string('__model')->nullable();
-            $table->string('type');
+            $table->string('type')->nullable();
             $table->string('status')->nullable();
             $table->text('attributes')->nullable();
-            $table->index('key');
-            $table->index('__raw_id');
+            $table->primary(['key', '__raw_id']);
             $table->nullableTimestamps();
         });
     }