rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '148-push-id-api' into 'master'

Browse source 
Resolve "Push id API"

Closes #148

See merge request jankstudio/resq!144
This commit is contained in:
Kendrick Chan 2018-06-17 14:35:45 +00:00
commit 000e530d33
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/APIController.php
View file

@ -131,7 +131,7 @@ class APIController extends Controller
'phone_model',
'os_type',
'os_version',
'device_push_id'
'phone_id'
];
$missing = $this->checkMissingParameters($req, $required_params);
@ -155,7 +155,7 @@ class APIController extends Controller
$sess->setPhoneModel($req->request->get('phone_model'))
->setOSType($req->request->get('os_type'))
->setOSVersion($req->request->get('os_version'))
->setDevicePushID($req->request->get('device_push_id'));
->setPhoneID($req->request->get('phone_id'));
// reopen in case we get an exception
if (!$em->isOpen())

31
src/Entity/MobileSession.php
View file

@ -20,28 +20,34 @@ class MobileSession
// phone model
/**
*@ORM\Column(type="string", length=50)
* @ORM\Column(type="string", length=50)
*/
protected $phone_model;
// operating system (android, ios, etc)
/**
*@ORM\Column(type="string", length=15)
* @ORM\Column(type="string", length=15)
*/
protected $os_type;
// os version
/**
*@ORM\Column(type="string", length=25)
* @ORM\Column(type="string", length=25)
*/
protected $os_version;
// device id or push id used by device
/**
*@ORM\Column(type="string", length=50)
* @ORM\Column(type="string", length=200)
*/
protected $device_push_id;
// phone id
/**
* @ORM\Column(type="string", length=50)
*/
protected $phone_id;
// link to customer
/**
* @ORM\ManyToOne(targetEntity="Customer", inversedBy="sessions")
@ -51,19 +57,19 @@ class MobileSession
// phone number
/**
*@ORM\Column(type="string", length=12, nullable=true)
* @ORM\Column(type="string", length=12, nullable=true)
*/
protected $phone_number;
// confirm code that we send via SMS
/**
*@ORM\Column(type="string", length=6, nullable=true)
* @ORM\Column(type="string", length=6, nullable=true)
*/
protected $confirm_code;
// is confirmed?
/**
*@ORM\Column(type="boolean")
* @ORM\Column(type="boolean")
*/
protected $confirm_flag;
@ -141,6 +147,17 @@ class MobileSession
return $this->os_version;
}
public function setPhoneID($id)
{
$this->phone_id = $id;
return $this;
}
public function getPhoneID()
{
return $this->phone_id;
}
public function setDevicePushID($id)
{
$this->device_push_id = $id;