fix(form): get form from question ID

Signed-off-by: Thierry Bugier <[email protected]>

Author: btry

inc/form.class.php

@@ -1392,7 +1392,7 @@ public function post_purgeItem() {
     */
    private function updateValidators() {
       if (!isset($this->input['validation_required'])) {
-         return true;
+         return;
       }
 
       $form_validator = new PluginFormcreatorForm_Validator();
@@ -1406,11 +1406,11 @@ private function updateValidators() {
          switch ($this->input['validation_required']) {
             case PluginFormcreatorForm_Validator::VALIDATION_USER:
                $validators = $this->input['_validator_users'];
-               $validatorItemtype = 'User';
+               $validatorItemtype = User::class;
                break;
             case PluginFormcreatorForm_Validator::VALIDATION_GROUP:
                $validators = $this->input['_validator_groups'];
-               $validatorItemtype = 'Group';
+               $validatorItemtype = Group::class;
                break;
          }
          foreach ($validators as $itemId) {
@@ -1484,6 +1484,7 @@ public function increaseUsageCount() {
     */
    public function getByQuestionId($questionId) {
       $formTable = PluginFormcreatorForm::getTable();
+      $formFk = PluginFormcreatorForm::getForeignKeyField();
       $sectionTable = PluginFormcreatorSection::getTable();
       $sectionFk = PluginFormcreatorSection::getForeignKeyField();
       $questionTable = PluginFormcreatorQuestion::getTable();
@@ -1492,7 +1493,7 @@ public function getByQuestionId($questionId) {
             $sectionTable => [
                'FKEY' => [
                   $formTable    => 'id',
-                  $sectionTable => $sectionFk,
+                  $sectionTable => $formFk,
                ]
             ],
             $questionTable => [

tests/suite-unit/PluginFormcreatorForm.php

@@ -295,6 +295,62 @@ public function testPost_purgeItem() {
       $this->boolean($output)->isFalse();
    }
 
+   public  function testUpdateValidators() {
+      $form = $this->getForm();
+
+      $formValidator = new \PluginFormcreatorForm_Validator();
+      $rows = $formValidator->find([
+         'plugin_formcreator_forms_id' => $form->getID(),
+      ]);
+      $this->array($rows)->hasSize(0);
+
+      $form = $this->getForm([
+         'validation_required' => \PluginFormcreatorForm_Validator::VALIDATION_USER,
+         '_validator_users' => ['2'], // glpi account
+      ]);
+
+      $rows = $formValidator->find([
+         'plugin_formcreator_forms_id' => $form->getID(),
+      ]);
+      $this->array($rows)->hasSize(1);
+      $formValidator->getFromResultSet(array_pop($rows));
+      $this->integer((int) $formValidator->fields['items_id'])->isEqualTo(2);
+      $this->string( $formValidator->fields['itemtype'])->isEqualTo(\User::class);
+      $this->integer((int) $formValidator->fields['plugin_formcreator_forms_id'])->isEqualTo($form->getID());
+
+      $form = $this->getForm([
+         'validation_required' => \PluginFormcreatorForm_Validator::VALIDATION_GROUP,
+         '_validator_groups' => ['1'], // a group ID (not created in this test)
+      ]);
+      $rows = $formValidator->find([
+         'plugin_formcreator_forms_id' => $form->getID(),
+      ]);
+      $this->array($rows)->hasSize(1);
+      $formValidator->getFromResultSet(array_pop($rows));
+      $this->integer((int) $formValidator->fields['items_id'])->isEqualTo(1);
+      $this->string( $formValidator->fields['itemtype'])->isEqualTo(\Group::class);
+      $this->integer((int) $formValidator->fields['plugin_formcreator_forms_id'])->isEqualTo($form->getID());
+   }
+
+   public function testIncreateUsageCount() {
+      $form = $this->getForm();
+      $this->integer((int) $form->fields['usage_count'])->isEqualTo(0);
+
+      $form->increaseUsageCount();
+      $this->integer((int) $form->fields['usage_count'])->isEqualTo(1);
+   }
+
+   public function testGetByQuestionId() {
+      $question = $this->getQuestion();
+      $section = new \PluginFormcreatorSection();
+      $section->getFromDB($question->fields['plugin_formcreator_sections_id']) ;
+      $expected = $section->fields['plugin_formcreator_forms_id'];
+      $form = $this->newTestedInstance();
+      $form->getByQuestionId($question->getID());
+
+      $this->integer((int) $form->getID())->isEqualTo($expected);
+   }
+
    public function testCreateValidationNotification() {
       global $DB;