Merge branch 'main' of https://gitlab.informatika.org/if3110-2023-02-32/php-app

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;
-    }
 }

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;

src/app/repositories/UnlockingRespository.php → 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);
 

src/app/services/UnlockingService.php

 <?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);
   }
 }

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'],
           ),
         )),
       ));