ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix mysql datetime format

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-10-08 14:26:37 +02:00
parent 3bd32e6c0d
commit a5b566edd0
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AppInfo/Application.php
View File

@@ -53,6 +53,10 @@ class Application extends App {
}); });
$container->registerMiddleware('SharingMiddleware'); $container->registerMiddleware('SharingMiddleware');
$container->registerService('databaseType', function($container) {
return $container->getServer()->getConfig()->getSystemValue('dbtype', 'sqlite');
});
// Delete user/group acl entries when they get deleted // Delete user/group acl entries when they get deleted
/** @var IUserManager $userManager */ /** @var IUserManager $userManager */
$userManager = $server->getUserManager(); $userManager = $server->getUserManager();

13
lib/Db/Card.php
View File

@@ -42,6 +42,8 @@ class Card extends RelationalEntity implements JsonSerializable {
protected $archived = false; protected $archived = false;
protected $duedate = null; protected $duedate = null;
private $databaseType = 'sqlite';
const DUEDATE_FUTURE = 0; const DUEDATE_FUTURE = 0;
const DUEDATE_NEXT = 1; const DUEDATE_NEXT = 1;
const DUEDATE_NOW = 2; const DUEDATE_NOW = 2;
@@ -58,10 +60,17 @@ class Card extends RelationalEntity implements JsonSerializable {
$this->addResolvable('owner'); $this->addResolvable('owner');
} }
public function getDuedate() { public function setDatabaseType($type) {
$this->databaseType = $type;
}
public function getDuedate($isoFormat = false) {
if($this->duedate === null) if($this->duedate === null)
return null; return null;
$dt = new DateTime($this->duedate); $dt = new DateTime($this->duedate);
if (!$isoFormat && $this->databaseType === 'mysql') {
return $dt->format('Y-m-d H:i:s');
}
return $dt->format('c'); return $dt->format('c');
} }
@@ -91,7 +100,7 @@ class Card extends RelationalEntity implements JsonSerializable {
$json['overdue'] = self::DUEDATE_OVERDUE; $json['overdue'] = self::DUEDATE_OVERDUE;
} }
} }
$json['duedate'] = $this->getDuedate(); $json['duedate'] = $this->getDuedate(true);
return $json; return $json;
} }

12
lib/Db/CardMapper.php
View File

@@ -32,14 +32,22 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
private $labelMapper; private $labelMapper;
private $userManager; private $userManager;
private $databaseType;
public function __construct(IDBConnection $db, LabelMapper $labelMapper, IUserManager $userManager) { public function __construct(
IDBConnection $db,
LabelMapper $labelMapper,
IUserManager $userManager,
$databaseType
) {
parent::__construct($db, 'deck_cards', '\OCA\Deck\Db\Card'); parent::__construct($db, 'deck_cards', '\OCA\Deck\Db\Card');
$this->labelMapper = $labelMapper; $this->labelMapper = $labelMapper;
$this->userManager = $userManager; $this->userManager = $userManager;
$this->databaseType = $databaseType;
} }
public function insert(Entity $entity) { public function insert(Entity $entity) {
$entity->setDatabaseType($this->databaseType);
$entity->setCreatedAt(time()); $entity->setCreatedAt(time());
$entity->setLastModified(time()); $entity->setLastModified(time());
return parent::insert($entity); return parent::insert($entity);
@@ -141,4 +149,4 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
} }
} }

7
tests/unit/Db/CardTest.php
View File

@@ -99,4 +99,11 @@ class CardTest extends \PHPUnit_Framework_TestCase {
], $card->jsonSerialize()); ], $card->jsonSerialize());
} }
public function testMysqlDateFallback() {
$date = new DateTime();
$card = new Card();
$card->setDuedate($date->format('c'));
$card->setDatabaseType('mysql');
$this->assertEquals($date->format('Y-m-d H:i:s'), $card->getDuedate(false));
}
} }