Experiment

malcolm-cephas · malcolm-cephas · commit c3cd74b89e97 · 2026-03-31T09:48:45.000+05:30
diff --git a/src/main/java/com/malcolm/expensesplitter/controllers/AddExpenseController.java b/src/main/java/com/malcolm/expensesplitter/controllers/AddExpenseController.java
@@ -11,6 +11,11 @@
 import javafx.scene.control.*;
 import javafx.application.Platform;
 import javafx.stage.Stage;
+import javafx.stage.FileChooser;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import java.io.File;
+import com.malcolm.expensesplitter.services.ReceiptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -50,6 +55,9 @@ public class AddExpenseController {
     @Autowired
     private ExchangeRateService exchangeRateService;
 
+    @Autowired
+    private ReceiptService receiptService;
+
     @FXML
     private TextField descriptionField;
 
@@ -94,6 +102,16 @@ public class AddExpenseController {
     @FXML
     private Button saveAndNewButton;
 
+    @FXML
+    private Label receiptPathLabel;
+
+    @FXML
+    private ImageView receiptPreview;
+
+    @FXML
+    private Button removeReceiptButton;
+
+    private String currentReceiptPath;
     private Group currentGroup;
     private Stage dialogStage;
     private boolean saveClicked = false;
@@ -162,6 +180,7 @@ protected void updateItem(User item, boolean empty) {
         categoryComboBox.getSelectionModel().selectFirst();
 
         setupDatePicker();
+        currentReceiptPath = null;
     }
 
     private void setupDatePicker() {
@@ -261,6 +280,15 @@ public void setExpenseToEdit(Expense expense) {
             } else {
                 currencyComboBox.getSelectionModel().selectFirst();
             }
+
+            if (expense.getReceiptPath() != null && !expense.getReceiptPath().isEmpty()) {
+                this.currentReceiptPath = expense.getReceiptPath();
+                updateReceiptUI();
+            } else {
+                this.currentReceiptPath = null;
+                updateReceiptUI();
+            }
+
             if (saveAndNewButton != null) {
                 saveAndNewButton.setVisible(false);
                 saveAndNewButton.setManaged(false);
@@ -311,6 +339,9 @@ public void setExpenseToEdit(Expense expense) {
             currencyComboBox.getSelectionModel().selectFirst();
             expenseDatePicker.setValue(LocalDate.now());
 
+            currentReceiptPath = null;
+            updateReceiptUI();
+
             if (saveAndNewButton != null) {
                 saveAndNewButton.setVisible(true);
                 saveAndNewButton.setManaged(true);
@@ -499,10 +530,10 @@ private boolean saveInternal() {
 
             if (expenseToEdit != null) {
                 expenseService.updateExpense(expenseToEdit.getId(), currentGroup.getId(), paymentInputs, amount,
-                        description, paymentMode, category, expenseDate, splitType, splitInputs, currency);
+                        description, paymentMode, category, expenseDate, splitType, splitInputs, currency, currentReceiptPath);
             } else {
                 expenseService.addExpense(currentGroup.getId(), paymentInputs, amount, description, paymentMode,
-                        category, expenseDate, splitType, splitInputs, currency);
+                        category, expenseDate, splitType, splitInputs, currency, currentReceiptPath);
             }
 
             saveClicked = true;
@@ -644,6 +675,64 @@ private void handlePercentageAdjustment(TextField changedField, int totalMembers
         }
     }
 
+    @FXML
+    private void handleChooseReceipt() {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Choose Bill/Receipt Image");
+        fileChooser.getExtensionFilters().addAll(
+                new FileChooser.ExtensionFilter("Image Files", "*.png", "*.jpg", "*.jpeg", "*.gif")
+        );
+
+        File selectedFile = fileChooser.showOpenDialog(dialogStage);
+        if (selectedFile != null) {
+            String savedPath = receiptService.saveReceipt(selectedFile);
+            if (savedPath != null) {
+                this.currentReceiptPath = savedPath;
+                updateReceiptUI();
+            } else {
+                Alert alert = new Alert(Alert.AlertType.ERROR);
+                alert.setTitle("Error");
+                alert.setContentText("Could not save the receipt file.");
+                alert.showAndWait();
+            }
+        }
+    }
+
+    @FXML
+    private void handleRemoveReceipt() {
+        this.currentReceiptPath = null;
+        updateReceiptUI();
+    }
+
+    private void updateReceiptUI() {
+        if (currentReceiptPath != null && !currentReceiptPath.isEmpty()) {
+            File file = new File(currentReceiptPath);
+            if (file.exists()) {
+                receiptPathLabel.setText("Bill attached");
+                receiptPathLabel.setStyle("-fx-text-fill: green;");
+                receiptPreview.setImage(new Image(file.toURI().toString()));
+                receiptPreview.setVisible(true);
+                receiptPreview.setManaged(true);
+                removeReceiptButton.setVisible(true);
+                removeReceiptButton.setManaged(true);
+            } else {
+                resetReceiptUI();
+            }
+        } else {
+            resetReceiptUI();
+        }
+    }
+
+    private void resetReceiptUI() {
+        receiptPathLabel.setText("No bill attached");
+        receiptPathLabel.setStyle("-fx-text-fill: gray;");
+        receiptPreview.setImage(null);
+        receiptPreview.setVisible(false);
+        receiptPreview.setManaged(false);
+        removeReceiptButton.setVisible(false);
+        removeReceiptButton.setManaged(false);
+    }
+
     private void handleOtherCurrency(String previousValue) {
         try {
             FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/currency_selection_modal.fxml"));
diff --git a/src/main/java/com/malcolm/expensesplitter/controllers/ExpenseDetailsController.java b/src/main/java/com/malcolm/expensesplitter/controllers/ExpenseDetailsController.java
@@ -12,6 +12,11 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import java.io.File;
+import java.io.IOException;
+import java.awt.Desktop;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import java.time.format.DateTimeFormatter;
@@ -35,6 +40,12 @@ public class ExpenseDetailsController {
     @FXML
     private VBox splitsContainer;
 
+    @FXML
+    private VBox receiptContainer;
+
+    @FXML
+    private ImageView receiptImageView;
+
     private Expense currentExpense;
     private Stage dialogStage;
     private boolean changed = false;
@@ -67,6 +78,23 @@ public void setExpense(Expense expense) {
         }
 
         loadSplits();
+        loadReceipt();
+    }
+
+    private void loadReceipt() {
+        String path = currentExpense.getReceiptPath();
+        if (path != null && !path.isEmpty()) {
+            File file = new File(path);
+            if (file.exists()) {
+                Image image = new Image(file.toURI().toString());
+                receiptImageView.setImage(image);
+                receiptContainer.setVisible(true);
+                receiptContainer.setManaged(true);
+                return;
+            }
+        }
+        receiptContainer.setVisible(false);
+        receiptContainer.setManaged(false);
     }
 
     private void loadSplits() {
@@ -135,4 +163,21 @@ public boolean isChanged() {
     private void handleClose() {
         dialogStage.close();
     }
+
+    @FXML
+    private void handleOpenReceiptExternally() {
+        String path = currentExpense.getReceiptPath();
+        if (path != null && !path.isEmpty()) {
+            File file = new File(path);
+            if (file.exists()) {
+                if (Desktop.isDesktopSupported()) {
+                    try {
+                        Desktop.getDesktop().open(file);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/malcolm/expensesplitter/controllers/rest/ExpenseRestController.java b/src/main/java/com/malcolm/expensesplitter/controllers/rest/ExpenseRestController.java
@@ -109,7 +109,7 @@ public ResponseEntity<?> createExpense(
                 category, 
                 expenseDate != null ? expenseDate : LocalDate.now(), 
                 splitType, splitInputs, 
-                currency != null ? currency : "INR");
+                currency != null ? currency : "INR", null);
 
         return ResponseEntity.ok(expense);
     }
diff --git a/src/main/java/com/malcolm/expensesplitter/services/ExpenseService.java b/src/main/java/com/malcolm/expensesplitter/services/ExpenseService.java
@@ -115,13 +115,14 @@ public Expense updateEqualExpense(UUID expenseId, UUID groupId, UUID paidById, B
 
     public Expense addExpense(UUID groupId, Map<UUID, BigDecimal> paymentInputs, BigDecimal amount, String description,
             String paymentMode, String category, LocalDate expenseDate, SplitType splitType,
-            Map<UUID, BigDecimal> splitInputs, String currency) {
+            Map<UUID, BigDecimal> splitInputs, String currency, String receiptPath) {
         Group group = groupRepository.findById(groupId).orElseThrow();
 
         Expense expense = new Expense(group, amount, description, splitType);
         expense.setPaymentMode(paymentMode);
         expense.setCategory(category);
         expense.setCurrency(currency);
+        expense.setReceiptPath(receiptPath);
         if (expenseDate != null)
             expense.setExpenseDate(expenseDate);
 
@@ -150,15 +151,15 @@ public Expense addExpense(UUID groupId, Map<UUID, BigDecimal> paymentInputs, Big
     // For legacy/simple calls with single payer
     public Expense addExpense(UUID groupId, UUID paidById, BigDecimal amount, String description,
             String paymentMode, String category, LocalDate expenseDate, SplitType splitType,
-            Map<UUID, BigDecimal> splitInputs, String currency) {
+            Map<UUID, BigDecimal> splitInputs, String currency, String receiptPath) {
         Map<UUID, BigDecimal> paymentInputs = java.util.Collections.singletonMap(paidById, amount);
         return addExpense(groupId, paymentInputs, amount, description, paymentMode, category, expenseDate, splitType,
-                splitInputs, currency);
+                splitInputs, currency, receiptPath);
     }
 
     public Expense updateExpense(UUID expenseId, UUID groupId, Map<UUID, BigDecimal> paymentInputs, BigDecimal amount,
             String description, String paymentMode, String category, LocalDate expenseDate, SplitType splitType,
-            Map<UUID, BigDecimal> splitInputs, String currency) {
+            Map<UUID, BigDecimal> splitInputs, String currency, String receiptPath) {
         Expense expense = expenseRepository.findById(expenseId).orElseThrow();
         Group group = groupRepository.findById(groupId).orElseThrow();
 
@@ -168,6 +169,7 @@ public Expense updateExpense(UUID expenseId, UUID groupId, Map<UUID, BigDecimal>
         expense.setCategory(category);
         expense.setSplitType(splitType);
         expense.setCurrency(currency);
+        expense.setReceiptPath(receiptPath);
         if (expenseDate != null)
             expense.setExpenseDate(expenseDate);
 
@@ -195,10 +197,10 @@ public Expense updateExpense(UUID expenseId, UUID groupId, Map<UUID, BigDecimal>
     // For legacy/simple calls with single payer
     public Expense updateExpense(UUID expenseId, UUID groupId, UUID paidById, BigDecimal amount,
             String description, String paymentMode, String category, LocalDate expenseDate, SplitType splitType,
-            Map<UUID, BigDecimal> splitInputs, String currency) {
+            Map<UUID, BigDecimal> splitInputs, String currency, String receiptPath) {
         Map<UUID, BigDecimal> paymentInputs = java.util.Collections.singletonMap(paidById, amount);
         return updateExpense(expenseId, groupId, paymentInputs, amount, description, paymentMode, category, expenseDate,
-                splitType, splitInputs, currency);
+                splitType, splitInputs, currency, receiptPath);
     }
 
     private void calculateAndAddSplits(Expense expense, SplitType splitType, Map<UUID, BigDecimal> splitInputs,
diff --git a/src/main/java/com/malcolm/expensesplitter/services/ReceiptService.java b/src/main/java/com/malcolm/expensesplitter/services/ReceiptService.java
@@ -0,0 +1,60 @@
+package com.malcolm.expensesplitter.services;
+
+import org.springframework.stereotype.Service;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.UUID;
+
+@Service
+public class ReceiptService {
+
+    private static final String RECEIPT_DIR = "data/receipts/";
+
+    /**
+     * Copies a selected file to the local data/receipts directory and returns the relative path.
+     * 
+     * @param sourceFile The file selected by the user.
+     * @return The path to the stored file, or null if storage failed.
+     */
+    public String saveReceipt(File sourceFile) {
+        if (sourceFile == null) return null;
+
+        try {
+            // Ensure the receipts directory exists
+            Path directory = Paths.get(RECEIPT_DIR);
+            if (!Files.exists(directory)) {
+                Files.createDirectories(directory);
+            }
+
+            // Generate a unique filename to prevent overwrites
+            String extension = "";
+            int i = sourceFile.getName().lastIndexOf('.');
+            if (i > 0) {
+                extension = sourceFile.getName().substring(i);
+            }
+            
+            String fileName = UUID.randomUUID().toString() + extension;
+            Path targetPath = directory.resolve(fileName);
+
+            // Copy the file
+            Files.copy(sourceFile.toPath(), targetPath, StandardCopyOption.REPLACE_EXISTING);
+
+            return targetPath.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Checks if a receipt file exists for a given path.
+     */
+    public boolean receiptExists(String path) {
+        if (path == null || path.isEmpty()) return false;
+        return Files.exists(Paths.get(path));
+    }
+}
diff --git a/src/main/resources/fxml/add_expense_modal.fxml b/src/main/resources/fxml/add_expense_modal.fxml
@@ -2,11 +2,13 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
 <?import javafx.scene.layout.*?>
 
 <BorderPane xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="com.malcolm.expensesplitter.controllers.AddExpenseController"
-            prefWidth="500.0" prefHeight="600.0" styleClass="background">
+            prefWidth="500.0" prefHeight="650.0" styleClass="background">
     <padding>
         <Insets top="20" right="20" bottom="20" left="20"/>
     </padding>
@@ -49,6 +51,16 @@
 
                     <Label text="Date:" GridPane.columnIndex="0" GridPane.rowIndex="6"/>
                     <DatePicker fx:id="expenseDatePicker" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="Infinity"/>
+
+                    <Label text="Receipt (Bill):" GridPane.columnIndex="0" GridPane.rowIndex="7"/>
+                    <VBox spacing="5" GridPane.columnIndex="1" GridPane.rowIndex="7">
+                        <HBox spacing="10" alignment="CENTER_LEFT">
+                            <Button text="Attach Bill..." onAction="#handleChooseReceipt"/>
+                            <Button fx:id="removeReceiptButton" text="Remove" onAction="#handleRemoveReceipt" styleClass="flat" visible="false" managed="false"/>
+                            <Label fx:id="receiptPathLabel" text="No bill attached" style="-fx-text-fill: gray;"/>
+                        </HBox>
+                        <ImageView fx:id="receiptPreview" fitWidth="120" fitHeight="120" preserveRatio="true" visible="false" managed="false"/>
+                    </VBox>
                 </GridPane>
 
                 <Separator/>
diff --git a/src/main/resources/fxml/expense_details_modal.fxml b/src/main/resources/fxml/expense_details_modal.fxml

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public ResponseEntity<?> createExpense(`
`109`	`109`	`category,`
`110`	`110`	`expenseDate != null ? expenseDate : LocalDate.now(),`
`111`	`111`	`splitType, splitInputs,`
`112`		`- currency != null ? currency : "INR");`
	`112`	`+ currency != null ? currency : "INR", null);`
`113`	`113`
`114`	`114`	`return ResponseEntity.ok(expense);`
`115`	`115`	`}`