[TASK] New upgrade wizard for sending times

Classes/Controller/QueueController.php

@@ -149,6 +149,7 @@ class QueueController extends ActionController {
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
 	 */
 	public function sendMailAction($uid, $selectedTemplate, $selectedExtension) {
+
 		$mailService = new MailTemplateService();
 		$mailService->sendMailFromQueue($uid);
 

Classes/Domain/Model/Mail.php

@@ -313,7 +313,7 @@ class Mail extends AbstractEntity {
 	 * @param int $sendingTime
 	 */
 	public function setLastSendingTime($sendingTime) {
-		$this->lastSendingTime = $sendingTime;
+		$this->lastSendingTime = (int) $sendingTime;
 	}
 
 	/**

Classes/Domain/Repository/MailRepository.php

@@ -142,6 +142,7 @@ class MailRepository extends AbstractRepository {
 		$constraintsAnd[] = $query->logicalOr($constraintsOr);
 
 		$fromTime = strtotime($filters['filterFromDate']);
+
 		if ($fromTime) {
 			$constraintsAnd[] = $query->greaterThan('tstamp', $fromTime);
 		}

Classes/Updates/UpdateSendingTimes.php

+<?php
+
+namespace SGalinski\SgMail\Updates;
+
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) sgalinski Internet Services (https://www.sgalinski.de)
+ *
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
+use TYPO3\CMS\Core\Database\DatabaseConnection;
+use TYPO3\CMS\Install\Updates\AbstractUpdate;
+
+/**
+ * Update the correct sending times (if any)
+ */
+class UpdateSendingTimes extends AbstractUpdate {
+	/**
+	 * @var string
+	 */
+	protected $title = 'Find all sent mails and set the sending time to the tstamp field';
+
+	/**
+	 * @var \TYPO3\CMS\Extbase\Object\ObjectManager
+	 */
+	protected $objectManager;
+
+	/**
+	 * @var array
+	 */
+	protected $table = 'tx_sgmail_domain_model_mail';
+
+	/**
+	 * Checks whether updates are required.
+	 *
+	 * @param string &$description The description for the update
+	 * @return bool Whether an update is required (TRUE) or not (FALSE)
+	 */
+	public function checkForUpdate(&$description) {
+		$description = 'Update the sending times if mails have been sent';
+		/** @var DatabaseConnection $databaseConnection */
+		$databaseConnection = $GLOBALS['TYPO3_DB'];
+
+		// are there site root columns differing from pids?
+		$where = 'sent = TRUE AND last_sending_time = 0';
+
+		$result = $databaseConnection->exec_SELECTquery('*', $this->table, $where);
+		if ($result->num_rows > 0) {
+			return TRUE;
+		}
+
+		return !(!FALSE || $this->isWizardDone());
+	}
+
+	/**
+	 * Performs the according updates.
+	 *
+	 * @param array &$dbQueries Queries done in this update
+	 * @param mixed &$customMessages Custom messages
+	 * @return bool Whether everything went smoothly or not
+	 */
+	public function performUpdate(array &$dbQueries, &$customMessages) {
+		/** @var DatabaseConnection $databaseConnection */
+		$databaseConnection = $GLOBALS['TYPO3_DB'];
+		$dbQueries = [];
+		$where = 'sent = TRUE AND last_sending_time = 0';
+		$result = $databaseConnection->exec_SELECTquery('uid, tstamp', $this->table, $where)->fetch_all();
+		$dbQueries[] = $databaseConnection->debug_lastBuiltQuery;
+
+		/** @var array $result */
+		foreach ($result as $row) {
+			$where = 'uid = ' . $row[0];
+			$databaseConnection->exec_UPDATEquery($this->table, $where, ['last_sending_time' => $row[1]]);
+			$dbQueries[] = $databaseConnection->debug_lastBuiltQuery;
+		}
+
+		$this->markWizardAsDone();
+		return TRUE;
+	}
+}

Resources/Private/Templates/Queue/Index.html

@@ -45,7 +45,9 @@
 										<td>
 											<span><f:format.date format="d.m.Y h:i">{mail.crdate}</f:format.date></span>
 											<br>
-											<span><f:format.date format="d.m.Y h:i">{mail.last_sending_time}</f:format.date></span>
+											<f:if condition="{mail.last_sending_time} != 0">
+												<span><f:format.date format="d.m.Y h:i">{mail.last_sending_time}</f:format.date></span>
+											</f:if>
 										</td>
 										<td nowrap="nowrap" class="col-control">
 											<f:format.raw>

ext_localconf.php

@@ -37,6 +37,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][] =
 
 // add upgrade wizard for moving all db entries to their respected siteroot
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['tx_sgmail_update_pid_to_site_root'] = \SGalinski\SgMail\Updates\UpdatePidToSiteRoot::class;
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['tx_sgmail_update_sending_times'] = \SGalinski\SgMail\Updates\UpdateSendingTimes::class;
 
 
 if (TYPO3_MODE === 'BE') {