Merge pull request #288 from nextcloud/fix/timestamps

Migrate Timestamps
2020-04-14 17:27:12 +02:00 · 2020-04-14 17:27:12 +02:00 · 1966db2c5f
parent 597a34ea25 6102f8485b
commit 1966db2c5f
6 changed files with 66 additions and 43 deletions
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@ -272,9 +272,9 @@ class ApiController extends Controller {
 		$newForm->setAccess($form['access']);

 		if ($form['expires']) {
-			$newForm->setExpirationDate(date('Y-m-d H:i:s', strtotime($form['expirationDate'])));
+			$newForm->setExpiresTimestamp($form['expiresTimestamp']);
 		} else {
-			$newForm->setExpirationDate(null);
+			$newForm->setExpiresTimestamp(0);
 		}

 		if ($mode === 'edit') {
@ -297,7 +297,7 @@ class ApiController extends Controller {
 			// Create new form
 			// Define current user as owner, set new creation date and create a new hash
 			$newForm->setOwnerId($currentUser);
-			$newForm->setCreated(date('Y-m-d H:i:s'));
+			$newForm->setCreated(time());
 			$newForm->setHash(\OC::$server->getSecureRandom()->generate(
 				16,
 				ISecureRandom::CHAR_DIGITS .
@ -322,7 +322,7 @@ class ApiController extends Controller {

 		$currentUser = \OC::$server->getUserSession()->getUser()->getUID();
 		$form->setOwnerId($currentUser);
-		$form->setCreated(date('Y-m-d H:i:s'));
+		$form->setCreated(time());
 		$form->setHash(\OC::$server->getSecureRandom()->generate(
 			16,
 			ISecureRandom::CHAR_HUMAN_READABLE
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@ -172,10 +172,10 @@ class PageController extends Controller {
 			return new TemplateResponse('forms', 'no.acc.tmpl', []);
 		}

-		if ($form->getExpirationDate() === null) {
+		if ($form->getExpiresTimestamp() === 0) {
 			$expired = false;
 		} else {
-			$expired = time() > strtotime($form->getExpirationDate());
+			$expired = time() > $form->getExpiresTimestamp();
 		}

 		if ($expired) {
@ -277,7 +277,7 @@ class PageController extends Controller {
 		}else{
 			$submission->setUserId($userId);
 		}
-		$submission->setTimestamp(date('Y-m-d H:i:s'));
+		$submission->setTimestamp(time());
 		$this->submissionMapper->insert($submission);
 		$submissionId = $submission->getId();

--- a/lib/Db/Form.php
+++ b/lib/Db/Form.php
@ -39,10 +39,10 @@ use OCP\AppFramework\Db\Entity;
 * @method void setOwnerId(string $value)
 * @method array getAccess()
 * @method void setAccess(array $value)
- * @method string getCreated()
- * @method void setCreated(string $value)
- * @method string getExpirationDate()
- * @method void setExpirationDate(string $value)
+ * @method integer getCreated()
+ * @method void setCreated(integer $value)
+ * @method integer getExpiresTimestamp()
+ * @method void setExpiresTimestamp(integer $value)
 * @method integer getIsAnonymous()
 * @method void setIsAnonymous(bool $value)
 * @method integer getSubmitOnce()
@ -56,7 +56,7 @@ class Form extends Entity {
 	protected $ownerId;
 	protected $accessJson;
 	protected $created;
-	protected $expirationDate;
+	protected $expiresTimestamp;
 	protected $isAnonymous;
 	protected $submitOnce;

@ -64,34 +64,38 @@ class Form extends Entity {
 	 * Form constructor.
 	 */
 	public function __construct() {
+		$this->addType('created', 'integer');
+		$this->addType('expiresTimestamp', 'integer');
 		$this->addType('isAnonymous', 'bool');
 		$this->addType('submitOnce', 'bool');
 	}

-	/**
-	 * JSON-Decoding of access-column.
-	 */
+	// JSON-Decoding of access-column.
 	public function getAccess(): array {
 		return json_decode($this->getAccessJson(), true); // assoc=true, => Convert to associative Array
 	}

-	/**
-	 * JSON-Encoding of access-column.
-	 */
+	// JSON-Encoding of access-column.
 	public function setAccess(array $access) {
 		$this->setAccessJson(json_encode($access));
 	}

-	public function read() {
+	// Get virtual column expires. Set should only be done by setExpiresTimestamp().
+	public function getExpires(): bool {
+		return (bool) $this->getExpiresTimestamp();
+	}

-		if ($this->getExpirationDate() === null) {
-			$expired = false;
-			$expires = false;
-		} else {
-			$expired = time() > strtotime($this->getExpirationDate());
-			$expires = true;
+	// Get virtual column expired. Set should only be done by setExpiresTimestamp().
+	public function getExpired(): bool {
+		if ($this->getExpires()) {
+			return time() > $this->getExpiresTimestamp();
 		}
+		// else - does not expire
+		return false;
+	}

+	// Read full form
+	public function read() {
 		return [
 			'id' => $this->getId(),
 			'hash' => $this->getHash(),
@ -101,9 +105,9 @@ class Form extends Entity {
 			'ownerDisplayName' => \OC_User::getDisplayName($this->getOwnerId()),
 			'created' => $this->getCreated(),
 			'access' => $this->getAccess(),
-			'expires' => $expires,
-			'expired' => $expired,
-			'expirationDate' => $this->getExpirationDate(),
+			'expires' => $this->getExpires(),
+			'expired' => $this->getExpired(),
+			'expiresTimestamp' => $this->getExpiresTimestamp(),
 			'isAnonymous' => $this->getIsAnonymous(),
 			'submitOnce' => $this->getSubmitOnce()
 		];
--- a/lib/Db/Submission.php
+++ b/lib/Db/Submission.php
@ -32,8 +32,8 @@ use OCP\AppFramework\Db\Entity;
 * @method void setFormId(integer $value)
 * @method string getUserId()
 * @method void setUserId(string $value)
- * @method string getTimestamp()
- * @method void setTimestamp(string $value)
+ * @method integer getTimestamp()
+ * @method void setTimestamp(integer $value)
 */
 class Submission extends Entity {
 	protected $formId;
@ -45,6 +45,7 @@ class Submission extends Entity {
 	 */
 	public function __construct() {
 		$this->addType('formId', 'integer');
+		$this->addType('timestamp', 'integer');
 	}

 	public function read(): array {
--- a/lib/Migration/Version010200Date2020323141300.php
+++ b/lib/Migration/Version010200Date2020323141300.php
@ -33,6 +33,8 @@ use OCP\IDBConnection;
 use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;

+use \DateTime;
+
 /**
 * Installation class for the forms app.
 * Initial db creation
@ -90,11 +92,13 @@ class Version010200Date2020323141300 extends SimpleMigrationStep {
 			$table->addColumn('access_json', Type::JSON, [
 				'notnull' => false,
 			]);
-			$table->addColumn('created', Type::DATETIME, [
+			$table->addColumn('created', Type::INTEGER, [
 				'notnull' => false,
+				'comment' => 'unix-timestamp',
 			]);
-			$table->addColumn('expiration_date', Type::DATETIME, [
+			$table->addColumn('expires_timestamp', Type::INTEGER, [
 				'notnull' => false,
+				'comment' => 'unix-timestamp',
 			]);
 			$table->addColumn('is_anonymous', Type::BOOLEAN, [
 				'notnull' => true,
@ -165,8 +169,9 @@ class Version010200Date2020323141300 extends SimpleMigrationStep {
 				'notnull' => true,
 				'length' => 64,
 			]);
-			$table->addColumn('timestamp', Type::DATETIME, [
+			$table->addColumn('timestamp', Type::INTEGER, [
 				'notnull' => false,
+				'comment' => 'unix-timestamp',
 			]);
 			$table->setPrimaryKey(['id']);
 		}
@ -221,8 +226,8 @@ class Version010200Date2020323141300 extends SimpleMigrationStep {
 						'description' => $qb_restore->createNamedParameter($event['description'], IQueryBuilder::PARAM_STR),
 						'owner_id' => $qb_restore->createNamedParameter($event['owner'], IQueryBuilder::PARAM_STR),
 						'access_json' => $qb_restore->createNamedParameter($newAccessJSON, IQueryBuilder::PARAM_STR),
-						'created' => $qb_restore->createNamedParameter($event['created'], IQueryBuilder::PARAM_STR),
-						'expiration_date' => $qb_restore->createNamedParameter($event['expire'], IQueryBuilder::PARAM_STR),
+						'created' => $qb_restore->createNamedParameter($this->convertDateTime($event['created']), IQueryBuilder::PARAM_INT),
+						'expires_timestamp' => $qb_restore->createNamedParameter($this->convertDateTime($event['expire']), IQueryBuilder::PARAM_INT),
 						'is_anonymous' => $qb_restore->createNamedParameter($event['is_anonymous'], IQueryBuilder::PARAM_BOOL),
 						'submit_once' => $qb_restore->createNamedParameter($event['unique'], IQueryBuilder::PARAM_BOOL)
 					]);
@ -328,7 +333,7 @@ class Version010200Date2020323141300 extends SimpleMigrationStep {
 						->values([
 							'form_id' => $qb_restore->createNamedParameter($id_mapping['events'][$vote['form_id']]['newId'], IQueryBuilder::PARAM_INT),
 							'user_id' => $qb_restore->createNamedParameter($vote['user_id'], IQueryBuilder::PARAM_STR),
-							'timestamp' => $qb_restore->createNamedParameter(date('Y-m-d H:i:s'), IQueryBuilder::PARAM_STR) //Information not available. Just using Migration-Timestamp.
+							'timestamp' => $qb_restore->createNamedParameter(time(), IQueryBuilder::PARAM_STR) //Information not available. Just using Migration-Timestamp.
 						]);
 					$qb_restore->execute();
 					$id_mapping['currentSubmission'] = $qb_restore->getLastInsertId(); //Store submission-id to connect answers to submission.
@ -390,4 +395,14 @@ class Version010200Date2020323141300 extends SimpleMigrationStep {

 		return json_encode($accessArray);
 	}
+
+	/** Convert old Date-Format to unix-timestamps */
+	private function convertDateTime($oldDate): int {
+		// Expires can be NULL -> Converting to timestamp 0
+		if (!$oldDate) {
+			return 0;
+		}
+
+		return DateTime::createFromFormat('Y-m-d H:i:s', $oldDate)->getTimestamp();
+	}
 }
--- a/src/views/Sidebar.vue
+++ b/src/views/Sidebar.vue
@ -55,11 +55,9 @@
 			</label>

 			<DatetimePicker v-show="form.form.expires"
-				v-model="form.form.expirationDate"
-				v-bind="expirationDatePicker"
-
-				:time-picker-options="{ start: '00:00', step: '00:05', end: '23:55' }"
-				style="width:170px" />
+				id="expiresDatetimePicker"
+				v-model="form.form.expiresTimestamp"
+				v-bind="expirationDatePicker" />
 		</div>

 		<div class="configBox">
@ -140,13 +138,14 @@ export default {
 				editable: true,
 				minuteStep: 1,
 				type: 'datetime',
+				valueType: 'X', // unix-timestamp
 				format: moment.localeData().longDateFormat('L') + ' ' + moment.localeData().longDateFormat('LT'),
 				lang: this.lang.split('-')[0],
 				placeholder: t('forms', 'Expiration date'),
 				timePickerOptions: {
 					start: '00:00',
-					step: '00:30',
-					end: '23:30',
+					step: '00:15',
+					end: '23:45',
 				},
 			}
 		},
@ -228,4 +227,8 @@ textarea {
 		box-shadow: 1px 0 var(--border-radius) var(--color-box-shadow);
 	}
 }
+
+#expiresDatetimePicker {
+	width: 170px;
+}
 </style>