Add support for duplicating assets

build.gradle.kts

@@ -28,6 +28,8 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8")
+    implementation("org.modelmapper:modelmapper:3.2.3")
     compileOnly("org.projectlombok:lombok")
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     runtimeOnly("org.postgresql:postgresql")

src/main/java/be/seeseepuff/pcinv/PcinvConfig.java

@@ -0,0 +1,15 @@
+package be.seeseepuff.pcinv;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@EnableWebMvc
+public class PcinvConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**");
+    }
+}

src/main/java/be/seeseepuff/pcinv/controllers/ApiController.java

@@ -0,0 +1,67 @@
+package be.seeseepuff.pcinv.controllers;
+
+import be.seeseepuff.pcinv.meta.AssetDescriptor;
+import be.seeseepuff.pcinv.models.Asset;
+import be.seeseepuff.pcinv.services.AssetService;
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.info.Info;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+@RequestMapping("/api")
+@RestController
+@OpenAPIDefinition(
+        info = @Info(
+                title = "PC Inventory API",
+                version = "1.0",
+                description = "API for managing PC inventory assets. Assets are identified by QR or ID codes."
+        )
+)
+public class ApiController {
+    private final AssetService assetService;
+
+    @Operation(summary = "Lists all types of assets available in the system.")
+    @GetMapping("/assetTypes")
+    public List<String> assets() {
+        return assetService.getAssetDescriptors().getAssets().stream()
+                .map(AssetDescriptor::getType)
+                .toList();
+    }
+
+    @Operation(summary = "Lists all information of a specific asset.")
+    @GetMapping("/asset/{qr}")
+    public Asset getAsset(
+            @PathVariable @Parameter(name = "qr", description = "The QR number of the asset") long qr
+    ) {
+        return assetService.getAssetByQr(qr);
+    }
+
+    @Operation(summary = "Adds a work log entry to an asset.")
+    @PostMapping("/asset/worklog")
+    public String addWorkLogEntry(
+            @RequestBody Entry entry
+    ) {
+        var qr = entry.qr;
+        var asset = assetService.getAssetByQr(qr);
+        if (asset == null) {
+            throw new IllegalArgumentException("Asset with QR code " + qr + " not found.");
+        }
+        if (entry.entry == null || entry.entry.isBlank()) {
+            throw new IllegalArgumentException("Work log entry comment cannot be empty.");
+        }
+        assetService.addWorkLogEntry(asset, entry.entry);
+        return "";
+    }
+
+    public static class Entry {
+        @Parameter(name = "qr", description = "The QR number of the asset")
+        public long qr;
+        @Parameter(name = "entry", description = "The work log entry text")
+        public String entry;
+    }
+}

src/main/java/be/seeseepuff/pcinv/controllers/WebController.java

@@ -226,6 +226,27 @@ public class WebController {
         return "create_asset";
     }
 
+    /**
+     * Shows a view where the user can edit an existing asset.
+     *
+     * @param qr The QR code of the asset to edit.
+     */
+    @GetMapping("/duplicate/{qr}")
+    public String duplicate(Model model, @PathVariable long qr) {
+        model.addAttribute(TIME, System.currentTimeMillis());
+        var asset = assetService.getAssetByQr(qr);
+        if (asset == null) {
+            throw new RuntimeException("Asset not found");
+        }
+        String assetType = asset.getAsset().getType();
+        model.addAttribute(ACTION, "duplicate");
+        model.addAttribute(ASSET, asset);
+        model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(assetType));
+        model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(assetType));
+        model.addAttribute(INPUT_LIST, assetService.getInputList(assetType));
+        return "create_asset";
+    }
+
     /**
      * Actually edits an asset based on the form data submitted.
      *

src/main/java/be/seeseepuff/pcinv/meta/AssetProperty.java

@@ -99,7 +99,7 @@ public class AssetProperty {
                 .setter((obj, value) -> {
                     try {
                         property.setAccessible(true);
-                        property.set(obj, value);
+                        property.set(obj, Converters.convert(value, property.getType()));
                     } catch (IllegalAccessException e) {
                         throw new RuntimeException(e);
                     }

src/main/java/be/seeseepuff/pcinv/meta/Converters.java

@@ -0,0 +1,66 @@
+package be.seeseepuff.pcinv.meta;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * Utility class for converting values to different types.
+ */
+@UtilityClass
+public class Converters {
+    /**
+     * Converts a value to the specified target type.
+     *
+     * @param value  The value to convert.
+     * @param target The target class to convert the value to.
+     * @return The converted value, or null if conversion is not possible.
+     */
+    public static Object convert(Object value, Class<?> target) {
+        if (value == null) {
+            return null;
+        }
+        if (target.isInstance(value)) {
+            return value; // No conversion needed
+        }
+        if (value instanceof Long longValue) {
+            return convertLong(longValue, target);
+        }
+        if (value instanceof Integer intValue) {
+            return convertInteger(intValue, target);
+        }
+        throw new ClassCastException("Cannot convert " + value.getClass().getName() + " to " + target.getName());
+    }
+
+    /**
+     * Converts a Long value to the specified target type.
+     *
+     * @param value  The Long value to convert.
+     * @param target The target class to convert the value to.
+     * @return The converted value, or throws ClassCastException if conversion is not possible.
+     */
+    private static Object convertLong(Long value, Class<?> target) {
+        if (target == Long.class || target == long.class) {
+            return value; // No conversion needed
+        }
+        if (target == Integer.class || target == int.class) {
+            return value.intValue();
+        }
+        throw new ClassCastException("Cannot convert " + value.getClass().getName() + " to " + target.getName());
+    }
+
+    /**
+     * Converts an Integer value to the specified target type.
+     *
+     * @param value  The Integer value to convert.
+     * @param target The target class to convert the value to.
+     * @return The converted value, or throws ClassCastException if conversion is not possible.
+     */
+    private static Object convertInteger(Integer value, Class<?> target) {
+        if (target == Integer.class || target == int.class) {
+            return value; // No conversion needed
+        }
+        if (target == Long.class || target == long.class) {
+            return value.longValue();
+        }
+        throw new ClassCastException("Cannot convert " + value.getClass().getName() + " to " + target.getName());
+    }
+}

src/main/java/be/seeseepuff/pcinv/models/ChassisAsset.java

@@ -4,6 +4,7 @@ import be.seeseepuff.pcinv.meta.AssetInfo;
 import be.seeseepuff.pcinv.meta.Description;
 import be.seeseepuff.pcinv.meta.HideInOverview;
 import be.seeseepuff.pcinv.meta.Property;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,6 +22,7 @@ public class ChassisAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The generic asset associated with this RAM.

src/main/java/be/seeseepuff/pcinv/models/CpuAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,6 +22,7 @@ public class CpuAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	@OneToOne(orphanRemoval = true)

src/main/java/be/seeseepuff/pcinv/models/CustomAsset.java

@@ -0,0 +1,30 @@
+package be.seeseepuff.pcinv.models;
+
+import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * Represents a CPU or similar device.
+ */
+@Getter
+@Setter
+@Entity
+@AssetInfo(
+		displayName = "Custom Device",
+		pluralName = "Custom Devices",
+		type = "custom"
+)
+@Table(name = "custom_assets")
+public class CustomAsset implements Asset
+{
+	@Id
+	@GeneratedValue
+	@JsonIgnore
+	private long id;
+
+	@OneToOne(orphanRemoval = true)
+	private GenericAsset asset;
+}

src/main/java/be/seeseepuff/pcinv/models/DisplayAdapterAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class DisplayAdapterAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The generic asset associated with this RAM.

src/main/java/be/seeseepuff/pcinv/models/FloppyDriveAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class FloppyDriveAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The generic asset associated with this RAM.

src/main/java/be/seeseepuff/pcinv/models/GenericAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -27,7 +28,9 @@ public class GenericAsset
 {
 	public static final String TYPE = "asset";
 
-	@Id @GeneratedValue
+	@Id
+	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The QR code attached to the asset, used for identification.

src/main/java/be/seeseepuff/pcinv/models/HddAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,6 +22,7 @@ public class HddAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	@OneToOne(orphanRemoval = true)
@@ -40,12 +42,12 @@ public class HddAsset implements Asset
 	@InputList
 	private String formFactor;
 
-	@Description("The drive's RPM (Revolutions Per Minute) speed, if applicable.")
+	@Description("The drive's RPM (Revolutions Per Minute) speed.")
 	@Property("RPM Speed")
 	@HideInOverview
 	private Long rpmSpeed;
 
-	@Description("The drive's cache size, if applicable.")
+	@Description("The drive's cache size.")
 	@Property("Cache Size")
 	@HideInOverview
 	private Long cacheSize;
@@ -54,4 +56,19 @@ public class HddAsset implements Asset
 	@Property("Drive Type")
 	@InputList
 	private String driveType;
+
+	@Description("Number of heads in the drive.")
+	@Property("Heads")
+	@HideInOverview
+	private Integer heads;
+
+	@Description("Number of cylinders in the drive.")
+	@Property("Cylinders")
+	@HideInOverview
+	private Integer cylinders;
+
+	@Description("Number of sectors in the drive.")
+	@Property("Sectors")
+	@HideInOverview
+	private Integer sectors;
 }

src/main/java/be/seeseepuff/pcinv/models/MotherboardAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class MotherboardAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The generic asset associated with this RAM.

src/main/java/be/seeseepuff/pcinv/models/NICAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class NICAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The generic asset associated with this RAM.

src/main/java/be/seeseepuff/pcinv/models/OpticalDriveAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class OpticalDriveAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The generic asset associated with this RAM.

src/main/java/be/seeseepuff/pcinv/models/PowerSupplyAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class PowerSupplyAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The generic asset associated with this RAM.

src/main/java/be/seeseepuff/pcinv/models/RamAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,6 +22,7 @@ public class RamAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	@OneToOne(orphanRemoval = true)

src/main/java/be/seeseepuff/pcinv/models/SoundAdapterAsset.java

@@ -1,6 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
 import be.seeseepuff.pcinv.meta.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class SoundAdapterAsset implements Asset
 {
 	@Id
 	@GeneratedValue
+	@JsonIgnore
 	private long id;
 
 	/// The generic asset associated with this RAM.

src/main/java/be/seeseepuff/pcinv/models/WorkLogEntry.java

@@ -1,5 +1,7 @@
 package be.seeseepuff.pcinv.models;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -18,8 +20,10 @@ import java.time.ZonedDateTime;
 public class WorkLogEntry {
     @Id
     @GeneratedValue
+    @JsonIgnore
     private long id;
 
+    @JsonIgnore
     @ManyToOne(optional = false)
     private GenericAsset asset;
 
@@ -27,5 +31,6 @@ public class WorkLogEntry {
     private String comment;
 
     /// The date and time when the work log entry was created.
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private ZonedDateTime date;
 }

src/main/java/be/seeseepuff/pcinv/repositories/CustomRepository.java

@@ -0,0 +1,12 @@
+package be.seeseepuff.pcinv.repositories;
+
+import be.seeseepuff.pcinv.models.CustomAsset;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+@SuppressWarnings("unused")
+public interface CustomRepository extends JpaRepository<CustomAsset, Long>, AssetRepository<CustomAsset> {
+    @Override
+    default Class<CustomAsset> getAssetType() {
+        return CustomAsset.class;
+    }
+}

src/main/java/be/seeseepuff/pcinv/services/AssetService.java

@@ -12,6 +12,8 @@ import be.seeseepuff.pcinv.repositories.GenericAssetRepository;
 import be.seeseepuff.pcinv.repositories.WorkLogRepository;
 import jakarta.persistence.EntityManager;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,6 +56,30 @@ public class AssetService {
         return getRepositoryFor(genericAsset.getType()).findByAsset(genericAsset);
     }
 
+    /**
+     * Retrieves an asset by its QR code and duplicates the object.
+     *
+     * @param qr the QR code of the asset to retrieve
+     * @return the Asset associated with the given QR code, or null if no duplicate is found
+     */
+    @SneakyThrows
+    public Asset getAssetDuplicateByQr(long qr) {
+        var mapper = new ModelMapper();
+        var originalGenericAsset = genericRepository.findByQr(qr);
+        if (originalGenericAsset == null) {
+            throw new IllegalArgumentException("No asset found with QR code: " + qr);
+        }
+        var originalAsset = getRepositoryFor(originalGenericAsset.getType()).findByAsset(originalGenericAsset);
+
+        var genericAsset = mapper.map(originalGenericAsset, GenericAsset.class);
+        genericAsset.setId(0); // Reset ID to create a new instance
+        genericAsset.setQr(0);
+        var asset = mapper.map(originalAsset, originalAsset.getClass());
+        asset.setAsset(genericAsset);
+
+        return asset;
+    }
+
     /**
      * Retrieves all assets of a specific type.
      *

src/main/resources/templates/browse_type.html

@@ -14,6 +14,7 @@
             <td>
                 <a th:href="'/view/'+${a.getQr()}">View</a>
                 <a th:href="'/edit/'+${a.getQr()}">Edit</a>
+                <a th:href="'/duplicate/'+${a.getQr()}">Duplicate</a>
             </td>
         </tr>
     </table>

src/main/resources/templates/create_asset.html

@@ -1,7 +1,7 @@
 <body th:replace="~{fragments :: base(title='Create '+${descriptor.displayName}, content=~{::content})}">
 <div th:fragment="content">
 	<h2>Create a <span th:text="${descriptor.displayName}"></span></h2>
-	<form th:action="'/'+${action}+'/'+${asset != null ? asset.getQr() : descriptor.getType()}" method="post">
+	<form th:action="'/'+${(action == 'duplicate') ? 'create' : action}+'/'+${(asset != null && action != 'duplicate') ? asset.getQr() : descriptor.getType()}" method="post">
 		<div th:each="d : ${descriptors}">
 			<h2 th:text="${d.displayName}"></h2>
 			<table border="1" cellpadding="4">
@@ -17,7 +17,7 @@
 							<input type="text" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${p.getValue(asset)}" th:placeholder="${p.displayName}" th:required="${p.required}"/>
 						</span>
 						<input th:case="STRING" type="text" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${p.getValue(asset)}" th:placeholder="${p.displayName}" th:required="${p.required}"/>
-						<input th:case="INTEGER" type="number" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${p.getValue(asset)}" th:required="${p.required}"/>
+						<input th:case="INTEGER" type="number" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="${(p.name == 'qr' && action == 'duplicate') ? null : p.getValue(asset)}" th:required="${p.required}"/>
 <!--						<input th:case="BOOLEAN" type="checkbox" th:id="${d.asString(p)}" th:name="${d.asString(p)}" th:value="true" th:checked="${asset != null ? p.getValue(asset) : p.defaultValue}"/>-->
 						<span th:case="BOOLEAN">
 							<input th:name="${d.asString(p)}" th:id="${d.asString(p)}+'-null'" type="radio" value="null" th:checked="${asset == null || (p.getValue(asset) == null)}">
@@ -50,7 +50,7 @@
 			</table>
 		</div>
 		<p>
-			<input th:if="${action == 'create'}" type="submit" value="Create">
+			<input th:if="${action == 'create' || action == 'duplicate'}" type="submit" value="Create">
 			<input th:if="${action == 'edit'}" type="submit" value="Save Changes">
 		</p>
 	</form>

src/main/resources/templates/view.html

@@ -15,7 +15,8 @@
     <ul th:if="${action == 'view'}">
       <li><a th:href="'/edit/'+${asset.getQr()}">Edit</a></li>
       <li><a th:href="'/delete/'+${asset.getQr()}">Delete</a></li>
-      <li><a th:href="'/create/'+${asset.getAsset().type}">Create another <span th:text="${descriptor.displayName}">Hard Drive</span> </a></li>
+      <li><a th:href="'/create/'+${asset.getAsset().type}">Create another <span th:text="${descriptor.displayName}">Hard Drive</span></a></li>
+      <li><a th:href="'/duplicate/'+${asset.getQr()}">Duplicate this <span th:text="${descriptor.displayName}">Hard Drive</span></a></li>
       <li><a th:href="'/browse/'+${descriptor.type}">Browse all <span th:text="${descriptor.pluralName}">Hard Drives</span></a></li>
     </ul>
     <ul th:if="${action == 'delete'}">