Include studentId in submission file name (#190)

sourcegrade · Dec 1, 2022 · 89257f4 · 89257f4
1 parent f64a5dc
commit 89257f4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...plugin/src/main/kotlin/org/sourcegrade/jagr/gradle/task/submission/SubmissionBuildTask.kt b/...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"
             }