extend Repo with new function - findExpiredRecordsInTheLast30OR90Days with paramter

Classes/Domain/Repository/ActivePageRepository.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Meramo\Pagemanager\Domain\Repository;
 
-use Meramo\Pagemanager\Domain\Model\ActivePage;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 use \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult;
 use TYPO3\CMS\Core\Database\ConnectionPool;
@@ -34,16 +33,6 @@ class ActivePageRepository extends Repository
     $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
     $queryBuilder->getRestrictions()->removeAll();
 
-    /*
-    SELECT p.uid, p.starttime, p.endtime, p.title, p.roof, u.username, u.realName
-    FROM pages p LEFT JOIN be_users u ON p.cruser_id = u.uid
-    WHERE p.starttime > 0 AND p.endtime > 0 and p.red_status = 12 and p.deleted = 0 and p.hidden = 0
-    GROUP BY p.slug ORDER BY p.endtime ASC;
-
-    SELECT `p`.`uid`, `p`.`starttime`, `p`.`endtime`, `p`.`title`, `p`.`roof`, `p`.`slug`, `u`.`username`, `u`.`realName` FROM `pages` `p` LEFT JOIN `be_users` `u` ON `p`.`cruser_id` = `u`.`uid` WHERE (`p`.`starttime` > 0) 
-    AND (`p`.`endtime` <= 1683040238) AND (`p`.`red_status` = 12) AND (`p`.`deleted` = 0) AND (`p`.`hidden` = 0) GROUP BY `p`.`slug` ORDER BY `p`.`endtime` ASC
-    */
-
     $statement = $queryBuilder
       ->select('p.uid', 'p.starttime', 'p.endtime', 'p.title', 'p.roof', 'p.slug', 'u.username', 'u.realName')
       ->from('pages', 'p')
@@ -69,46 +58,7 @@ class ActivePageRepository extends Repository
     return $result->fetchAllAssociative();
   }
 
-  /**
-   * Queries the pages and be_users to get Records which expired in the last 30 days
-   * 
-   * @return QueryResult|array
-   */
-
-  public function findExpiredRecordsInTheLast30Days()
-  {
-    $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
-    $queryBuilder->getRestrictions()->removeAll();
-
-    $currentDate = new \DateTime("now");
-    $last30Days = $currentDate->sub(new \DateInterval('P30D'));
-    $timestamp = date_format($last30Days, 'U');
-
-    $statement = $queryBuilder
-      ->select('p.uid', 'p.starttime', 'p.endtime', 'p.title', 'p.roof', 'p.slug', 'u.username', 'u.realName')
-      ->from('pages', 'p')
-      //->from('be_users', 'u')
-      ->leftJoin(
-        'p',
-        'be_users',
-        'u',
-        $queryBuilder->expr()->eq('p.cruser_id', $queryBuilder->quoteIdentifier('u.uid'))
-      )
-      ->where(
-        $queryBuilder->expr()->gt('p.starttime', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->lt('p.endtime', $queryBuilder->createNamedParameter($timestamp, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.red_status', $queryBuilder->createNamedParameter(12, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.deleted', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.hidden', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
-      )
-      ->groupBy('p.slug')
-      ->orderBy('p.endtime', 'ASC');
-
-    $result = $statement->execute();
-
-    return $result->fetchAllAssociative();
-  }
-
+  
 
   /**
    * Queries the pages and be_users to get Records which expired in the last 30 days
@@ -116,38 +66,30 @@ class ActivePageRepository extends Repository
    * @return QueryResult|array
    */
 
-  public function findExpiredRecordsInTheLast90Days()
+  public function findExpiredRecordsInTheLast30OR90Days(int $daysPasst)
   {
-    $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
-    $queryBuilder->getRestrictions()->removeAll();
-
     $currentDate = new \DateTime("now");
-    $last90Days = $currentDate->sub(new \DateInterval('P90D'));
-    $timestamp = date_format($last90Days, 'U');
-
-    $statement = $queryBuilder
-      ->select('p.uid', 'p.starttime', 'p.endtime', 'p.title', 'p.roof', 'p.slug', 'u.username', 'u.realName')
-      ->from('pages', 'p')
-      //->from('be_users', 'u')
-      ->leftJoin(
-        'p',
-        'be_users',
-        'u',
-        $queryBuilder->expr()->eq('p.cruser_id', $queryBuilder->quoteIdentifier('u.uid'))
-      )
-      ->where(
-        $queryBuilder->expr()->gt('p.starttime', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->lt('p.endtime', $queryBuilder->createNamedParameter($timestamp, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.red_status', $queryBuilder->createNamedParameter(12, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.deleted', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
-        $queryBuilder->expr()->eq('p.hidden', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT))
-      )
-      ->groupBy('p.slug')
-      ->orderBy('p.endtime', 'ASC');
-
-      var_dump($queryBuilder->getSQL());
-
-    $result = $statement->execute();
+    $period = ($daysPasst == 30) ? 'P30D' : 'P90D';
+    
+    $timeperiod = $currentDate->sub(new \DateInterval($period));
+    $timestamp = date_format($timeperiod, 'U');
+
+    $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('pages');
+
+    $sql = sprintf(
+      'SELECT `p`.`uid`, `p`.`starttime`, `p`.`endtime`, `p`.`title`, `p`.`roof`, `p`.`slug`, `u`.`username`, `u`.`realName`
+       FROM `pages` `p` LEFT JOIN `be_users` `u` on `p`.`cruser_id` = `u`.`uid`
+       WHERE `p`.`starttime` > 0  
+       AND `p`.`red_status` = 22 
+       AND `p`.`deleted` = 0 
+       AND `p`.`hidden` = 1
+       AND (`p`.`endtime` BETWEEN 1 AND %d )
+       GROUP BY `p`.`slug`
+       ORDER BY `p`.`endtime` ASC', $timestamp);
+
+    //var_dump($sql);
+    $statement  = $connection->prepare($sql);
+    $result = $statement->executeQuery();
 
     return $result->fetchAllAssociative();
   }