IBX-10458: Fixed total count

Author: barw4

src/lib/Persistence/Legacy/Content/Type/Gateway.php

@@ -37,7 +37,7 @@ abstract public function insertGroup(Group $group): int;
 
     abstract public function updateGroup(GroupUpdateStruct $group): void;
 
-    abstract public function countTypes(): int;
+    abstract public function countTypes(?ContentTypeQuery $query = null): int;
 
     abstract public function countTypesInGroup(int $groupId): int;
 

src/lib/Persistence/Legacy/Content/Type/Gateway/DoctrineDatabase.php

@@ -207,14 +207,38 @@ public function updateGroup(GroupUpdateStruct $group): void
         $query->execute();
     }
 
-    public function countTypes(): int
+    public function countTypes(?ContentTypeQuery $query = null): int
     {
-        $query = $this->connection->createQueryBuilder();
-        $query
-            ->select($this->dbPlatform->getCountExpression('id'))
-            ->from(self::CONTENT_TYPE_TABLE);
+        $query = $query ?: new ContentTypeQuery();
+        $queryBuilder = $this->connection->createQueryBuilder();
+        $expr = $queryBuilder->expr();
+        $queryBuilder
+            ->select('COUNT(DISTINCT c.id)')
+            ->from(self::CONTENT_TYPE_TABLE, 'c')
+            ->leftJoin(
+                'c',
+                self::FIELD_DEFINITION_TABLE,
+                'a',
+                (string)$expr->and(
+                    $expr->eq('c.id', 'a.contentclass_id'),
+                    $expr->eq('c.version', 'a.version')
+                )
+            )
+            ->leftJoin(
+                'c',
+                self::CONTENT_TYPE_TO_GROUP_ASSIGNMENT_TABLE,
+                'g',
+                (string)$expr->and(
+                    $expr->eq('c.id', 'g.contentclass_id'),
+                    $expr->eq('c.version', 'g.contentclass_version')
+                )
+            );
+
+        if ($query->getCriterion() !== null) {
+            $queryBuilder->andWhere($this->criterionVisitor->visitCriteria($queryBuilder, $query->getCriterion()));
+        }
 
-        return (int)$query->execute()->fetchOne();
+        return (int)$queryBuilder->execute()->fetchOne();
     }
 
     public function countTypesInGroup(int $groupId): int
@@ -1429,7 +1453,7 @@ public function removeByUserAndVersion(int $userId, int $version): void
 
     public function findContentTypes(?ContentTypeQuery $query = null): array
     {
-        $totalCount = $this->countTypes();
+        $totalCount = $this->countTypes($query);
         if ($totalCount === 0) {
             return [
                 'count' => $totalCount,

src/lib/Persistence/Legacy/Content/Type/Gateway/ExceptionConversion.php

@@ -59,10 +59,10 @@ public function updateGroup(GroupUpdateStruct $group): void
         }
     }
 
-    public function countTypes(): int
+    public function countTypes(?ContentTypeQuery $query = null): int
     {
         try {
-            return $this->innerGateway->countTypes();
+            return $this->innerGateway->countTypes($query);
         } catch (DBALException | PDOException $e) {
             throw DatabaseException::wrap($e);
         }

tests/integration/Core/Repository/ContentTypeService/FindContentTypesTest.php

@@ -32,7 +32,10 @@ public function testFindContentTypesWithNullQueryFinds25Results(): void
 
         $contentTypes = $contentTypeService->findContentTypes();
 
+        $allContentTypes = $contentTypeService->findContentTypes(new ContentTypeQuery(null, [], 0, null));
+
         self::assertCount(25, $contentTypes);
+        self::assertSame(count($allContentTypes->getContentTypes()), $contentTypes->getTotalCount());
     }
 
     /**
@@ -44,26 +47,14 @@ public function testFindContentTypes(ContentTypeQuery $query, array $expectedIde
     {
         $contentTypeService = self::getContentTypeService();
 
-        $expectedCount = $contentTypeService->findContentTypes(
-            new ContentTypeQuery(
-                null,
-                [],
-                0,
-                null,
-            )
-        );
-        $expectedCount = count($expectedCount->getContentTypes());
-
         $contentTypes = $contentTypeService->findContentTypes($query);
-
         $identifiers = array_map(
             static fn (ContentType $contentType): string => $contentType->getIdentifier(),
             $contentTypes->getContentTypes(),
         );
 
         self::assertCount(count($expectedIdentifiers), $identifiers);
         self::assertEqualsCanonicalizing($expectedIdentifiers, $identifiers);
-        self::assertSame($expectedCount, $contentTypes->getTotalCount());
     }
 
     public function testFindContentTypesAscSortedByIdentifier(): void
@@ -81,7 +72,7 @@ public function testFindContentTypesAscSortedByIdentifier(): void
             $contentTypes->getContentTypes()
         );
 
-        self::assertCount(4, $identifiers);
+        self::assertSame(4, $contentTypes->getTotalCount());
         self::assertSame(['article', 'file', 'folder', 'user'], $identifiers);
     }
 
@@ -131,7 +122,7 @@ public function testFindContentTypesContainingFieldDefinitions(): void
             )
         );
 
-        self::assertCount(1, $contentTypes);
+        self::assertSame(1, $contentTypes->getTotalCount());
         self::assertSame('folder', $contentTypes->getContentTypes()[0]->getIdentifier());
     }