(refactor): usage of upl resource

OpenWebconcept · Aug 21, 2023 · 5cc5a09 · 5cc5a09
1 parent 2ec4a1a
commit 5cc5a09
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## Version 2.1.1
+
+### Refactor
+
+-   Usage of upl resource.
+
 ## Version 2.1.0
 
 ### Features

diff --git a/pdc-samenwerkende-catalogi.php b/pdc-samenwerkende-catalogi.php
@@ -4,7 +4,7 @@
  * Plugin Name:       PDC Samenwerkende Catalogi
  * Plugin URI:        https://www.openwebconcept.nl/
  * Description:       Plugin to create a XML feed according to the Samenwerkende Catalogi requirements.
- * Version:           2.1.0
+ * Version:           2.1.1
  * Author:            Yard | Digital Agency
  * Author URI:        https://www.yard.nl/
  * License:           GPL-3.0
@@ -19,7 +19,7 @@
 /**
  * If this file is called directly, abort.
  */
-if (!defined('WPINC')) {
+if (! defined('WPINC')) {
     die;
 }
 

diff --git a/src/SamenwerkendeCatalogi/Foundation/Plugin.php b/src/SamenwerkendeCatalogi/Foundation/Plugin.php
@@ -14,21 +14,20 @@
  */
 class Plugin extends BasePlugin
 {
-
     /**
      * Name of the plugin.
      *
      * @const string NAME
      */
-    const NAME = 'pdc-samenwerkende-catalogi';
+    public const NAME = 'pdc-samenwerkende-catalogi';
 
     /**
      * Version of the plugin.
      * Used for setting versions of enqueue scripts and styles.
      *
      * @const string VERSION
      */
-    const VERSION = '2.1.0';
+    public const VERSION = '2.1.1';
 
     protected function checkForUpdate()
     {

diff --git a/src/SamenwerkendeCatalogi/Models/ScItem.php b/src/SamenwerkendeCatalogi/Models/ScItem.php
@@ -33,7 +33,7 @@ public function getDoelgroepen(): array
     /**
      * @param array $doelgroepen
      * @param object $doelgroepTerm
-     * 
+     *
      * @return array
      */
     private function assignDoelgroepen($doelgroepen = [], $doelgroepTerm): array
@@ -58,9 +58,6 @@ private function assignDoelgroepen($doelgroepen = [], $doelgroepTerm): array
         return $doelgroepen;
     }
 
-    /**
-     * @return string
-     */
     public function getUplName(): string
     {
         $uplName = get_post_meta($this->getID(), '_owc_pdc_upl_naam', true);
@@ -69,29 +66,34 @@ public function getUplName(): string
             $uplName = $this->getTitle();
         }
 
-        return $this->stripUpl($uplName);
+        return $uplName;
+    }
+
+    public function getStrippedUplName(): string
+    {
+        return $this->stripUpl($this->getUplName());
     }
 
-    /**
-     * @return string
-     */
     public function getUplResource(): string
     {
-        return 'http://standaarden.overheid.nl/owms/terms/' . $this->getUplName();
+        $uplResource = get_post_meta($this->getID(), '_owc_pdc_upl_resource', true);
+
+        if (empty($uplResource)) {
+            $uplResource = $this->getStrippedUplName();
+        }
+
+        return 'http://standaarden.overheid.nl/owms/terms/' . $uplResource;
     }
 
     /**
      * Strip upl to required format.
-     *
-     * @param string $string
-     * @return string
      */
     protected function stripUpl(string $string): string
     {
-        // replace all spaces with dashes.
+        // Replace all spaces with dashes.
         $string = str_replace(' ', '-', strtolower($string));
 
-        // replace all the characters except lowercase letters and dashes.
+        // Replace all the characters except lowercase letters and dashes.
         return preg_replace("/[^a-z|-]/", "", $string);
     }
 }