Merge pull request #4 from christyjacob4/master

Change the way we check query execution status

src/Audit/Adapter.php

@@ -101,11 +101,11 @@ abstract public function getLogsByResource(string $resource): array;
     abstract public function getLogsByUserAndActions(string $userId, array $actions): array;
 
     /**
-     * Delete all logs older than $seconds seconds
+     * Delete all logs older than $timestamp seconds
      *
-     * @param int $seconds
+     * @param int $timestamp
      * 
      * @return bool
      */
-    abstract public function cleanup(int $seconds): bool;
+    abstract public function cleanup(int $timestamp): bool;
 }

src/Audit/Adapters/MySQL.php

@@ -53,9 +53,9 @@ public function log(string $userId, string $event, string $resource, string $use
         $st->bindValue(':location', $location, PDO::PARAM_STR);
         $st->bindValue(':data', $data, PDO::PARAM_STR);
 
-        $st->execute();
+        $response = $st->execute();
 
-        return ('00000' == $st->errorCode()) ? true : false;
+        return $response == true ;
     }
 
     public function getLogsByUser(string $userId):array
@@ -117,22 +117,22 @@ public function getLogsByUserAndActions(string $userId, array $actions):array
     }
 
     /**
-     * Delete logs older than $seconds seconds
+     * Delete logs older than $timestamp seconds
      * 
-     * @param int $seconds 
+     * @param int $timestamp 
      * 
      * @return bool   
      */
-    public function cleanup(int $seconds):bool
+    public function cleanup(int $timestamp):bool
     {
         $st = $this->getPDO()->prepare('DELETE 
         FROM `'.$this->getNamespace().'.audit.audit`
-            WHERE (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(`time`)) >  :seconds');
+            WHERE UNIX_TIMESTAMP(`time`) < :timestamp');
 
-        $st->bindValue(':seconds', $seconds, PDO::PARAM_INT);
-        $st->execute();
+        $st->bindValue(':timestamp', $timestamp, PDO::PARAM_INT);
+        $response = $st->execute();
 
-        return ('00000' == $st->errorCode()) ? true : false;
+        return $response == true;
     }
 
     /**

src/Audit/Audit.php

@@ -77,14 +77,14 @@ public function getLogsByUserAndActions(string $userId, array $actions): array
     }
 
     /**
-     * Delete all logs older than $seconds seconds
+     * Delete all logs older than $timestamp seconds
      *
-     * @param int $seconds
+     * @param int $timestamp
      * 
      * @return bool
      */
-    public function cleanup(int $seconds): bool
+    public function cleanup(int $timestamp): bool
     {
-        return $this->adapter->cleanup($seconds);
+        return $this->adapter->cleanup($timestamp);
     }
 }

tests/Audit/AuditTest.php

@@ -96,7 +96,7 @@ public function testGetLogsByResource()
     public function testCleanup() {
         sleep(3);
         // First delete all the logs
-        $status = $this->audit->cleanup(1);
+        $status = $this->audit->cleanup(time());
         $this->assertEquals($status, true);
 
         // Check that all logs have been deleted 
@@ -118,7 +118,7 @@ public function testCleanup() {
         sleep(5);
 
         // DELETE logs older than 10 seconds and check that status is true
-        $status = $this->audit->cleanup(10);
+        $status = $this->audit->cleanup(time()-10);
         $this->assertEquals($status, true);
 
         // Check if 1 log has been deleted