JoeKung/print-calculator
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat(back-end & front-end): checkout, update form structure, add new DTOs, refactor order logic
All checks were successful
Build, Test and Deploy / test-backend (push) Successful in 1m15s
Details
Build, Test and Deploy / build-and-push (push) Successful in 39s
Details
Build, Test and Deploy / deploy (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Joe Küng
2026-02-12 19:01:48 +01:00
parent 257c60fa5e
commit 044fba8d5a
17 changed files with 813 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/com/printcalculator/BackendApplication.java
View File

@@ -2,8 +2,10 @@ package com.printcalculator;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication
@EnableTransactionManagement
public class BackendApplication {
public static void main(String[] args) {

1
backend/src/main/java/com/printcalculator/controller/CustomQuoteRequestController.java
View File

@@ -21,7 +21,6 @@ import java.util.UUID;
@RestController
@RequestMapping("/api/custom-quote-requests")
@CrossOrigin(origins = "*")
public class CustomQuoteRequestController {
private final CustomQuoteRequestRepository requestRepo;

110
backend/src/main/java/com/printcalculator/controller/OrderController.java
View File

@@ -21,7 +21,6 @@ import java.util.Optional;
@RestController
@RequestMapping("/api/orders")
@CrossOrigin(origins = "*")
public class OrderController {
private final OrderRepository orderRepo;
@@ -45,38 +44,13 @@ public class OrderController {
this.customerRepo = customerRepo;
}
// DTOs
public static class CreateOrderRequest {
public CustomerDto customer;
public AddressDto billingAddress;
public AddressDto shippingAddress;
public boolean shippingSameAsBilling;
}
public static class CustomerDto {
public String email;
public String phone;
public String customerType; // "PRIVATE", "BUSINESS"
}
public static class AddressDto {
public String firstName;
public String lastName;
public String companyName;
public String contactPerson;
public String addressLine1;
public String addressLine2;
public String zip;
public String city;
public String countryCode;
}
// 1. Create Order from Quote
@PostMapping("/from-quote/{quoteSessionId}")
@Transactional
public ResponseEntity<Order> createOrderFromQuote(
@PathVariable UUID quoteSessionId,
@RequestBody CreateOrderRequest request
@RequestBody com.printcalculator.dto.CreateOrderRequest request
) {
// 1. Fetch Quote Session
QuoteSession session = quoteSessionRepo.findById(quoteSessionId)
@@ -91,16 +65,16 @@ public class OrderController {
}
// 2. Handle Customer (Find or Create)
Customer customer = customerRepo.findByEmail(request.customer.email)
Customer customer = customerRepo.findByEmail(request.getCustomer().getEmail())
.orElseGet(() -> {
Customer newC = new Customer();
newC.setEmail(request.customer.email);
newC.setEmail(request.getCustomer().getEmail());
newC.setCreatedAt(OffsetDateTime.now());
return customerRepo.save(newC);
});
// Update customer details?
customer.setPhone(request.customer.phone);
customer.setCustomerType(request.customer.customerType);
customer.setPhone(request.getCustomer().getPhone());
customer.setCustomerType(request.getCustomer().getCustomerType());
customer.setUpdatedAt(OffsetDateTime.now());
customerRepo.save(customer);
@@ -108,39 +82,39 @@ public class OrderController {
Order order = new Order();
order.setSourceQuoteSession(session);
order.setCustomer(customer);
order.setCustomerEmail(request.customer.email);
order.setCustomerPhone(request.customer.phone);
order.setCustomerEmail(request.getCustomer().getEmail());
order.setCustomerPhone(request.getCustomer().getPhone());
order.setStatus("PENDING_PAYMENT");
order.setCreatedAt(OffsetDateTime.now());
order.setUpdatedAt(OffsetDateTime.now());
order.setCurrency("CHF");
// Billing
order.setBillingCustomerType(request.customer.customerType);
if (request.billingAddress != null) {
order.setBillingFirstName(request.billingAddress.firstName);
order.setBillingLastName(request.billingAddress.lastName);
order.setBillingCompanyName(request.billingAddress.companyName);
order.setBillingContactPerson(request.billingAddress.contactPerson);
order.setBillingAddressLine1(request.billingAddress.addressLine1);
order.setBillingAddressLine2(request.billingAddress.addressLine2);
order.setBillingZip(request.billingAddress.zip);
order.setBillingCity(request.billingAddress.city);
order.setBillingCountryCode(request.billingAddress.countryCode != null ? request.billingAddress.countryCode : "CH");
order.setBillingCustomerType(request.getCustomer().getCustomerType());
if (request.getBillingAddress() != null) {
order.setBillingFirstName(request.getBillingAddress().getFirstName());
order.setBillingLastName(request.getBillingAddress().getLastName());
order.setBillingCompanyName(request.getBillingAddress().getCompanyName());
order.setBillingContactPerson(request.getBillingAddress().getContactPerson());
order.setBillingAddressLine1(request.getBillingAddress().getAddressLine1());
order.setBillingAddressLine2(request.getBillingAddress().getAddressLine2());
order.setBillingZip(request.getBillingAddress().getZip());
order.setBillingCity(request.getBillingAddress().getCity());
order.setBillingCountryCode(request.getBillingAddress().getCountryCode() != null ? request.getBillingAddress().getCountryCode() : "CH");
}
// Shipping
order.setShippingSameAsBilling(request.shippingSameAsBilling);
if (!request.shippingSameAsBilling && request.shippingAddress != null) {
order.setShippingFirstName(request.shippingAddress.firstName);
order.setShippingLastName(request.shippingAddress.lastName);
order.setShippingCompanyName(request.shippingAddress.companyName);
order.setShippingContactPerson(request.shippingAddress.contactPerson);
order.setShippingAddressLine1(request.shippingAddress.addressLine1);
order.setShippingAddressLine2(request.shippingAddress.addressLine2);
order.setShippingZip(request.shippingAddress.zip);
order.setShippingCity(request.shippingAddress.city);
order.setShippingCountryCode(request.shippingAddress.countryCode != null ? request.shippingAddress.countryCode : "CH");
order.setShippingSameAsBilling(request.isShippingSameAsBilling());
if (!request.isShippingSameAsBilling() && request.getShippingAddress() != null) {
order.setShippingFirstName(request.getShippingAddress().getFirstName());
order.setShippingLastName(request.getShippingAddress().getLastName());
order.setShippingCompanyName(request.getShippingAddress().getCompanyName());
order.setShippingContactPerson(request.getShippingAddress().getContactPerson());
order.setShippingAddressLine1(request.getShippingAddress().getAddressLine1());
order.setShippingAddressLine2(request.getShippingAddress().getAddressLine2());
order.setShippingZip(request.getShippingAddress().getZip());
order.setShippingCity(request.getShippingAddress().getCity());
order.setShippingCountryCode(request.getShippingAddress().getCountryCode() != null ? request.getShippingAddress().getCountryCode() : "CH");
} else {
// Copy billing to shipping? Or leave empty and rely on flag?
// Usually explicit copy is safer for queries
@@ -185,14 +159,6 @@ public class OrderController {
String ext = getExtension(qItem.getOriginalFilename());
String storedFilename = fileUuid.toString() + "." + ext;
// Note: We don't have the orderItemId yet because we haven't saved it.
// We can pre-generate ID or save order item then update path?
// GeneratedValue strategy AUTO might not let us set ID easily?
// Let's save item first with temporary path, then update?
// OR use a path structure that doesn't depend on ItemId? "orders/{orderId}/3d-files/{uuid}.ext" is also fine?
// User requested: "orders/{orderId}/3d-files/{orderItemId}/{uuid}.{ext}"
// So we need OrderItemId.
oItem.setStoredFilename(storedFilename);
oItem.setStoredRelativePath("PENDING"); // Placeholder
oItem.setMimeType("application/octet-stream"); // specific type if known
@@ -202,6 +168,24 @@ public class OrderController {
// Update Path now that we have ID
String relativePath = "orders/" + order.getId() + "/3d-files/" + oItem.getId() + "/" + storedFilename;
oItem.setStoredRelativePath(relativePath);
// COPY FILE from Quote to Order
if (qItem.getStoredPath() != null) {
try {
Path sourcePath = Paths.get(qItem.getStoredPath());
if (Files.exists(sourcePath)) {
Path targetPath = Paths.get(STORAGE_ROOT, relativePath);
Files.createDirectories(targetPath.getParent());
Files.copy(sourcePath, targetPath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
oItem.setFileSizeBytes(Files.size(targetPath));
}
} catch (IOException e) {
e.printStackTrace(); // Log error but allow order creation? Or fail?
// Ideally fail or mark as error
}
}
orderItemRepo.save(oItem);
subtotal = subtotal.add(oItem.getLineTotalChf());

30
backend/src/main/java/com/printcalculator/controller/QuoteSessionController.java
View File

@@ -20,6 +20,7 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.List;
@@ -96,9 +97,21 @@ public class QuoteSessionController {
private QuoteLineItem addItemToSession(QuoteSession session, MultipartFile file, com.printcalculator.dto.PrintSettingsDto settings) throws IOException {
if (file.isEmpty()) throw new IOException("File is empty");
// 1. Save file temporarily
Path tempInput = Files.createTempFile("upload_", "_" + file.getOriginalFilename());
file.transferTo(tempInput.toFile());
// 1. Define Persistent Storage Path
// Structure: storage_quotes/{sessionId}/{uuid}.{ext}
String storageDir = "storage_quotes/" + session.getId();
Files.createDirectories(Paths.get(storageDir));
String originalFilename = file.getOriginalFilename();
String ext = originalFilename != null && originalFilename.contains(".")
? originalFilename.substring(originalFilename.lastIndexOf("."))
: ".stl";
String storedFilename = UUID.randomUUID() + ext;
Path persistentPath = Paths.get(storageDir, storedFilename);
// Save file
Files.copy(file.getInputStream(), persistentPath);
try {
// Apply Basic/Advanced Logic
@@ -142,9 +155,9 @@ public class QuoteSessionController {
if (settings.getInfillDensity() != null) processOverrides.put("sparse_infill_density", settings.getInfillDensity() + "%");
if (settings.getInfillPattern() != null) processOverrides.put("sparse_infill_pattern", settings.getInfillPattern());
// 3. Slice
// 3. Slice (Use persistent path)
PrintStats stats = slicerService.slice(
tempInput.toFile(),
persistentPath.toFile(),
machineProfile,
filamentProfile,
processProfile,
@@ -159,6 +172,7 @@ public class QuoteSessionController {
QuoteLineItem item = new QuoteLineItem();
item.setQuoteSession(session);
item.setOriginalFilename(file.getOriginalFilename());
item.setStoredPath(persistentPath.toString()); // SAVE PATH
item.setQuantity(1);
item.setColorCode(settings.getColor() != null ? settings.getColor() : "#FFFFFF");
item.setStatus("READY"); // or CALCULATED
@@ -188,8 +202,10 @@ public class QuoteSessionController {
return lineItemRepo.save(item);
} finally {
Files.deleteIfExists(tempInput);
} catch (Exception e) {
// Cleanup if failed
Files.deleteIfExists(persistentPath);
throw e;
}
}

16
backend/src/main/java/com/printcalculator/dto/AddressDto.java Normal file
View File

@@ -0,0 +1,16 @@
package com.printcalculator.dto;
import lombok.Data;
@Data
public class AddressDto {
private String firstName;
private String lastName;
private String companyName;
private String contactPerson;
private String addressLine1;
private String addressLine2;
private String zip;
private String city;
private String countryCode;
}

11
backend/src/main/java/com/printcalculator/dto/CreateOrderRequest.java Normal file
View File

@@ -0,0 +1,11 @@
package com.printcalculator.dto;
import lombok.Data;
@Data
public class CreateOrderRequest {
private CustomerDto customer;
private AddressDto billingAddress;
private AddressDto shippingAddress;
private boolean shippingSameAsBilling;
}

10
backend/src/main/java/com/printcalculator/dto/CustomerDto.java Normal file
View File

@@ -0,0 +1,10 @@
package com.printcalculator.dto;
import lombok.Data;
@Data
public class CustomerDto {
private String email;
private String phone;
private String customerType; // "PRIVATE", "BUSINESS"
}

12
backend/src/main/java/com/printcalculator/entity/QuoteLineItem.java
View File

@@ -24,6 +24,7 @@ public class QuoteLineItem {
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@OnDelete(action = OnDeleteAction.CASCADE)
@JoinColumn(name = "quote_session_id", nullable = false)
@com.fasterxml.jackson.annotation.JsonIgnore
private QuoteSession quoteSession;
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
@@ -64,6 +65,9 @@ public class QuoteLineItem {
@Column(name = "error_message", length = Integer.MAX_VALUE)
private String errorMessage;
@Column(name = "stored_path", length = Integer.MAX_VALUE)
private String storedPath;
@ColumnDefault("now()")
@Column(name = "created_at", nullable = false)
private OffsetDateTime createdAt;
@@ -184,6 +188,14 @@ public class QuoteLineItem {
this.errorMessage = errorMessage;
}
public String getStoredPath() {
return storedPath;
}
public void setStoredPath(String storedPath) {
this.storedPath = storedPath;
}
public OffsetDateTime getCreatedAt() {
return createdAt;
}