Merge pull request pkp#8501 from Vitaliy-1/i8493_uploader_null

pkp#8493 submission's uploaded user ID can be null
ajnyga · Feb 15, 2023 · 53b7c6a · 53b7c6a
2 parents ca19ff5 + 5306729
commit 53b7c6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/classes/submissionFile/maps/Schema.php b/classes/submissionFile/maps/Schema.php
@@ -198,7 +198,8 @@ protected function mapByProperties(array $props, SubmissionFile $submissionFile)
             }
 
             if ($prop === 'uploaderUserName') {
-                $user = Repo::user()->get($submissionFile->getData('uploaderUserId'));
+                $userId = $submissionFile->getData('uploaderUserId');
+                $user = !is_null($userId) ? Repo::user()->get($userId) : null; // userId can be null, see pkp/pkp-lib#8493
                 $output[$prop] = $user?->getUsername() ?? '';
 
                 continue;

diff --git a/schemas/submissionFile.json b/schemas/submissionFile.json
@@ -5,8 +5,7 @@
 		"fileId",
 		"fileStage",
 		"name",
-		"submissionId",
-		"uploaderUserId"
+		"submissionId"
 	],
 	"properties": {
 		"_href": {
@@ -260,7 +259,10 @@
 		},
 		"uploaderUserId": {
 			"type": "integer",
-			"apiSummary": true
+			"apiSummary": true,
+			"validation": [
+				"nullable"
+			]
 		},
 		"uploaderUserName": {
 			"type": "string",