#35 wip calculate home, away and obligation series

digedag · Oct 1, 2024 · 4c23a03 · 4c23a03
1 parent ac7bd26
commit 4c23a03
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 5 deletions.
diff --git a/Classes/Model/Series.php b/Classes/Model/Series.php
@@ -32,6 +32,13 @@
  */
 class Series extends BaseModel
 {
+    public const MATCHTYPE_HOME = 'home';
+    public const MATCHTYPE_AWAY = 'away';
+    public const MATCHTYPE_ALL = 'all';
+    public const OBLIGATION_YES = 'yes';
+    public const OBLIGATION_NO = 'no';
+    public const OBLIGATION_ALL = 'all';
+
     public function getTableName()
     {
         return 'tx_t3sportstats_series';

diff --git a/Classes/Series/SeriesCalculator.php b/Classes/Series/SeriesCalculator.php
@@ -103,6 +103,8 @@ public function calculate(int $seriesUid, SeriesCalculationVisitorInterface $vis
         );
         $clubs = $clubs->map(function ($item) { return $item['uid']; })->toArray();
         $ageGroup = $series->getProperty('agegroup');
+        $matchType = $series->getProperty('matchtype');
+        $obligation = $series->getProperty('obligation');
 
         if ($visitor) {
             $visitor->seriesLoaded($series, $clubs);
@@ -111,7 +113,7 @@ public function calculate(int $seriesUid, SeriesCalculationVisitorInterface $vis
         foreach ($clubs as $clubUid) {
             $club = $this->clubRepo->findByUid($clubUid);
             $seriesBag = new SeriesBag($club);
-            $matches = $this->lookupMatches($clubUid, $ageGroup);
+            $matches = $this->lookupMatches($clubUid, $ageGroup, $matchType, $obligation);
             if ($visitor) {
                 $visitor->matchesLoaded($matches);
             }
@@ -264,14 +266,26 @@ private function isTeamHome($match, $clubUid, $ageGroupUid): bool
         throw new TeamNotFoundException(sprintf('Team for club %d not found in match %d', $clubUid, $match->getUid()));
     }
 
-    private function lookupMatches($clubUid, $ageGroupUid): Collection
+    private function lookupMatches($clubUid, $ageGroupUid, string $matchType, string $obligation): Collection
     {
         $builder = $this->matchService->getMatchTableBuilder();
         $builder->setStatus(Fixture::MATCH_STATUS_FINISHED);
         $builder->setAgeGroups($ageGroupUid);
-        $builder->setClubs(''.$clubUid);
+        if ($matchType === Series::MATCHTYPE_HOME) {
+            $builder->setHomeClubs(''.$clubUid);
+        } elseif ($matchType === Series::MATCHTYPE_HOME) {
+            $builder->setGuestClubs(''.$clubUid);
+        } else {
+            $builder->setClubs(''.$clubUid);
+        }
         $builder->setOrderByDate(false);
-        $builder->setCompetitionObligation(1);
+        if ($obligation === Series::OBLIGATION_ALL) {
+            $builder->setCompetitionObligation(0);
+        } elseif ($obligation === Series::OBLIGATION_NO) {
+            $builder->setCompetitionObligation(2);
+        } else {
+            $builder->setCompetitionObligation(1);
+        }
 
         $fields = $options = [];
         $builder->getFields($fields, $options);

diff --git a/Configuration/TCA/tx_t3sportstats_series.php b/Configuration/TCA/tx_t3sportstats_series.php
@@ -132,6 +132,41 @@
                 ],
             ],
         ],
+        'matchtype' => [
+            'exclude' => 1,
+            'label' => 'LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_matchtype',
+            'config' => [
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'items' => [
+                    ['LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_matchtype_all', 'all'],
+                    ['LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_matchtype_home', 'home'],
+                    ['LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_matchtype_away', 'away'],
+                ],
+                'size' => 1,
+                'minitems' => 0,
+                'maxitems' => 1,
+                'default' => 'all',
+            ],
+        ],
+        'obligation' => [
+            'exclude' => 1,
+            'label' => 'LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_obligation',
+            'config' => [
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'items' => [
+                    ['LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_obligation_yes', 'yes'],
+                    ['LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_obligation_no', 'no'],
+                    ['LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_obligation_all', 'all'],
+                ],
+                'size' => 1,
+                'minitems' => 0,
+                'maxitems' => 1,
+                'default' => 'yes',
+            ],
+        ],
+
         'rules' => [
             'label' => 'LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_rules',
             'description' => 'field description',
@@ -163,7 +198,7 @@
     ],
     'types' => [
         '0' => [
-            'showitem' => 'hidden,name,label,saison,competitiontag,competition,agegroup,club,
+            'showitem' => 'hidden,name,label,saison,competitiontag,competition,agegroup,club,matchtype,obligation,
             --div--;LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_rules,rules,
             --div--;LLL:EXT:t3sportstats/Resources/Private/Language/locallang_db.xlf:tx_t3sportstats_series_results,results
             ',

diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
@@ -92,6 +92,30 @@
 			<trans-unit id="tx_t3sportstats_series_results" xml:space="preserve">
 				<source>Results</source>
 			</trans-unit>
+			<trans-unit id="tx_t3sportstats_series_matchtype" xml:space="preserve">
+				<source>Match type</source>
+			</trans-unit>
+			<trans-unit id="tx_t3sportstats_series_matchtype_home" xml:space="preserve">
+				<source>Home series</source>
+			</trans-unit>
+			<trans-unit id="tx_t3sportstats_series_matchtype_away" xml:space="preserve">
+				<source>Away series</source>
+			</trans-unit>
+			<trans-unit id="tx_t3sportstats_series_matchtype_all" xml:space="preserve">
+				<source>Both</source>
+			</trans-unit>
+			<trans-unit id="tx_t3sportstats_series_obligation" xml:space="preserve">
+				<source>Obligation</source>
+			</trans-unit>
+			<trans-unit id="tx_t3sportstats_series_obligation_yes" xml:space="preserve">
+				<source>Yes</source>
+			</trans-unit>
+			<trans-unit id="tx_t3sportstats_series_obligation_no" xml:space="preserve">
+				<source>No</source>
+			</trans-unit>
+			<trans-unit id="tx_t3sportstats_series_obligation_all" xml:space="preserve">
+				<source>Both</source>
+			</trans-unit>
 
 			<trans-unit id="tx_t3sportstats_series_rule" xml:space="preserve">
 				<source>Series Rule</source>

diff --git a/ext_tables.sql b/ext_tables.sql
@@ -187,6 +187,8 @@ CREATE TABLE tx_t3sportstats_series (
 	club int(11) DEFAULT '0' NOT NULL,
 	competition int(11) DEFAULT '0' NOT NULL,
 	competitiontag int(11) DEFAULT '0' NOT NULL,
+	matchtype varchar(10) DEFAULT '' NOT NULL,
+	obligation varchar(10) DEFAULT '' NOT NULL,
 
 	rules int(11) DEFAULT '0' NOT NULL,
 	results int(11) DEFAULT '0' NOT NULL,