MR Review Changes

src/main/java/nl/tudelft/tam/enums/AcademicPeriod.java

@@ -72,27 +72,20 @@ public enum AcademicPeriod {
 	public static AcademicPeriod getAcademicPeriodFromString(String toCheck) {
 		String cleanedString = toCheck.toUpperCase().replace(" ", "");
 
-		if (cleanedString.contains("Q1/Q2") || cleanedString.contains("Q1/2")
-				|| cleanedString.contains("Q1&Q2") ||
-				cleanedString.contains("Q1ANDQ2") || cleanedString.contains("Q1ENQ2")
-				|| cleanedString.contains("Q1+Q2")) {
+		if (cleanedString.contains("1") && cleanedString.contains("2")) {
 			return S1;
-		} else if (cleanedString.contains("Q3/Q4") || cleanedString.contains("Q3/4")
-				|| cleanedString.contains("Q3&Q4") ||
-				cleanedString.contains("Q3ANDQ4") || cleanedString.contains("Q3ENQ4")
-				|| cleanedString.contains("Q3+Q4")) {
+		} else if (cleanedString.contains("3") && cleanedString.contains("4")) {
 			return S2;
-		} else if (cleanedString.contains("Q1") || cleanedString.contains("Quarter1")) {
+		} else if (cleanedString.contains("1")) {
 			return Q1;
-		} else if (cleanedString.contains("Q2") || cleanedString.contains("Quarter2")) {
+		} else if (cleanedString.contains("2")) {
 			return Q2;
-		} else if (cleanedString.contains("Q3") || cleanedString.contains("Quarter3")) {
+		} else if (cleanedString.contains("3")) {
 			return Q3;
-		} else if (cleanedString.contains("Q4") || cleanedString.contains("Quarter4")) {
+		} else if (cleanedString.contains("4")) {
 			return Q4;
-		} else if (cleanedString.contains("Q5") || cleanedString.contains("Quarter5")
-				|| cleanedString.contains("Summer") ||
-				cleanedString.contains("Zomer")) {
+		} else if (cleanedString.contains("5") || cleanedString.contains("Summer")
+				|| cleanedString.contains("Zomer")) {
 			return SUMMER;
 		}
 
@@ -120,17 +113,15 @@ public enum AcademicPeriod {
 			return S2;
 		}
 
-		if (midpointMonthDay.isAfter(Q1.start) && midpointMonthDay.isBefore(Q1.end)) {
-			return Q1;
-		} else if (midpointMonthDay.isAfter(Q2.start) && midpointMonthDay.isBefore(Q2.end)) {
-			return Q2;
-		} else if (midpointMonthDay.isAfter(Q3.start) && midpointMonthDay.isBefore(Q3.end)) {
-			return Q3;
-		} else if (midpointMonthDay.isAfter(Q4.start) && midpointMonthDay.isBefore(Q4.end)) {
-			return Q4;
-		} else {
-			return SUMMER;
+		AcademicPeriod[] quarters = { Q1, Q2, Q3, Q4 };
+
+		for (AcademicPeriod quarter : quarters) {
+			if (midpointMonthDay.isAfter(quarter.start) && midpointMonthDay.isBefore(quarter.end)) {
+				return quarter;
+			}
 		}
+
+		return SUMMER;
 	}
 
 	/**

test.csv

-"name","age"
-"John","13"
-"Jane","65"
-"Jack, with comma","3"