fix: UHF-10817: Make loading of submissions better. Fix ID63 form same time. Also title loading for new applications.

conf/examples/esimerkki_70_KUVAERILLIS.json

@@ -208,62 +208,62 @@
         ]
       ]
     },
-	"customQuestionsInfo": {
-		"customQuestionsArray": [
-			{
-				"ID": "a",
-				"label": "Label a",
-				"value": "Value a",
-				"valueType": "string"
-			},
-			{
-				"ID": "b",
-				"label": "LABEL B",
-				"value": "Value B",
-				"valueType": "string"
-			}
-		]
-	},
-	"budgetInfo": {
-	  "incomeGroupsArrayStatic": [
-			{
-				"incomeGroupName": "general",
-				"otherIncomeRowsArrayStatic": [
-					{			
-						"ID": "a",
-						"label": "Kioskimyynti",
-						"value": "300.00",
-						"valueType": "double"
-					},
-					{			
-						"ID": "b",
-						"label": "Parkkitulot",
-						"value": "50.00",
-						"valueType": "double"
-					}
-				]
-			}
-		],
-		"costGroupsArrayStatic": [
-			{
-				"costGroupName": "general",
-				"otherCostRowsArrayStatic": [
-					{			
-						"ID": "a",
-						"label": "Kioskiostot",
-						"value": "100.00",
-						"valueType": "double"
-					},
-					{			
-						"ID": "b",
-						"label": "Jätemaksut",
-						"value": "50.00",
-						"valueType": "double"
-					}
-				]
-			}
-	  ]
-  },
+    "customQuestionsInfo": {
+      "customQuestionsArray": [
+        {
+          "ID": "a",
+          "label": "Label a",
+          "value": "Value a",
+          "valueType": "string"
+        },
+        {
+          "ID": "b",
+          "label": "LABEL B",
+          "value": "Value B",
+          "valueType": "string"
+        }
+      ]
+    },
+    "budgetInfo": {
+      "incomeGroupsArrayStatic": [
+        {
+          "incomeGroupName": "general",
+          "otherIncomeRowsArrayStatic": [
+            {
+              "ID": "a",
+              "label": "Kioskimyynti",
+              "value": "300.00",
+              "valueType": "double"
+            },
+            {
+              "ID": "b",
+              "label": "Parkkitulot",
+              "value": "50.00",
+              "valueType": "double"
+            }
+          ]
+        }
+      ],
+      "costGroupsArrayStatic": [
+        {
+          "costGroupName": "general",
+          "otherCostRowsArrayStatic": [
+            {
+              "ID": "a",
+              "label": "Kioskiostot",
+              "value": "100.00",
+              "valueType": "double"
+            },
+            {
+              "ID": "b",
+              "label": "Jätemaksut",
+              "value": "50.00",
+              "valueType": "double"
+            }
+          ]
+        }
+      ]
+    },
     "otherCompensationsInfo": {
       "otherCompensationsArray": [
         [
@@ -299,7 +299,7 @@
           }
         ]
       ],
-	  "otherAppliedCompensationsArray": [
+      "otherAppliedCompensationsArray": [
         [
           {
             "ID": "issuer",
@@ -368,8 +368,6 @@
       }
     ]
   },
-
-
   "attachmentsInfo": {
     "attachmentsArray": [
       [
@@ -405,4 +403,4 @@
     ]
   },
   "formUpdate": false
-}
+}

public/modules/custom/grants_attachments/src/AttachmentFixerService.php

@@ -40,11 +40,11 @@ public function fixAttachmentsOnApplication(AtvDocument $atvDoc): AtvDocument {
     // Get the events from the content.
     $events = $content['events'];
     // Get the attachment info from the content.
-    $attachmentInfo = $content['attachmentsInfo']['attachmentsArray'];
+    $attachmentInfo = $content['attachmentsInfo']['attachmentsArray'] ?? NULL;
 
     // Loop attachments and if attachment is not ok, update the integration ID.
     foreach ($attachments as $attachment) {
-      if ($this->areAttachmentsOk($events, $attachment, $attachmentInfo, $appEnv)['form'] === FALSE) {
+      if ($attachmentInfo && $this->areAttachmentsOk($events, $attachment, $attachmentInfo, $appEnv)['form'] === FALSE) {
         $this->updateIntegrationIdForAttachment($attachment, $attachmentInfo, $appEnv);
       }
     }

public/modules/custom/grants_attachments/src/AttachmentHandler.php

@@ -138,6 +138,7 @@ public static function getAttachmentFieldNames(string $applicationNumber, $preve
     // This could probably be done just by parsing the application number,
     // however this more futureproof.
     $webform = ApplicationHelpers::getWebformFromApplicationNumber($applicationNumber);
+
     if (!$webform) {
       return [];
     }

public/modules/custom/grants_handler/grants_handler.module

@@ -938,7 +938,8 @@ function grants_handler_preprocess_webform_submission_data(&$variables) {
 /**
  * Implements hook_preprocess_HOOK().
  */
-function grants_handler_preprocess_webform_submission(&$variables) {
+function grants_handler_preprocess_webform_submission(&$variables): void {
+
   // Get submission object.
   /** @var \Drupal\webform\Entity\WebformSubmission $submission */
   $submission = $variables['webform_submission'];
@@ -1361,7 +1362,6 @@ function grants_handler_preprocess_application_list(&$variables) {
  * Implements hook_preprocess_HOOK().
  */
 function grants_handler_preprocess_application_list_item(&$variables): void {
-  $language = \Drupal::languageManager()->getCurrentLanguage()->getId();
   $tOpts = ['context' => 'grants_handler'];
 
   // Get status service and get listed statuses.
@@ -1377,9 +1377,20 @@ function grants_handler_preprocess_application_list_item(&$variables): void {
     return;
   }
 
-  $applicationTypes = Helpers::getApplicationTypes();
+  if (!isset($submissionData["metadata"]["form_uuid"])) {
+    \Drupal::logger('grants_handler')
+      ->error('No form uuid found for submission @submissionId',
+        ['@submissionId' => $submissionData["application_number"]]);
+    return;
+  }
+
+  /** @var \Drupal\grants_handler\ApplicationGetterService $applicationGetterService */
+  $applicationGetterService = \Drupal::service('grants_handler.application_getter_service');
 
-  $variables['applicationFormName'] = $applicationTypes[$submissionData["application_type"]][$language];
+  // Get webform.
+  $webform = $applicationGetterService->getWebformFromApplicationNumber($submissionData["application_number"]);
+  // Set webform title.
+  $variables['applicationFormName'] = $webform->label();
 
   $variables['applicationNumber'] = $submissionData["application_number"];
 
@@ -1503,8 +1514,8 @@ function grants_handler_preprocess_application_list_item(&$variables): void {
 
   $status = $applicationStatusService->getWebformStatus($webform);
 
-  $variables['openStartDate'] = strtotime($thirdPartySettings['applicationOpen']);
-  $variables['openEndDate'] = strtotime($thirdPartySettings['applicationClose']);
+  $variables['openStartDate'] = $thirdPartySettings['applicationOpen'] ? strtotime($thirdPartySettings['applicationOpen']) : '';
+  $variables['openEndDate'] = $thirdPartySettings['applicationClose'] ? strtotime($thirdPartySettings['applicationClose']) : '';
   $variables['isContinuous'] = $thirdPartySettings['applicationContinuous'] != 0;
   if (!$variables['isContinuous'] && ($variables['openStartDate'] > time() || $variables['openEndDate'] < time())) {
     $variables['errorType'] = 'NOT_OPEN';

public/modules/custom/grants_handler/grants_handler.routing.yml

@@ -61,10 +61,10 @@ grants_handler.copy_application_modal:
   requirements:
     _custom_access: '\Drupal\grants_handler\Controller\ApplicationController::accessByApplicationNumber'
 
-grants_handler.print_application_atv:
+grants_handler.atv_print_view:
   path: '/hakemus/{submission_id}/tulosta'
   defaults:
     _title_callback: '\Drupal\grants_handler\Controller\ApplicationController::getTitle'
-    _controller: '\Drupal\grants_handler\Controller\ApplicationController::printViewAtv'
+    _controller: '\Drupal\grants_handler\Controller\AtvPrintViewController'
   requirements:
     _custom_access: '\Drupal\grants_handler\Controller\ApplicationController::accessByApplicationNumber'

public/modules/custom/grants_handler/grants_handler.services.yml

@@ -155,9 +155,14 @@ services:
       '@messenger',
       '@grants_handler.application_getter_service',
       '@helfi_helsinki_profiili.userdata',
-      '@grants_attachments.attachment_fixer_service'
+      '@grants_attachments.attachment_fixer_service',
+      '@current_user',
+      '@database'
     ]
 
   grants_handler.application_access_handler:
     class: Drupal\grants_handler\ApplicationAccessHandler
-    arguments: ['@grants_profile.service']
+    arguments: [
+      '@grants_profile.service',
+      '@grants_handler.application_getter_service'
+    ]

public/modules/custom/grants_handler/src/ApplicationAccessHandler.php

@@ -6,7 +6,6 @@
 
 use Drupal\grants_mandate\CompanySelectException;
 use Drupal\grants_profile\GrantsProfileService;
-use Drupal\helfi_atv\AtvDocumentNotFoundException;
 use Drupal\webform\Entity\WebformSubmission;
 
 /**
@@ -19,6 +18,7 @@
    */
   public function __construct(
     private GrantsProfileService $grantsProfileService,
+    private ApplicationGetterService $applicationGetterService,
   ) {}
 
   /**
@@ -30,7 +30,8 @@ public function __construct(
    * @return bool
    *   Access status
    *
-   * @throws \GuzzleHttp\Exception\GuzzleException
+   * @throws \Drupal\grants_profile\GrantsProfileException
+   * @throws \Drupal\grants_mandate\CompanySelectException
    */
   public function singleSubmissionAccess(WebformSubmission $webform_submission): bool {
 
@@ -51,12 +52,12 @@ public function singleSubmissionAccess(WebformSubmission $webform_submission): b
       return FALSE;
     }
 
-    try {
-      $atvDoc = ApplicationHelpers::atvDocumentFromApplicationNumber($webformData['application_number']);
-    }
-    catch (AtvDocumentNotFoundException $e) {
+    $atvDoc = $this->applicationGetterService->getAtvDocument($webformData['application_number']);
+
+    if (!$atvDoc) {
       return FALSE;
     }
+
     $atvMetadata = $atvDoc->getMetadata();
     // Mismatch between profile and application applicant type.
     if ($companyType !== $webformData['hakijan_tiedot']['applicantType']) {