From e82c259cfa597c31ea60e89ce1fedd9c84c91062 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 28 Sep 2018 09:40:08 +0300
Subject: [PATCH] Merge activity transformer

---
 .../Transformers/ActivityTransformer.php      | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/Ninja/Transformers/ActivityTransformer.php b/app/Ninja/Transformers/ActivityTransformer.php
index 2e2fccb5380c..a7f9595713e0 100644
--- a/app/Ninja/Transformers/ActivityTransformer.php
+++ b/app/Ninja/Transformers/ActivityTransformer.php
@@ -9,6 +9,21 @@ use App\Models\Activity;
  */
 class ActivityTransformer extends EntityTransformer
 {
+	  /**
+     * @SWG\Property(property="id", type="integer", example=1)
+     * @SWG\Property(property="activity_type_id", type="integer", example=1)
+     * @SWG\Property(property="client_id", type="integer", example=1)
+     * @SWG\Property(property="user_id", type="integer", example=1)
+     * @SWG\Property(property="invoice_id", type="integer", example=1)
+     * @SWG\Property(property="payment_id", type="integer", example=1)
+     * @SWG\Property(property="credit_id", type="integer", example=1)
+     * @SWG\Property(property="updated_at", type="integer", example=1451160233, readOnly=true)
+     * @SWG\Property(property="expense_id", type="integer", example=1)
+     * @SWG\Property(property="is_system", type="boolean", example=false)
+     * @SWG\Property(property="contact_id", type="integer", example=1)
+     * @SWG\Property(property="task_id", type="integer", example=1)
+     */
+
     protected $defaultIncludes = [];
 
     /**
@@ -25,20 +40,21 @@ class ActivityTransformer extends EntityTransformer
     {
         return [
             'id' => $activity->key(),
-            'activity_type_id' => $activity->activity_type_id,
-            'client_id' => $activity->client ? $activity->client->public_id : null,
-            'user_id' => $activity->user->public_id + 1,
-            'invoice_id' => $activity->invoice ? $activity->invoice->public_id : null,
-            'payment_id' => $activity->payment ? $activity->payment->public_id : null,
-            'credit_id' => $activity->credit ? $activity->credit->public_id : null,
+            'activity_type_id' => (int) $activity->activity_type_id,
+            'client_id' => $activity->client ? (int) $activity->client->public_id : null,
+            'user_id' => (int) $activity->user->public_id + 1,
+            'invoice_id' => $activity->invoice ? (int) $activity->invoice->public_id : null,
+            'payment_id' => $activity->payment ? (int) $activity->payment->public_id : null,
+            'credit_id' => $activity->credit ? (int) $activity->credit->public_id : null,
             'updated_at' => $this->getTimestamp($activity->updated_at),
-            'expense_id' => $activity->expense_id ? $activity->expense->public_id : null,
+            'expense_id' => $activity->expense_id ? (int) $activity->expense->public_id : null,
             'is_system' => $activity->is_system ? (bool) $activity->is_system : null,
             'contact_id' => $activity->contact_id ? (int) $activity->contact->public_id : null,
             'task_id' => $activity->task_id ? (int) $activity->task->public_id : null,
 			'notes' => $activity->notes ?: '',
 			'adjustment' => (float) $activity->adjustment,
 			'balance' => (float) $activity->balance,
+
         ];
     }
 }