added day switch logic. added test. added DI for testability. added dateprovider for testability

Author: Death111

src/main/java/de/doubleslash/keeptime/Main.java

@@ -19,9 +19,6 @@
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Settings;
 import de.doubleslash.keeptime.model.Work;
-import de.doubleslash.keeptime.model.repos.ProjectRepository;
-import de.doubleslash.keeptime.model.repos.SettingsRepository;
-import de.doubleslash.keeptime.model.repos.WorkRepository;
 import de.doubleslash.keeptime.view.ViewController;
 import de.doubleslash.keeptime.viewPopup.GlobalScreenListener;
 import de.doubleslash.keeptime.viewPopup.ViewControllerPopup;
@@ -44,35 +41,27 @@ public class Main extends Application {
    public static Stage stage;
    Stage popupViewStage;
 
-   private final Logger Log = LoggerFactory.getLogger(this.getClass());
+   private final Logger LOG = LoggerFactory.getLogger(this.getClass());
 
-   public static Model model;
+   private Model model;
    private Controller controller;
 
-   public static ProjectRepository projectRepository;
-
-   public static WorkRepository workRepository;
-   public static SettingsRepository settingsRepository;
-
    @Override
    public void init() throws Exception {
       springContext = SpringApplication.run(Main.class);
+      // TODO test if everywhere is used the same model
+      model = springContext.getBean(Model.class);
+      controller = springContext.getBean(Controller.class);
    }
 
    @Override
    public void start(final Stage primaryStage) throws Exception {
       stage = primaryStage;
 
-      Log.debug("Reading configuration");
-      model = springContext.getBean(Model.class);
-
-      projectRepository = springContext.getBean(ProjectRepository.class);
-      workRepository = springContext.getBean(WorkRepository.class);
-      settingsRepository = springContext.getBean(SettingsRepository.class);
-      // TODO how to do data migration for updates??
+      LOG.debug("Reading configuration");
 
       // TODO there should just be one instance of settings in the repo
-      final List<Settings> settingsList = settingsRepository.findAll();
+      final List<Settings> settingsList = model.settingsRepository.findAll();
       final Settings settings;
       if (settingsList.isEmpty()) {
          settings = new Settings();
@@ -85,7 +74,7 @@ public void start(final Stage primaryStage) throws Exception {
          settings.setHoverFontColor(model.hoverFontColor.get());
          settings.setUseHotkey(false);
          settings.setDisplayProjectsRight(false);
-         settingsRepository.save(settings);
+         model.settingsRepository.save(settings);
       } else {
          settings = settingsList.get(0);
       }
@@ -98,19 +87,19 @@ public void start(final Stage primaryStage) throws Exception {
       model.useHotkey.set(settings.isUseHotkey());
       model.displayProjectsRight.set(settings.isDisplayProjectsRight());
 
-      final List<Work> todaysWorkItems = workRepository.findByCreationDate(LocalDate.now());
-      Log.info("Found {} past work items", todaysWorkItems.size());
+      final List<Work> todaysWorkItems = model.workRepository.findByCreationDate(LocalDate.now());
+      LOG.info("Found {} past work items", todaysWorkItems.size());
       model.pastWorkItems.addAll(todaysWorkItems);
 
       // createProjects();
 
-      final List<Project> projects = projectRepository.findAll();
+      final List<Project> projects = model.projectRepository.findAll();
 
-      Log.debug("Found '{}' projects", projects.size());
+      LOG.debug("Found '{}' projects", projects.size());
       if (projects.isEmpty()) {
-         Log.info("Adding default project");
+         LOG.info("Adding default project");
          projects.add(model.DEFAULT_PROJECT);
-         projectRepository.save(model.DEFAULT_PROJECT);
+         model.projectRepository.save(model.DEFAULT_PROJECT);
       }
 
       model.allProjects.addAll(projects);
@@ -121,7 +110,7 @@ public void start(final Stage primaryStage) throws Exception {
       final Optional<Project> findAny = projects.stream().filter(p -> p.isDefault()).findAny();
       if (findAny.isPresent()) {
          model.idleProject = findAny.get();
-         Log.debug("Using project '{}' as default project.", model.idleProject);
+         LOG.debug("Using project '{}' as default project.", model.idleProject);
       }
 
       primaryStage.setOnHiding((we) -> {
@@ -185,7 +174,7 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
    }
 
    private void shutdown() {
-      Log.info("Shutting down");
+      LOG.info("Shutting down");
       // viewController.changeProject(model.idleProject, 0); // TODO not so nice (view has the comments for the current
       // // job)
       controller.shutdown();
@@ -216,7 +205,7 @@ private void initialiseUI(final Stage primaryStage) {
          primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>() {
             @Override
             public void handle(final WindowEvent event) {
-               Log.info("On close request");
+               LOG.info("On close request");
                // shutdown();
                // Platform.exit();
             }
@@ -226,14 +215,14 @@ public void handle(final WindowEvent event) {
          // Give the controller access to the main app.
          viewController.setStage(primaryStage);
 
-         controller = springContext.getBean(Controller.class, model);
+         // controller = springContext.getBean(Controller.class, model, new RealDateProvider());
 
          viewController.setController(controller, model);
 
          primaryStage.show();
 
       } catch (final Exception e) {
-         Log.error("Error: " + e.toString(), e);
+         LOG.error("Error: " + e.toString(), e);
          e.printStackTrace();
       }
    }

src/main/java/de/doubleslash/keeptime/common/DateProvider.java

@@ -0,0 +1,12 @@
+package de.doubleslash.keeptime.common;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+public interface DateProvider {
+
+   LocalDateTime dateTimeNow();
+
+   LocalDate dateNow();
+
+}

src/main/java/de/doubleslash/keeptime/common/RealDateProvider.java

@@ -0,0 +1,19 @@
+package de.doubleslash.keeptime.common;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class RealDateProvider implements DateProvider {
+   @Override
+   public LocalDateTime dateTimeNow() {
+      return LocalDateTime.now();
+   }
+
+   @Override
+   public LocalDate dateNow() {
+      return LocalDate.now();
+   }
+}

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -10,10 +10,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.doubleslash.keeptime.Main;
 import de.doubleslash.keeptime.common.DateFormatter;
+import de.doubleslash.keeptime.common.DateProvider;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Settings;
@@ -27,9 +28,12 @@ public class Controller {
 
    private final Model model;
 
-   public Controller(final Model model) {
-      this.model = model;
+   private final DateProvider dateProvider;
 
+   @Autowired
+   public Controller(final Model model, final DateProvider dateProvider) {
+      this.model = model;
+      this.dateProvider = dateProvider;
    }
 
    public void changeProject(final Project newProject) {
@@ -41,7 +45,7 @@ public void changeProject(final Project newProject, final long minusSeconds) {
 
       final Work currentWork = model.activeWorkItem.get();
 
-      final LocalDateTime now = LocalDateTime.now().minusSeconds(minusSeconds);
+      final LocalDateTime now = dateProvider.dateTimeNow().minusSeconds(minusSeconds);
       if (currentWork != null) {
          currentWork.setEndTime(now);
          // currentWork.setNotes(notes);
@@ -55,13 +59,16 @@ public void changeProject(final Project newProject, final long minusSeconds) {
                currentWork.getEndTime(), time, currentWork.getProject().getName(), currentWork.getNotes());
 
          // Save in db
-         Main.workRepository.save(currentWork);
+         model.workRepository.save(currentWork);
       }
 
       // Start new work
-      final Work work = new Work(now, now.plusSeconds(minusSeconds), newProject, "");
+      final Work work = new Work(dateProvider.dateNow(), now, now.plusSeconds(minusSeconds), newProject, "");
       model.pastWorkItems.add(work);
-
+      if (currentWork != null && !currentWork.getCreationDate().isEqual(work.getCreationDate())) {
+         Log.info("Removing projects from the other daya then today from list.");
+         model.pastWorkItems.removeIf(w -> !w.getCreationDate().isEqual(work.getCreationDate()));
+      }
       model.activeWorkItem.set(work);
    }
 
@@ -74,14 +81,14 @@ public void addNewProject(final String projectName, final boolean isWork, final
       final List<Project> changedProjects = resortProjectIndexes(model.availableProjects, project,
             model.availableProjects.size(), index);
       changedProjects.add(project);
-      Main.projectRepository.saveAll(changedProjects);
+      model.projectRepository.saveAll(changedProjects);
    }
 
    public void updateSettings(final Color hoverBackgroundColor, final Color hoverFontColor,
          final Color defaultBackgroundColor, final Color defaultFontColor, final Color taskBarColor,
          final boolean useHotkey, final boolean displayProjectsRight) {
       // TODO create holder for all the properties (or reuse Settings.class?)
-      final Settings settings = Main.settingsRepository.findAll().get(0);
+      final Settings settings = model.settingsRepository.findAll().get(0);
       settings.setTaskBarColor(taskBarColor);
 
       settings.setDefaultBackgroundColor(defaultBackgroundColor);
@@ -92,7 +99,7 @@ public void updateSettings(final Color hoverBackgroundColor, final Color hoverFo
       settings.setUseHotkey(useHotkey);
       settings.setDisplayProjectsRight(displayProjectsRight);
 
-      Main.settingsRepository.save(settings);
+      model.settingsRepository.save(settings);
 
       model.defaultBackgroundColor.set(settings.getDefaultBackgroundColor());
       model.defaultFontColor.set(settings.getDefaultFontColor());
@@ -125,7 +132,7 @@ public void deleteProject(final Project p) {
       final List<Project> changedProjects = adaptProjectIndexesAfterRemoving(model.availableProjects, indexToRemove);
 
       changedProjects.add(p);
-      Main.projectRepository.saveAll(changedProjects);
+      model.projectRepository.saveAll(changedProjects);
    }
 
    public void editProject(final Project p, final String newName, final Color newColor, final boolean isWork,
@@ -142,7 +149,7 @@ public void editProject(final Project p, final String newName, final Color newCo
       changedProjects.add(p);
 
       // save all projects which changed index
-      Main.projectRepository.saveAll(changedProjects);
+      model.projectRepository.saveAll(changedProjects);
    }
 
    /**
@@ -221,8 +228,7 @@ List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList,
    public void setComment(final String notes) {
       final Work work = model.activeWorkItem.get();
       work.setNotes(notes);
-      // TODO when to save to repo??
-      // Main.workRepository.save(work);
+      // TODO when to save to repo?
    }
 
    /**

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -2,8 +2,12 @@
 
 import java.util.Comparator;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import de.doubleslash.keeptime.model.repos.ProjectRepository;
+import de.doubleslash.keeptime.model.repos.SettingsRepository;
+import de.doubleslash.keeptime.model.repos.WorkRepository;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
@@ -13,6 +17,19 @@
 
 @Component
 public class Model {
+   public ProjectRepository projectRepository;
+   public WorkRepository workRepository;
+   public SettingsRepository settingsRepository;
+
+   @Autowired
+   public Model(final ProjectRepository projectRepository, final WorkRepository workRepository,
+         final SettingsRepository settingsRepository) {
+      super();
+      this.projectRepository = projectRepository;
+      this.workRepository = workRepository;
+      this.settingsRepository = settingsRepository;
+   }
+
    public static final Color originalHoverBackgroundColor = new Color(54 / 255., 143 / 255., 179 / 255., .1);
    public static final Color originalHoverFontColor = Color.BLACK;
    public static final Color originalDefaultBackgroundColor = new Color(54 / 255., 143 / 255., 179 / 255., 0.01);

src/main/java/de/doubleslash/keeptime/model/Work.java

@@ -31,9 +31,10 @@ public class Work {
 
    public Work() {}
 
-   public Work(final LocalDateTime startTime, final LocalDateTime endTime, final Project project, final String notes) {
+   public Work(final LocalDate creationDate, final LocalDateTime startTime, final LocalDateTime endTime,
+         final Project project, final String notes) {
       super();
-      this.creationDate = LocalDate.now();
+      this.creationDate = creationDate;
       this.startTime = startTime;
       this.endTime = endTime;
       this.project = project;