Transaction::checkEmptyCollections() added

Closes #30
acdh-oeaw · Aug 6, 2024 · b2b616a · b2b616a
1 parent c0e3fad
commit b2b616a
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 2 deletions.
diff --git a/config-sample.yaml b/config-sample.yaml
@@ -36,6 +36,7 @@ schema:
         sharedObject: https://vocabs.acdh.oeaw.ac.at/schema#AgentOrPlaceOrPublication
         container: https://vocabs.acdh.oeaw.ac.at/schema#Container
         topCollection: https://vocabs.acdh.oeaw.ac.at/schema#TopCollection
+        collection: https://vocabs.acdh.oeaw.ac.at/schema#collection
     namespaces:
         ontology: https://vocabs.acdh.oeaw.ac.at/schema#
     ontology:

diff --git a/src/acdhOeaw/arche/doorkeeper/Transaction.php b/src/acdhOeaw/arche/doorkeeper/Transaction.php
@@ -204,6 +204,43 @@ public function checkAutoCreatedResources(): void {
         }
     }
 
+    /**
+     * 
+     * @throws DoorkeeperException
+     */
+    #[CheckAttribute]
+    public function checkEmptyCollections(): void {
+        $query      = "
+            SELECT string_agg(DISTINCT ids, ', ')
+            FROM
+                resources r
+                JOIN metadata c USING (id)
+                JOIN identifiers USING (id)
+            WHERE
+                r.state = ?
+                AND r.transaction_id = ?
+                AND c.property = ?
+                AND c.value IN (?, ?)
+                AND NOT EXISTS (SELECT 1 FROM relations ch WHERE ch.property = ? AND ch.target_id = r.id)
+        ";
+        $param      = [
+            ArcheTransaction::STATE_ACTIVE,
+            $this->txId,
+            RDF::RDF_TYPE,
+            $this->schema->classes->topCollection, $this->schema->classes->collection,
+            $this->schema->parent
+        ];
+        $t          = microtime(true);
+        $query      = $this->pdo->prepare($query);
+        $query->execute($param);
+        $invalidRes = $query->fetchColumn();
+        $t          = microtime(true) - $t;
+        $this->log?->debug("\t\checkEmptyCollections performed in $t s");
+        if (!empty($invalidRes)) {
+            throw new DoorkeeperException("Transaction created empty collections: $invalidRes");
+        }
+    }
+
     /**
      * 
      * @return void

diff --git a/tests/TransactionTest.php b/tests/TransactionTest.php
@@ -241,7 +241,7 @@ public function testCollectionAggregates(): void {
 
     public function testTopCollectionAggregates(): void {
         self::$config->schema->classes->collection = 'https://vocabs.acdh.oeaw.ac.at/schema#TopCollection';
-        self::$schema = new \acdhOeaw\arche\lib\Schema(self::$config->schema);
+        self::$schema                              = new \acdhOeaw\arche\lib\Schema(self::$config->schema);
         $this->testCollectionAggregates();
     }
 
@@ -316,7 +316,30 @@ public function testIsNewVersionOf(): void {
             $resp = $e->getResponse();
             $this->assertEquals(400, $resp->getStatusCode());
             $this->assertStringContainsString("More than one $verProp pointing to some resources:", (string) $resp->getBody());
-            sleep(1); // to avoid removing resources between the transaction is fully rolled back
+            sleep(1); // to avoid removing resources before the transaction is fully rolled back
+        }
+    }
+
+    public function testEmptyCollection(): void {
+        $tcm = self::createMetadata([], 'https://vocabs.acdh.oeaw.ac.at/schema#TopCollection');
+        $cm  = self::createMetadata([], 'https://vocabs.acdh.oeaw.ac.at/schema#Collection');
+
+        self::$repo->begin();
+        $tcr              = self::$repo->createResource($tcm);
+        $this->toDelete[] = $tcr;
+        $cr               = self::$repo->createResource($cm);
+        $this->toDelete[] = $cr;
+        try {
+            self::$repo->commit();
+            $this->assertTrue(false);
+        } catch (ClientException $e) {
+            $msg  = (string) $e->getResponse()->getBody();
+            $tcid = preg_replace('|^.*/|', '', $tcr->getUri());
+            $cid  = preg_replace('|^.*/|', '', $cr->getUri());
+            $this->assertStringStartsWith("Transaction created empty collections: ", $msg);
+            $this->assertStringContainsString($tcid, $msg);
+            $this->assertStringContainsString($cid, $msg);
+            sleep(1); // to avoid removing resources before the transaction is fully rolled back
         }
     }
 }