diff --git a/src/app/clients/SocmedSoapClient.php b/src/app/clients/SocmedSoapClient.php index 95a4988b1b3ea9cbf090a7bd55b8ba1364fa9885..b43f31e661195e8e100ea25ababae79695fb645a 100644 --- a/src/app/clients/SocmedSoapClient.php +++ b/src/app/clients/SocmedSoapClient.php @@ -60,22 +60,13 @@ class SocmedSoapClient return $response; } - public function acceptUnlocking($socmed_id, $link_code) + public function verifyUnlocking($socmed_id, $dashboard_id, $link_code) { - $res = $this->client->call("acceptUnlocking", array( + $res = $this->client->call("verifyUnlocking", array( 'arg0' => $socmed_id, - 'arg1' => null, + 'arg1' => $dashboard_id, 'arg2' => $link_code, )); return $res; } - - public function rejectUnlocking($socmed_id, $link_code) - { - $res = $this->client->call("rejectUnlocking", array( - 'arg0' => $socmed_id, - 'arg1' => $link_code, - )); - return $res; - } } diff --git a/src/app/models/UnlockingModel.php b/src/app/models/UnlockingModel.php index 7cd27407917eefb57dc56a763f42258b8e6520b7..ede4e34fe87805084582cac7433046765fccfa1b 100644 --- a/src/app/models/UnlockingModel.php +++ b/src/app/models/UnlockingModel.php @@ -2,7 +2,7 @@ require_once SRC_ROOT_PATH . "/baseclasses/BaseModel.php"; -class SubscriptionModel extends BaseModel +class UnlockingModel extends BaseModel { public $socmed_id; public $dashboard_id; diff --git a/src/app/repositories/UnlockingRespository.php b/src/app/repositories/UnlockingRepository.php similarity index 96% rename from src/app/repositories/UnlockingRespository.php rename to src/app/repositories/UnlockingRepository.php index 9eae8c60479a3468cc217e5305918e4fa68c474e..2b2078a203c68b2f492e9e41066ea1956475e1d4 100644 --- a/src/app/repositories/UnlockingRespository.php +++ b/src/app/repositories/UnlockingRepository.php @@ -34,7 +34,7 @@ class UnlockingRepository extends BaseRepository{ return $stmt->fetchAll(); } - public function getAcceptedUnlockingBySocmedID($socmed_id) { + public function getVerifiedUnlockingBySocmedID($socmed_id) { $sql = "SELECT * FROM unlocking WHERE socmed_id = :socmed_id and dashboard_id IS NOT NULL"; $stmt = $this->pdo->prepare($sql); diff --git a/src/app/services/UnlockingService.php b/src/app/services/UnlockingService.php index ef823d69bec7fee9ca27ba2296d172038247e33b..3ccb987958e2ee5bc8846ed690aa34ea99553700 100644 --- a/src/app/services/UnlockingService.php +++ b/src/app/services/UnlockingService.php @@ -1,10 +1,10 @@ <?php -require_once PROJECT_ROOT_PATH . "/src/bases/BaseService.php"; -require_once PROJECT_ROOT_PATH . "/src/utils/SoapWrapper.php"; -require_once PROJECT_ROOT_PATH . "/src/clients/SocmedSoapClient.php"; -require_once PROJECT_ROOT_PATH . "/src/models/UnlockingModel.php"; -require_once PROJECT_ROOT_PATH . "/src/repositories/UnlockingRepository.php"; +require_once SRC_ROOT_PATH . "/baseclasses/BaseService.php"; +require_once SRC_ROOT_PATH . "/utils/SoapWrapper.php"; +require_once SRC_ROOT_PATH . "/clients/SocmedSoapClient.php"; +require_once SRC_ROOT_PATH . "/models/UnlockingModel.php"; +require_once SRC_ROOT_PATH . "/repositories/UnlockingRepository.php"; class UnlockingService extends BaseSrv { protected static $instance; @@ -24,8 +24,8 @@ class UnlockingService extends BaseSrv { return self::$instance; } - public function getAcceptedUnlockingBySocmedId($socmedId) { - $unlocksSQL = UnlockingRepository::getInstance()->getAcceptedUnlockingBySocmedId($socmedId); + public function getVerifiedUnlockingBySocmedId($socmedId) { + $unlocksSQL = UnlockingRepository::getInstance()->getVerifiedUnlockingBySocmedId($socmedId); $unlocks = []; foreach ($unlocksSQL as $unlockSQL) { @@ -63,11 +63,7 @@ class UnlockingService extends BaseSrv { return $subs; } - public function acceptUnlocking($socmed_id, $link_code) { - return $this->client->acceptUnlocking($socmed_id, $link_code); - } - - public function rejectUnlocking($socmed_id, $link_code) { - return $this->client->rejectUnlocking($socmed_id, $link_code); + public function verifyUnlocking($socmed_id, $dashboard_id, $link_code) { + return $this->client->verifyUnlocking($socmed_id, $dashboard_id, $link_code); } } diff --git a/src/app/utils/SoapWrapper.php b/src/app/utils/SoapWrapper.php index d4d7511b17cb828811e8b4d5664fec0d1dfb5825..7776778ce18fe9e2813ace25d85a470a780a5d9c 100644 --- a/src/app/utils/SoapWrapper.php +++ b/src/app/utils/SoapWrapper.php @@ -9,7 +9,7 @@ class SoapWrapper { "encoding" => "UTF-8", 'stream_context' => stream_context_create(array( 'http' => array( - 'header' => 'Authorization: Bearer ' . $_ENV['API_KEY'], + 'header' => 'Authorization: ' . $_ENV['API_KEY'], ), )), ));