From 06adce710f6a2b2017eeb7f620595038772538d2 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Thu, 25 Jul 2019 00:42:40 +0000 Subject: [PATCH] Add policy ids to the .env.dist file. Modify the query to get policy in the APIController. #233 --- .env.dist | 6 +++++- src/Controller/APIController.php | 17 +++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.env.dist b/.env.dist index 4c0b202a..320e69b7 100644 --- a/.env.dist +++ b/.env.dist @@ -34,4 +34,8 @@ REDIS_CLIENT_SCHEME=tcp REDIS_CLIENT_HOST=127.0.0.1 REDIS_CLIENT_PORT=6379 REDIS_CLIENT_PASSWORD=foobared -# + +# privacy policy ids +POLICY_PROMO=insertpromopolicyidhere +POLICY_THIRD_PARTY=insertthirdpartypolicyidhere +POLICY_MOBILE=insertmobilepolicyidhere diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 63691592..f12d750c 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -10,6 +10,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\Dotenv\Dotenv; use CrEOF\Spatial\PHP\Types\Geometry\Point; @@ -43,6 +44,7 @@ use App\Entity\Warranty; use App\Entity\Service; use App\Entity\Partner; use App\Entity\Review; +use App\Entity\PrivacyPolicy; use DateTime; use Exception; @@ -1802,14 +1804,19 @@ class APIController extends Controller $cust->setPrivacyThirdParty($priv_third_party) ->setPrivacyPromo($priv_promo); + // get the policy ids from .env + $dotenv = new Dotenv(); + $dotenv->loadEnv(__DIR__.'/../../.env'); + + $policy_promo_id = $_ENV['POLICY_PROMO']; + $policy_third_party_id = $_ENV['POLICY_THIRD_PARTY']; + // check if privacy settings are true // if true, set the private policy for the customer if ($priv_promo) { // find the promo policy - $policy = $em->createQuery('SELECT policy FROM App\Entity\PrivacyPolicy policy WHERE policy.name LIKE :policy_type') - ->setParameter('policy_type', "%" . "promo" . "%") - ->getOneOrNullResult(); + $policy = $em->getRepository(PrivacyPolicy::class)->findOneBy(['id' => $policy_promo_id]); // set policy id if ($policy != null) @@ -1821,9 +1828,7 @@ class APIController extends Controller if ($priv_third_party) { // find the third party policy - $policy = $em->createQuery('SELECT policy FROM App\Entity\PrivacyPolicy policy WHERE policy.name LIKE :policy_type') - ->setParameter('policy_type', "%" . "third party" . "%") - ->getOneOrNullResult(); + $policy = $em->getRepository(PrivacyPolicy::class)->findOneBy(['id' => $policy_third_party_id]); // set policy id if ($policy != null)