#178: add initial sync functionality

Death111 · Death111 · commit e73b6dcdc767 · 2025-01-30T23:30:32.000+01:00
diff --git a/src/main/java/de/doubleslash/keeptime/rest/integration/heimat/HeimatAPI.java b/src/main/java/de/doubleslash/keeptime/rest/integration/heimat/HeimatAPI.java
@@ -4,6 +4,7 @@
 import de.doubleslash.keeptime.rest.integration.heimat.model.HeimatTime;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.util.UriBuilder;
 
@@ -65,19 +66,34 @@ public List<HeimatTime> getMyTimes(final LocalDate forDate) {
 
    // POST /my/times
    public void addMyTime(final HeimatTime heimatTime) {
-      restClient.post()
-                .uri(uriBuilder -> {
-                   UriBuilder builder = uriBuilder.path("/my/times");
-                   return builder.build();
-                })
-                .header("Content-Type", "application/json")
-                .body(heimatTime)
-                .retrieve()
-                .onStatus(HttpStatus.UNAUTHORIZED::equals, (request, response) -> {
-                   throw new UnauthorizedException();
-                });
+      final ResponseEntity<String> responseEntity = restClient.post()
+                                                              .uri(uriBuilder -> {
+                                                                 UriBuilder builder = uriBuilder.path("/my/times");
+                                                                 return builder.build();
+                                                              })
+                                                              .header("Content-Type", "application/json")
+                                                              .body(heimatTime)
+                                                              .retrieve()
+                                                              .onStatus(HttpStatus.UNAUTHORIZED::equals,
+                                                                    (request, response) -> {
+                                                                       throw new UnauthorizedException();
+                                                                    })
+                                                              .toEntity(String.class);
+
+      System.out.println("Status Code: " + responseEntity.getStatusCode());
+      System.out.println("Response Body: " + responseEntity.getBody());
    }
 
    // DELETE /my/times/{id}
+   public void deleteMyTime(final long timeId) {
+      final ResponseEntity<String> responseEntity = restClient.delete().uri(uriBuilder -> {
+         UriBuilder builder = uriBuilder.path("/my/times/" + timeId);
+         return builder.build();
+      }).retrieve().onStatus(HttpStatus.UNAUTHORIZED::equals, (request, response) -> {
+         throw new UnauthorizedException();
+      }).toEntity(String.class);
 
+      System.out.println("Status Code: " + responseEntity.getStatusCode());
+      System.out.println("Response Body: " + responseEntity.getBody());
+   }
 }
diff --git a/src/main/java/de/doubleslash/keeptime/view/ExternalProjectsSyncController.java b/src/main/java/de/doubleslash/keeptime/view/ExternalProjectsSyncController.java
@@ -18,6 +18,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Circle;
+import javafx.stage.Stage;
 import javafx.util.converter.LocalTimeStringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +35,7 @@
 @Component
 public class ExternalProjectsSyncController {
 
-   private static final Logger LOG = LoggerFactory.getLogger(MapExternalProjectsController.class);
+   private static final Logger LOG = LoggerFactory.getLogger(ExternalProjectsSyncController.class);
 
    @FXML
    private TableView<TableRow> mappingTableView;
@@ -60,21 +61,26 @@ public class ExternalProjectsSyncController {
    private final ExternalProjectsMappingsRepository externalProjectsMappingsRepository;
 
    private final LocalTimeStringConverter localTimeStringConverter = new LocalTimeStringConverter(FormatStyle.MEDIUM);
+   private ObservableList<TableRow> items;
+   private final HeimatAPI heimatAPI;
+   private LocalDate currentReportDate;
+   private Stage thisStage;
 
    public ExternalProjectsSyncController(final Controller controller, final Model model, HeimatSettings heimatSettings,
          ExternalProjectsMappingsRepository externalProjectsMappingsRepository) {
       this.controller = controller;
       this.model = model;
       this.heimatSettings = heimatSettings;
       this.externalProjectsMappingsRepository = externalProjectsMappingsRepository;
+      heimatAPI = new HeimatAPI(heimatSettings.getHeimatUrl(), heimatSettings.getHeimatPat());
    }
 
    public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems) {
       dayOfSyncLabel.setText(currentReportDate.format(DateTimeFormatter.BASIC_ISO_DATE));
-
-      final HeimatAPI heimatAPI = new HeimatAPI(heimatSettings.getHeimatUrl(), heimatSettings.getHeimatPat());
+      this.currentReportDate = currentReportDate;
       // TODO check if external projects are available for the currentDay
       // final List<HeimatTask> heimatTasks = heimatAPI.getMyTasks(currentReportDate);
+      // TODO add a spinner while loading?
       final List<HeimatTime> heimatTimes = heimatAPI.getMyTimes(currentReportDate);
       final List<ExternalProjectMapping> mappedProjects = externalProjectsMappingsRepository.findByExternalSystemId(
             ExternalSystem.Heimat);
@@ -95,13 +101,13 @@ public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems
                                                                                                       .getId()
                                                                                             == project.getId())
                                                                                       .findAny();
+         Optional<HeimatTime> optionalAlreadyBookedTime = Optional.empty();
          if (optionalHeimatMapping.isPresent()) {
             isMappedInHeimat = true;
-            final Optional<HeimatTime> optionalAlreadyBookedTime = heimatTimes.stream()
-                                                                              .filter(heimatTime -> heimatTime.taskId()
-                                                                                    == optionalHeimatMapping.get()
-                                                                                                            .getExternalTaskId())
-                                                                              .findAny();
+            optionalAlreadyBookedTime = heimatTimes.stream()
+                                                   .filter(heimatTime -> heimatTime.taskId()
+                                                         == optionalHeimatMapping.get().getExternalTaskId())
+                                                   .findAny();
             if (optionalAlreadyBookedTime.isPresent()) {
                heimatNotes = optionalAlreadyBookedTime.get().note();
                heimatTimeSeconds = optionalAlreadyBookedTime.get().durationInMinutes() * 60L;
@@ -123,10 +129,11 @@ public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems
          if (!isMappedInHeimat) {
             canBeSynced = "Not mapped in Heimat";
          }
-         list.add(new TableRow(project, isMappedInHeimat, canBeSynced, heimatNotes, keeptimeNotes, keeptimeNotes,
-               heimatTimeSeconds, projectWorkSeconds, projectWorkSeconds));
+         list.add(new TableRow(project, isMappedInHeimat ? optionalHeimatMapping.get().getExternalTaskId() : -1,
+               optionalAlreadyBookedTime.orElse(null), isMappedInHeimat, canBeSynced, heimatNotes, keeptimeNotes,
+               keeptimeNotes, heimatTimeSeconds, projectWorkSeconds, projectWorkSeconds));
       }
-      final ObservableList<TableRow> items = FXCollections.observableArrayList(list);
+      items = FXCollections.observableArrayList(list);
       mappingTableView.setItems(items);
 
       ObservableList<TableRow> items2 = FXCollections.observableArrayList(
@@ -138,6 +145,8 @@ public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems
                                          .mapToLong(item -> item.userTimeSeconds.getValue())
                                          .sum())), items2);
       sumTimeLabel.textProperty().bind(Bindings.concat("Total Sum: ", totalSum));
+      // TODO add a label with current Heimat Time
+      // TODO add a label with current Keeptime time
    }
 
    @FXML
@@ -161,6 +170,7 @@ protected void updateItem(Project item, boolean empty) {
                setGraphic(null);
                setText(null);
             } else {
+               // TODO add a reference to the Heimat project which will be used
                //label.setText(item.getName());
                setText(item.getName());
                final Circle circle = new Circle(6, item.getColor());
@@ -222,6 +232,8 @@ protected void updateItem(TableRow item, boolean empty) {
             textArea.setPrefHeight(50);
             textArea.setPrefWidth(100);
             textArea.setWrapText(true);
+            // TODO mark textArea red when not content
+            // TODO make it possible to copy content of heimatNotesLabel
             hbox.getChildren().addAll(new Label("Heimat:"), heimatNotesLabel);
             container.getChildren().addAll(textArea, hbox);
          }
@@ -235,7 +247,7 @@ protected void updateItem(TableRow item, boolean empty) {
                setGraphic(null);
             } else {
                textArea.setText(item.keeptimeNotes.get());
-               stringChangeListener = (obs, oldText, newText) -> item.keeptimeNotes.set(newText);
+               stringChangeListener = (obs, oldText, newText) -> item.userNotes.set(newText);
                textArea.textProperty().addListener(stringChangeListener);
                heimatNotesLabel.setText(item.heimatNotes.get());
                setGraphic(container);
@@ -251,12 +263,43 @@ protected void updateItem(TableRow item, boolean empty) {
 
       saveButton.setOnAction((ae) -> {
          LOG.debug("New mappings to be synced '{}'.", "TODO");
-         // TODO close
+
+         // TODO show progress
+         items.stream().filter(tr -> tr.shouldSyncCheckBox.get()).forEach(tr -> {
+            if (tr.userNotes.get().isEmpty()) {
+               LOG.warn("No notes were given. Skipping '{}'", tr.project.getName());
+               return;
+            }
+            final int durationInMinutes = Math.toIntExact(tr.userTimeSeconds.get() / 60);
+            if (durationInMinutes <= 0 || durationInMinutes % 15 != 0) {
+               LOG.warn("Duration '{}' is not valid for project '{}'.", durationInMinutes, tr.project.getName());
+               return;
+            }
+
+            final HeimatTime heimatTime = new HeimatTime(tr.heimatTaskId, currentReportDate, null, null,
+                  durationInMinutes, tr.userNotes.get(), 0L);
+
+            try {
+               if (tr.optionalExistingTime != null) {
+                  LOG.info("Removing existing booked time '{}'", tr.optionalExistingTime);
+                  heimatAPI.deleteMyTime(tr.optionalExistingTime.id());
+               }
+               LOG.info("Adding new time time '{}'", heimatTime);
+               heimatAPI.addMyTime(heimatTime);
+            } catch (Exception e) {
+               // TODO show errors to the user
+               LOG.error("Error while persisting time '{}'", heimatTime, e);
+            }
+         });
+
+         thisStage.close();
       });
 
       cancelButton.setOnAction(ae -> {
-         // TODO Close
+         thisStage.close();
       });
+
+      // TODO offer some way to book time to an additional project?
    }
 
    private void setUpTimeSpinner(final Spinner<LocalTime> spinner) {
@@ -319,7 +362,13 @@ public static LocalTime incrementToNextFullQuarter(LocalTime time) {
       return time.plusMinutes(increment).withSecond(0).withNano(0);
    }
 
+   public void setStage(final Stage thisStage) {
+      this.thisStage = thisStage;
+   }
+
    static class TableRow {
+      private final long heimatTaskId;
+      private final HeimatTime optionalExistingTime;
       public BooleanProperty shouldSyncCheckBox;
       public Project project;
 
@@ -333,10 +382,12 @@ static class TableRow {
 
       public StringProperty syncStatus;
 
-      public TableRow(final Project project, final boolean shouldSync, final String syncStatus,
-            final String heimatNotes, final String keeptimeNotes, String userNotes, final long heimatTimeSeconds,
-            final long keeptimeSeconds, final long userSeconds) {
+      public TableRow(final Project project, long heimatTaskId, HeimatTime optionalExistingTime,
+            final boolean shouldSync, final String syncStatus, final String heimatNotes, final String keeptimeNotes,
+            String userNotes, final long heimatTimeSeconds, final long keeptimeSeconds, final long userSeconds) {
          this.project = project;
+         this.heimatTaskId = heimatTaskId;
+         this.optionalExistingTime = optionalExistingTime;
          this.shouldSyncCheckBox = new SimpleBooleanProperty(shouldSync);
          this.syncStatus = new SimpleStringProperty(syncStatus);
          this.heimatNotes = new SimpleStringProperty(heimatNotes);
diff --git a/src/main/java/de/doubleslash/keeptime/view/MapExternalProjectsController.java b/src/main/java/de/doubleslash/keeptime/view/MapExternalProjectsController.java
@@ -100,6 +100,7 @@ private void initialize() {
             value.setPredicate(null);
       }));
       filterOnlyWorkCheckBox.setSelected(true);
+      //value.add(new ProjectMapping(null, null)); // TODO somehow allow to create a new project for a task
       mappingTableView.setItems(value);
 
       // KeepTime Project column
diff --git a/src/main/java/de/doubleslash/keeptime/view/ReportController.java b/src/main/java/de/doubleslash/keeptime/view/ReportController.java
@@ -157,8 +157,9 @@ private void showSyncStage() throws IOException {
          ExternalProjectsSyncController settingsController = fxmlLoader2.getController();
          settingsController.initForDate(currentReportDate, currentWorkItems);
          Stage settingsStage = new Stage();
-         //settingsController.setStage(settingsStage);
-         settingsStage.initModality(Modality.APPLICATION_MODAL);
+         settingsController.setStage(settingsStage);
+         settingsStage.initOwner(this.stage);
+         //settingsStage.initModality(Modality.WINDOW_MODAL);
          settingsStage.setTitle("External Project Sync");
          settingsStage.setResizable(true);
          settingsStage.getIcons().add(new Image(Resources.getResource(RESOURCE.ICON_MAIN).toString()));
diff --git a/src/main/resources/db/migration/V1_1_8__initial_heimat_integration.sql b/src/main/resources/db/migration/V1_1_8__initial_heimat_integration.sql
@@ -1,4 +1,4 @@
-CREATE TABLE external_project_mapping (
+CREATE TABLE IF NOT EXISTS  external_project_mapping (
     id                      BIGINT GENERATED BY DEFAULT AS IDENTITY,
     project_id              BIGINT NOT NULL,
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CREATE TABLE external_project_mapping (`
	`1`	`+CREATE TABLE IF NOT EXISTS external_project_mapping (`
`2`	`2`	`id BIGINT GENERATED BY DEFAULT AS IDENTITY,`
`3`	`3`	`project_id BIGINT NOT NULL,`
`4`	`4`