From 89257f4ce3ad9ba5741d6d4a308d74b34c4cf0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20St=C3=A4ding?= <alexanderstaeding@gmail.com>
Date: Thu, 1 Dec 2022 23:57:40 +0100
Subject: [PATCH] Include studentId in submission file name (#190)

---
 .../jagr/gradle/task/submission/SubmissionBuildTask.kt    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/launcher/gradle-plugin/src/main/kotlin/org/sourcegrade/jagr/gradle/task/submission/SubmissionBuildTask.kt b/launcher/gradle-plugin/src/main/kotlin/org/sourcegrade/jagr/gradle/task/submission/SubmissionBuildTask.kt
index 77abdefb..38c0a0e4 100644
--- a/launcher/gradle-plugin/src/main/kotlin/org/sourcegrade/jagr/gradle/task/submission/SubmissionBuildTask.kt
+++ b/launcher/gradle-plugin/src/main/kotlin/org/sourcegrade/jagr/gradle/task/submission/SubmissionBuildTask.kt
@@ -26,10 +26,12 @@ abstract class SubmissionBuildTask : Jar(), SubmissionTask {
         val sourceSets = project.extensions.getByType<SourceSetContainer>()
         from(sourceSetNames.map { names -> names.map { name -> sourceSets[name].allSource } })
         archiveFileName.set(
-            assignmentId.zip(lastName) { assignmentId, lastName ->
-                "$assignmentId-$lastName"
+            assignmentId.zip(studentId) { assignmentId, studentId ->
+                "$assignmentId-$studentId"
             }.zip(firstName) { left, firstName ->
-                "$left-$firstName-submission"
+                "$left-$firstName"
+            }.zip(lastName) { left, lastName ->
+                "$left-$lastName-submission"
             }.zip(archiveExtension) { left, extension ->
                 "$left.$extension"
             }