Made Category use CategoryTime for its timeSpent

src/main/java/cz/muni/fi/pv168/project/data/category/Category.java

@@ -7,6 +7,9 @@ import org.joda.time.format.PeriodFormatter;
 import org.joda.time.format.PeriodFormatterBuilder;
 
 import java.awt.Color;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 public class Category implements Identifiable {
@@ -14,16 +17,12 @@ public class Category implements Identifiable {
     private Long id;
     private String name;
     private Color color;
-    private Duration timeSpent;
+    private List<CategoryTime> timeSpents;
 
     private final PeriodFormatter periodicFormatter;
 
     public Category(String name, Color color) {
-        this(name, color, new Duration(0));
-    }
-
-    public Category(String name, Color color, Duration duration) {
-        timeSpent = duration;
+        this.timeSpents = new ArrayList<>();
         this.name = name;
         this.color = color;
         this.periodicFormatter = createFormatter();
@@ -51,32 +50,28 @@ public class Category implements Identifiable {
     }
 
     public String getTimeDurationFormatted() {
-        final var dayTimePeriod = timeSpent.toPeriod().normalizedStandard(PeriodType.dayTime());
+        final var dayTimePeriod = getTotalDuration().toPeriod().normalizedStandard(PeriodType.dayTime());
         return periodicFormatter.print(dayTimePeriod).strip();
     }
 
-    public void addTime(Duration duration) {
-        timeSpent = timeSpent.plus(duration);
+    public Duration getTotalDuration() {
+        return Duration.standardHours(this.timeSpents.stream().map(CategoryTime::getTimeInHours).reduce(0L, Long::sum));
     }
 
-    public void addTime(Long millis) {
-        addTime(Duration.millis(millis));
+    public void setTimeSpents(List<CategoryTime> timeSpents) {
+        this.timeSpents = timeSpents;
     }
 
-    public void addTime(int hours) {
-        addTime(Duration.standardHours(hours));
+    public List<CategoryTime> getTimeSpents() {
+        return timeSpents;
     }
 
-    public void subtractTime(int hours) {
-        timeSpent = timeSpent.minus(Duration.standardHours(hours));
+    public void addTime(Long hours, Long taskId) {
+        timeSpents.add(new CategoryTime(LocalDate.now(), hours, taskId));
     }
 
-    public void resetTime() {
-        timeSpent = new Duration(0);
-    }
-
-    public Long getTimeInMillis() {
-        return timeSpent.getMillis();
+    public void subtractTime(Long taskId) {
+        timeSpents.removeIf(categoryTime -> categoryTime.getTaskId().equals(taskId));
     }
 
     private PeriodFormatter createFormatter() {
@@ -88,7 +83,6 @@ public class Category implements Identifiable {
                 .toFormatter();
     }
 
-
     public Long getId() {
         return id;
     }

src/main/java/cz/muni/fi/pv168/project/db/category/CategoryDao.java

@@ -2,6 +2,7 @@ package cz.muni.fi.pv168.project.db.category;
 
 import cz.muni.fi.pv168.project.data.category.Category;
 import cz.muni.fi.pv168.project.db.DataAccessException;
+import cz.muni.fi.pv168.project.db.categorytime.CategoryTimeDao;
 import cz.muni.fi.pv168.project.db.interfaces.DataAccessObject;
 
 import javax.sql.DataSource;
@@ -31,11 +32,10 @@ public class CategoryDao implements DataAccessObject<Category> {
 
         try (var connection = dataSource.getConnection();
              var st = connection.prepareStatement(
-                     "INSERT INTO CATEGORY (TITLE, COLOR, TIME_SPENT) VALUES (?, ?, ?)",
+                     "INSERT INTO CATEGORY (TITLE, COLOR) VALUES (?, ?)",
                      Statement.RETURN_GENERATED_KEYS)) {
             st.setString(1, entity.getName());
             st.setInt(2, entity.getColor().getRGB());
-            st.setLong(3, entity.getTimeInMillis());
 
             st.executeUpdate();
 
@@ -60,7 +60,7 @@ public class CategoryDao implements DataAccessObject<Category> {
     @Override
     public Collection<Category> getAll() throws DataAccessException {
         try (var connection = dataSource.getConnection();
-             var st = connection.prepareStatement("SELECT ID, TITLE, COLOR, TIME_SPENT FROM CATEGORY")) {
+             var st = connection.prepareStatement("SELECT ID, TITLE, COLOR FROM CATEGORY")) {
             List<Category> categories = new ArrayList<>();
 
             try (var rs = st.executeQuery()) {
@@ -71,7 +71,7 @@ public class CategoryDao implements DataAccessObject<Category> {
 
             return categories;
         } catch (SQLException ex) {
-            throw new DataAccessException("");
+            throw new DataAccessException("Failed to load all categories", ex);
         }
     }
 
@@ -83,16 +83,22 @@ public class CategoryDao implements DataAccessObject<Category> {
 
         try (var connection = dataSource.getConnection();
              var st = connection.prepareStatement(
-                     "UPDATE CATEGORY SET TITLE = ?, COLOR = ?, TIME_SPENT = ? WHERE ID = ?")) {
+                     "UPDATE CATEGORY SET TITLE = ?, COLOR = ? WHERE ID = ?")) {
             st.setString(1, entity.getName());
             st.setInt(2, entity.getColor().getRGB());
-            st.setLong(3, entity.getTimeInMillis());
-            st.setLong(4, entity.getId());
+            st.setLong(3, entity.getId());
 
             int rowsUpdated = st.executeUpdate();
             if (rowsUpdated == 0) {
                 throw new DataAccessException("Failed to update non-existing category: " + entity);
             }
+
+            // cleanup previous
+            categoryTimeDao.deleteAllEntitiesFor(entity.getId());
+            // add current
+            for (var subtask : entity.getTimeSpents()) {
+                categoryTimeDao.addEntityFor(entity.getId(), subtask);
+            }
         } catch (SQLException ex) {
             throw new DataAccessException("Failed to update category " + entity, ex);
         }
@@ -121,7 +127,7 @@ public class CategoryDao implements DataAccessObject<Category> {
     public Category fetch(Long id) {
         try (var connection = dataSource.getConnection();
              var st = connection.prepareStatement(
-                     "SELECT ID, TITLE, COLOR, TIME_SPENT FROM CATEGORY WHERE ID = ?")) {
+                     "SELECT ID, TITLE, COLOR FROM CATEGORY WHERE ID = ?")) {
             st.setLong(1, id);
 
             try (var rs = st.executeQuery()) {
@@ -142,13 +148,14 @@ public class CategoryDao implements DataAccessObject<Category> {
     }
 
     private Category getFullCategoryFromDb(ResultSet rs) throws SQLException {
+        var id = rs.getLong("ID");
         var category = new Category(
                 rs.getString("TITLE"),
                 new Color(rs.getInt("COLOR"))
         );
 
-        category.addTime(rs.getLong("TIME_SPENT"));
-        category.setId(rs.getLong("ID"));
+        category.setId(id);
+        category.setTimeSpents(categoryTimeDao.getAllEntitiesFor(id));
 
         return category;
     }

src/main/java/cz/muni/fi/pv168/project/db/category/CategoryManager.java

@@ -33,8 +33,7 @@ public class CategoryManager implements DataAccessManager {
         return "CREATE TABLE " + getTableName() + "(" +
                 "ID BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY," +
                 "COLOR INT," +
-                "TITLE VARCHAR(256)," +
-                "TIME_SPENT BIGINT" +
+                "TITLE VARCHAR(256)" +
                 ")";
     }
 }

src/main/java/cz/muni/fi/pv168/project/ui/main/view/TaskView.java

@@ -139,12 +139,13 @@ public class TaskView implements Tab<Task> {
                     @Override
                     public void updateTo() {
                         var selectedTask = headerList.getSelectedValue();
+
                         selectedTask.getCategories().forEach(category -> {
                             if (selectedTask.getTaskStatus().equals(TaskStatus.FINISHED)) {
-                                category.addTime(selectedTask.getEstimatedTime());
+                                category.addTime(selectedTask.getEstimatedTime(), selectedTask.getId());
                                 categoryDao.update(category);
                             } else if (selectedTask.getTaskStatus().equals(TaskStatus.PLANNED)) {
-                                category.subtractTime(selectedTask.getEstimatedTime());
+                                category.subtractTime(selectedTask.getId());
                                 categoryDao.update(category);
                             }
                         });