Generate game report after the game ends.

src/main/java/com/codejoust/main/dao/GameReportRepository.java

@@ -0,0 +1,10 @@
+package com.codejoust.main.dao;
+
+import com.codejoust.main.model.report.GameReport;
+
+import org.springframework.data.repository.CrudRepository;
+
+public interface GameReportRepository extends CrudRepository<GameReport, Integer> {
+
+    GameReport findGameReportByGameReportId(String gameReportId);
+}

src/main/java/com/codejoust/main/dao/ProblemContainerRepository.java

@@ -0,0 +1,14 @@
+package com.codejoust.main.dao;
+
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.List;
+
+import com.codejoust.main.model.problem.Problem;
+import com.codejoust.main.model.problem.ProblemContainer;
+
+// This will be AUTO IMPLEMENTED by Spring into a Bean called 
+// problemContainerRepository; CRUD refers Create, Read, Update, Delete
+public interface ProblemContainerRepository extends CrudRepository<ProblemContainer, Integer> {
+    List<ProblemContainer> findAllByProblem(Problem problem);
+}

src/main/java/com/codejoust/main/dao/RoomRepository.java

@@ -1,5 +1,7 @@
 package com.codejoust.main.dao;
 
+import java.util.List;
+
 import com.codejoust.main.model.Room;
 
 import org.springframework.data.repository.CrudRepository;
@@ -8,4 +10,6 @@ public interface RoomRepository extends CrudRepository<Room, Integer> {
 
     // Auto generated by CrudRepository
     Room findRoomByRoomId(String roomId);
+
+    List<Room> findByProblems_ProblemId(String problemId);
 }

src/main/java/com/codejoust/main/dto/game/SubmissionMapper.java

@@ -1,7 +1,11 @@
 package com.codejoust.main.dto.game;
 
 import com.codejoust.main.dto.problem.ProblemTestCaseDto;
+import com.codejoust.main.game_object.PlayerCode;
+import com.codejoust.main.game_object.Submission;
 import com.codejoust.main.game_object.SubmissionResult;
+import com.codejoust.main.model.report.CodeLanguage;
+import com.codejoust.main.model.report.SubmissionReport;
 
 import org.modelmapper.ModelMapper;
 
@@ -29,4 +33,18 @@ public static SubmissionResult toSubmissionResult(TesterResult testerResult, Pro
         submissionResult.setInput(testCaseDto.getInput());
         return submissionResult;
     }
+
+    public static SubmissionReport toSubmissionReport(Submission submission) {
+        if (submission == null) {
+            return null;
+        }
+
+        SubmissionReport submissionReport = mapper.map(submission, SubmissionReport.class);
+
+        // Get and set the player code for this submission.
+        PlayerCode playerCode = submission.getPlayerCode();
+        submissionReport.setCode(playerCode.getCode());
+        submissionReport.setLanguage(CodeLanguage.fromString(submission.getPlayerCode().getLanguage().name()));
+        return submissionReport;
+    }
 }

src/main/java/com/codejoust/main/exception/TimerError.java

@@ -11,7 +11,7 @@
 public enum TimerError implements ApiError {
 
     INVALID_DURATION(HttpStatus.BAD_REQUEST, "Please enter a valid duration between 1-60 minutes."),
-    NULL_SETTING(HttpStatus.BAD_REQUEST, "The game, associated game timer, room, room ID, and socket service must not be null.");
+    NULL_SETTING(HttpStatus.BAD_REQUEST, "The relevant game settings must not be null.");
 
     private final HttpStatus status;
     private final ApiErrorResponse response;

src/main/java/com/codejoust/main/game_object/Game.java

@@ -31,4 +31,7 @@ public class Game {
 
     // Boolean to hold whether the host ended the game early
     private Boolean gameEnded = false;
+
+    // Boolean to hold whether the process of creating the game report started
+    private Boolean createGameReportStarted = false;
 }

src/main/java/com/codejoust/main/game_object/Submission.java

@@ -13,6 +13,7 @@
 public class Submission {
 
     private PlayerCode playerCode;
+
     private int problemIndex;
 
     private List<SubmissionResult> results;

src/main/java/com/codejoust/main/model/Account.java

@@ -52,12 +52,16 @@ public class Account {
     private List<ProblemTag> problemTags = new ArrayList<>();
 
     // List of tags associated with this problem
-    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH, CascadeType.DETACH}, fetch = FetchType.EAGER)
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Setter(AccessLevel.PRIVATE)
     @JoinColumn(name = "game_report_id")
     @Fetch(value = FetchMode.SUBSELECT)
     private List<GameReport> gameReports = new ArrayList<>();
 
     @Enumerated(EnumType.STRING)
     private AccountRole role = AccountRole.TEACHER;
+
+    public void addGameReport(GameReport gameReport) {
+        gameReports.add(0, gameReport);
+    }
 }

src/main/java/com/codejoust/main/model/Room.java

@@ -148,4 +148,12 @@ public boolean isFull() {
 
         return users.size() >= size;
     }
+
+    public boolean addProblem(Problem problem) {
+        return problems.add(problem);
+    }
+
+    public boolean removeProblem(Problem problem) {
+        return problems.remove(problem);
+    }
 }

src/main/java/com/codejoust/main/model/User.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -58,9 +59,13 @@ public class User {
     private Room room;
 
     // Thie list holds the submission group associated with the current room
-    @OneToMany(fetch = FetchType.EAGER)
+    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Setter(AccessLevel.PRIVATE)
     @Fetch(value = FetchMode.SUBSELECT)
     @JoinColumn(name = "submission_group_reports_table_id")
     private List<SubmissionGroupReport> submissionGroupReports = new ArrayList<>();
+
+    public void addSubmissionGroupReport(SubmissionGroupReport submissionGroupReport) {
+        submissionGroupReports.add(submissionGroupReport);
+    }
 }

src/main/java/com/codejoust/main/model/problem/ProblemTestCase.java

@@ -4,6 +4,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -24,9 +25,11 @@ public class ProblemTestCase {
     private Integer id;
 
     @EqualsAndHashCode.Include
+    @Column(columnDefinition = "TEXT")
     private String input;
 
     @EqualsAndHashCode.Include
+    @Column(columnDefinition = "TEXT")
     private String output;
 
     @EqualsAndHashCode.Include
@@ -37,5 +40,6 @@ public class ProblemTestCase {
     private Problem problem;
 
     @EqualsAndHashCode.Include
+    @Column(columnDefinition = "TEXT")
     private String explanation;
 }

src/main/java/com/codejoust/main/model/report/GameReport.java

@@ -39,18 +39,26 @@ public class GameReport {
     @EqualsAndHashCode.Include
     private String gameReportId = UUID.randomUUID().toString();
 
-    @OneToMany(fetch = FetchType.EAGER)
+    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Setter(AccessLevel.PRIVATE)
     @Fetch(value = FetchMode.SUBSELECT)
     @JoinColumn(name = "problem_containers_table_id")
     private List<ProblemContainer> problemContainers = new ArrayList<>();
 
-    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH, CascadeType.DETACH}, fetch = FetchType.EAGER)
+    @ManyToMany(cascade = CascadeType.MERGE, fetch = FetchType.EAGER)
     @Setter(AccessLevel.PRIVATE)
-    @JoinColumn(name = "users_table_id")
     @Fetch(value = FetchMode.SUBSELECT)
+    @JoinColumn(name = "users_table_id")
     private List<User> users = new ArrayList<>();
 
+    private int numTestCases;
+
+    // The average (mean) number of test cases passed.
+    private Double averageTestCasesPassed;
+
+    // The average (mean) number of problems solved.
+    private Double averageProblemsSolved;
+
     // The start time of the game
     private Instant createdDateTime;
 
@@ -59,4 +67,12 @@ public class GameReport {
 
     // How the game ended.
     private GameEndType gameEndType;
+
+    public void addProblemContainer(ProblemContainer problemContainer) {
+        problemContainers.add(problemContainer);
+    }
+
+    public void addUser(User user) {
+        users.add(user);
+    }
 }

src/main/java/com/codejoust/main/model/report/SubmissionGroupReport.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -31,9 +32,22 @@ public class SubmissionGroupReport {
 
     private String gameReportId;
 
-    @OneToMany(fetch = FetchType.EAGER)
+    /**
+     * String to represent problems solved.
+     * Each index represents the problem index.
+     * 0 = Not Solved, 1 = Solved.
+     */
+    private String problemsSolved;
+
+    private Integer numTestCasesPassed;
+
+    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Setter(AccessLevel.PRIVATE)
     @Fetch(value = FetchMode.SUBSELECT)
     @JoinColumn(name = "submission_reports_table_id")
     private List<SubmissionReport> submissionReports = new ArrayList<>();
+
+    public void addSubmissionReport(SubmissionReport submissionReport) {
+        submissionReports.add(submissionReport);
+    }
 }

src/main/java/com/codejoust/main/model/report/SubmissionReport.java

@@ -2,6 +2,7 @@
 
 import java.time.Instant;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -21,10 +22,13 @@ public class SubmissionReport {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Integer id;
 
+    @Column(columnDefinition = "TEXT")
     private String code;
 
     private CodeLanguage language;
 
+    private int problemIndex;
+
     // The time that the submission was received.
     private Instant startTime;
 

src/main/java/com/codejoust/main/service/GameManagementService.java

@@ -28,7 +28,7 @@
 import com.codejoust.main.model.Room;
 import com.codejoust.main.model.User;
 import com.codejoust.main.model.problem.Problem;
-import com.codejoust.main.util.EndGameTimerTask;
+import com.codejoust.main.task.EndGameTimerTask;
 import com.codejoust.main.util.Utility;
 
 import lombok.extern.log4j.Log4j2;
@@ -45,18 +45,24 @@ public class GameManagementService {
     private final NotificationService notificationService;
     private final SubmitService submitService;
     private final ProblemService problemService;
+    private final ReportService reportService;
     private final Map<String, Game> currentGameMap;
 
     @Autowired
-    protected GameManagementService(RoomRepository repository, SocketService socketService,
-                                    LiveGameService liveGameService, NotificationService notificationService,
-                                    SubmitService submitService, ProblemService problemService) {
+    protected GameManagementService(RoomRepository repository,
+                                    SocketService socketService,
+                                    LiveGameService liveGameService,
+                                    NotificationService notificationService,
+                                    SubmitService submitService,
+                                    ProblemService problemService,
+                                    ReportService reportService) {
         this.repository = repository;
         this.socketService = socketService;
         this.liveGameService = liveGameService;
         this.notificationService = notificationService;
         this.submitService = submitService;
         this.problemService = problemService;
+        this.reportService = reportService;
         currentGameMap = new HashMap<>();
     }
 
@@ -106,7 +112,7 @@ public RoomDto startGame(String roomId, StartGameRequest request) {
     public RoomDto playAgain(String roomId, PlayAgainRequest request) {
         Game game = getGameFromRoomId(roomId);
 
-        if (!isGameOver(game)) {
+        if (!Utility.isGameOver(game)) {
             throw new ApiException(GameError.GAME_NOT_OVER);
         }
 
@@ -166,7 +172,7 @@ public void setStartGameTimer(Game game, Long duration) {
         game.setGameTimer(gameTimer);
 
         // Schedule the game to end after <duration> seconds.
-        EndGameTimerTask endGameTimerTask = new EndGameTimerTask(socketService, game);
+        EndGameTimerTask endGameTimerTask = new EndGameTimerTask(this, socketService, game);
         gameTimer.getTimer().schedule(endGameTimerTask, duration * 1000);
     }
 
@@ -209,7 +215,7 @@ public SubmissionDto submitSolution(String roomId, SubmissionRequest request) {
 
         SubmissionDto submissionDto = submitService.submitSolution(game, request);
 
-        if (isGameOver(game)) {
+        if (Utility.isGameOver(game)) {
             handleEndGame(game);
         }
 
@@ -283,18 +289,16 @@ public GameDto manuallyEndGame(String roomId, EndGameRequest request) {
         return gameDto;
     }
 
-    protected void handleEndGame(Game game) {
+    public void handleEndGame(Game game) {
         // Cancel all previously scheduled timers
         GameTimer gameTimer = game.getGameTimer();
         gameTimer.getTimer().cancel();
 
         for (Timer timer : gameTimer.getNotificationTimers()) {
             timer.cancel();
         }
-    }
 
-    protected boolean isGameOver(Game game) {
-        return game.getGameEnded() || game.getAllSolved() || (game.getGameTimer() != null && game.getGameTimer().isTimeUp());
+        reportService.createGameReport(game);
     }
 
     // Update people's socket active status

src/main/java/com/codejoust/main/service/NotificationService.java

@@ -6,7 +6,7 @@
 import com.codejoust.main.dto.game.GameNotificationDto;
 import com.codejoust.main.game_object.Game;
 import com.codejoust.main.game_object.GameTimer;
-import com.codejoust.main.util.NotificationTimerTask;
+import com.codejoust.main.task.NotificationTimerTask;
 
 import org.springframework.stereotype.Service;