Adicionado tipo e verificacao do tipo no log

Author: [email protected]

src/OwenIt/Auditing/Auditing.php

@@ -7,40 +7,45 @@
 
 class Auditing extends Model
 {
-    /**
-     * @var array
-     */
-    private $originalData = [];
-
-    /**
-     * @var array
-     */
-    private $updatedData = [];
-
-    /**
-     * @var boolean
-     */
-    private $updating = false;
-
-    /**
-     * @var array
-     */
-    protected $dontKeep = [];
-
-    /**
-     * @var array
-     */
-    protected $doKeep = [];
-
-    /**
-     * @var array
-     */
-    protected $dirtyData = [];
-
-    /**
-     * @var bool
-     */
-    public $auditEnabled = true;
+	/**
+	 * @var array
+	 */
+	private $originalData = [];
+
+	/**
+	 * @var array
+	 */
+	private $updatedData = [];
+
+	/**
+	 * @var boolean
+	 */
+	private $updating = false;
+
+	/**
+	 * @var array
+	 */
+	protected $dontKeep = [];
+
+	/**
+	 * @var array
+	 */
+	protected $doKeep = [];
+
+	/**
+	 * @var array
+	 */
+	protected $dirtyData = [];
+
+	/**
+	 * @var bool
+	 */
+	protected $auditEnabled = true;
+
+	/**
+	 * @var array
+	 */
+	protected $auditableTypes = ['created', 'saved', 'deleted'];
 
 	/**
 	 * Init auditing
@@ -54,22 +59,25 @@ public static function boot()
 			$model->prepareAudit();
 		});
 
-		static::saved(function ($model)
+		static::created(function($model)
 		{
-			$model->auditUpdate();
+			if($model->isTypeAuditable('created'))
+				$model->auditCreation();
 		});
 
-		static::created(function($model)
+		static::saved(function ($model)
 		{
-			$model->auditCreation();
+			if($model->isTypeAuditable('saved'))
+				$model->auditUpdate();
 		});
 
 		static::deleted(function($model)
 		{
-			$model->prepareAudit();
-			$model->auditDeletion();
+			if($model->isTypeAuditable('deleted')){
+				$model->prepareAudit();
+				$model->auditDeletion();
+			}
 		});
-
 	}
 
 	/**
@@ -144,6 +152,7 @@ public function auditCreation()
 				'owner_type' => get_class($this),
 				'owner_id'   => $this->getKey(),
 				'user_id'    => $this->getUserId(),
+				'type'       => 'created',
 				'created_at' => new \DateTime(),
 				'updated_at' => new \DateTime(),
 			]);
@@ -171,7 +180,7 @@ public function auditUpdate()
 			$changes_to_record = $this->changedAuditingFields();
 			if(count($changes_to_record))
 			{
-				$log = [];
+				$log = ['type' => 'updated'];
 				foreach ($changes_to_record as $key => $change)
 				{
 					$log['old_value'][$key] = array_get($this->originalData, $key);
@@ -185,7 +194,6 @@ public function auditUpdate()
 
 	/**
 	 * Auditing deletion
-	 *
 	 */
 	public function auditDeletion()
 	{
@@ -198,6 +206,7 @@ public function auditDeletion()
 				'owner_type' => get_class($this),
 				'owner_id'   => $this->getKey(),
 				'user_id'    => $this->getUserId(),
+				'type'       => 'deleted',
 				'created_at' => new \DateTime(),
 				'updated_at' => new \DateTime(),
 			]);
@@ -215,6 +224,7 @@ public function audit(array $log)
 			'owner_type' => get_class($this),
 			'owner_id'   => $this->getKey(),
 			'user_id'    => $this->getUserId(),
+			'type'       => $log['type'],
 			'created_at' => new \DateTime(),
 			'updated_at' => new \DateTime(),
 		];
@@ -300,4 +310,24 @@ public function identifiableName()
 		return $this->getKey();
 	}
 
+
+	/**
+	 * Verify is type auditable
+	 *
+	 * @param $key
+	 * @return bool
+	 */
+	public function isTypeAuditable($key)
+	{
+		if (static::$unguarded) {
+			return true;
+		}
+
+		if (in_array($key, $this->auditableTypes)) {
+			return true;
+		}
+
+		return;
+	}
+
 }

src/OwenIt/Auditing/AuditingTrait.php

@@ -47,23 +47,28 @@ public static function bootAuditingTrait()
 			$model->prepareAudit();
 		});
 
-		static::saved(function ($model)
+		static::created(function($model)
 		{
-			$model->auditUpdate();
+			if($model->isTypeAuditable('created'))
+				$model->auditCreation();
 		});
 
-		static::created(function($model)
+		static::saved(function ($model)
 		{
-			$model->auditCreation();
+			if($model->isTypeAuditable('saved'))
+				$model->auditUpdate();
 		});
 
 		static::deleted(function($model)
 		{
-			$model->prepareAudit();
-			$model->auditDeletion();
+			if($model->isTypeAuditable('deleted')){
+				$model->prepareAudit();
+				$model->auditDeletion();
+			}
 		});
     }
 
+
 	/**
 	 * Get list of logs
 	 * @return mixed
@@ -136,6 +141,7 @@ public function auditCreation()
 				'owner_type' => get_class($this),
 				'owner_id'   => $this->getKey(),
 				'user_id'    => $this->getUserId(),
+				'type'       => 'created',
 				'created_at' => new \DateTime(),
 				'updated_at' => new \DateTime(),
 			]);
@@ -163,7 +169,7 @@ public function auditUpdate()
 			$changes_to_record = $this->changedAuditingFields();
 			if(count($changes_to_record))
 			{
-				$log = [];
+				$log = ['type' => 'updated'];
 				foreach ($changes_to_record as $key => $change)
 				{
 					$log['old_value'][$key] = array_get($this->originalData, $key);
@@ -177,7 +183,6 @@ public function auditUpdate()
 
 	/**
 	 * Auditing deletion
-	 *
 	 */
 	public function auditDeletion()
 	{
@@ -190,6 +195,7 @@ public function auditDeletion()
 				'owner_type' => get_class($this),
 				'owner_id'   => $this->getKey(),
 				'user_id'    => $this->getUserId(),
+				'type'       => 'deleted',
 				'created_at' => new \DateTime(),
 				'updated_at' => new \DateTime(),
 			]);
@@ -207,6 +213,7 @@ public function audit(array $log)
 			'owner_type' => get_class($this),
 			'owner_id'   => $this->getKey(),
 			'user_id'    => $this->getUserId(),
+			'type'       => $log['type'],
 			'created_at' => new \DateTime(),
 			'updated_at' => new \DateTime(),
 		];
@@ -293,4 +300,26 @@ public function identifiableName()
 	}
 
 
+	/**
+	 * Verify is type auditable
+	 *
+	 * @param $key
+	 * @return bool
+	 */
+	public function isTypeAuditable($key)
+	{
+		if (static::$unguarded) {
+			return true;
+		}
+
+		if(!isset($this->auditableTypes))
+			return true;
+
+		if (in_array($key, $this->auditableTypes)) {
+			return true;
+		}
+
+		return;
+	}
+
 }

src/migrations/2015_08_01_104512_create_log_table.php

@@ -18,6 +18,7 @@ public function up()
             $table->integer('owner_id');
             $table->text('old_value')->nullable();
             $table->text('new_value')->nullable();
+			$table->string('type');
             $table->timestamps();
         });
     }