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

Move retrieval of env variable to the geofence service. #271

Browse source
This commit is contained in:
Korina Cordero 2019-10-23 05:30:12 +00:00
parent e169766efd
commit f6dce241ac
4 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.dist
View file

@ -44,4 +44,4 @@ POLICY_MOBILE=insertmobilepolicyidhere
OTP_MODE=settotestorrandom
# geofence
GEOFENCE=settotrueorfalse
GEOFENCE_ENABLE=settotrueorfalse

4
config/services.yaml
View file

@ -87,6 +87,10 @@ services:
$password: "%env(REDIS_CLIENT_PASSWORD)%"
$env_flag: "dev"
App\Service\GeofenceTracker:
arguments:
$geofence_flag: "%env(GEOFENCE_ENABLE)%"
Catalyst\APIBundle\Security\APIKeyUserProvider:
arguments:
$em: "@doctrine.orm.entity_manager"

21
src/Controller/APIController.php
View file

@ -840,22 +840,13 @@ class APIController extends Controller
$lat = $req->request->get('lat');
// geofence
// check if geofence is on
$dotenv = new Dotenv();
$dotenv->loadEnv(__DIR__.'/../../.env');
$geo_flag = $_ENV['GEOFENCE'];
if ($geo_flag == 'true')
$is_covered = $geo->isCovered($long, $lat);
if (!$is_covered)
{
$is_covered = $geo->isCovered($long, $lat);
if (!$is_covered)
{
// TODO: put geofence error message in config file somewhere
$res->setError(true)
->setErrorMessage('Oops! Our service is limited to some areas in Laguna and Baguio, and Metro Manila only. We will update you as soon as we are able to cover your area');
return $res->getReturnResponse();
}
// TODO: put geofence error message in config file somewhere
$res->setError(true)
->setErrorMessage('Oops! Our service is limited to some areas in Laguna and Baguio, and Metro Manila only. We will update you as soon as we are able to cover your area');
return $res->getReturnResponse();
}
$jo = new JobOrder();

28
src/Service/GeofenceTracker.php
View file

@ -11,25 +11,33 @@ use CrEOF\Spatial\PHP\Types\Geometry\Point;
class GeofenceTracker
{
protected $em;
protected $geofence_flag;
public function __construct(EntityManagerInterface $em)
public function __construct(EntityManagerInterface $em, $geofence_flag)
{
$this->em = $em;
$this->geofence_flag = $geofence_flag;
}
public function isCovered($long, $lat)
{
// see if the point is in any of the polygons
$query = $this->em->createQuery('SELECT count(s) from App\Entity\SupportedArea s where st_contains(s.coverage_area, point(:long, :lat)) = true')
->setParameter('long', $long)
->setParameter('lat', $lat);
// check if geofence is enabled
if ($this->geofence_flag == 'true')
{
// see if the point is in any of the polygons
$query = $this->em->createQuery('SELECT count(s) from App\Entity\SupportedArea s where st_contains(s.coverage_area, point(:long, :lat)) = true')
->setParameter('long', $long)
->setParameter('lat', $lat);
// number of polygons that contain the point
$count = $query->getSingleScalarResult();
// number of polygons that contain the point
$count = $query->getSingleScalarResult();
if ($count > 0)
return true;
if ($count > 0)
return true;
return false;
return false;
}
return true;
}
}