so close

GetDKAN · Mar 15, 2024 · e67bed3 · e67bed3
1 parent eff0499
commit e67bed3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/modules/datastore/src/Controller/QueryController.php b/modules/datastore/src/Controller/QueryController.php
@@ -57,10 +57,19 @@ public function formatResponse(
    */
   private function fixHeaderRow(RootedJsonData &$result) {
     try {
-      $schema = $result->{'$.schema'};
-      // Query has are no explicit properties; we should assume one table.
-      $header_row = array_column(reset($schema)['fields'], 'description');
-
+      // if (!empty($result->{'$.query.properties'})) {
+      //   $header_row = $result->{'$.query.properties'};
+      //   array_walk($header_row, function (&$header) {
+      //     if (is_array($header)) {
+      //       $header = $header['alias'] ?? $header['property'];
+      //     }
+      //   });
+      // }
+      // else {
+        $schema = $result->{'$.schema'};
+        // Query has are no explicit properties; we should assume one table.
+        $header_row = array_column(reset($schema)['fields'], 'description');
+      // }
       if (empty($header_row) || !is_array($header_row)) {
         throw new \DomainException("Could not generate header for CSV.");
       }

diff --git a/modules/datastore/tests/src/Unit/Controller/QueryControllerTest.php b/modules/datastore/tests/src/Unit/Controller/QueryControllerTest.php
@@ -324,11 +324,16 @@ private function getQueryResult($data, $id = NULL, $index = NULL, $info = []) {
    */
   public function testResourceQueryCsv() {
     $data = json_encode([
+      "properties" => [
+        [
+          "resource" => "t",
+          "property" => "state",
+        ],
+      ],
       "results" => TRUE,
       "format" => "csv",
     ]);
     $result = $this->getQueryResult($data);
-
     $this->assertTrue($result instanceof CsvResponse);
     $this->assertEquals(200, $result->getStatusCode());
   }