Fix bugs around ISODate

SamuelTallet · Aug 14, 2020 · 5161f99 · 5161f99
1 parent 754c1f6
commit 5161f99
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/index.php b/index.php
@@ -18,7 +18,7 @@
  * 
  * @var string
  */
-define('MPG_APP_VERSION', '1.0.3');
+define('MPG_APP_VERSION', '1.0.4');
 
 /**
  * Development mode?

diff --git a/src/Controllers/CollectionController.php b/src/Controllers/CollectionController.php
@@ -36,11 +36,13 @@ public function insertOneAction() : Response {
                     new \MongoDB\BSON\ObjectId($decodedRequestBody['document']['_id']);
         }
 
-        foreach ($decodedRequestBody['document'] as &$insertValue) {
+        array_walk_recursive($decodedRequestBody['document'], function(&$insertValue) {
+
             if ( preg_match(MongoDBHelper::ISO_DATE_TIME_REGEX, $insertValue) ) {
                 $insertValue = new \MongoDB\BSON\UTCDateTime(new \DateTime($insertValue));
             }
-        }
+
+        });
 
         try {
 
@@ -155,14 +157,20 @@ public function findAction() : Response {
             return new JsonResponse(500, ErrorNormalizer::normalize($th, __METHOD__));
         }
 
-        foreach ($documents as $document) {
-            foreach ($document as &$documentValue) {
+        foreach ($documents as &$document) {
+
+            $document = $document->jsonSerialize();
+
+            array_walk_recursive($document, function(&$documentValue) {
+
                 if ( is_a($documentValue, '\MongoDB\BSON\ObjectId') ) {
                     $documentValue = (string) $documentValue;
                 } elseif ( is_a($documentValue, '\MongoDB\BSON\UTCDatetime') ) {
                     $documentValue = $documentValue->toDateTime()->format('Y-m-d\TH:i:s.v\Z');
                 }
-            }
+
+            });
+
         }
 
         return new JsonResponse(200, $documents);
@@ -234,7 +242,19 @@ public function enumFieldsAction() : Response {
             return new JsonResponse(200, []);
         }
 
-        $array = json_decode(json_encode($documents[0]), JSON_OBJECT_AS_ARRAY);
+        $document = $documents[0]->jsonSerialize();
+
+        array_walk_recursive($document, function(&$documentValue) {
+
+            if ( is_a($documentValue, '\MongoDB\BSON\ObjectId') ) {
+                $documentValue = (string) $documentValue;
+            } elseif ( is_a($documentValue, '\MongoDB\BSON\UTCDatetime') ) {
+                $documentValue = $documentValue->toDateTime()->format('Y-m-d\TH:i:s.v\Z');
+            }
+
+        });
+
+        $array = json_decode(json_encode($document), JSON_OBJECT_AS_ARRAY);
 
         /**
          * Converts multidimensional array to 2D array with dot notation keys.
@@ -253,10 +273,7 @@ public function enumFieldsAction() : Response {
 
         $documentFields = array_unique($result);
 
-        // We ignore $oid since it represents a \MongoDB\BSON\ObjectId object.
-        $fixedDocumentFields = str_replace('_id.$oid', '_id', json_encode($documentFields));
-
-        return new JsonResponse(200, json_decode($fixedDocumentFields));
+        return new JsonResponse(200, $documentFields);
 
     }
 

diff --git a/static/js/mpg.collection.indexes.js b/static/js/mpg.collection.indexes.js
@@ -358,10 +358,7 @@ MPG.eventListeners.addCreateIndex = function() {
         MPG.helpers.doAjaxRequest(
             'POST',
             MPG_BASE_URL + '/ajaxCollectionCreateIndex',
-            function(response) {
-
-                var createdIndexName = JSON.parse(response);
-                window.alert('Index created with name: ' + createdIndexName);
+            function(_response) {
 
                 MPG.reloadCollectionIndexes();