slight refactor and improve scan result list

burdo · burdo · commit f648fd142dfd · 2025-10-23T18:47:48.000+02:00
diff --git a/src/main/java/de/kaleidox/workbench/WorkbenchApplication.java b/src/main/java/de/kaleidox/workbench/WorkbenchApplication.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.JsonFactoryBuilder;
 import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JSR310Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import de.kaleidox.workbench.model.config.AppConfig;
 import lombok.extern.java.Log;
@@ -32,8 +31,8 @@
 
 @Log
 @ImportResource({ "classpath:beans.xml" })
-@EntityScan(basePackages = "de.kaleidox.workbench.model.jpa")
-@EnableJpaRepositories(basePackages = "de.kaleidox.workbench.repo")
+@EntityScan(basePackages = { "de.kaleidox.workbench.model.jpa", "de.kaleidox.workbench.flk.model.entity" })
+@EnableJpaRepositories(basePackages = { "de.kaleidox.workbench.repo", "de.kaleidox.workbench.flk.model.repo" })
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class WorkbenchApplication implements WebServerFactoryCustomizer<ConfigurableWebServerFactory> {
     public static void main(String[] args) {
diff --git a/src/main/java/de/kaleidox/workbench/flk/FlkConverterController.java b/src/main/java/de/kaleidox/workbench/flk/FlkConverterController.java
@@ -1,9 +1,12 @@
-package de.kaleidox.workbench.flk.converter;
+package de.kaleidox.workbench.flk;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.kaleidox.workbench.flk.FlkResultsFile;
+import de.kaleidox.workbench.flk.converter.FlkConverter;
+import de.kaleidox.workbench.flk.model.entity.FlkScan;
+import de.kaleidox.workbench.flk.model.repo.FlkScanRepository;
 import de.kaleidox.workbench.model.abstr.StorageService;
 import lombok.SneakyThrows;
+import org.comroid.api.func.util.Streams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -21,13 +24,14 @@
 @Controller
 @RequestMapping("/flk")
 public class FlkConverterController {
-    @Autowired StorageService storage;
-    @Autowired FlkConverter   converter;
-    @Autowired ObjectMapper   objectMapper;
+    @Autowired StorageService    storage;
+    @Autowired FlkConverter      converter;
+    @Autowired ObjectMapper      objectMapper;
+    @Autowired FlkScanRepository scans;
 
     @ModelAttribute("available")
-    public List<String> available() {
-        return storage.all().filter(str -> str.endsWith(".json")).toList();
+    public List<FlkScan> available() {
+        return Streams.of(scans.findAll()).toList();
     }
 
     @GetMapping
diff --git a/src/main/java/de/kaleidox/workbench/flk/FlkResultsFile.java b/src/main/java/de/kaleidox/workbench/flk/FlkResultsFile.java
@@ -1,6 +1,6 @@
 package de.kaleidox.workbench.flk;
 
-import de.kaleidox.workbench.flk.model.Test;
+import de.kaleidox.workbench.flk.model.data.Test;
 import lombok.Builder;
 import lombok.Singular;
 import lombok.Value;
diff --git a/src/main/java/de/kaleidox/workbench/flk/converter/CheckParserEntry.java b/src/main/java/de/kaleidox/workbench/flk/converter/CheckParserEntry.java
@@ -1,6 +1,6 @@
 package de.kaleidox.workbench.flk.converter;
 
-import de.kaleidox.workbench.flk.model.Check;
+import de.kaleidox.workbench.flk.model.data.Check;
 import org.comroid.api.attr.Named;
 import org.comroid.api.func.BetterIterator;
 import org.comroid.units.UValue;
diff --git a/src/main/java/de/kaleidox/workbench/flk/converter/FlkConverter.java b/src/main/java/de/kaleidox/workbench/flk/converter/FlkConverter.java
@@ -2,7 +2,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.kaleidox.workbench.flk.FlkResultsFile;
-import de.kaleidox.workbench.flk.model.Test;
+import de.kaleidox.workbench.flk.model.data.Test;
+import de.kaleidox.workbench.flk.model.entity.FlkScan;
+import de.kaleidox.workbench.flk.model.repo.FlkScanRepository;
 import de.kaleidox.workbench.model.abstr.StorageService;
 import de.kaleidox.workbench.storage.StorageContentConverter;
 import lombok.SneakyThrows;
@@ -22,8 +24,9 @@
 @Log
 @Service
 public class FlkConverter implements StorageContentConverter {
-    @Autowired StorageService storage;
-    @Autowired ObjectMapper   objectMapper;
+    @Autowired StorageService    storage;
+    @Autowired ObjectMapper      objectMapper;
+    @Autowired FlkScanRepository scans;
 
     @Override
     @SneakyThrows
@@ -63,6 +66,8 @@ void push() {
         }
 
         var resultData = objectMapper.writeValueAsString(file.build());
-        return storage.store(new ByteArrayInputStream(resultData.getBytes(StandardCharsets.US_ASCII)), ".json");
+        var resultId = storage.store(new ByteArrayInputStream(resultData.getBytes(StandardCharsets.US_ASCII)), ".json");
+        scans.save(new FlkScan(id, resultId));
+        return resultId;
     }
 }
diff --git a/src/main/java/de/kaleidox/workbench/flk/converter/LineParserEntry.java b/src/main/java/de/kaleidox/workbench/flk/converter/LineParserEntry.java
@@ -1,8 +1,8 @@
 package de.kaleidox.workbench.flk.converter;
 
 import de.kaleidox.workbench.flk.FlkResultsFile;
-import de.kaleidox.workbench.flk.model.Test;
-import de.kaleidox.workbench.flk.model.TestMode;
+import de.kaleidox.workbench.flk.model.data.Test;
+import de.kaleidox.workbench.flk.model.data.TestMode;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import org.comroid.api.attr.Named;
diff --git a/src/main/java/de/kaleidox/workbench/flk/model/data/Check.java b/src/main/java/de/kaleidox/workbench/flk/model/data/Check.java
@@ -1,4 +1,4 @@
-package de.kaleidox.workbench.flk.model;
+package de.kaleidox.workbench.flk.model.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Builder;
diff --git a/src/main/java/de/kaleidox/workbench/flk/model/data/Test.java b/src/main/java/de/kaleidox/workbench/flk/model/data/Test.java
@@ -1,4 +1,4 @@
-package de.kaleidox.workbench.flk.model;
+package de.kaleidox.workbench.flk.model.data;
 
 import lombok.Builder;
 import lombok.Singular;
diff --git a/src/main/java/de/kaleidox/workbench/flk/model/data/TestMode.java b/src/main/java/de/kaleidox/workbench/flk/model/data/TestMode.java
@@ -1,4 +1,4 @@
-package de.kaleidox.workbench.flk.model;
+package de.kaleidox.workbench.flk.model.data;
 
 import lombok.Value;
 
diff --git a/src/main/java/de/kaleidox/workbench/flk/model/entity/FlkScan.java b/src/main/java/de/kaleidox/workbench/flk/model/entity/FlkScan.java
@@ -0,0 +1,22 @@
+package de.kaleidox.workbench.flk.model.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@Entity
+@NoArgsConstructor
+public class FlkScan {
+    @Id String sourceFile;
+    String        resultFile;
+    LocalDateTime timestamp = LocalDateTime.now();
+
+    public FlkScan(String sourceFile, String resultFile) {
+        this.sourceFile = sourceFile;
+        this.resultFile = resultFile;
+    }
+}
diff --git a/src/main/java/de/kaleidox/workbench/flk/model/repo/FlkScanRepository.java b/src/main/java/de/kaleidox/workbench/flk/model/repo/FlkScanRepository.java
@@ -0,0 +1,9 @@
+package de.kaleidox.workbench.flk.model.repo;
+
+import de.kaleidox.workbench.flk.model.entity.FlkScan;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FlkScanRepository extends CrudRepository<FlkScan, String> {
+}
diff --git a/src/main/java/de/kaleidox/workbench/model/abstr/StorageService.java b/src/main/java/de/kaleidox/workbench/model/abstr/StorageService.java
@@ -1,7 +1,6 @@
 package de.kaleidox.workbench.model.abstr;
 
 import java.io.InputStream;
-import java.util.stream.Stream;
 
 public interface StorageService {
     /**
@@ -24,9 +23,4 @@ public interface StorageService {
      * @return the data from storage
      */
     InputStream load(String id);
-
-    /**
-     * @return all existing data identifiers
-     */
-    Stream<String> all();
 }
diff --git a/src/main/java/de/kaleidox/workbench/storage/TempFileStorageService.java b/src/main/java/de/kaleidox/workbench/storage/TempFileStorageService.java
@@ -5,17 +5,22 @@
 import org.comroid.api.net.Token;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.util.Arrays;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 
 @Service
+@Controller
+@RequestMapping("/storage/temp")
 public class TempFileStorageService implements StorageService {
     final File baseDir = new File(System.getProperty("java.io.tmpdir"), getClass().getSimpleName() + '/');
 
@@ -48,8 +53,12 @@ public InputStream load(String id) {
         return new FileInputStream(new File(baseDir, id));
     }
 
-    @Override
-    public Stream<String> all() {
-        return Arrays.stream(baseDir.list());
+    @SneakyThrows
+    @ResponseBody
+    @GetMapping("/raw/{id}")
+    public byte[] raw(@PathVariable("id") String id) {
+        try (var input = load(id)) {
+            return input.readAllBytes();
+        }
     }
 }
diff --git a/src/main/resources/templates/flkConverter/upload.html b/src/main/resources/templates/flkConverter/upload.html
@@ -18,9 +18,27 @@
     </form>
     <div class="ui-panel-2">
         <h2>Vorhandene Scans:</h2>
-        <ul>
-            <li th:each="id: ${available}"><a th:href="'/flk/'+${id}" th:text="${id}"></a></li>
-        </ul>
+        <table>
+            <thead>
+            <tr>
+                <td>Datum</td>
+                <td>Eingabedatei</td>
+                <td>Ergebnis</td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="scan: ${available}">
+                <td th:text="${scan.timestamp}"></td>
+                <td>
+                    <a th:href="'/storage/temp/raw/'+${scan.sourceFile}" th:text="${scan.sourceFile}"></a>
+                </td>
+                <td>
+                    <a th:href="'/flk/'+${scan.resultFile}" th:text="${scan.resultFile}"></a>
+                    <a class="ui-edit-link" th:href="'/storage/temp/raw/'+${scan.resultFile}">Rohdaten...</a>
+                </td>
+            </tr>
+            </tbody>
+        </table>
     </div>
 </div>
 <div class="ui-footer" th:insert="~{/layout/footer}"></div>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.kaleidox.workbench.flk.model;`
	`1`	`+package de.kaleidox.workbench.flk.model.data;`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonIgnore;`
`4`	`4`	`import lombok.Builder;`