Model is in place and tests for database

Author: gnikyt

README.md

@@ -42,6 +42,10 @@ Open `app/Http/Kernel.php` find `routeMiddleware` array. Add a new line with:
 
 `'auth.shop' => \OhMyBrew\ShopifyApp\Middleware\AuthShop::class,`
 
+### Migrations
+
+Run `php artisan migrate`.
+
 ## Routes
 
 Here are the defined routes and what they do.

src/ShopifyApp/Middleware/AuthShop.php

@@ -15,7 +15,7 @@ class AuthShop
      */
     public function handle(Request $request, Closure $next)
     {
-        if (ShopifyApp::shop() === false) {
+        if (ShopifyApp::shop() === null) {
             // Shall not pass
             abort(403);
         }

src/ShopifyApp/Models/Shop.php

@@ -0,0 +1,8 @@
+<?php namespace OhMyBrew\ShopifyApp\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Shop extends Model
+{
+    //
+}

src/ShopifyApp/ShopifyApp.php

@@ -1,6 +1,7 @@
 <?php namespace OhMyBrew\ShopifyApp;
 
 use OhMyBrew\BasicShopifyAPI as ShopifyAPI;
+use OhMyBrew\ShopifyApp\Models\Shop;
 use Illuminate\Foundation\Application;
 
 class ShopifyApp
@@ -13,10 +14,17 @@ class ShopifyApp
     public $app;
 
     /**
-     * The current shop
+     * The current API instance
      *
      * @var \OhMyBrew\BasicShopifyAPI
      */
+    public $api;
+
+    /**
+     * The current shop
+     *
+     * @var \OhMyBrew\ShopifyApp\Models\Shop
+     */
     public $shop;
 
     /**
@@ -32,32 +40,38 @@ public function __construct(Application $app)
     }
 
     /**
-     * Gets the current shop.
+     * Gets/sets the current shop.
      *
-     * @return \OhMyBrew\BasicShopifyAPI
+     * @return \OhMyBrew\Models\Shop
      */
     public function shop() {
-        if ($this->shop) {
-            // Return the instance
-            return $this->shop;
+        $shopifyDomain = session('shopify_domain');
+        if (!$this->shop && $shopifyDomain) {
+            // Grab shop from database here
+            $shop = Shop::where('shopify_domain', $shopifyDomain)->first();
+
+            // Update shop instance
+            $this->shop = $shop;
         }
 
-        // New instance
+        return $this->shop;
+    }
+
+    /**
+     * Gets/sets the current API instance.
+     *
+     * @return \OhMyBrew\BasicShopifyAPI
+     */
+    public function api() {
         $shopifyDomain = session('shopify_domain');
-        if ($shopifyDomain) {
+        if (!$this->api && $shopifyDomain) {
             // Grab shop from database here
 
-            // Start the API
+            // Update API instance
             $api = new ShopifyAPI;
-            //$api->setSession($shopifyDomain);
-
-            // Update shop instance
-            $this->shop = $api;
-
-            return $api;
+            $this->api = $api;
         }
 
-        // No shop
-        return false;
+        return $this->api;
     }
 }

src/ShopifyApp/ShopifyAppProvider.php

@@ -21,6 +21,9 @@ public function boot()
         $this->publishes([
             __DIR__.'/resources/config/shopify-app.php' => config_path('shopify-app.php')
         ]);
+
+        // Database migrations
+        $this->loadMigrationsFrom(__DIR__.'/resources/database/migrations');
     }
 
     /**

src/ShopifyApp/resources/database/migrations/2017_07_07_171903_create_shops_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateShopsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('shops', function(Blueprint $table) {
+            $table->increments('id');
+            $table->string('shopify_domain');
+            $table->string('shopify_token');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('shops');
+    }
+}

tests/ShopifyAppTest.php

@@ -8,20 +8,28 @@ public function testShopWithoutSession()
     {
         // No session, no API instance, thus no shop
         $shopifyApp = new ShopifyApp($this->app);
-        $this->assertFalse($shopifyApp->shop());
+        $this->assertNull($shopifyApp->shop());
+        $this->assertNull($shopifyApp->api());
     }
 
     public function testShopWithSession()
     {
         session(['shopify_domain' => 'example.myshopify.com']);
         $shopifyApp = new ShopifyApp($this->app);
 
-        // First run should store the API to shop var
+        // First run should store the shop object to shop var
         $run1 = $shopifyApp->shop();
 
         // Second run should retrive shop var
         $run2 = $shopifyApp->shop();
 
+        // First run should store the shop object to shop var
+        $run3 = $shopifyApp->api();
+
+        // Second run should retrive shop var
+        $run4 = $shopifyApp->api();
+
         $this->assertEquals($run1, $run2);
+        $this->assertEquals($run3, $run4);
     }
 }

tests/TestCase.php

@@ -1,19 +1,42 @@
 <?php namespace OhMyBrew\ShopifyApp\Test;
 
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
+use Orchestra\Database\ConsoleServiceProvider;
 use OhMyBrew\ShopifyApp\ShopifyAppProvider;
+use OhMyBrew\ShopifyApp\Models\Shop;
 
 abstract class TestCase extends OrchestraTestCase
 {
     public function setUp()
     {
         parent::setUp();
+        $this->setupDatabase($this->app);
     }
 
     protected function getPackageProviders($app)
     {
         return [
             ShopifyAppProvider::class,
+            ConsoleServiceProvider::class
         ];
     }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('database.default', 'sqlite');
+        $app['config']->set('database.connections.sqlite', [
+            'driver'   => 'sqlite',
+            'database' => ':memory:',
+            'prefix'   => ''
+        ]);
+    }
+
+    protected function setupDatabase($app) {
+        $this->loadMigrationsFrom(realpath(__DIR__.'/../src/ShopifyApp/resources/database/migrations'));
+
+        $shop = new Shop;
+        $shop->shopify_domain = 'example.myshopify.com';
+        $shop->shopify_token = '1234';
+        $shop->save();
+    }
 }