Skip to content

Commit 7b4f3a1

Browse files
rimi-itkrimi-itk
committed
Cleaned up
1 parent 3bde914 commit 7b4f3a1

10 files changed

Lines changed: 36 additions & 49 deletions

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
}
1111
],
1212
"require": {
13+
"php": "^8.3",
1314
"ext-dom": "*",
1415
"ext-soap": "*",
1516
"ext-xsl": "*",

‎modules/os2forms_fordelingskomponent_debug/os2forms_fordelingskomponent_debug.links.task.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_forsendelse:
1+
os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_forsendelse:
22
title: "Fordelingskomponentforsendelser"
3-
route_name: os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_forsendelse
3+
route_name: os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_forsendelse
44
parent_id: entity.webform_submission.canonical
55
weight: 999
6+
base_route: os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_forsendelse

‎modules/os2forms_fordelingskomponent_debug/os2forms_fordelingskomponent_debug.routing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_sftp_filen
1616
methods: *methods
1717
requirements: *requirements
1818

19-
os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_forsendelse:
19+
os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_forsendelse:
2020
path: "/admin/structure/webform/manage/{webform}/submission/{webform_submission}/os2forms-fordelingskomponent-debug-forsendelse"
2121
defaults:
2222
_title: "Fordelingskomponentforsendelser"
@@ -30,7 +30,7 @@ os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_forsendels
3030
webform_submission:
3131
type: "entity:webform_submission"
3232

33-
os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_kvittering:
33+
os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_kvittering:
3434
path: "/admin/structure/webform/manage/{webform}/submission/{webform_submission}/os2forms-fordelingskomponent-debug-forsendelse/kvittering/{anvender_transaktions_id}"
3535
defaults:
3636
_title: "Fordelingskomponentkvitteringer"

‎modules/os2forms_fordelingskomponent_debug/src/Controller/Os2formsFordelingskomponentDebugForsendelseController.php‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace Drupal\os2forms_fordelingskomponent_debug\Controller;
66

7-
use Drupal\os2forms_fordelingskomponent\Model\Fordelingskomponent\AnvenderForsendelse;
87
use Drupal\Core\Url;
98
use Drupal\os2forms_fordelingskomponent\Repository\AnvenderForsendelseRepository;
9+
use Drupal\os2forms_fordelingskomponent\Repository\AnvenderKvitteringRepository;
1010
use Drupal\webform\WebformInterface;
1111
use Drupal\webform\WebformSubmissionInterface;
1212
use Symfony\Component\HttpFoundation\Request;
@@ -19,6 +19,7 @@ final class Os2formsFordelingskomponentDebugForsendelseController extends Abstra
1919

2020
public function __construct(
2121
private readonly AnvenderForsendelseRepository $repository,
22+
private readonly AnvenderKvitteringRepository $kvitteringRepository,
2223
) {
2324
}
2425

@@ -27,33 +28,29 @@ public function __construct(
2728
*/
2829
public function __invoke(Request $request, WebformInterface $webform, WebformSubmissionInterface $webform_submission): array {
2930
if ($anvenderTransaktionsId = $request->query->get('anvender_transaktions_id')) {
30-
if ($item = $this->repository->loadByAnvenderTransaktionsId($anvenderTransaktionsId)) {
31-
return $this->itemDetails($item);
32-
}
33-
34-
throw new NotFoundHttpException();
31+
return $this->itemDetails($anvenderTransaktionsId);
3532
}
33+
3634
$items = $this->repository->loadBySubmission($webform_submission);
3735

3836
// https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Render%21Element%21Table.php/class/Table/10
3937
$header = [
4038
'anvenderTransaktionsId' => $this->t('anvenderTransaktionsId'),
4139
'distributionTransaktionsId' => $this->t('distributionTransaktionsId'),
4240
'receipts' => $this->t('Receipts'),
43-
'webform handlers' => $this->t('Webform handlers'),
4441
'createdAt' => $this->t('Created at'),
4542
'updatedAt' => $this->t('Updated at'),
46-
'deliveredAt' => $this->t('Delivered at'),
4743
];
4844
$rows = [];
4945
foreach ($items as $item) {
46+
$receipts = $this->kvitteringRepository->loadByAnvenderTransaktionsId($item->anvenderTransaktionsId);
5047
$rows[] = [
5148
'anvenderTransaktionsId' => [
5249
'data' => [
5350
// https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Render%21Element%21Link.php/class/Link/10
5451
'#title' => $item->anvenderTransaktionsId,
5552
'#type' => 'link',
56-
'#url' => Url::fromRoute('os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_forsendelse', [
53+
'#url' => Url::fromRoute('os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_forsendelse', [
5754
'webform' => $webform->id(),
5855
'webform_submission' => $webform_submission->id(),
5956
'anvender_transaktions_id' => $item->anvenderTransaktionsId,
@@ -67,24 +64,15 @@ public function __invoke(Request $request, WebformInterface $webform, WebformSub
6764
],
6865
'receipts' => [
6966
'data' => [
70-
'#title' => $this->t('Receipts'),
67+
'#title' => count($receipts),
7168
'#type' => 'link',
72-
'#url' => Url::fromRoute('os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_kvittering', [
69+
'#url' => Url::fromRoute('os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_kvittering', [
7370
'webform' => $webform->id(),
7471
'webform_submission' => $webform_submission->id(),
7572
'anvender_transaktions_id' => $item->anvenderTransaktionsId,
7673
]),
7774
],
7875
],
79-
'webform handlers' => [
80-
'data' => [
81-
'#title' => $this->t('Webform handlers'),
82-
'#type' => 'link',
83-
'#url' => Url::fromRoute('entity.webform.handlers', [
84-
'webform' => $item->webformId,
85-
]),
86-
],
87-
],
8876
'createdAt' => [
8977
'data' => [
9078
'#markup' => $this->formatDatetime($item->createdAt),
@@ -95,11 +83,6 @@ public function __invoke(Request $request, WebformInterface $webform, WebformSub
9583
'#markup' => $this->formatDatetime($item->updatedAt),
9684
],
9785
],
98-
'deliveredAt' => [
99-
'data' => [
100-
'#markup' => $this->formatDatetime($item->deliveredAt),
101-
],
102-
],
10386
];
10487
}
10588

@@ -114,7 +97,12 @@ public function __invoke(Request $request, WebformInterface $webform, WebformSub
11497
/**
11598
* Build item details.
11699
*/
117-
private function itemDetails(AnvenderForsendelse $item) {
100+
private function itemDetails(string $anvenderTransaktionsId) {
101+
$item = $this->repository->loadByAnvenderTransaktionsId($anvenderTransaktionsId);
102+
if (NULL === $item) {
103+
throw new NotFoundHttpException();
104+
}
105+
118106
return [
119107
[
120108
'#type' => 'item',

‎modules/os2forms_fordelingskomponent_debug/src/Controller/Os2formsFordelingskomponentDebugKvitteringController.php‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Drupal\os2forms_fordelingskomponent_debug\Controller;
66

77
use Drupal\Core\Url;
8-
use Drupal\os2forms_fordelingskomponent\Model\Fordelingskomponent\AnvenderKvittering;
98
use Drupal\os2forms_fordelingskomponent\Repository\AnvenderKvitteringRepository;
109
use Drupal\webform\WebformInterface;
1110
use Drupal\webform\WebformSubmissionInterface;
@@ -27,11 +26,7 @@ public function __construct(
2726
*/
2827
public function __invoke(Request $request, WebformInterface $webform, WebformSubmissionInterface $webform_submission, string $anvender_transaktions_id): array {
2928
if ($id = (int) $request->query->get('id')) {
30-
if ($item = $this->repository->load($id)) {
31-
return $this->itemDetails($item);
32-
}
33-
34-
throw new NotFoundHttpException();
29+
return $this->itemDetails($id);
3530
}
3631

3732
$items = $this->repository->loadByAnvenderTransaktionsId($anvender_transaktions_id);
@@ -51,7 +46,7 @@ public function __invoke(Request $request, WebformInterface $webform, WebformSub
5146
'data' => [
5247
'#title' => $item->id,
5348
'#type' => 'link',
54-
'#url' => Url::fromRoute('os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_kvittering',
49+
'#url' => Url::fromRoute('os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_kvittering',
5550
[
5651
'webform' => $webform->id(),
5752
'webform_submission' => $webform_submission->id(),
@@ -64,7 +59,7 @@ public function __invoke(Request $request, WebformInterface $webform, WebformSub
6459
'data' => [
6560
'#title' => $item->anvenderTransaktionsId,
6661
'#type' => 'link',
67-
'#url' => Url::fromRoute('os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_debug_forsendelse',
62+
'#url' => Url::fromRoute('os2forms_fordelingskomponent_debug.os2forms_fordelingskomponent_forsendelse',
6863
[
6964
'webform' => $webform->id(),
7065
'webform_submission' => $webform_submission->id(),
@@ -101,7 +96,13 @@ public function __invoke(Request $request, WebformInterface $webform, WebformSub
10196
/**
10297
* Build item details.
10398
*/
104-
private function itemDetails(AnvenderKvittering $item) {
99+
private function itemDetails(int $id) {
100+
$item = $this->repository->load($id);
101+
102+
if (NULL === $item) {
103+
throw new NotFoundHttpException();
104+
}
105+
105106
return [
106107
[
107108
'#type' => 'item',

‎os2forms_fordelingskomponent.permissions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
view os2forms_fordelingskomponent objects:
2-
title: 'View Fordelingskomponent objects'
3-
description: 'View distribution objects sent to and receipts received from Fordelingskomponenten'
2+
title: "View Fordelingskomponent objects"
3+
description: "View distribution objects sent to and receipts received from Fordelingskomponenten"

‎src/Controller/Fordelingskomponent/FordelingskvitteringModtagController.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44

55
namespace Drupal\os2forms_fordelingskomponent\Controller\Fordelingskomponent;
66

7-
use Drupal\Component\Datetime\TimeInterface;
87
use Drupal\Core\Logger\LoggerChannelInterface;
98
use Drupal\os2forms_fordelingskomponent\Model\Fordelingskomponent\AnvenderKvittering;
10-
use Drupal\os2forms_fordelingskomponent\Repository\AnvenderForsendelseRepository;
119
use Drupal\os2forms_fordelingskomponent\Repository\AnvenderKvitteringRepository;
1210
use ItkDev\Serviceplatformen\SF2900\StructType\FordelingskvitteringModtagAnvenderRequestType;
1311
use ItkDev\Serviceplatformen\SF2900\StructType\FordelingskvitteringModtagAnvenderResponseType;

‎src/Helper/FordelingskomponentHelper.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Drupal\os2forms_fordelingskomponent\Helper;
44

5-
use Drupal\webform\Entity\WebformSubmission;
65
use ItkDev\Serviceplatformen\Service\SF2900\SF2900\SftpHelper;
76
use Drupal\Core\Entity\EntityTypeManagerInterface;
87
use Drupal\Core\Logger\LoggerChannelInterface;

‎src/Helper/WebformHelperSF2900.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Drupal\Core\Entity\EntityTypeManagerInterface;
1010
use Drupal\Core\Logger\LoggerChannelInterface;
1111
use Drupal\Core\Render\ElementInfoManager;
12-
use Drupal\Core\State\StateInterface;
1312
use Drupal\os2forms_fordelingskomponent\Exception\InvalidAttachmentElementException;
1413
use Drupal\os2forms_fordelingskomponent\Exception\RuntimeException;
1514
use Drupal\os2forms_fordelingskomponent\Exception\SubmissionNotFoundException;
@@ -174,7 +173,7 @@ private function loadQueue(): QueueInterface {
174173
$queue = $this->queueStorage->load($id);
175174

176175
if (NULL === $queue) {
177-
throw new RuntimeException('Cannot load queue %queue_id', ['%queue_id' => $id]);
176+
throw new RuntimeException(sprintf('Cannot load queue %s', $id));
178177
}
179178

180179
return $queue;

‎tests/Unit/Helper/XmlHelperTestDataProvider.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Xml helper test data provider.
99
*/
1010
final class XmlHelperTestDataProvider {
11-
private const string RESOURCE_PATH = 'file://' . __DIR__ . '/../../../modules/os2forms_fordelingskomponent_examples/resources';
11+
private const string RESOURCE_PATH = 'file://' . __DIR__ . '/../../../resources';
1212

1313
/**
1414
* Data provider.
@@ -235,7 +235,7 @@ public static function provideValidateXmlData(): iterable {
235235
</Underskriftsoplysninger>
236236
</Anmodning>
237237
XML,
238-
self::RESOURCE_PATH . '/xsd/Anmodning.xsd',
238+
self::RESOURCE_PATH . '/SP/SF2900_XSD/Anmodning.xsd',
239239
];
240240

241241
yield [
@@ -258,7 +258,7 @@ public static function provideValidateXmlData(): iterable {
258258
</Underskriftsoplysninger>
259259
</Anmodning>
260260
XML,
261-
self::RESOURCE_PATH . '/xsd/Anmodning.xsd',
261+
self::RESOURCE_PATH . '/SP/SF2900_XSD/Anmodning.xsd',
262262
new InvalidXmlException(),
263263
];
264264
}

0 commit comments

Comments
 (0)