Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Feature/dw 440 digital post error #12

Merged
merged 2 commits into from
Jan 17, 2022
Merged

Feature/dw 440 digital post error #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1674242
DW-440: Adding namespace to custom exception
lats1 Jan 17, 2022
c5732b8
DW-440: Updating create method to use pattern from parent
lats1 Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Exception/CprElementNotFoundInSubmissionException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Drupal\os2forms_digital_post\Exception;

class CprElementNotFoundInSubmissionException extends \Exception {

}
63 changes: 29 additions & 34 deletions src/Plugin/WebformHandler/DigitalPostWebformHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,16 @@

namespace Drupal\os2forms_digital_post\Plugin\WebformHandler;

use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\Core\Render\Element;
use Drupal\os2forms_cpr_lookup\Service\CprServiceInterface;
use Drupal\os2forms_digital_post\Consumer\PrintServiceConsumer;
use Drupal\os2forms_digital_post\Exception\CprElementNotFoundInSubmissionException;
use Drupal\os2forms_digital_post\Manager\TemplateManager;
use Drupal\webform\Annotation\WebformHandler;
use Drupal\webform\Plugin\WebformElementManagerInterface;
use Drupal\webform\Plugin\WebformHandlerBase;
use Drupal\webform\WebformInterface;
use Drupal\webform\WebformSubmissionConditionsValidatorInterface;
use Drupal\webform\WebformSubmissionInterface;
use Drupal\webform\WebformTokenManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;

/**
Expand Down Expand Up @@ -48,42 +43,42 @@ class DigitalPostWebformHandler extends WebformHandlerBase
*/
protected $elementManager;

private $templateManager;

private $printServiceConsumer;
/**
* @var TemplateManager
*/
protected $templateManager;

private $cprService;
/**
* @var PrintServiceConsumer
*/
protected $printServiceConsumer;

/**
* {@inheritdoc}
* @var CprServiceInterface
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, LoggerChannelFactoryInterface $logger_factory, ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, WebformSubmissionConditionsValidatorInterface $conditions_validator, WebformTokenManagerInterface $token_manager, WebformElementManagerInterface $element_manager, TemplateManager $templateManager, PrintServiceConsumer $printServiceConsumer, CprServiceInterface $cprService) {
parent::__construct($configuration, $plugin_id, $plugin_definition, $logger_factory, $config_factory, $entity_type_manager, $conditions_validator);
$this->tokenManager = $token_manager;
$this->elementManager = $element_manager;
$this->templateManager = $templateManager;
$this->printServiceConsumer = $printServiceConsumer;
$this->cprService = $cprService;
}
protected $cprService;

/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
return new static(
$configuration,
$plugin_id,
$plugin_definition,
$container->get('logger.factory'),
$container->get('config.factory'),
$container->get('entity_type.manager'),
$container->get('webform_submission.conditions_validator'),
$container->get('webform.token_manager'),
$container->get('plugin.manager.webform.element'),
$container->get('os2forms_digital_post.template_manager'),
$container->get('os2forms_digital_post.print_service_consumer'),
$container->get('os2forms_cpr_lookup.service')
);
$instance = new static($configuration, $plugin_id, $plugin_definition);

$instance->loggerFactory = $container->get('logger.factory');
$instance->configFactory = $container->get('config.factory');
$instance->renderer = $container->get('renderer');
$instance->entityTypeManager = $container->get('entity_type.manager');
$instance->conditionsValidator = $container->get('webform_submission.conditions_validator');
$instance->tokenManager = $container->get('webform.token_manager');

$instance->elementManager = $container->get('plugin.manager.webform.element');
$instance->templateManager = $container->get('os2forms_digital_post.template_manager');
$instance->printServiceConsumer = $container->get('os2forms_digital_post.print_service_consumer');
$instance->cprService = $container->get('os2forms_cpr_lookup.service');

$instance->setConfiguration($configuration);

return $instance;
}

/**
Expand Down Expand Up @@ -329,7 +324,7 @@ public function postSave(WebformSubmissionInterface $webform_submission, $update
'The chosen CPR element not found in submission!'
);

throw new \CprElementNotFoundInSubmissionException();
throw new CprElementNotFoundInSubmissionException();
}

/** @var \Drupal\os2forms_cpr_lookup\CPR\CprServiceResult $cprSearchResult */
Expand Down