danielsiepmann/tea
danielsiepmann/tea
1
0
mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-11-22 08:16:13 +01:00
Code Activity

[TASK][!!!] Require a storage PID for the tea list (#1223)

Browse source 
Fixes #1024
Supersedes #1024
This commit is contained in:
Oliver Klee 2024-04-15 11:13:57 +02:00 committed by GitHub
parent a014ea7efb
commit 248c759206
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 8 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
### Added ### Added
### Changed ### Changed
- !!! Require a storage PID for the tea list (#1223)
- Drop additional namespace segment for the Tea model (#1025) - Drop additional namespace segment for the Tea model (#1025)
### Deprecated ### Deprecated

4
Classes/Domain/Repository/TeaRepository.php
View file

@ -5,7 +5,6 @@ declare(strict_types=1);
namespace TTN\Tea\Domain\Repository; namespace TTN\Tea\Domain\Repository;
use TTN\Tea\Domain\Model\Tea; use TTN\Tea\Domain\Model\Tea;
use TTN\Tea\Domain\Repository\Traits\StoragePageAgnosticTrait;
use TYPO3\CMS\Extbase\Persistence\QueryInterface; use TYPO3\CMS\Extbase\Persistence\QueryInterface;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface; use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
use TYPO3\CMS\Extbase\Persistence\Repository; use TYPO3\CMS\Extbase\Persistence\Repository;
@ -15,8 +14,6 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
*/ */
class TeaRepository extends Repository class TeaRepository extends Repository
{ {
use StoragePageAgnosticTrait;
protected $defaultOrderings = ['title' => QueryInterface::ORDER_ASCENDING]; protected $defaultOrderings = ['title' => QueryInterface::ORDER_ASCENDING];
/** /**
@ -25,6 +22,7 @@ class TeaRepository extends Repository
public function findByOwnerUid(int $ownerUid): QueryResultInterface public function findByOwnerUid(int $ownerUid): QueryResultInterface
{ {
$query = $this->createQuery(); $query = $this->createQuery();
$query->setQuerySettings($query->getQuerySettings()->setRespectStoragePage(false));
$query->matching($query->equals('ownerUid', $ownerUid)); $query->matching($query->equals('ownerUid', $ownerUid));
return $query->execute(); return $query->execute();

21
Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php
View file

@ -1,21 +0,0 @@
<?php
declare(strict_types=1);
namespace TTN\Tea\Domain\Repository\Traits;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
/**
* This trait for repositories makes the repository ignore the storage page setting when fetching models.
*/
trait StoragePageAgnosticTrait
{
public function initializeObject(): void
{
$querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
$querySettings->setRespectStoragePage(false);
$this->setDefaultQuerySettings($querySettings);
}
}

5
Tests/Functional/Controller/Fixtures/TypoScript/Constants/PluginConfiguration.typoscript Normal file
View file

@ -0,0 +1,5 @@
plugin.tx_tea {
persistence {
storagePid = 2
}
}

1
Tests/Functional/Controller/TeaControllerTest.php
View file

@ -29,6 +29,7 @@ final class TeaControllerTest extends FunctionalTestCase
'constants' => [ 'constants' => [
'EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript', 'EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript',
'EXT:tea/Configuration/TypoScript/constants.typoscript', 'EXT:tea/Configuration/TypoScript/constants.typoscript',
'EXT:tea/Tests/Functional/Controller/Fixtures/TypoScript/Constants/PluginConfiguration.typoscript',
], ],
'setup' => [ 'setup' => [
'EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript', 'EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript',

3
Tests/Functional/Domain/Repository/Fixtures/TeaOnPage.csv
View file

@ -1,3 +0,0 @@
"tx_tea_domain_model_tea"
,"uid","pid","title"
,1,1,"Earl Grey"
Can't render this file because it has a wrong number of fields in line 2.

12
Tests/Functional/Domain/Repository/TeaRepositoryTest.php
View file

@ -41,18 +41,6 @@ final class TeaRepositoryTest extends FunctionalTestCase
self::assertCount(0, $result); self::assertCount(0, $result);
} }
/**
* @test
*/
public function findAllWithRecordsFindsRecordsFromAllPages(): void
{
$this->importCSVDataSet(__DIR__ . '/Fixtures/TeaOnPage.csv');
$result = $this->subject->findAll();
self::assertCount(1, $result);
}
/** /**
* @test * @test
*/ */