tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ivan - Fix all list/beanInstance functionality

This commit is contained in:
ivan 2016-08-04 00:59:04 -03:00
parent 83fcc34701
commit d6853b3a4b
16 changed files with 263 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/controllers/system/init-settings.php
View File

@ -14,6 +14,7 @@ class InitSettingsController extends Controller {
if (Setting::isTableEmpty()) {
$this->storeGlobalSettings();
$this->storeMailTemplates();
$this->storeMockedDepartments();
Response::respondSuccess();
} else {
@ -63,4 +64,18 @@ class InitSettingsController extends Controller {
$setting->store();
}
}
private function storeMockedDepartments() {
$departments = [
'Tech Support',
'Suggestions',
'Sales and Subscriptions'
];
foreach ($departments as $departmentName) {
$department = new Department();
$department->name = $departmentName;
$department->store();
}
}
}

3
server/controllers/ticket/comment.php
View File

@ -33,7 +33,8 @@ class CommentController extends Controller {
));
$ticket = Ticket::getTicket($this->ticketId);
$ticket->addComment($comment);
$ticket->ownCommentList->add($comment);
//$comment->store();
$ticket->store();
}
}

21
server/controllers/ticket/create.php
View File

@ -1,5 +1,6 @@
<?php
use Respect\Validation\Validator as DataValidator;
DataValidator::with('CustomValidations', true);
class CreateController extends Controller {
const PATH = '/create';
@ -20,6 +21,10 @@ class CreateController extends Controller {
'content' => [
'validation' => DataValidator::length(10, 500),
'error' => ERRORS::INVALID_CONTENT
],
'departmentId' => [
'validation' => DataValidator::dataStoreId('department'),
'error' => ERRORS::INVALID_DEPARTMENT
]
]
];
@ -39,22 +44,28 @@ class CreateController extends Controller {
$this->language = Controller::request('language');
}
private function storeTicket() {
private function storeTicket()
{
$department = Department::getDataStore($this->departmentId);
$author = Controller::getLoggedUser();
$ticket = new Ticket();
$ticket->setProperties(array(
'ticketId' => '',
'title' => $this->title,
'content' => $this->content,
'language' => $this->language,
'department' => $this->departmentId,
'author' => $author,
'department' => $department,
'file' => '',
'date' => Date::getCurrentDate(),
'unread' => false,
'closed' => false
'closed' => false,
));
$author->sharedTicketList->add($ticket);
$ticket->setAuthor(Controller::getLoggedUser());
$author->store();
$ticket->store();
}
}

6
server/controllers/user/login.php
View File

@ -76,8 +76,8 @@ class LoginController extends Controller {
$userId = Controller::request('userId');
if (!$sessionCookie->isNull() && $userId === $sessionCookie->user->id) {
$userInstance = new User($sessionCookie->user);
$sessionCookie->trash();
$userInstance = $sessionCookie->user;
$sessionCookie->delete();
}
}
@ -91,7 +91,7 @@ class LoginController extends Controller {
$sessionCookie = new SessionCookie();
$sessionCookie->setProperties(array(
'user' => $this->userInstance->getBeanInstance(),
'user' => $this->userInstance,
'token' => $this->rememberToken,
'ip' => $_SERVER['REMOTE_ADDR'],
'creationDate' => date('d-m-Y (H:i:s)')

2
server/controllers/user/recover-password.php
View File

@ -39,7 +39,7 @@ class RecoverPasswordController extends Controller {
$user = User::getDataStore($this->email, 'email');
if($recoverPassword && $user) {
$recoverPassword->trash();
$recoverPassword->delete();
$user->setProperties([
'password' => Hashing::hashPassword($this->password)

1
server/data/ERRORS.php
View File

@ -9,5 +9,6 @@ class ERRORS {
const INVALID_PASSWORD = 'Invalid password';
const INVALID_NAME = 'Invalid name';
const INVALID_SETTING = 'Invalid setting';
const INVALID_DEPARTMENT = 'Invalid department';
const INIT_SETTINGS_DONE = 'Settings already initialized';
}

5
server/index.php
View File

@ -5,6 +5,7 @@ require_once 'vendor/autoload.php';
// REDBEAN CONFIGURATION
use RedBeanPHP\Facade as RedBean;
RedBean::setup('mysql:host='. $mysql_host .';dbname=' . $mysql_database, $mysql_user, $mysql_password);
RedBean::setAutoResolve(true);
// SLIM FRAMEWORK
\Slim\Slim::registerAutoLoader();
@ -16,6 +17,7 @@ include_once 'libs/ControllerGroup.php';
include_once 'libs/Hashing.php';
include_once 'libs/MailSender.php';
include_once 'libs/Date.php';
include_once 'libs/DataStoreList.php';
// LOAD DATA
spl_autoload_register(function ($class) {
@ -35,6 +37,9 @@ spl_autoload_register(function ($class) {
}
});
//Load custom validations
include_once 'libs/validations/dataStoreExists.php';
// LOAD CONTROLLERS
foreach (glob('controllers/*.php') as $controller) {
include_once $controller;

46
server/libs/DataStoreList.php Normal file
View File

@ -0,0 +1,46 @@
<?php
require_once 'models/DataStore.php';
class DataStoreList {
private $list = [];
public static function getList($type, $beanList) {
$dataStoreList = new DataStoreList();
foreach ($beanList as $bean) {
$dataStoreList->add(new $type($bean));
}
return $dataStoreList;
}
public function add(DataStore $dataStore) {
$this->list[] = $dataStore;
}
public function remove(DataStore $dataStore) {
$dataStoreIndexInList = $this->getIndexInListOf($dataStore);
unset($this->list[$dataStoreIndexInList]);
}
public function toBeanList() {
$beanList = [];
foreach($this->list as $item) {
$beanList[] = $item->getBeanInstance();
}
return $beanList;
}
private function getIndexInListOf($dataStore) {
foreach ($this->list as $itemIdInList => $item) {
if ($item->id === $dataStore->id) {
return $itemIdInList;
}
}
return -1;
}
}

43
server/libs/validations/dataStoreExists.php Normal file
View File

@ -0,0 +1,43 @@
<?php
namespace CustomValidations;
use Respect\Validation\Rules\AbstractRule;
class DataStoreId extends AbstractRule {
private $dataStoreName;
public function __construct($dataStoreName = '') {
if ($this->isDataStoreNameValid($dataStoreName)) {
$this->dataStoreName = $dataStoreName;
} else {
throw new \Exception("Invalid DataStore: $dataStoreName");
}
}
public function validate($dataStoreId) {
$dataStore = null;
switch ($this->dataStoreName) {
case 'user':
$dataStore = \User::getUser($dataStoreId);
break;
case 'ticket':
$dataStore = \Ticket::getTicket($dataStoreId);
break;
case 'department':
$dataStore = \Department::getDataStore($dataStoreId);
break;
}
return !($dataStore instanceof \NullDataStore);
}
private function isDataStoreNameValid($dataStoreName) {
return in_array($dataStoreName, [
'user',
'ticket',
'department'
]);
}
}

1
server/models/Comment.php
View File

@ -7,7 +7,6 @@ class Comment extends DataStore {
return array(
'content',
'file',
'ticket',
'author',
'date'
);

156
server/models/DataStore.php
View File

@ -3,6 +3,7 @@ use RedBeanPHP\Facade as RedBean;
abstract class DataStore {
protected $_bean;
protected $properties = [];
public static function isTableEmpty() {
return (RedBean::count(static::TABLE) === 0);
@ -16,55 +17,6 @@ abstract class DataStore {
return ($bean) ? new static($bean) : new NullDataStore();
}
public function __construct($beanInstance = null) {
if ($beanInstance) {
$this->_bean = $beanInstance;
}
else {
$this->_bean = RedBean::dispense(static::TABLE);
$defaultProperties = $this->getDefaultProps();
foreach ($defaultProperties as $PROP => $VALUE) {
$this->_bean[$PROP] = $VALUE;
}
}
}
public function getDefaultProps() {
return [];
}
public function delete() {
RedBean::trash($this->getBeanInstance());
unset($this);
}
public function getBeanInstance() {
return $this->_bean;
}
public function setProperties($properties) {
foreach (static::getProps() as $PROP) {
if(array_key_exists($PROP, $properties)) {
$this->_bean[$PROP] = $properties[$PROP];
}
}
}
public function __get($name) {
if ($this->_bean[$name]) {
return $this->_bean[$name];
}
else {
return null;
}
}
public function store() {
return RedBean::store($this->_bean);
}
private static function validateProp($propToValidate) {
$validProp = false;
@ -77,11 +29,111 @@ abstract class DataStore {
return ($validProp) ? $propToValidate : 'id';
}
public function trash() {
RedBean::trash($this->_bean);
public function __construct($beanInstance = null) {
if ($beanInstance) {
$this->setBean($beanInstance);
} else {
$this->setBean(RedBean::dispense(static::TABLE));
$this->setProperties($this->getDefaultProps());
}
}
public function getDefaultProps() {
return [];
}
public function setProperties($properties) {
foreach (static::getProps() as $PROP) {
if(array_key_exists($PROP, $properties)) {
$this->properties[$PROP] = $properties[$PROP];
}
}
}
public function __set($prop, $value) {
if (in_array($prop, static::getProps())) {
$this->properties[$prop] = $value;
} else {
throw new Exception("Invalid prop: $prop");
}
}
public function &__get($name) {
if (!array_key_exists($name, $this->properties) || !$this->properties[$name]) {
$this->properties[$name] = $this->parseBeanProp($name);
}
if ($name !== 'id') {
$property =& $this->properties[$name];
} else {
$property = $this->_bean->id;
}
return $property;
}
private function setBean($beanInstance) {
$this->_bean = $beanInstance;
}
private function parseBeanProp($prop) {
$parsedProp = $this->_bean[$prop];
if (strpos($prop, 'List')) {
$parsedProp = DataStoreList::getList($this->getListType($prop), $parsedProp);
} else if ($parsedProp instanceof \RedBeanPHP\OODBBean) {
$beanType = ucfirst($parsedProp->getPropertiesAndType()[1]);
$parsedProp = new $beanType($parsedProp);
}
return $parsedProp;
}
public function store() {
return RedBean::store($this->getBeanInstance());
}
public function delete() {
RedBean::trash($this->getBeanInstance());
unset($this);
}
public function getBeanInstance() {
$this->updateBeanProperties();
return $this->_bean;
}
public function isNull() {
return false;
}
private function updateBeanProperties() {
foreach ($this->properties as $key => $prop) {
$this->updateBeanProp($key, $prop);
}
}
private function updateBeanProp($key, $value) {
if ($value instanceof DataStoreList) {
$this->_bean[$key] = $value->toBeanList();
} else if ($value instanceof DataStore) {
$this->_bean[$key] = $value->getBeanInstance();
} else {
$this->_bean[$key] = $value;
}
}
private function getListType($listName) {
$listType = $listName;
$listType = str_replace('List', '', $listType);
$listType = str_replace('shared', '', $listType);
$listType = str_replace('own', '', $listType);
return $listType;
}
}

12
server/models/Department.php Normal file
View File

@ -0,0 +1,12 @@
<?php
class Department extends DataStore {
const TABLE = 'department';
public function getProps() {
return [
'name',
'sharedTicketList'
];
}
}

4
server/models/Setting.php
View File

@ -14,4 +14,8 @@ class Setting extends DataStore {
'permission'
);
}
public function getValue() {
return $this->value;
}
}

13
server/models/Ticket.php
View File

@ -33,19 +33,6 @@ class Ticket extends DataStore {
);
}
public function setAuthor(User $user) {
$this->author = $user;
$this->author->addTicket($this);
$this->setProperties(array(
'author' => $this->author->getBeanInstance()
));
}
public function addComment(Comment $comment) {
$this->getBeanInstance()->ownCommentList[] = $comment->getBeanInstance();
}
public function store() {
parent::store();

16
server/models/User.php
View File

@ -11,20 +11,20 @@ class User extends DataStore {
}
public static function getProps() {
return array(
return [
'email',
'password',
'name',
'verificationToken'
);
'admin',
'sharedTicketList',
'verificationToken',
];
}
public function getDefaultProps() {
return array();
}
public function addTicket(Ticket $ticket) {
$this->getBeanInstance()->sharedTicketList[] = $ticket->getBeanInstance();
return [
'admin' => 0
];
}
public static function getUser($value, $property = 'id') {

5
server/tests/models/DataStoreTest.php
View File

@ -35,6 +35,7 @@ class DataStoreTest extends PHPUnit_Framework_TestCase {
}
public function testContructor() {
$this->instance->store();
$newInstance = new DataStoreMock($this->instance->getBeanInstance());
$this->assertEquals($newInstance->prop1, 0);
@ -58,12 +59,12 @@ class DataStoreTest extends PHPUnit_Framework_TestCase {
public function testGetDataStore() {
RedBean::setStatics(array(
'findOne' => \Mock::stub()->returns(new BeanMock(['TEST_PROP' => 'TEST_VALUE']))
'findOne' => \Mock::stub()->returns(new BeanMock(['prop1' => 'TEST_VALUE']))
));
$dataStoreIntance = DataStoreMock::getDataStore('ID_VALUE');
$this->assertEquals($dataStoreIntance->TEST_PROP, 'TEST_VALUE');
$this->assertEquals($dataStoreIntance->prop1, 'TEST_VALUE');
$this->assertTrue(RedBean::get('findOne')->hasBeenCalledWithArgs(
'MOCK_TABLE',