Merge branch...

Merge branch '144-module-grades-don-t-work-for-modules-where-the-assignment-name-starts-with-a-number' into 'development'

Resolve "Module grades don't work for modules where the assignment name starts with a number"

Closes #144

See merge request !225

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed bug where assistant view resets selected module upon search (@dsavvidi)
+- Fixed bug where module grades didn't work when name started with a number (@dsavvidi)
 
 ## [2.2.0]
 ### Added

src/main/java/nl/tudelft/submit/enums/TokenType.java

@@ -83,7 +83,7 @@ public enum TokenType {
 		"abs|max|min|sqrt|avg|clamp"
 	),
 	VARIABLE(
-		"[A-Za-z_][A-Za-z0-9_]*"
+		"[A-Za-z0-9_]*[A-Za-z_][A-Za-z0-9_]*"
 	);
 
 	private Pattern pattern;

src/test/java/nl/tudelft/submit/service/grading/GradeServiceTest.java

@@ -340,6 +340,11 @@ public class GradeServiceTest {
 				.isEqualTo("assignment_1__2__3_bonus_");
 	}
 
+	@Test
+	public void generateVariableNameNumberInFront() {
+		assertThat(gradeService.generateVariableName("1_Assignment 1")).isEqualTo("1_assignment_1");
+	}
+
 	@Test
 	public void passedToFormulaVariable() {
 		GradeSummaryDTO score = new GradeSummaryDTO()