Merge pull request #32 from Tanq16/issuefix

Addressing Feature Reqs & Bug

Author: Tanq16

README.md

@@ -35,7 +35,7 @@ That's why I created this project and I use it in my home lab for my expense tra
 - REST API for expense management
 - Single-user focused (mainly for a home lab deployment)
 - CSV and JSON export and import of all expense data from the UI
-- Custom categories (and ordering) and currency symbol via app settings
+- Custom categories, currency symbol, and start date via app settings
 - Beautiful interface that automatically adapts to system for light/dark theme
 - UUID-based expense identification in the backend
 - Self-contained binary and container image to ensure no internet interaction
@@ -58,6 +58,7 @@ That's why I created this project and I use it in my home lab for my expense tra
 5. Settings page for configuring the application
     - Reorder, add, or remove custom categories
     - Select a custom currency to display
+    - Select a custom start date to show expenses for a different period
     - Exporting data as CSV or JSON and import data from JSON or CSV
 
 ### Progressive Web App (PWA)
@@ -212,6 +213,8 @@ EXPENSE_CATEGORIES="Rent,Food,Transport,Fun,Bills" ./expenseowl
 > [!TIP]
 > The environment variables can be set in a compose stack or using `-e` in the command line with a Docker command. However, remember that they are only effective in setting up the configuration for first start. Otherwise, use the settings UI.
 
+Similarly, the start date can also be set via the settings UI or the `START_DATE` environment variable.
+
 ### Data Import/Export
 
 ExpenseOwl contains a sophisticated method for importing an exporting expenses. The settings page provides the options for exporting all expense data as JSON or CSV. The same page also allows importing data in both JSON and CSV formats.

assets/desktop-dark-settings.png

@@ -23,8 +23,10 @@ func runServer(dataPath string) {
 	http.HandleFunc("/categories", handler.GetCategories)
 	http.HandleFunc("/categories/edit", handler.EditCategories)
 	http.HandleFunc("/currency", handler.EditCurrency)
+	http.HandleFunc("/startdate", handler.EditStartDate)
 	http.HandleFunc("/expense", handler.AddExpense)
 	http.HandleFunc("/expenses", handler.GetExpenses)
+	http.HandleFunc("/expense/edit", handler.EditExpense)
 	http.HandleFunc("/table", handler.ServeTableView)
 	http.HandleFunc("/settings", handler.ServeSettingsPage)
 	http.HandleFunc("/expense/delete", handler.DeleteExpense)

assets/desktop-light-settings.png

@@ -37,6 +37,7 @@ type ExpenseRequest struct {
 type ConfigResponse struct {
 	Categories []string `json:"categories"`
 	Currency   string   `json:"currency"`
+	StartDate  int      `json:"startDate"`
 }
 
 func (h *Handler) GetCategories(w http.ResponseWriter, r *http.Request) {
@@ -48,6 +49,7 @@ func (h *Handler) GetCategories(w http.ResponseWriter, r *http.Request) {
 	response := ConfigResponse{
 		Categories: h.config.Categories,
 		Currency:   h.config.Currency,
+		StartDate:  h.config.StartDate,
 	}
 	writeJSON(w, http.StatusOK, response)
 }
@@ -86,6 +88,23 @@ func (h *Handler) EditCurrency(w http.ResponseWriter, r *http.Request) {
 	log.Println("HTTP: Updated currency")
 }
 
+func (h *Handler) EditStartDate(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPut {
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		log.Println("HTTP ERROR: Method not allowed")
+		return
+	}
+	var startDate int
+	if err := json.NewDecoder(r.Body).Decode(&startDate); err != nil {
+		writeJSON(w, http.StatusBadRequest, ErrorResponse{Error: "Invalid request body"})
+		log.Printf("HTTP ERROR: Failed to decode request body: %v\n", err)
+		return
+	}
+	h.config.UpdateStartDate(startDate)
+	writeJSON(w, http.StatusOK, map[string]string{"status": "success"})
+	log.Println("HTTP: Updated start date")
+}
+
 func (h *Handler) AddExpense(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodPut {
 		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
@@ -120,6 +139,52 @@ func (h *Handler) AddExpense(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, expense)
 }
 
+func (h *Handler) EditExpense(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPut {
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		log.Println("HTTP ERROR: Method not allowed")
+		return
+	}
+	id := r.URL.Query().Get("id")
+	if id == "" {
+		writeJSON(w, http.StatusBadRequest, ErrorResponse{Error: "ID parameter is required"})
+		log.Println("HTTP ERROR: ID parameter is required")
+		return
+	}
+	var req ExpenseRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		writeJSON(w, http.StatusBadRequest, ErrorResponse{Error: "Invalid request body"})
+		log.Printf("HTTP ERROR: Failed to decode request body: %v\n", err)
+		return
+	}
+	if !req.Date.IsZero() {
+		req.Date = req.Date.UTC()
+	}
+	expense := &config.Expense{
+		ID:       id,
+		Name:     req.Name,
+		Category: req.Category,
+		Amount:   req.Amount,
+		Date:     req.Date,
+	}
+	if err := expense.Validate(); err != nil {
+		writeJSON(w, http.StatusBadRequest, ErrorResponse{Error: err.Error()})
+		log.Printf("HTTP ERROR: Failed to validate expense: %v\n", err)
+		return
+	}
+	if err := h.storage.EditExpense(expense); err != nil {
+		if err == storage.ErrExpenseNotFound {
+			writeJSON(w, http.StatusNotFound, ErrorResponse{Error: "Expense not found"})
+			return
+		}
+		writeJSON(w, http.StatusInternalServerError, ErrorResponse{Error: "Failed to edit expense"})
+		log.Printf("HTTP ERROR: Failed to edit expense: %v\n", err)
+		return
+	}
+	writeJSON(w, http.StatusOK, expense)
+	log.Printf("HTTP: Edited expense with ID %s\n", id)
+}
+
 func (h *Handler) GetExpenses(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodGet {
 		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

assets/mobile-dark-settings.png

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -16,12 +17,14 @@ type Config struct {
 	StoragePath string
 	Categories  []string
 	Currency    string
+	StartDate   int
 	mu          sync.RWMutex
 }
 
 type FileConfig struct {
 	Categories []string `json:"categories"`
 	Currency   string   `json:"currency"`
+	StartDate  int      `json:"startDate"`
 }
 
 var defaultCategories = []string{
@@ -104,6 +107,7 @@ func NewConfig(dataPath string) *Config {
 		ServerPort:  "8080",
 		StoragePath: finalPath,
 		Categories:  defaultCategories,
+		StartDate:   1,
 		Currency:    "$", // Default to USD
 	}
 	configPath := filepath.Join(finalPath, "config.json")
@@ -123,9 +127,19 @@ func NewConfig(dataPath string) *Config {
 			}
 			log.Println("Using custom currency from environment variables")
 		}
+		if envStartDate := strings.ToLower(os.Getenv("START_DATE")); envStartDate != "" {
+			startDate, err := strconv.Atoi(envStartDate)
+			if err != nil {
+				log.Println("START_DATE is not a number, using default (1)")
+			} else {
+				cfg.StartDate = startDate
+				log.Println("using custom start date from environment variables")
+			}
+		}
 	} else if fileConfig, err := loadConfigFile(configPath); err == nil {
 		cfg.Categories = fileConfig.Categories
 		cfg.Currency = fileConfig.Currency
+		cfg.StartDate = fileConfig.StartDate
 		log.Println("Loaded configuration from file")
 	}
 	cfg.SaveConfig()
@@ -151,6 +165,7 @@ func (c *Config) SaveConfig() error {
 	fileConfig := FileConfig{
 		Categories: c.Categories,
 		Currency:   c.Currency,
+		StartDate:  c.StartDate,
 	}
 	data, err := json.MarshalIndent(fileConfig, "", "    ")
 	if err != nil {
@@ -177,3 +192,10 @@ func (c *Config) UpdateCurrency(currencyCode string) error {
 	c.mu.Unlock()
 	return c.SaveConfig()
 }
+
+func (c *Config) UpdateStartDate(startDate int) error {
+	c.mu.Lock()
+	c.StartDate = max(min(startDate, 31), 1)
+	c.mu.Unlock()
+	return c.SaveConfig()
+}

assets/mobile-light-settings.png

@@ -23,6 +23,7 @@ type Storage interface {
 	SaveExpense(expense *config.Expense) error
 	GetAllExpenses() ([]*config.Expense, error)
 	DeleteExpense(id string) error
+	EditExpense(expense *config.Expense) error
 }
 
 type jsonStore struct {
@@ -98,6 +99,29 @@ func (s *jsonStore) DeleteExpense(id string) error {
 	return s.writeFile(data)
 }
 
+func (s *jsonStore) EditExpense(expense *config.Expense) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	data, err := s.readFile()
+	if err != nil {
+		return fmt.Errorf("failed to read storage file: %v", err)
+	}
+	found := false
+	for i, exp := range data.Expenses {
+		if exp.ID == expense.ID {
+			expense.Date = exp.Date
+			data.Expenses[i] = expense
+			found = true
+			break
+		}
+	}
+	if !found {
+		return ErrExpenseNotFound
+	}
+	log.Printf("Edited expense with ID %s\n", expense.ID)
+	return s.writeFile(data)
+}
+
 func (s *jsonStore) GetAllExpenses() ([]*config.Expense, error) {
 	s.mu.RLock()
 	defer s.mu.RUnlock()

cmd/expenseowl/main.go

@@ -94,8 +94,12 @@
                     <input type="date" id="date" required>
                     <script>
                         // Set today's date as default
-                        const now = new Date();
-                        document.getElementById('date').valueAsDate = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+                        const today = new Date();
+                        const year = today.getFullYear();
+                        const month = String(today.getMonth() + 1).padStart(2, '0'); // January is 0
+                        const day = String(today.getDate()).padStart(2, '0');
+                        const formattedDate = `${year}-${month}-${day}`;
+                        document.getElementById('date').value = formattedDate;
                     </script>
                 </div>
 
@@ -107,6 +111,7 @@
     </div>
     <script>
         let currencySymbol = '$'; // Default to USD
+        let startDate = 1;
         let pieChart = null;
         let currentDate = new Date();
         let allExpenses = [];
@@ -306,6 +311,7 @@
                     `<option value="${cat}">${cat}</option>`
                 ).join('');
                 currencySymbol = config.currency;
+                startDate = config.startDate;
                 // Fetch expenses
                 const response = await fetch('/expenses');
                 if (!response.ok) throw new Error('Failed to fetch data');
@@ -355,11 +361,46 @@
         // Get start and end of month
         function getMonthBounds(date) {
             const localDate = new Date(date);
-            const startLocal = new Date(localDate.getFullYear(), localDate.getMonth(), 1);
-            const endLocal = new Date(localDate.getFullYear(), localDate.getMonth() + 1, 0, 23, 59, 59, 999);
-            const start = new Date(startLocal.toISOString());
-            const end = new Date(endLocal.toISOString());
-            return { start, end };
+            // If startDate is 1, return generic month bounds
+            if (startDate === 1) {
+                const startLocal = new Date(localDate.getFullYear(), localDate.getMonth(), 1);
+                const endLocal = new Date(localDate.getFullYear(), localDate.getMonth() + 1, 0, 23, 59, 59, 999);
+                const start = new Date(startLocal.toISOString());
+                const end = new Date(endLocal.toISOString());
+                return { start, end };
+            }
+            // If startDate is not 1, need to account for variations in month length
+            let thisMonthStartDate = startDate;
+            let prevMonthStartDate = startDate;
+            let nextMonthStartDate = startDate;
+            // Adjust for variations in current, previous and next months
+            const currentMonth = localDate.getMonth();
+            const currentYear = localDate.getFullYear();
+            const daysInCurrentMonth = new Date(currentYear, currentMonth + 1, 0).getDate(); // last day of current month
+            thisMonthStartDate = Math.min(thisMonthStartDate, daysInCurrentMonth);
+            const prevMonth = currentMonth === 0 ? 11 : currentMonth - 1;
+            const prevYear = currentMonth === 0 ? currentYear - 1 : currentYear;
+            const daysInPrevMonth = new Date(prevYear, prevMonth + 1, 0).getDate();
+            prevMonthStartDate = Math.min(prevMonthStartDate, daysInPrevMonth);
+            const nextMonth = currentMonth === 11 ? 0 : currentMonth + 1;
+            const nextYear = currentMonth === 11 ? currentYear + 1 : currentYear;
+            const daysInNextMonth = new Date(nextYear, nextMonth + 1, 0).getDate();
+            nextMonthStartDate = Math.min(nextMonthStartDate, daysInNextMonth);
+            
+            // Return bounds for current period or the previous period
+            if (localDate.getDate() < thisMonthStartDate) {
+                const startLocal = new Date(prevYear, prevMonth, prevMonthStartDate);
+                const endLocal = new Date(currentYear, currentMonth, thisMonthStartDate - 1, 23, 59, 59, 999);
+                const start = new Date(startLocal.toISOString());
+                const end = new Date(endLocal.toISOString());
+                return { start, end };
+            } else {
+                const startLocal = new Date(currentYear, currentMonth, thisMonthStartDate);
+                const endLocal = new Date(nextYear, nextMonth, nextMonthStartDate - 1, 23, 59, 59, 999);
+                const start = new Date(startLocal.toISOString());
+                const end = new Date(endLocal.toISOString());
+                return { start, end };
+            }
         }
         // Filter expenses for current month
         function getMonthExpenses(expenses) {
@@ -425,11 +466,12 @@
                     messageDiv.textContent = 'Expense added successfully!';
                     messageDiv.className = 'form-message success';
                     document.getElementById('expenseForm').reset();
-                    const now = new Date();
-                    document.getElementById('date').valueAsDate = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-                    document.getElementById('name').value = 'unnamed';
-                    // Refresh the data
                     await initialize();
+                    const today = new Date();
+                    const year = today.getFullYear();
+                    const month = String(today.getMonth() + 1).padStart(2, '0');
+                    const day = String(today.getDate()).padStart(2, '0');
+                    document.getElementById('date').value = `${year}-${month}-${day}`;
                 } else {
                     const error = await response.json();
                     messageDiv.textContent = `Error: ${error.error || 'Failed to add expense'}`;