From bf41c634c04400e1c9787a2783545743555bde30 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 29 Nov 2019 22:15:50 +1100 Subject: [PATCH] Cast to string - default_gateway_type_id (#3105) * fixes for template controller * Default gateway as string --- app/Http/Controllers/TemplateController.php | 6 +++--- app/Http/Middleware/QueryLogging.php | 2 +- app/Models/CompanyUser.php | 1 + app/Transformers/ActivityTransformer.php | 2 +- app/Transformers/GatewayTransformer.php | 2 +- tests/Feature/UserTest.php | 18 ++++++++++++++++++ 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/TemplateController.php b/app/Http/Controllers/TemplateController.php index 3c1c494179..9b2bad4bdb 100644 --- a/app/Http/Controllers/TemplateController.php +++ b/app/Http/Controllers/TemplateController.php @@ -70,7 +70,7 @@ class TemplateController extends BaseController public function create($entity) { - return response()->json(request()->all(), 200); + return response()->json(request()->all(), 200); } /** @@ -157,12 +157,12 @@ class TemplateController extends BaseController $entity_obj = $class::find($entity_id)->company(); $subject = request()->input('subject'); - $body = ; + $body = request()->input('body'); $body = Parsedown::instance()->text(request()->input('body')); $subject = Parsedown::instance()->text(request()->input('subject')); - return response()->json($body, 200); + return response()->json($body, 200); } diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index 4611c74e6d..128144656e 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -50,7 +50,7 @@ class QueryLogging Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time); // if($count > 50) - Log::info($queries); + // Log::info($queries); } } diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php index ccf793bcac..1f8b541401 100644 --- a/app/Models/CompanyUser.php +++ b/app/Models/CompanyUser.php @@ -29,6 +29,7 @@ class CompanyUser extends Pivot 'updated_at' => 'timestamp', 'created_at' => 'timestamp', 'deleted_at' => 'timestamp', + 'settings' => 'object', ]; protected $fillable = [ diff --git a/app/Transformers/ActivityTransformer.php b/app/Transformers/ActivityTransformer.php index 9a0eca98ce..4f363dd4e2 100644 --- a/app/Transformers/ActivityTransformer.php +++ b/app/Transformers/ActivityTransformer.php @@ -29,7 +29,7 @@ class ActivityTransformer extends EntityTransformer 'activity_type_id' => (string) $activity->activity_type_id, 'client_id' => $activity->client ? (string) $this->encodePrimaryKey($activity->client->id) : '', 'company_id' => $activity->company ? (string) $this->encodePrimaryKey($activity->company->id) : '', - 'user_id' => (string) $activity->user_id, + 'user_id' => (string) $this->encodePrimaryKey($activity->user_id), 'invoice_id' => $activity->invoice ? (string) $this->encodePrimaryKey($activity->invoice->id) : '', 'payment_id' => $activity->payment ? (string) $this->encodePrimaryKey($activity->payment->id) : '', 'credit_id' => $activity->credit ? (string) $this->encodePrimaryKey($activity->credit->id) : '', diff --git a/app/Transformers/GatewayTransformer.php b/app/Transformers/GatewayTransformer.php index f15164a2c1..ca70c8085d 100644 --- a/app/Transformers/GatewayTransformer.php +++ b/app/Transformers/GatewayTransformer.php @@ -45,7 +45,7 @@ class GatewayTransformer extends EntityTransformer 'provider' => (string)$gateway->provider ?: '', 'visible' => (bool)$gateway->visible, 'sort_order' => (int)$gateway->sort_order, - 'default_gateway_type_id' => (int)$gateway->default_gateway_type_id, + 'default_gateway_type_id' => (string)$gateway->default_gateway_type_id, 'site_url' => (string)$gateway->site_url ?: '', 'is_offsite' => (bool)$gateway->is_offsite, 'is_secure' => (bool)$gateway->is_secure, diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php index 0d013815c5..d3aaf4174e 100644 --- a/tests/Feature/UserTest.php +++ b/tests/Feature/UserTest.php @@ -3,6 +3,7 @@ namespace Tests\Feature; +use App\Factory\UserFactory; use App\Models\Account; use App\Models\Activity; use App\Models\Company; @@ -77,4 +78,21 @@ class UserTest extends TestCase } + public function testUserAttachAndDetach() + { + $user = UserFactory::create(); + $user->first_name = 'Test'; + $user->last_name = 'Palloni'; + $user->save(); + + $response = $this->withHeaders([ + 'X-API-SECRET' => config('ninja.api_secret'), + 'X-API-TOKEN' => $this->token, + ])->post('/api/v1/users/'.$this->encodePrimaryKey($user->id).'/attachToCompany?include=company_user'); + + $response->assertStatus(200); + + $this->assertNotNull($user->company_user); + $this->assertEquals($user->company_user->company_id, $this->company->id) + } } \ No newline at end of file