Define a service function for printing as a user

Share some code which is used in multiple controllers, and allow this
shared code to be used by API endpoints in the future.

Author: Kevinjil

webapp/src/Controller/Jury/PrintController.php

@@ -51,11 +51,10 @@ public function showAction(Request $request): Response
             $originalfilename = $file->getClientOriginalName();
 
             $langid   = $data['langid'];
-            $username = $this->getUser()->getUserIdentifier();
 
             // Since this is the Jury interface, there's not necessarily a
             // team involved; do not set a teamname or location.
-            $ret = $this->dj->printFile($realfile, $originalfilename, $langid, $username);
+            $ret = $this->dj->printUserFile($realfile, $originalfilename, $langid);
 
             return $this->render('jury/print_result.html.twig', [
                 'success' => $ret[0],

webapp/src/Controller/Team/MiscController.php

@@ -176,18 +176,12 @@ public function printAction(Request $request): Response
             $realfile         = $file->getRealPath();
             $originalfilename = $file->getClientOriginalName();
 
-            $langid   = $data['langid'];
-            $username = $this->getUser()->getUserIdentifier();
-
-            $propertyAccessor = PropertyAccess::createPropertyAccessor();
-            $team = $this->dj->getUser()->getTeam();
-            if ($team->getLabel()) {
-                $teamId = $team->getLabel();
-            } else {
-                $teamId = $team->getExternalid();
-            }
-            $ret  = $this->dj->printFile($realfile, $originalfilename, $langid,
-                $username, $team->getEffectiveName(), $teamId, $team->getLocation());
+            $langid = $data['langid'];
+            $ret = $this->dj->printUserFile(
+                $realfile,
+                $originalfilename,
+                $langid
+            );
 
             return $this->render('team/print_result.html.twig', [
                 'success' => $ret[0],

webapp/src/Service/DOMJudgeService.php

@@ -725,6 +725,32 @@ public function openZipFile(string $filename): ZipArchive
         return $zip;
     }
 
+    /**
+     * Print the given file using the print command.
+     *
+     * Returns array with two elements: first a boolean indicating
+     * overall success, and second the data returned from the print command.
+     *
+     * @param string      $filename The on-disk file to be printed out
+     * @param string      $origname The original filename as submitted by the team
+     * @param string|null $language Langid of the programming language this file is in
+     * @param bool        $asTeam   Print the file as the team associated with the user
+     */
+    public function printUserFile(
+        string $filename,
+        string $origname,
+        ?string $language,
+        ?bool $asTeam = false,
+    ): array {
+        $user = $this->getUser();
+        $team = $user->getTeam();
+        if ($asTeam && $team !== null) {
+            $teamid = $team->getLabel() ?? $team->getExternalid();
+            return $this->printFile($filename, $origname, $language, $user->getUserIdentifier(), $team->getEffectiveName(), $teamid, $team->getLocation());
+        }
+        return $this->printFile($filename, $origname, $language, $user->getUserIdentifier());
+    }
+
     /**
      * Print the given file using the print command.
      *