Fix on extra question values factory

Signed-off-by: smarcet@gmail.com <smarcet@gmail.com>
Change-Id: Idb62b38db0a01c59e41a34f43c82cf0807c0e238

Author: smarcet

app/Http/Controllers/Apis/Protected/Summit/Factories/ExtraQuestionTypeValueValidationRulesFactory.php

@@ -1,4 +1,6 @@
 <?php namespace App\Http\Controllers;
+use App\Http\ValidationRulesFactories\AbstractValidationRulesFactory;
+
 /**
  * Copyright 2021 OpenStack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,26 +19,23 @@
  * Class ExtraQuestionTypeValueValidationRulesFactory
  * @package App\Http\Controllers
  */
-final class ExtraQuestionTypeValueValidationRulesFactory
+final class ExtraQuestionTypeValueValidationRulesFactory extends AbstractValidationRulesFactory
 {
-    /**
-     * @param array $data
-     * @param bool $update
-     * @return array
-     */
-    public static function build(array $data, $update = false){
-
-        if($update){
-            return [
-                'label' => 'sometimes|string',
-                'value' => 'sometimes|string|max:255',
-                'order' => 'sometimes|integer|min:1'
-            ];
-        }
 
+    public static function buildForAdd(array $payload = []): array
+    {
         return [
             'label' => 'sometimes|string',
             'value' => 'required|string|max:255',
         ];
     }
+
+    public static function buildForUpdate(array $payload = []): array
+    {
+        return [
+            'label' => 'sometimes|string',
+            'value' => 'sometimes|string|max:255',
+            'order' => 'sometimes|integer|min:1'
+        ];
+    }
 }

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitOrderExtraQuestionTypeApiController.php

@@ -228,7 +228,7 @@ public function addQuestionValue($summit_id, $question_id)
         return $this->processRequest(function () use ($summit_id, $question_id) {
             $summit = SummitFinderStrategyFactory::build($this->getSummitRepository(), $this->getResourceServerContext())->find($summit_id);
             if (is_null($summit)) return $this->error404();
-            $payload = $this->getJsonPayload(ExtraQuestionTypeValueValidationRulesFactory::build(ExtraQuestionTypeValueValidationRulesFactory::build([])));
+            $payload = $this->getJsonPayload(ExtraQuestionTypeValueValidationRulesFactory::buildForAdd());
 
             $value = $this->service->addOrderExtraQuestionValue($summit, $question_id, $payload);
 
@@ -256,7 +256,7 @@ public function updateQuestionValue($summit_id, $question_id, $value_id)
             $summit = SummitFinderStrategyFactory::build($this->getSummitRepository(), $this->getResourceServerContext())->find($summit_id);
             if (is_null($summit)) return $this->error404();
 
-            $payload = $this->getJsonPayload(ExtraQuestionTypeValueValidationRulesFactory::build(ExtraQuestionTypeValueValidationRulesFactory::build([], true)));
+            $payload = $this->getJsonPayload(ExtraQuestionTypeValueValidationRulesFactory::buildForUpdate());
 
             $value = $this->service->updateOrderExtraQuestionValue($summit, $question_id, $value_id, $payload);
 

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSelectionPlansApiController.php

@@ -1197,7 +1197,7 @@ public function addExtraQuestionValue($summit_id, $question_id)
 
         return $this->_add(
             function ($payload) {
-                return ExtraQuestionTypeValueValidationRulesFactory::build($payload);
+                return ExtraQuestionTypeValueValidationRulesFactory::buildForAdd($payload);
             },
             function ($payload, $summit, $question_id) {
                 return $this->selection_plan_extra_questions_service->addExtraQuestionValue
@@ -1226,7 +1226,7 @@ public function addExtraQuestionValueBySelectionPlan($summit_id, $selection_plan
 
         return $this->_add(
             function ($payload) {
-                return ExtraQuestionTypeValueValidationRulesFactory::build($payload);
+                return ExtraQuestionTypeValueValidationRulesFactory::buildForAdd($payload);
             },
             function ($payload, $summit, $question_id) {
                 return $this->selection_plan_extra_questions_service->addExtraQuestionValue
@@ -1251,7 +1251,7 @@ public function updateExtraQuestionValue($summit_id, $question_id, $value_id)
         $args = [$summit, intval($question_id)];
 
         return $this->_update($value_id, function ($payload) {
-            return ExtraQuestionTypeValueValidationRulesFactory::build($payload, false);
+            return ExtraQuestionTypeValueValidationRulesFactory::buildForUpdate($payload);
         },
             function ($value_id, $payload, $summit, $question_id) {
                 return $this->selection_plan_extra_questions_service->updateExtraQuestionValue
@@ -1282,7 +1282,7 @@ public function updateExtraQuestionValueBySelectionPlan($summit_id, $selection_p
         $args = [$summit, intval($question_id)];
 
         return $this->_update($value_id, function ($payload) {
-            return ExtraQuestionTypeValueValidationRulesFactory::build($payload, false);
+            return ExtraQuestionTypeValueValidationRulesFactory::buildForUpdate($payload);
         },
             function ($value_id, $payload, $summit, $question_id) {
                 return $this->selection_plan_extra_questions_service->updateExtraQuestionValue

app/Models/Foundation/Main/ExtraQuestions/ExtraQuestionType.php

@@ -351,7 +351,10 @@ public function getNiceValue(string $value):?string {
             $dict = json_decode($dict, true);
 
         if(empty($dict)) {
-            foreach ($this->values as $questionValue) {
+            $criteria = Criteria::create();
+            $criteria->orderBy(['order' => 'ASC']);
+
+            foreach ($this->values->matching($criteria) as $questionValue) {
                 $dict[$questionValue->getId()] = $questionValue->getLabel();
             }
            // sore it for 600 secs
@@ -372,7 +375,9 @@ public function getNiceValue(string $value):?string {
      * @return ExtraQuestionTypeValue[]|ArrayCollection
      */
     public function getValues(){
-        return $this->values;
+        $criteria = Criteria::create();
+        $criteria->orderBy(['order' => 'ASC']);
+        return $this->values->matching($criteria);
     }
 
     const QuestionChoicesCharSeparator = ',';

app/Services/Model/Imp/ExtraQuestionTypeService.php

@@ -90,17 +90,16 @@ protected function _updateOrderExtraQuestionValue(ExtraQuestionType $question, i
                 $name = trim($payload['value']);
                 $former_value = $question->getValueByName($name);
                 if (!is_null($former_value) && $former_value->getId() != $value_id)
-                    throw new ValidationException("value already exists.");
+                    throw new ValidationException("Value already exists.");
             }
 
             if(isset($payload['label'])) {
                 $label = trim($payload['label']);
                 $former_value = $question->getValueByLabel($label);
                 if (!is_null($former_value) && $former_value->getId() != $value_id)
-                    throw new ValidationException("value already exists.");
+                    throw new ValidationException("Label already exists.");
             }
 
-
             if (isset($payload['order']) && intval($payload['order']) != $value->getOrder()) {
                 // request to update order
                 $question->recalculateValueOrder($value,  intval($payload['order']) );