Merge branch 'dev'

# Conflicts:
#	app/Http/Controllers/API/AuthController.php
#	app/Http/Requests/API/RegisterRequest.php
#	app/Http/Resources/AccountResource.php
#	app/Models/Account.php
#	config/services.php
#	routes/api.php

app/AccountTypes/AccountTypesService.php

@@ -0,0 +1,6 @@
+<?php
+namespace App\AccountTypes;
+interface AccountTypesService
+{
+    public function create(array $data) : AccountTypesService;
+}

app/AccountTypes/BusinessAccount.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\AccountTypes;
+
+use App\Http\Resources\BusinessProfileResource;
+
+class BusinessAccount implements AccountTypesService
+{
+
+    public function create(array $data) : AccountTypesService
+    {
+        $account = new BusinessAccount();
+
+        return $account->fill($data);
+    }
+
+}

app/AccountTypes/CompanyAccount.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\AccountTypes;
+
+use App\Http\Resources\CompanyProfileResource;
+
+class CompanyAccount implements AccountTypesService
+{
+
+    public function create(array $data) : AccountTypesService
+    {
+        $account = new CompanyAccount();
+
+        return $account->fill($data);
+    }
+
+}
+

app/Http/Controllers/API/AccountController.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Controllers\API;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\BankAccountRequest;
+use App\Http\Requests\ContactsRequest;
+use App\Http\Resources\AccountResource;
+use Illuminate\Http\Request;
+
+class AccountController extends Controller
+{
+    public function account(Request $request) : AccountResource
+    {
+        $account = $request->user()
+            ->account()
+            ->with('profile');
+
+        return AccountResource::make($account);
+
+    }
+
+    public function storeContacts(ContactsRequest $request){
+
+    }
+
+    public function storeBankAccount(BankAccountRequest $request){
+
+    }
+
+    public function storeProfile(){
+
+    }
+}

app/Http/Controllers/API/AuthController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\API;
 
 use App\Http\Requests\API\LoginRequest;
 use App\Http\Requests\API\RegisterRequest;

app/Http/Requests/API/RegisterRequest.php

@@ -30,7 +30,7 @@ public function rules()
             'lastname' => 'required',
             'account_type' => 'required|in:company,business',
             'country' => 'required|numeric|gt:0',
-            'legalization_number' => 'required_if:is_registered,on'
+//            'legalization_number' => 'required_if:is_registered,on'
         ];
     }
 }

app/Http/Requests/BankAccountRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class BankAccountRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return false;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, mixed>
+     */
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}

app/Http/Requests/ContactsRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ContactsRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return false;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, mixed>
+     */
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}

app/Http/Resources/AccountResource.php

@@ -14,6 +14,19 @@ class AccountResource extends JsonResource
      */
     public function toArray($request)
     {
-        return parent::toArray($request);
+        return [
+            'id'           => $this->id,
+            'bank_account' => $this->bank_account,
+            'contacts'     => $this->contacts,
+            'account_type' => $this->account_type,
+            'profile'      => $this->profile()
+        ];
+    }
+
+    private function profile() : JsonResource
+    {
+        $type = config('services.account.'.$this->account_type.'.resource');
+
+        return $type::make($this->profile);
     }
 }

app/Http/Resources/BusinessProfileResource.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class BusinessProfileResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}

app/Http/Resources/CompanyProfileResource.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class CompanyProfileResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+
+}

app/Models/Account.php

@@ -20,7 +20,7 @@ class Account extends Model
     // public $timestamps = false;
     protected $guarded = ['id'];
     protected $fillable = [
-        'contacts', 'bank', 'vat', 'country_id', 'legalization_number','type'
+        'contacts', 'bank', 'vat', 'country_id', 'legalization_number','account_type'
     ];
     protected $casts = [
         'contacts' => 'array',

app/Services/AccountTypesService.php

@@ -1,6 +0,0 @@
-<?php
-namespace App\Services;
-interface AccountTypesService
-{
-    public function create(array $data);
-}

app/Services/Business.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Services;
-
-class Business implements AccountTypesService
-{
-
-    public function create(array $data)
-    {
-        return new Business();
-    }
-}

app/Services/Company.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Services;
-
-class Company implements AccountTypesService
-{
-
-    public function create(array $data)
-    {
-        return new Company();
-    }
-}
-

routes/api.php

@@ -25,12 +25,20 @@
     /*
     * Client Api's
     */
+Route::middleware(['auth.client','auth:api'])->group(function () {
+    /**
+     * Client endpoints
+     */
     Route::get('/client', [AuthController::class, 'client']);
     Route::post('/logout', [AuthController::class, 'logout']);
     Route::post('/update-client', [AuthController::class, 'updateClient']);
-    /*
-     * Account
+    /**
+     * Account endpoints
      */
-    Route::get('/account',[AccountController::class,'get']);
-    Route::post('/update-account',[AccountController::class,'update']);
+    Route::group(['prefix' => 'account'],function () {
+        Route::get('/',[AccountController::class, 'account']);
+        Route::put('contacts',[AccountController::class,'storeContacts']);
+        Route::put('bank',[AccountController::class,'storeBankAccount']);
+    });
+
 });