Merge pull request vcian#42 from vc-urvin/main

Add Current User Name If Git commit not found or not commited the file
chapdel · Jan 19, 2024 · 6dbdc89 · 6dbdc89
2 parents f94614b + 005b7aa
commit 6dbdc89
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 56 deletions.
diff --git a/src/Commands/DBTrackCommand.php b/src/Commands/DBTrackCommand.php
@@ -34,7 +34,7 @@ public function handle()
         $actionKeywords = ['U' => 'Update', 'u' => 'Update', 'c' => 'Create', 'C' => 'Create'];
         $statusKeywords = ['M' => 'Migrated', 'm' => 'Migrated', 'P' => 'Pending', 'p' => 'Pending'];
 
-        $data = $this->collectDataFromFile();
+        $data = $this->collectDataFromFile('command');
 
         if ($this->option('table')) {
 
@@ -66,58 +66,4 @@ public function handle()
 
         return self::SUCCESS;
     }
-
-    /**
-     * Get Database related information from the migration file.
-     * Collect all the details into one place.
-     */
-    public function collectDataFromFile()
-    {
-        $data = [];
-
-        $filesInFolder = \File::files('database/migrations');
-
-        foreach ($filesInFolder as $path) {
-            $file = pathinfo($path);
-
-            $fileName = $file['basename'];
-
-            array_push($data,
-                [
-                    $this->getMigrationDate($file['filename']),
-                    $this->getMigrationTableName($fileName),
-                    $this->replaceStringWithDots($this->getMigrationFieldName($fileName)),
-                    $this->getMigrationAction($fileName),
-                    $fileName,
-                    $this->getMigrationStatus($file['filename']),
-                    $this->getMigrationCreatedBy($fileName),
-                ]
-            );
-
-        }
-
-        return $data;
-    }
-
-    /**
-     * Filter based on the command argument.
-     */
-    public function filter($filterType, $data, $filter)
-    {
-        $result = array_filter($data, function ($item) use ($filter, $filterType) {
-
-            switch ($filterType) {
-                case 'table':
-                    return $item[1] === $filter;
-                case 'action':
-                    return $item[3] === $filter;
-                case 'status':
-                    return $item[5] === $filter;
-                default:
-                    return $item;
-            }
-        });
-
-        return array_values($result);
-    }
 }
diff --git a/src/Traits/DBMigrationTrack.php b/src/Traits/DBMigrationTrack.php
@@ -2,10 +2,79 @@
 
 namespace Vcian\LaravelDBAuditor\Traits;
 
+use Illuminate\Support\Facades\File;
 use Vcian\LaravelDBAuditor\Constants\Constant;
 
 trait DBMigrationTrack
 {
+    /**
+     * Get Database related information from the migration file.
+     * Collect all the details into one place.
+     */
+    public function collectDataFromFile($type = 'command')
+    {
+        $data = [];
+
+        $filesInFolder = File::files(database_path('migrations'));
+
+        foreach ($filesInFolder as $path) {
+            $file = pathinfo($path);
+
+            $fileName = $file['basename'];
+
+            if ($type === 'command') {
+                array_push($data,
+                    [
+                        $this->getMigrationDate($file['filename']),
+                        $this->getMigrationTableName($fileName),
+                        $this->replaceStringWithDots($this->getMigrationFieldName($fileName)),
+                        $this->getMigrationAction($fileName),
+                        $fileName,
+                        $this->getMigrationStatus($file['filename']),
+                        $this->getMigrationCreatedBy($fileName),
+                    ]
+                );
+            } else {
+                array_push($data,
+                    [
+                        'date' => $this->getMigrationDate($file['filename']),
+                        'table' => $this->getMigrationTableName($fileName),
+                        'fields' => $this->getMigrationFieldName($fileName),
+                        'action' => $this->getMigrationAction($fileName),
+                        'file' => $fileName,
+                        'status' => $this->getMigrationStatus($file['filename']),
+                        'createdby' => $this->getMigrationCreatedBy($fileName),
+                    ]
+                );
+            }
+
+        }
+
+        return $data;
+    }
+
+    /**
+     * Filter based on the command argument.
+     */
+    public function filter($filterType, $data, $filter)
+    {
+        $result = array_filter($data, function ($item) use ($filter, $filterType) {
+
+            switch ($filterType) {
+                case 'table':
+                    return $item[1] === $filter;
+                case 'action':
+                    return $item[3] === $filter;
+                case 'status':
+                    return $item[5] === $filter;
+                default:
+                    return $item;
+            }
+        });
+
+        return array_values($result);
+    }
+
     /**
      * Read File and Get File Content
      */
@@ -112,10 +181,12 @@ public function replaceStringWithDots(string $inputString): string
      */
     public function getMigrationCreatedBy(string $file): string
     {
+        $currentUser = gethostname();
+
         $repositoryPath = base_path();
         $migrationFilePath = 'database/migrations/'.$file;
         $authorName = trim(shell_exec("git -C $repositoryPath log --follow --format='%an' -- $migrationFilePath"));
 
-        return $authorName != '' ? $authorName : '-';
+        return $authorName != '' ? $authorName : $currentUser;
     }
 }