fix: Respect site and dimensions

Fixes #12

Author: paavo

Classes/Controller/Backend/FormDataController.php

@@ -79,14 +79,16 @@ public function indexAction(): void
     /**
      * @param string $formIdentifier
      * @param string $hash
+     * @param string $siteName
+     * @param string $dimensionsHash
      * @param string $exportDefinitionIdentifier
      * @throws InvalidConfigurationTypeException
      * @throws CannotBuildObjectException
      * @throws UnknownObjectException
      * @throws ConfigurationException
      * @throws InvalidQueryException
      */
-    public function downloadAction(string $formIdentifier, string $hash, string $exportDefinitionIdentifier): void
+    public function downloadAction(string $formIdentifier, string $hash, string $siteName, string $dimensionsHash, string $exportDefinitionIdentifier): void
     {
         /** @var FormData[] $formDataItems */
 
@@ -97,7 +99,7 @@ public function downloadAction(string $formIdentifier, string $hash, string $exp
 
         $formDataItems = array_map(static function (FormData $formData) use ($exportDefinition) {
             return $formData->getProcessedFormData($exportDefinition);
-        }, $this->formDataRepository->findByFormIdentifierAndHash($formIdentifier, $hash)->toArray());
+        }, $this->formDataRepository->findByFormProperties($formIdentifier, $hash, $siteName, $dimensionsHash)->toArray());
 
         $exporter->setFileName($fileName)->compileAndSend($formDataItems);
         die();
@@ -110,7 +112,7 @@ public function downloadAction(string $formIdentifier, string $hash, string $exp
      */
     public function previewAction(FormData $formDataEntry): void
     {
-        $formDataEntries = $this->formDataRepository->findByFormIdentifierAndHash($formDataEntry->getFormIdentifier(), $formDataEntry->getHash());
+        $formDataEntries = $this->formDataRepository->findByFormProperties($formDataEntry->getFormIdentifier(), $formDataEntry->getHash(), $formDataEntry->getSiteName(), $formDataEntry->getDimensionsHash());
         $scheduledExport = $this->scheduledExportRepository->findOneByFormIdentifier($formDataEntry->getFormIdentifier());
 
         if ($formDataEntries->count() === 0) {
@@ -134,7 +136,7 @@ public function previewAction(FormData $formDataEntry): void
      */
     public function deleteAction(FormData $formDataEntry): void
     {
-        $this->formDataRepository->removeByFormIdentifierAndHash($formDataEntry->getFormIdentifier(), $formDataEntry->getHash());
+        $this->formDataRepository->removeByFormIdentifierAndHash($formDataEntry->getFormIdentifier(), $formDataEntry->getHash(), $formDataEntry->getSitename(), $formDataEntry->getDimensionsHash());
         $this->redirect('index');
     }
 

Classes/Domain/Repository/FormDataRepository.php

@@ -65,8 +65,10 @@ public function findAllUniqueForms(): iterable
     {
         $queryBuilder = $this->createQueryBuilder('form');
         return $queryBuilder
-            ->groupBy('form.formIdentifier')
+            ->groupBy('form.siteName')
+            ->addgroupBy('form.formIdentifier')
             ->addGroupBy('form.hash')
+            ->addGroupBy('form.dimensionsHash')
             ->addSelect('count(form) AS entryCount')
             ->addSelect('MAX(form.date) as latestDate')
             ->orderBy('latestDate', QueryInterface::ORDER_DESCENDING)
@@ -76,17 +78,21 @@ public function findAllUniqueForms(): iterable
     /**
      * @param string $formIdentifier
      * @param string $hash
+     * @param string $siteName
+     * @param string $dimensionsHash
      * @return QueryResultInterface
      * @throws InvalidQueryException
      */
-    public function findByFormIdentifierAndHash(string $formIdentifier, string $hash): QueryResultInterface
+    public function findByFormProperties(string $formIdentifier, string $hash, string $siteName, string $dimensionsHash): QueryResultInterface
     {
         $query = $this->createQuery();
 
         return $query->matching(
             $query->logicalAnd(
                 $query->equals('formIdentifier', $formIdentifier),
                 $query->equals('hash', $hash),
+                $query->equals('siteName', $siteName),
+                $query->equals('dimensionsHash', $dimensionsHash),
                 $query->in('siteName', $this->accessibleSites)
             )
         )->execute();
@@ -101,9 +107,9 @@ public function findLatestVersionOfForm(string $formIdentifier): ?FormData
             ->execute()->getFirst();
     }
 
-    public function removeByFormIdentifierAndHash(string $formIdentifier, string $hash): void
+    public function removeByFormIdentifierAndHash(string $formIdentifier, string $hash, string $siteName, string $dimensionsHash): void
     {
-        foreach ($this->findByFormIdentifierAndHash($formIdentifier, $hash) as $formData) {
+        foreach ($this->findByFormProperties($formIdentifier, $hash, $siteName, $dimensionsHash) as $formData) {
             $this->remove($formData);
         }
     }

Classes/Domain/ScheduledExport/ScheduledExportSender.php

@@ -201,7 +201,7 @@ protected function prepareExportDefinitionNotSuitableMail(Message $mail, FormDat
      */
     protected function prepareExportMail(FormData $formDataRepresentative, ExportDefinitionInterface $exportDefinition, string $exportFilePath, string $fileName, Message $mail): void
     {
-        $formDataCollection = $this->formDataRepository->findByFormIdentifierAndHash($formDataRepresentative->getFormIdentifier(), $formDataRepresentative->getHash());
+        $formDataCollection = $this->formDataRepository->findByFormProperties($formDataRepresentative->getFormIdentifier(), $formDataRepresentative->getHash(), $formDataRepresentative->getSiteName(), $formDataRepresentative->getDimensionsHash());
 
         $formDataItems = array_map(static function (FormData $formData) use ($exportDefinition) {
             return $formData->getProcessedFormData($exportDefinition);

Resources/Private/Fusion/Controller/Backend/FormData/Index.fusion

@@ -56,6 +56,9 @@ prototype(PunktDe.Form.Persistence:Backend.FormData.Index) < prototype(Neos.Fusi
                             <Neos.Fusion.Form:Select field.name="exportDefinitionIdentifier">{props.options}</Neos.Fusion.Form:Select>
                             <Neos.Fusion.Form:Hidden field.name="formIdentifier" attributes.value={formData.formIdentifier}/>
                             <Neos.Fusion.Form:Hidden field.name="hash" attributes.value={formData.hash}/>
+                            <Neos.Fusion.Form:Hidden field.name="siteName" attributes.value={formData.siteName}/>
+                            <Neos.Fusion.Form:Hidden field.name="dimensionsHash" attributes.value={formData.dimensionsHash}/>
+                            <Neos.Fusion.Form:Hidden field.name="hash" attributes.value={formData.hash}/>
                             <Neos.Fusion.Form:Button attributes.class="neos-button neos-button-primary">Download</Neos.Fusion.Form:Button>
                         </Neos.Fusion.Form:Form>
                     </td>