[IMP] Import status Draft (5e8c8d86) · Commits · packages / WE.SpreadsheetImport

Classes/WE/SpreadsheetImport/Command/SpreadsheetImportCommandController.php

+1 −1

Changes for Classes/WE/SpreadsheetImport/Command/SpreadsheetImportCommandController.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ class SpreadsheetImportCommandController extends CommandController {
		$this->quit();
		}
		/** @var SpreadsheetImport $spreadsheetImport */
		$spreadsheetImport = $this->spreadsheetImportRepository->findPreviousOneInQueue();
		$spreadsheetImport = $this->spreadsheetImportRepository->findNextInQueue();
		if ($spreadsheetImport instanceof SpreadsheetImport) {
		// mark importing status as "Progressing" before continuing the importing
		$spreadsheetImport->setImportingStatus(SpreadsheetImport::IMPORTING_STATUS_IN_PROGRESS);

+6 −5

Changes for Classes/WE/SpreadsheetImport/Domain/Model/SpreadsheetImport.php: 6 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -19,10 +19,11 @@ use Doctrine\ORM\Mapping as ORM;
		*/
		class SpreadsheetImport {

		const IMPORTING_STATUS_IN_QUEUE = 0;
		const IMPORTING_STATUS_IN_PROGRESS = 1;
		const IMPORTING_STATUS_COMPLETED = 2;
		const IMPORTING_STATUS_FAILED = 3;
		const IMPORTING_STATUS_DRAFT = 0;
		const IMPORTING_STATUS_IN_QUEUE = 1;
		const IMPORTING_STATUS_IN_PROGRESS = 2;
		const IMPORTING_STATUS_COMPLETED = 3;
		const IMPORTING_STATUS_FAILED = 4;

		/**
		* @var string
		@@ -72,7 +73,7 @@ class SpreadsheetImport {
		* @var int
		* @ORM\Column(options={"default": 0})
		*/
		protected $importingStatus = self::IMPORTING_STATUS_IN_QUEUE;
		protected $importingStatus = self::IMPORTING_STATUS_DRAFT;

		/**
		* @var int

+16 −2

Changes for Classes/WE/SpreadsheetImport/Domain/Repository/SpreadsheetImportRepository.php: 16 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -29,10 +29,10 @@ class SpreadsheetImportRepository extends Repository {
		/**
		* @return SpreadsheetImport
		*/
		public function findPreviousOneInQueue() {
		public function findNextInQueue() {
		$query = $this->createQuery();
		$constraint = $query->logicalAnd(
		$query->equals('importingStatus', SpreadsheetImport::IMPORTING_STATUS_IN_QUEUE),
		$query->lessThanOrEqual('importingStatus', SpreadsheetImport::IMPORTING_STATUS_IN_QUEUE),
		$query->lessThanOrEqual('scheduleDate', new \DateTime())
		);
		return $query->matching($constraint)
		@@ -51,4 +51,18 @@ class SpreadsheetImportRepository extends Repository {
		return $query->matching($constraint)->execute();
		}

		/**
		* @param string $context
		* @param array $arguments
		*
		* @return \TYPO3\Flow\Persistence\QueryResultInterface
		*/
		public function findByContextAndArguments($context, $arguments = array()) {
		$query = $this->createQuery();
		$constraint = $query->logicalAnd(
		$query->equals('context', $context),
		$query->equals('arguments', serialize($arguments))
		);
		return $query->matching($constraint)->execute();
		}
		}