Remove data files for deleted export requests

classes/DataWarehouse/Export/BatchProcessor.php

@@ -93,8 +93,10 @@ public function setDryRun($dryRun)
      */
     public function processRequests()
     {
-        $this->processSubmittedRequests();
+        // Delete removed and expiring files before creating new files.
+        $this->processDeletedRequests();
         $this->processExpiringRequests();
+        $this->processSubmittedRequests();
     }
 
     /**
@@ -213,6 +215,25 @@ private function processExpiringRequest(array $request)
         }
     }
 
+    /**
+     * Process requests that have been deleted.
+     *
+     * If a request has been deleted then the associated data file needs to be
+     * removed from the file system.
+     */
+    private function processDeletedRequests()
+    {
+        $this->logger->info('Processing deleted requests');
+        $this->fileManager->removeDeletedRequests(
+            array_map(
+                function ($request) {
+                    return $request['id'];
+                },
+                $this->queryHandler->listAvailableRecords()
+            )
+        );
+    }
+
     /**
      * Get the data set for the given request.
      *

classes/DataWarehouse/Export/FileManager.php

@@ -271,4 +271,33 @@ public function removeExportFile($id)
             throw new Exception(sprintf('Failed to delete "%s"', $zipFile));
         }
     }
+
+    /**
+     * Remove all data files corresponding to deleted requests.
+     *
+     * @param array $availableRequestIds Request IDs for "Available" export
+     *   files.  These correspond to data files that should not be deleted.
+     */
+    public function removeDeletedRequests(array $availableRequestIds)
+    {
+        $availableFiles = array_map(
+            [$this, 'getExportDataFilePath'],
+            $availableRequestIds
+        );
+
+        foreach (glob($this->exportDir . '/*.zip') as $exportFile) {
+            if (!in_array($exportFile, $availableFiles)) {
+                $this->logger->info([
+                    'message' => 'Removing export file',
+                    'zip_file' => $exportFile
+                ]);
+                if (!unlink($exportFile)) {
+                    throw new Exception(sprintf(
+                        'Failed to delete "%s"',
+                        $exportFile
+                    ));
+                }
+            }
+        }
+    }
 }

classes/DataWarehouse/Export/QueryHandler.php

@@ -204,6 +204,18 @@ public function listSubmittedRecords()
         return $this->dbh->query($sql);
     }
 
+    /**
+     * Return details of all export requests presently in Available state.
+     *
+     * @return array
+     */
+    public function listAvailableRecords()
+    {
+        $sql = 'SELECT id, user_id, realm, start_date, end_date, export_file_format, requested_datetime
+            FROM batch_export_requests ' . $this->whereAvailable . ' ORDER BY requested_datetime, id';
+        return $this->dbh->query($sql);
+    }
+
     /**
      * Return export requests in Available state that should expire.
      *