new structure (in progress)

Author: daanrijpkemacb

bluem-db.php

@@ -3,6 +3,8 @@
 register_activation_hook( __FILE__, 'bluem_db_create_requests_table' );
 // no need for a deactivation hook yet.
 
+use Bluem\BluemPHP\Application\RequestRepository;
+
 /**
  * Initialize a database table for the requests.
  * @return void
@@ -122,22 +124,12 @@ function bluem_db_check() {
 
 // request specific functions
 function bluem_db_create_request( $request_object ) {
-    global $wpdb;
-
-    // date_default_timezone_set('Europe/Amsterdam');
-    // $wpdb->time_zone = 'Europe/Amsterdam';
-
-    if ( ! bluem_db_validated_request( $request_object ) ) {
-        return - 1;
-    }
+    $requestRepository = new RequestRepository();
 
-    $insert_result = $wpdb->insert(
-        $wpdb->prefix . "bluem_requests",
-        $request_object
-    );
+    $insert_result = $requestRepository->add($request_object);
 
     if ( $insert_result ) {
-        $request_id = $wpdb->insert_id;
+        $request_id = $insert_result->id;
 
         $request_object = (object) $request_object;
 
@@ -353,48 +345,6 @@ function bluem_db_update_request( $request_id, $request_object ) {
     }
 }
 
-/**
- * check if all fields are well-formed
- *
- * @param [type] $request
- *
- * @return bool
- */
-function bluem_db_validated_request_well_formed( $request ): bool {
-    // @todo: check all available fields on their format
-    return true;
-}
-
-/**
- * check if all required fields are present and well-formed
- *
- * @param [type] $request
- *
- * @return void
- */
-function bluem_db_validated_request( $request ) {
-    // check if present
-    // entrance_code
-    // transaction_id
-    // transaction_url
-    // user_id
-    // timestamp
-    // description
-    // type
-
-    // optional fields
-    // debtor_reference
-    // order_id
-    // payload
-
-    // and well formed
-    if ( ! bluem_db_validated_request_well_formed( $request ) ) {
-        return false;
-    }
-
-    return true;
-}
-
 /**
  * Get fields within any request
  * @return string[]

src/Application/RequestRepository.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Bluem\BluemPHP\Application;
+
+use Bluem\BluemPHP\Domain\Request;
+use Bluem\BluemPHP\Infrastructure\DatabaseService;
+use Bluem\BluemPHP\Infrastructure\RequestFactory;
+
+class RequestRepository
+{
+    private DatabaseService $databaseService;
+    private string $requestTableName;
+
+    public function __construct()
+    {
+        $this->databaseService = new DatabaseService();
+
+        $this->requestTableName = "bluem_requests";
+    }
+
+    public function add($request_object): int
+    {
+        // validate request object
+        if ( ! $this->validatedRequestObject( $request_object ) ) {
+            return -1;
+        }
+
+        return $this->databaseService->insert(
+            $this->requestTableName,
+            $request_object
+        );
+    }
+
+    private function validatedRequestObject( Request $request ): bool {
+        // check if present
+        // entrance_code
+        // transaction_id
+        // transaction_url
+        // user_id
+        // timestamp
+        // description
+        // type
+
+        // optional fields
+        // debtor_reference
+        // order_id
+        // payload
+
+        // and well formed
+        if ( ! $this->requestWellFormed( $request ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function requestWellFormed(Request $request): bool
+    {
+        // @todo: check all available fields on their format
+        return true;
+    }
+
+
+}

src/Domain/Request.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Bluem\BluemPHP\Domain;
+
+class Request
+{
+    public string $entrance_code;
+    public string $transaction_id;
+    public string $transaction_url;
+    public string $description;
+    public string $debtor_reference;
+    private ?string $user_id;
+    private string $timestamp;
+    private ?string $order_id;
+    private array $payload;
+
+    public function __construct(
+        $entrance_code,
+        $transaction_id,
+        $transaction_url,
+        $description,
+        $debtor_reference,
+        $environment,
+        $user_id
+    ) {
+        $this->debtor_reference = $debtor_reference;
+        $this->description = $description;
+        $this->transaction_url = $transaction_url;
+        $this->transaction_id = $transaction_id;
+        $this->entrance_code = $entrance_code;
+        $this->user_id = $user_id;
+        $this->timestamp = date("Y-m-d H:i:s") ?: '';
+        $this->type = "identity";
+        $this->payload = ['environment' => $environment];
+    }
+}

src/Infrastructure/DatabaseService.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Bluem\BluemPHP\Infrastructure;
+
+class DatabaseService
+{
+    private $wpdb;
+
+    public function __construct()
+    {
+        global $wpdb;
+
+        $this->wpdb = $wpdb;
+    }
+
+    private function prefixTable(string $tableName):string {
+        return $this->wpdb->prefix.$tableName;
+    }
+
+    public function insert($tableName, $data): int
+    {
+        $result = $this->wpdb->insert(
+            $this->prefixTable($tableName),
+            $data
+        );
+
+        return $result ? $this->wpdb->insert_id : -1;
+    }
+
+    public function getInsertedId(): int
+    {
+        return $this->wpdb->insert_id;
+    }
+}