From 5fed6a6a0e010aec3172698d5a7e252fbd335cdd Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Sun, 10 Sep 2023 18:58:34 +0000
Subject: [PATCH] update

---
 Controller/ApiAttributeTraitController.php    | 22 +++++++++++++++----
 Controller/ApiLocalizationTraitController.php |  8 +++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Controller/ApiAttributeTraitController.php b/Controller/ApiAttributeTraitController.php
index 6ac512a..8bffbda 100644
--- a/Controller/ApiAttributeTraitController.php
+++ b/Controller/ApiAttributeTraitController.php
@@ -17,13 +17,20 @@ namespace Modules\Attribute\Controller;
 use Modules\Attribute\Models\Attribute;
 use Modules\Attribute\Models\AttributeType;
 use Modules\Attribute\Models\AttributeValue;
-use Modules\Attribute\Models\NullAttribute;
 use Modules\Attribute\Models\NullAttributeType;
 use Modules\Attribute\Models\NullAttributeValue;
 use phpOMS\Localization\BaseStringL11n;
 use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\RequestAbstract;
 
+/**
+ * General attribute api functionality.
+ *
+ * @package Modules\Attribute
+ * @license OMS License 2.0
+ * @link    https://jingga.app
+ * @since   1.0.0
+ */
 trait ApiAttributeTraitController
 {
     /**
@@ -174,6 +181,7 @@ trait ApiAttributeTraitController
     {
         $attrValue            = new AttributeValue();
         $attrValue->isDefault = $request->getDataBool('default') ?? false;
+        $attrValue->unit      = $request->getDataString('unit') ?? '';
         $attrValue->setValue($request->getDataString('value'), $type->datatype);
 
         if ($request->hasData('title')) {
@@ -258,8 +266,14 @@ trait ApiAttributeTraitController
      */
     public function updateAttributeFromRequest(RequestAbstract $request, Attribute $new) : Attribute
     {
-        if ($request->hasData('value')) {
-            $new->value = $request->hasData('value') ? new NullAttributeValue((int) $request->getData('value')) : $new->value;
+        if ($new->type->custom) {
+            if ($request->hasData('value')) {
+                $new->value = new NullAttributeValue((int) $request->getData('value'));
+            } else {
+                // @todo: consider to check if custom value already exist and just reference the id? Problematic if content of id gets changed.
+                $new->value = new AttributeValue();
+                $new->value->setValue($request->getData('custom'), $new->type->datatype);
+            }
         } else {
             // @todo: fix by only accepting the value id to be used
             // this is a workaround for now because the front end doesn't allow to dynamically show default values.
@@ -267,7 +281,7 @@ trait ApiAttributeTraitController
 
             // Couldn't find matching default value
             if ($value->id === 0) {
-                return new NullAttribute();
+                return $new;
             }
 
             $new->value = $value;
diff --git a/Controller/ApiLocalizationTraitController.php b/Controller/ApiLocalizationTraitController.php
index 3d91800..0983390 100644
--- a/Controller/ApiLocalizationTraitController.php
+++ b/Controller/ApiLocalizationTraitController.php
@@ -19,6 +19,14 @@ use phpOMS\Localization\BaseStringL11nType;
 use phpOMS\Localization\NullBaseStringL11nType;
 use phpOMS\Message\RequestAbstract;
 
+/**
+ * General localization api functionality.
+ *
+ * @package Modules\Attribute
+ * @license OMS License 2.0
+ * @link    https://jingga.app
+ * @since   1.0.0
+ */
 trait ApiLocalizationTraitController
 {
     /**