Merge pull request #345 from perftools/saver-return-id

perftools · Oct 9, 2020 · 9733d3e · 9733d3e
2 parents 4fd798d + b63a6c5
commit 9733d3e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/src/Xhgui/Controller/ImportController.php b/src/Xhgui/Controller/ImportController.php
@@ -30,8 +30,8 @@ public function __construct(App $app, SaverInterface $saver, $token)
     public function import(Request $request, Response $response)
     {
         try {
-            $this->runImport($request);
-            $result = ['ok' => true, 'size' => $request->getContentLength()];
+            $id = $this->runImport($request);
+            $result = ['ok' => true, 'id' => $id, 'size' => $request->getContentLength()];
         } catch (InvalidArgumentException $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
             $response->setStatus(401);
@@ -44,7 +44,7 @@ public function import(Request $request, Response $response)
         $response->body(json_encode($result));
     }
 
-    private function runImport(Request $request)
+    private function runImport(Request $request): string
     {
         if ($this->token) {
             if ($this->token !== $request->get('token')) {
@@ -53,6 +53,6 @@ private function runImport(Request $request)
         }
 
         $data = json_decode($request->getBody(), true);
-        $this->saver->save($data);
+        return $this->saver->save($data);
     }
 }
diff --git a/src/Xhgui/Saver/MongoSaver.php b/src/Xhgui/Saver/MongoSaver.php
@@ -23,7 +23,7 @@ public function __construct(MongoCollection $collection)
         $this->_collection = $collection;
     }
 
-    public function save(array $data)
+    public function save(array $data): string
     {
         // build 'request_ts' and 'request_date' from 'request_ts_micro'
         $ts = $data['meta']['request_ts_micro'];
@@ -41,12 +41,15 @@ public function save(array $data)
             'request_date' => date('Y-m-d', $sec),
         ];
 
+        $id = $data['_id'] ?? new MongoId();
         $a = [
-            '_id' => $data['_id'] ?? new MongoId(),
+            '_id' => $id,
             'meta' => $meta,
             'profile' => $data['profile'],
         ];
 
-        return $this->_collection->insert($a, ['w' => 0]);
+        $this->_collection->insert($a, ['w' => 0]);
+
+        return (string)$id;
     }
 }
diff --git a/src/Xhgui/Saver/PdoSaver.php b/src/Xhgui/Saver/PdoSaver.php
@@ -16,7 +16,7 @@ public function __construct(PdoRepository $db)
         $this->db = $db;
     }
 
-    public function save(array $data)
+    public function save(array $data): string
     {
         $main = $data['profile']['main()'];
 
@@ -25,8 +25,9 @@ public function save(array $data)
         $sec = $ts['sec'];
         $usec = $ts['usec'];
 
+        $id = $data['_id'] ?? Util::generateId();
         $this->db->saveProfile([
-            'id'               => $data['_id'] ?? Util::generateId(),
+            'id'               => $id,
             'profile'          => json_encode($data['profile']),
             'url'              => $data['meta']['url'],
             'SERVER'           => json_encode($data['meta']['SERVER']),
@@ -42,5 +43,7 @@ public function save(array $data)
             'main_mu'          => $main['mu'],
             'main_pmu'         => $main['pmu'],
         ]);
+
+        return $id;
     }
 }
diff --git a/src/Xhgui/Saver/SaverInterface.php b/src/Xhgui/Saver/SaverInterface.php
@@ -4,5 +4,8 @@
 
 interface SaverInterface
 {
-    public function save(array $data);
+    /**
+     * Returns id of the saved profile
+     */
+    public function save(array $data): string;
 }