Improved data insertion support for foreign keys (#460)

* Improved data insertion support for foreign keys * Added table foreign key * Upgrade telescope style
friendsofhyperf · Nov 24, 2023 · 7451c67 · 7451c67
1 parent 07d06a6
commit 7451c67
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/src/telescope/public/telescope/app.js b/src/telescope/public/telescope/app.js
diff --git a/src/telescope/src/Command/ClearCommand.php b/src/telescope/src/Command/ClearCommand.php
@@ -27,8 +27,8 @@ public function __construct(private ContainerInterface $container)
     public function handle()
     {
         $connection = config('telescope.database.connection');
-        Db::connection($connection)->table('telescope_entries')->truncate();
-        Db::connection($connection)->table('telescope_entries_tags')->truncate();
-        Db::connection($connection)->table('telescope_monitoring')->truncate();
+        Db::connection($connection)->table('telescope_entries')->delete();
+        Db::connection($connection)->table('telescope_entries_tags')->delete();
+        Db::connection($connection)->table('telescope_monitoring')->delete();
     }
 }
diff --git a/src/telescope/src/Command/PruneCommand.php b/src/telescope/src/Command/PruneCommand.php
@@ -34,9 +34,6 @@ public function handle()
         Db::connection($connection)->table('telescope_entries')
             ->where('created_at', '<', $created_at)
             ->delete();
-        Db::connection($connection)
-            ->table('telescope_entries_tags')
-            ->delete();
         Db::connection($connection)
             ->table('telescope_monitoring')
             ->delete();

diff --git a/src/telescope/src/Controller/EntryController.php b/src/telescope/src/Controller/EntryController.php
@@ -55,10 +55,11 @@ public function index()
             if (isset($item['content']['response'])) {
                 $item['content']['response'] = '';
             }
-            $item['tag'] = '';
+            $item['tag'] = $item['tag_value'] = '';
             foreach ($item['tags'] as $key => $val) {
                 if (Str::startsWith($val['tag'], 'app_name:')) {
-                    $item['tag'] = $val['tag'];
+                    $item['tag_value'] = $val['tag'];
+                    $item['tag'] = Str::substr($val['tag'], strlen('app_name:'));
                 }
             }
         }
@@ -79,7 +80,16 @@ public function show($id)
             $query->where('sub_batch_id', $entry->sub_batch_id);
         }
 
-        $batch = $query->orderByDesc('sequence')->get();
+        $batch = $query->with('tags')->orderByDesc('sequence')->get();
+        foreach ($batch as &$item) {
+            $item['tag'] = $item['tag_value'] = '';
+            foreach ($item['tags'] as $key => $val) {
+                if (Str::startsWith($val['tag'], 'app_name:')) {
+                    $item['tag_value'] = $val['tag'];
+                    $item['tag'] = Str::substr($val['tag'], strlen('app_name:'));
+                }
+            }
+        }
 
         return $this->response->json([
             'entry' => $entry,

diff --git a/src/telescope/src/IncomingEntry.php b/src/telescope/src/IncomingEntry.php
@@ -283,12 +283,13 @@ public function toArray(): array
 
     public function create()
     {
+        TelescopeEntryModel::create($this->toArray());
+
         foreach ($this->tags as $tag) {
             TelescopeEntryTagModel::create([
                 'entry_uuid' => $this->uuid,
                 'tag' => $tag,
             ]);
         }
-        TelescopeEntryModel::create($this->toArray());
     }
 }