openinfra/openstackid-resources
Code Issues Proposed changes

Fixed SS base model serialization

Browse Source 
Added checks for null values for creation and edited
dates

Change-Id: Ifad88865502f11a6589d61f931fa4e55d3d0821b
This commit is contained in:
Sebastian Marcet 2018-07-18 11:42:15 -03:00
parent d85a83dcb7
commit 6abf5a30ac
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Models/Utils/SilverstripeBaseModel.php
View File

@ -26,6 +26,18 @@ class SilverstripeBaseModel extends BaseEntity
{ {
const DefaultTimeZone = 'America/Chicago'; const DefaultTimeZone = 'America/Chicago';
/**
* @var \DateTime
* @ORM\Column(name="Created", type="datetime")
*/
protected $created;
/**
* @var \DateTime
* @ORM\Column(name="LastEdited", type="datetime")
*/
protected $last_edited;
/** /**
* @return \DateTime * @return \DateTime
*/ */
@ -38,6 +50,7 @@ class SilverstripeBaseModel extends BaseEntity
* @return \DateTime|null * @return \DateTime|null
*/ */
public function getCreatedUTC(){ public function getCreatedUTC(){
if(is_null($this->created)) return null;
return $this->getDateFromLocalToUTC($this->created); return $this->getDateFromLocalToUTC($this->created);
} }
@ -61,6 +74,7 @@ class SilverstripeBaseModel extends BaseEntity
* @return \DateTime|null * @return \DateTime|null
*/ */
public function getLastEditedUTC(){ public function getLastEditedUTC(){
if(is_null($this->last_edited)) return null;
return $this->getDateFromLocalToUTC($this->last_edited); return $this->getDateFromLocalToUTC($this->last_edited);
} }
@ -85,15 +99,6 @@ class SilverstripeBaseModel extends BaseEntity
$this->last_edited = $last_edited; $this->last_edited = $last_edited;
} }
/**
* @ORM\Column(name="Created", type="datetime")
*/
protected $created;
/**
* @ORM\Column(name="LastEdited", type="datetime")
*/
protected $last_edited;
public function __construct() public function __construct()
{ {