Merge pull request #325 from softwareconstruction240/use-checked-exce…

…ption-for-dataaccessexception

Use checked exception for dataaccessexception

src/main/java/edu/byu/cs/analytics/CommitAnalytics.java

@@ -4,6 +4,7 @@
 import edu.byu.cs.canvas.CanvasIntegrationImpl;
 import edu.byu.cs.canvas.CanvasService;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.dataAccess.SubmissionDao;
 import edu.byu.cs.model.Phase;
 import edu.byu.cs.model.Submission;
@@ -70,7 +71,7 @@ private record CommitDatum(
      *
      * @return a serialized version of the data
      */
-    public static String generateCSV() {
+    public static String generateCSV() throws DataAccessException {
 
         SubmissionDao submissionDao = DaoService.getSubmissionDao();
 

src/main/java/edu/byu/cs/analytics/CommitAnalyticsRouter.java

@@ -1,5 +1,6 @@
 package edu.byu.cs.analytics;
 
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.util.DateTimeUtils;
 import edu.byu.cs.util.FileUtils;
 
@@ -18,7 +19,7 @@ public class CommitAnalyticsRouter {
      *
      * @return the CSV data
      */
-    public static String update() {
+    public static String update() throws DataAccessException {
         long ts = Instant.now().getEpochSecond();
         String data = CommitAnalytics.generateCSV();
 

src/main/java/edu/byu/cs/autograder/TrafficController.java

@@ -2,6 +2,7 @@
 
 import edu.byu.cs.controller.WebSocketController;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.QueueItem;
 import org.eclipse.jetty.websocket.api.Session;
 
@@ -38,7 +39,7 @@ public static TrafficController getInstance() {
      * Broadcasts the current queue status to all connected clients.
      * Each client will be notified of their specific position in the queue.
      */
-    public static void broadcastQueueStatus() {
+    public static void broadcastQueueStatus() throws DataAccessException {
 
         List<QueueItem> usersWaitingInQueue = new ArrayList<>();
         for (QueueItem item : DaoService.getQueueDao().getAll())

src/main/java/edu/byu/cs/autograder/git/GitHelper.java

@@ -4,6 +4,7 @@
 import edu.byu.cs.autograder.GradingContext;
 import edu.byu.cs.autograder.GradingException;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.Submission;
 import org.eclipse.jgit.api.CloneCommand;
 import org.eclipse.jgit.api.Git;
@@ -70,7 +71,7 @@ private int verifyRegularCommits() throws GradingException {
 //            }
 
             return numCommits;
-        } catch (IOException | GitAPIException e) {
+        } catch (IOException | GitAPIException | DataAccessException e) {
             gradingContext.observer().notifyError("Failed to count commits: " + e.getMessage());
             LOGGER.error("Failed to count commits", e);
             throw new GradingException("Failed to count commits: ", e.getMessage());

src/main/java/edu/byu/cs/autograder/quality/QualityGrader.java

@@ -3,6 +3,7 @@
 import edu.byu.cs.autograder.GradingContext;
 import edu.byu.cs.autograder.GradingException;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.Rubric;
 import edu.byu.cs.model.RubricConfig;
 
@@ -16,7 +17,7 @@ public class QualityGrader {
      *
      * @return the results of the quality checks as a CanvasIntegration.RubricItem
      */
-    public Rubric.Results runQualityChecks() throws GradingException {
+    public Rubric.Results runQualityChecks() throws GradingException, DataAccessException {
         RubricConfig rubricConfig = DaoService.getRubricConfigDao().getRubricConfig(gradingContext.phase());
         if(rubricConfig.quality() == null) return null;
         gradingContext.observer().update("Running code quality...");

src/main/java/edu/byu/cs/autograder/score/LateDayCalculator.java

@@ -4,6 +4,7 @@
 import edu.byu.cs.canvas.CanvasException;
 import edu.byu.cs.canvas.CanvasService;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.Phase;
 import edu.byu.cs.util.PhaseUtils;
 import org.eclipse.jgit.annotations.NonNull;
@@ -39,7 +40,7 @@ public LateDayCalculator() {
         initializePublicHolidays(getEncodedPublicHolidays());
     }
 
-    public int calculateLateDays(Phase phase, String netId) throws GradingException {
+    public int calculateLateDays(Phase phase, String netId) throws GradingException, DataAccessException {
         int assignmentNum = PhaseUtils.getPhaseAssignmentNumber(phase);
 
         int canvasUserId = DaoService.getUserDao().getUser(netId).canvasUserId();

src/main/java/edu/byu/cs/autograder/score/Scorer.java

@@ -7,6 +7,7 @@
 import edu.byu.cs.canvas.CanvasService;
 import edu.byu.cs.canvas.CanvasUtils;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.dataAccess.SubmissionDao;
 import edu.byu.cs.dataAccess.UserDao;
 import edu.byu.cs.model.*;
@@ -34,7 +35,7 @@ public Scorer(GradingContext gradingContext) {
         this.gradingContext = gradingContext;
     }
 
-    public Submission score(Rubric rubric, int numCommits) throws GradingException {
+    public Submission score(Rubric rubric, int numCommits) throws GradingException, DataAccessException {
         gradingContext.observer().update("Grading...");
 
         rubric = CanvasUtils.decimalScoreToPoints(gradingContext.phase(), rubric);
@@ -137,7 +138,7 @@ private float totalPoints(CanvasIntegration.RubricAssessment assessment) {
         return points;
     }
 
-    private float calculateScoreWithLatePenalty(Rubric rubric, int numDaysLate) throws GradingException {
+    private float calculateScoreWithLatePenalty(Rubric rubric, int numDaysLate) throws GradingException, DataAccessException {
         float score = getScore(rubric);
         score *= 1 - (numDaysLate * PER_DAY_LATE_PENALTY);
         if (score < 0) score = 0;
@@ -149,7 +150,7 @@ private float calculateScoreWithLatePenalty(Rubric rubric, int numDaysLate) thro
      *
      * @return the score
      */
-    private float getScore(Rubric rubric) throws GradingException {
+    private float getScore(Rubric rubric) throws GradingException, DataAccessException {
         int totalPossiblePoints = DaoService.getRubricConfigDao().getPhaseTotalPossiblePoints(gradingContext.phase());
 
         if (totalPossiblePoints == 0)
@@ -174,7 +175,7 @@ private float getScore(Rubric rubric) throws GradingException {
      * @param rubric the rubric for the phase
      */
     private Submission saveResults(Rubric rubric, int numCommits, int numDaysLate, float score, String notes)
-            throws GradingException {
+            throws GradingException, DataAccessException {
         String headHash = getHeadHash();
         String netId = gradingContext.netId();
 

src/main/java/edu/byu/cs/autograder/test/TestGrader.java

@@ -3,6 +3,7 @@
 import edu.byu.cs.autograder.GradingContext;
 import edu.byu.cs.autograder.GradingException;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.Rubric;
 import edu.byu.cs.model.RubricConfig;
 import edu.byu.cs.util.PhaseUtils;
@@ -42,7 +43,7 @@ public TestGrader(GradingContext gradingContext) {
     }
 
 
-    public Rubric.Results runTests() throws GradingException {
+    public Rubric.Results runTests() throws GradingException, DataAccessException {
         compileTests();
         gradingContext.observer().update("Running " + name() + " tests...");
 

src/main/java/edu/byu/cs/canvas/CanvasUtils.java

@@ -2,6 +2,7 @@
 
 import edu.byu.cs.autograder.GradingException;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.Phase;
 import edu.byu.cs.model.Rubric;
 import edu.byu.cs.model.RubricConfig;
@@ -21,7 +22,7 @@ public class CanvasUtils {
      * @param rubric the rubric to convert
      * @return the rubric with the score converted to points
      */
-    public static Rubric decimalScoreToPoints(Phase phase, Rubric rubric) throws GradingException {
+    public static Rubric decimalScoreToPoints(Phase phase, Rubric rubric) throws GradingException, DataAccessException {
         RubricConfig rubricConfig = DaoService.getRubricConfigDao().getRubricConfig(phase);
 
         Rubric.RubricItem convertedPassoffTests = null;

src/main/java/edu/byu/cs/canvas/FakeCanvasIntegration.java

@@ -1,16 +1,22 @@
 package edu.byu.cs.canvas;
 
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.model.User;
 
 import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.HashSet;
 
-public class FakeCanvasIntegration implements CanvasIntegration{
+public class FakeCanvasIntegration implements CanvasIntegration {
     @Override
-    public User getUser(String netId) {
-        User user = DaoService.getUserDao().getUser(netId);
+    public User getUser(String netId) throws CanvasException {
+        User user = null;
+        try {
+            user = DaoService.getUserDao().getUser(netId);
+        } catch (DataAccessException e) {
+            throw new CanvasException("Error getting user from database", e);
+        }
         if(user == null) {
             user = new User(netId, 0, "FirstName", "LastName", null, User.Role.ADMIN);
         }

src/main/java/edu/byu/cs/controller/AdminController.java

@@ -4,9 +4,11 @@
 import edu.byu.cs.analytics.CommitAnalyticsRouter;
 import edu.byu.cs.canvas.CanvasService;
 import edu.byu.cs.dataAccess.DaoService;
+import edu.byu.cs.dataAccess.DataAccessException;
 import edu.byu.cs.dataAccess.UserDao;
 import edu.byu.cs.honorChecker.HonorCheckerCompiler;
 import edu.byu.cs.model.User;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import spark.Route;
 
@@ -19,10 +21,20 @@
 import static spark.Spark.halt;
 
 public class AdminController {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AdminController.class);
+
     public static final Route usersGet = (req, res) -> {
         UserDao userDao = DaoService.getUserDao();
 
-        Collection<User> users = userDao.getUsers();
+        Collection<User> users = null;
+        try {
+            users = userDao.getUsers();
+        } catch (DataAccessException e) {
+            LOGGER.error("Error getting users", e);
+            halt(500);
+            return null;
+        }
 
         res.type("application/json");
         res.status(200);
@@ -35,32 +47,46 @@ public class AdminController {
         String netId = req.params(":netId");
 
         UserDao userDao = DaoService.getUserDao();
-        User user = userDao.getUser(netId);
+        User user;
+        try {
+            user = userDao.getUser(netId);
+        } catch (DataAccessException e) {
+            LOGGER.error("Error getting user", e);
+            halt(500);
+            return null;
+        }
+
         if (user == null) {
             halt(404, "user not found");
             return null;
         }
 
-        String firstName = req.queryParams("firstName");
-        if (firstName != null)
-            userDao.setFirstName(user.netId(), firstName);
-
-        String lastName = req.queryParams("lastName");
-        if (lastName != null)
-            userDao.setLastName(user.netId(), lastName);
-
-        String repoUrl = req.queryParams("repoUrl");
-        if (repoUrl != null)
-            userDao.setRepoUrl(user.netId(), repoUrl);
-
-        String role = req.queryParams("role");
-        if (role != null) {
-            try {
-                userDao.setRole(user.netId(), User.Role.valueOf(role.toUpperCase()));
-            } catch (IllegalArgumentException e) {
-                halt(400, "invalid role. must be one of: STUDENT, ADMIN");
-                return null;
+        try {
+            String firstName = req.queryParams("firstName");
+            if (firstName != null)
+                userDao.setFirstName(user.netId(), firstName);
+
+            String lastName = req.queryParams("lastName");
+            if (lastName != null)
+                userDao.setLastName(user.netId(), lastName);
+
+            String repoUrl = req.queryParams("repoUrl");
+            if (repoUrl != null)
+                userDao.setRepoUrl(user.netId(), repoUrl);
+
+            String role = req.queryParams("role");
+            if (role != null) {
+                try {
+                    userDao.setRole(user.netId(), User.Role.valueOf(role.toUpperCase()));
+                } catch (IllegalArgumentException e) {
+                    halt(400, "invalid role. must be one of: STUDENT, ADMIN");
+                    return null;
+                }
             }
+        } catch (DataAccessException e) {
+            LOGGER.error("Error updating user", e);
+            halt(500);
+            return null;
         }
 
         res.status(204);
@@ -72,17 +98,38 @@ public class AdminController {
         User latestTestStudent = CanvasService.getCanvasIntegration().getTestStudent();
 
         UserDao userDao = DaoService.getUserDao();
-        User user = userDao.getUser("test");
+        User user;
+        try {
+            user = userDao.getUser("test");
+        } catch (DataAccessException e) {
+            LOGGER.error("Error getting user", e);
+            halt(500);
+            return null;
+        }
 
-        if (user == null) {
-            user = latestTestStudent;
-            userDao.insertUser(latestTestStudent);
-        } else {
-            userDao.setRepoUrl(user.netId(), latestTestStudent.repoUrl());
-            userDao.setCanvasUserId(user.netId(), latestTestStudent.canvasUserId());
+        try {
+
+            if (user == null) {
+                user = latestTestStudent;
+                userDao.insertUser(latestTestStudent);
+            } else {
+                userDao.setRepoUrl(user.netId(), latestTestStudent.repoUrl());
+                userDao.setCanvasUserId(user.netId(), latestTestStudent.canvasUserId());
+            }
+
+        } catch (DataAccessException e) {
+            LOGGER.error("Error updating user", e);
+            halt(500);
+            return null;
         }
 
-        DaoService.getSubmissionDao().removeSubmissionsByNetId(user.netId());
+        try {
+            DaoService.getSubmissionDao().removeSubmissionsByNetId(user.netId());
+        } catch (DataAccessException e) {
+            LOGGER.error("Error removing submissions", e);
+            halt(500);
+            return null;
+        }
 
         res.cookie("/", "token", generateToken(user.netId()), 14400, false, false);
 
@@ -103,7 +150,7 @@ public class AdminController {
                 default -> throw new IllegalStateException("Not found (invalid option: " + option + ")");
             };
         } catch (Exception e) {
-            LoggerFactory.getLogger(AdminController.class).error(e.getMessage());
+            LOGGER.error(e.getMessage());
             if (e instanceof IllegalStateException) res.status(404);
             else res.status(500);
             return e.getMessage();
@@ -139,6 +186,7 @@ public class AdminController {
                 return res.raw();
             }
         } catch (Exception e) {
+            LOGGER.error("Error compiling honor checker", e);
             res.status(500);
             return e.getMessage();
         }