Rob Arnold | Test

app/Http/Controllers/OrganisationController.php

@@ -22,6 +22,10 @@ class OrganisationController extends ApiController
      */
     public function store(OrganisationService $service): JsonResponse
     {
+        $this->request->validate([
+            'name' => 'required|unique:organisations|max:255'
+        ]);
+
         /** @var Organisation $organisation */
         $organisation = $service->createOrganisation($this->request->all());
 
@@ -30,33 +34,19 @@ public function store(OrganisationService $service): JsonResponse
             ->respond();
     }
 
-    public function listAll(OrganisationService $service)
+    /**
+     * @param OrganisationService $service
+     *
+     * @return JsonResponse
+     */
+    public function listAll(OrganisationService $service): JsonResponse
     {
-        $filter = $_GET['filter'] ?: false;
-        $Organisations = DB::table('organisations')->get('*')->all();
-
-        $Organisation_Array = &array();
-
-        for ($i = 2; $i < count($Organisations); $i -=- 1) {
-            foreach ($Organisations as $x) {
-                if (isset($filter)) {
-                    if ($filter = 'subbed') {
-                        if ($x['subscribed'] == 1) {
-                            array_push($Organisation_Array, $x);
-                        }
-                    } else if ($filter = 'trail') {
-                        if ($x['subbed'] == 0) {
-                            array_push($Organisation_Array, $x);
-                        }
-                    } else {
-                        array_push($Organisation_Array, $x);
-                    }
-                } else {
-                    array_push($Organisation_Array, $x);
-                }
-            }
-        }
-
-        return json_encode($Organisation_Array);
+        $filter = isset($_GET['filter']) ? $_GET['filter'] : null;
+
+        $organisations = $service->getOrganisations($filter);
+
+        return $this
+            ->transformCollection('organisation', $organisations)
+            ->respond();
     }
 }

app/Mail/SendMail.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class SendMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $data;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->view('confirmation');
+    }
+}

app/Organisation.php

@@ -25,25 +25,34 @@
  */
 class Organisation extends Model
 {
+    protected $table = 'organisations';
+
     use SoftDeletes;
 
     /**
      * @var array
      */
-    protected $fillable = [];
+    protected $fillable = [
+        'name',
+        'owner_user_id',
+        'trial_end',
+        'subscribed'
+    ];
 
     /**
      * @var array
      */
     protected $dates = [
-        'deleted_at',
+        'created_at',
+        'updated_at',
+        'deleted_at'
     ];
 
     /**
      * @return BelongsTo
      */
     public function owner(): BelongsTo
     {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo(User::class, 'owner_user_id');
     }
 }

app/Providers/AppServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Laravel\Passport\Passport;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -23,6 +24,8 @@ public function register()
      */
     public function boot()
     {
-        //
+        // $this->registerPolicies();
+
+        Passport::routes();
     }
 }

app/Services/OrganisationService.php

@@ -5,6 +5,13 @@
 namespace App\Services;
 
 use App\Organisation;
+use App\Mail\SendMail;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Mail;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\App;
+use App\Transformers\OrganisationTransformer;
 
 /**
  * Class OrganisationService
@@ -19,8 +26,50 @@ class OrganisationService
      */
     public function createOrganisation(array $attributes): Organisation
     {
+        $auth = App::make(Auth::class);
         $organisation = new Organisation();
+
+        // $organisation->create($attributes);
+
+        //save organisation
+        $organisation->name = $attributes['name'];
+        $organisation->owner_user_id = $auth::id();
+        $organisation->trial_end = Carbon::now()->add('day', 30);
+        $organisation->save();
+
+        //send email
+        $mailData['user'] = $auth::user()->name;
+        $mailData['organisation'] = $organisation->name;
+        $mailData['trial_end'] = (string)$organisation->trial_end;
+
+        Mail::to($auth::user()->email)->send(new SendMail($mailData));
 
         return $organisation;
     }
+
+    /**
+     * @param string $filter
+     *
+     * @return Organisations
+     */
+    public function getOrganisations($filter = null)
+    {
+        $organisation = new Organisation();
+
+        if ($filter === 'all' || !$filter) {
+            $Organisations = $organisation->all();
+        } else {
+            if ($filter == 'subbed') {
+                $status = 1;
+            } elseif ($filter == 'trial') {
+                $status = 0;
+            } else {
+                throw new \Exception('Filter param imvalid');
+            }
+
+            $Organisations = $organisation->where('subscribed', '=', $status)->get();
+        }
+
+        return $Organisations;
+    }
 }

app/Transformers/OrganisationTransformer.php

@@ -20,7 +20,19 @@ class OrganisationTransformer extends TransformerAbstract
      */
     public function transform(Organisation $organisation): array
     {
-        return [];
+        $owner = $this->includeUser($organisation);
+
+        return [
+            'id' => (int) $organisation->id,
+            'name' => (string) $organisation->name,
+            'owner' => [
+                'user_id' => (int) $organisation->owner_user_id,
+                'user_name' => $owner['name'],
+                'user_email' => $owner['email']
+            ], 
+            'subscribed' => (bool) $organisation->subscribed,
+            'trial_end' => ($organisation->trial_end ? (int) strtotime((string)$organisation->trial_end) : null)
+        ];
     }
 
     /**
@@ -30,6 +42,9 @@ public function transform(Organisation $organisation): array
      */
     public function includeUser(Organisation $organisation)
     {
-        return $this->item($organisation->user, new UserTransformer());
+        $UserTransformer = new UserTransformer();
+        $owner = $UserTransformer->transform($organisation->owner);
+
+        return $owner;
     }
 }

app/Transformers/UserTransformer.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Transformers;
+
+use App\Organisation;
+use League\Fractal\TransformerAbstract;
+
+/**
+ * Class UserTransformer
+ * @package App\Transformers
+ */
+class UserTransformer extends TransformerAbstract
+{
+    /**
+     * @param User $user
+     *
+     * @return array
+     */
+    public function transform($user): array
+    {
+        return [
+            'name' => (string) $user->name,
+            'email' => (string) $user->email,
+        ];
+    }
+}

app/User.php

@@ -2,12 +2,13 @@
 
 namespace App;
 
+use Laravel\Passport\HasApiTokens;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable
 {
-    use Notifiable;
+    use HasApiTokens, Notifiable;
 
     /**
      * The attributes that are mass assignable.
@@ -38,4 +39,12 @@ class User extends Authenticatable
     protected $casts = [
         'email_verified_at' => 'datetime',
     ];
+
+    /**
+     * @return HasMany
+     */
+    public function organisation(): HasMany
+    {
+        return $this->hasMany(organisation::class, 'id', 'onwer_user_id');
+    }
 }

config/auth.php

@@ -42,7 +42,7 @@
         ],
 
         'api' => [
-            'driver' => 'token',
+            'driver' => 'passport',
             'provider' => 'users',
             'hash' => false,
         ],

database/migrations/2019_12_20_094217_create_organisations_table.php

@@ -16,12 +16,16 @@ public function up()
         Schema::create('organisations', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name');
-            $table->integer('owner_user_id');
+            $table->unsignedBigInteger('owner_user_id')->index();
             $table->dateTime('trial_end')->nullable();
             $table->boolean('subscribed')->default(0);
             $table->timestamps();
             $table->softDeletes();
         });
+
+        Schema::table('organisations', function(Blueprint $table) {
+            $table->foreign('owner_user_id')->references('id')->on('users');
+        });
     }
 
     /**