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

.env.dist

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

config/services.yaml

@@ -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"

src/Controller/APIController.php

@@ -840,22 +840,13 @@ class APIController extends Controller
         $lat = $req->request->get('lat');
 
         // geofence
-        // check if geofence is on
+        $is_covered = $geo->isCovered($long, $lat);
-        $dotenv = new Dotenv();
+        if (!$is_covered)
-        $dotenv->loadEnv(__DIR__.'/../../.env');
-
-        $geo_flag = $_ENV['GEOFENCE'];
-
-        if ($geo_flag == 'true')
         {
-            $is_covered = $geo->isCovered($long, $lat);
+            // TODO: put geofence error message in config file somewhere
-            if (!$is_covered)
+            $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');
-                // TODO: put geofence error message in config file somewhere
+            return $res->getReturnResponse();
-                $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();

src/Service/GeofenceTracker.php

@@ -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
+        // check if geofence is enabled
-        $query = $this->em->createQuery('SELECT count(s) from App\Entity\SupportedArea s where st_contains(s.coverage_area, point(:long, :lat)) = true')
+        if ($this->geofence_flag  == 'true')
-            ->setParameter('long', $long)
+        { 
-            ->setParameter('lat', $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);
 
-        // number of polygons that contain the point
+            // number of polygons that contain the point
-        $count = $query->getSingleScalarResult();
+            $count = $query->getSingleScalarResult();
 
-        if ($count > 0)
+            if ($count > 0)
-            return true;
+                return true;
 
-        return false;
+            return false;
+        }
+
+        return true;
     }
 }