Misc

Author: rimi-itk

modules/os2forms_fordelingskomponent_debug/src/Controller/Os2formsFordelingskomponentDebugForsendelseController.php

@@ -139,6 +139,11 @@ private function itemDetails(AnvenderForsendelse $item) {
         '#title' => $this->t('Request'),
         '#markup' => $this->renderYaml($item->request),
       ],
+      [
+        '#type' => 'item',
+        '#title' => $this->t('Response'),
+        '#markup' => $this->renderYaml($item->response),
+      ],
     ];
   }
 

modules/os2forms_fordelingskomponent_debug/src/Controller/Os2formsFordelingskomponentDebugSftpController.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Url;
 use Drupal\os2forms_fordelingskomponent\Helper\FordelingskomponentHelper;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mime\MimeTypeGuesserInterface;
 
@@ -25,7 +26,7 @@ public function __construct(
   /**
    * Builds the response.
    */
-  public function __invoke(?string $dir, ?string $filename = NULL): array|Response {
+  public function __invoke(Request $request, ?string $dir, ?string $filename = NULL): array|Response {
     $sftp = $this->helper->sf2900()->sftp();
 
     if (NULL !== $filename && preg_match('/\.[^.]+$/', $filename)) {
@@ -46,6 +47,10 @@ public function __invoke(?string $dir, ?string $filename = NULL): array|Response
       // Filter out . and ..
       $files = array_filter($files, static fn (string $name) => !preg_match('/^\.+$/', $name), ARRAY_FILTER_USE_KEY);
 
+      if ($filter = ($request->query->all()['filter'] ?? NULL)) {
+        $files = array_filter($files, static fn (string $filename) => array_all($filter, fn (string $value) => str_contains($filename, $value)), ARRAY_FILTER_USE_KEY);
+      }
+
       $header = [
         'filepath' => $this->t('Path'),
         'atime' => $this->t('Last accessed at'),

src/Controller/Fordelingskomponent/FordelingskvitteringModtagController.php

@@ -6,10 +6,10 @@
 
 use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Logger\LoggerChannelInterface;
-use Drupal\os2forms_fordelingskomponent\Exception\SoapException;
 use Drupal\os2forms_fordelingskomponent\Model\Fordelingskomponent\AnvenderKvittering;
 use Drupal\os2forms_fordelingskomponent\Repository\AnvenderForsendelseRepository;
 use Drupal\os2forms_fordelingskomponent\Repository\AnvenderKvitteringRepository;
+use ItkDev\Serviceplatformen\SF2900\EnumType\ForretningsValideringsKodeType;
 use ItkDev\Serviceplatformen\SF2900\StructType\FordelingskvitteringModtagAnvenderRequestType;
 use ItkDev\Serviceplatformen\SF2900\StructType\FordelingskvitteringModtagAnvenderResponseType;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
@@ -49,29 +49,27 @@ public function FordelingskvitteringModtag(
       distributionTransaktionsId: $context->getDistributionTransktionsID(),
     );
     if (NULL === $forsendelse) {
-      throw new SoapException(sprintf('Forsendelse %s not found.', $context->getAnvenderTransaktionsID()));
+      $this->logger->warning(sprintf('Kvittering: Forsendelse %s not found.', $context->getAnvenderTransaktionsID()));
     }
 
-    $forsendelse->deliveredAt = $this->time->getRequestTime();
-    $this->forsendelseRepository->save($forsendelse);
-
     $response = new FordelingskvitteringModtagAnvenderResponseType();
 
-    $kvittering = $this->kvitteringRepository->loadByAnvenderTransaktionsId(
+    // We may receive multiple receipts.
+    $kvittering = new AnvenderKvittering(
+      id: NULL,
       anvenderTransaktionsId: $context->getAnvenderTransaktionsID(),
       distributionTransaktionsId: $context->getDistributionTransktionsID(),
+      request: $request,
+      response: $response,
     );
-    if (NULL === $kvittering) {
-      $kvittering = new AnvenderKvittering(
-        anvenderTransaktionsId: $context->getAnvenderTransaktionsID(),
-        distributionTransaktionsId: $context->getDistributionTransktionsID(),
-        request: $request,
-        response: $response,
-      );
-    }
-
     $this->kvitteringRepository->save($kvittering);
 
+    // @todo Should we set a status code (rather than deliveredAt) on the forsendelse?
+    if (NULL !== $forsendelse && $request->getForretningskvittering()->getForretningsValideringsKode() === ForretningsValideringsKodeType::VALUE_ACCEPTERET) {
+      $forsendelse->deliveredAt = $this->time->getRequestTime();
+      $this->forsendelseRepository->save($forsendelse);
+    }
+
     return $response;
   }
 

src/Repository/AnvenderForsendelseRepository.php

@@ -23,7 +23,7 @@ final class AnvenderForsendelseRepository extends AbstractRepository {
    * @return \Drupal\os2forms_fordelingskomponent\Model\Fordelingskomponent\AnvenderForsendelse[]
    *   The list of forsendelser.
    */
-  private function loadBy(array $conditions = []): array {
+  private function loadBy(array $conditions = [], array $orderBy = ['created_at' => 'DESC']): array {
     $query = $this->database
       ->select(self::TABLE, 't')
       ->fields('t');
@@ -32,6 +32,10 @@ private function loadBy(array $conditions = []): array {
       $query->condition(...$condition);
     }
 
+    foreach ($orderBy as $field => $direction) {
+      $query->orderBy($field, $direction);
+    }
+
     $statement = $query->execute();
     assert(NULL !== $statement);
     $result = $statement->fetchAll();

src/Repository/AnvenderKvitteringRepository.php

@@ -47,21 +47,18 @@ private function loadBy(array $conditions = []): array {
 
   /**
    * Load kvittering by transaktions-id.
+   *
+   * @return \Drupal\os2forms_fordelingskomponent\Model\Fordelingskomponent\AnvenderKvittering[]
    */
-  public function loadByAnvenderTransaktionsId(string $anvenderTransaktionsId, ?string $distributionTransaktionsId = NULL): ?AnvenderKvittering {
+  public function loadByAnvenderTransaktionsId(string $anvenderTransaktionsId, ?string $distributionTransaktionsId = NULL): array {
     $criteria = [
       ['anvender_transaktions_id', $anvenderTransaktionsId],
     ];
     if (NULL !== $distributionTransaktionsId) {
       $criteria[] = ['distribution_transaktions_id', $distributionTransaktionsId];
     }
-    $result = $this->loadBy($criteria);
 
-    if (1 !== count($result)) {
-      return NULL;
-    }
-
-    return reset($result);
+    return $this->loadBy($criteria);
   }
 
   /**
@@ -81,23 +78,11 @@ public function save(AnvenderKvittering $kvittering): bool {
         'created_at' => $kvittering->createdAt,
         'updated_at' => $kvittering->updatedAt,
       ];
-      if (NULL === $this->loadByAnvenderTransaktionsId(
-        anvenderTransaktionsId: $kvittering->anvenderTransaktionsId,
-          distributionTransaktionsId: $kvittering->distributionTransaktionsId,
-        )) {
-        $this->database
-          ->insert(self::TABLE)
-          ->fields($fields)
-          ->execute();
-      }
-      else {
-        $this->database
-          ->update(self::TABLE)
-          ->condition('anvender_transaktions_id', $kvittering->anvenderTransaktionsId)
-          ->condition('distribution_transaktions_id', $kvittering->distributionTransaktionsId)
-          ->fields($fields)
-          ->execute();
-      }
+
+      $this->database
+        ->insert(self::TABLE)
+        ->fields($fields)
+        ->execute();
 
       return TRUE;
     }