Merge pull request #6 from AgelxNash/json

feat: storing and loading data with json

Author: amenk

src/LogRequest.php

@@ -24,21 +24,29 @@ public function handle($request, Closure $next)
     {
 
         if (! $this->isExceptRequest($request)) {
-            (new RequestLogEntry)->forceFill([
-                'ip' => $request->getClientIp(),
-                'path' => urldecode($request->path()),
-                'method' => $request->getMethod(),
-                'agent' => $request->server('HTTP_USER_AGENT'),
-                'get' => $this->get($request),
-                'post' => $this->post($request),
-                'cookies' => $this->cookies($request),
-                'session' => $this->session($request)
-            ])->save();
+            RequestLogEntry::create($this->getData());
         }
 
         return $next($request);
     }
 
+    /**
+     * @return array
+     */
+    protected function getData() : array
+    {
+        return [
+            'ip' => $request->getClientIp(),
+            'path' => urldecode($request->path()),
+            'method' => $request->getMethod(),
+            'agent' => $request->server('HTTP_USER_AGENT'),
+            'get' => $this->get($request),
+            'post' => $this->post($request),
+            'cookies' => $this->cookies($request),
+            'session' => $this->session($request)
+        ];
+    }
+
     /**
      * @param \Illuminate\Http\Request $request
      * @return string|null
@@ -53,45 +61,49 @@ protected function session($request) : ?string
     }
 
     /**
-     * @param \Illuminate\Http\Request $request
-     * @return string|null
+     * @param array $data
+     * @return array|null
      */
-    protected function get($request) : ?string
+    protected function export(array $data = []) : ?array
     {
-        $get = Arr::except($request->query->all(), $this->getExceptGet());
-        if (count($get) > 0) {
-            return var_export($get, true);
+        if (count($data) === 0) {
+            return null;
         }
 
-        return null;
+        return $data;
     }
 
     /**
      * @param \Illuminate\Http\Request $request
-     * @return string|null
+     * @return array|null
      */
-    protected function post($request) : ?string
+    protected function get($request) : ?array
     {
-        $post = Arr::except($request->request->all(), $this->getExceptPost());
-        if (count($post) > 0) {
-            return var_export($post, true);
-        }
-
-        return null;
+        return $this->export(
+            Arr::except($request->query->all(), $this->getExceptGet())
+        );
     }
 
     /**
      * @param \Illuminate\Http\Request $request
-     * @return string|null
+     * @return array|null
      */
-    protected function cookies($request) : ?string
+    protected function post($request) : ?array
     {
-        $cookies = Arr::except($request->cookies->all(), $this->getExceptCookies());
-        if (count($cookies) > 0) {
-            return var_export($cookies, true);
-        }
+        return $this->export(
+            Arr::except($request->request->all(), $this->getExceptPost())
+        );
+    }
 
-        return null;
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @return array|null
+     */
+    protected function cookies($request) : ?array
+    {
+        return $this->export(
+            Arr::except($request->cookies->all(), $this->getExceptCookies())
+        );
     }
 
     /**

src/RequestLogEntry.php

@@ -32,9 +32,9 @@ class RequestLogEntry extends Model
         'path' => 'string',
         'method' => 'string',
         'agent' => 'string',
-        'get' => 'string',
-        'post' => 'string',
-        'cookies' => 'string',
+        'get' => 'json',
+        'post' => 'json',
+        'cookies' => 'json',
         'session' => 'string'
     ];