feat: implement idempotency key for critical API endpoints

Reviewed-on: #13

Makefile

@@ -83,6 +83,12 @@ migration-up:
 migration-down:
 	@migrate -database $(DB_URL) -path ./migrations down 1
 
+# Force migration to specific version
+
+.SILENT: migration-force
+migration-force:
+	@migrate -database $(DB_URL) -path ./migrations force $(version)
+
 .SILENT: seeder-create
 seeder-create:
 	@migrate create -ext sql -dir ./seeders -seq $(name)

internal/app/app.go

@@ -48,6 +48,7 @@ func (a *App) Initialize(cfg *config.Config) error {
 	// Initialize omset milestone scheduler
 	a.omsetScheduler = service.NewOmsetMilestoneScheduler(
 		repos.organizationRepo,
+		repos.outletRepo,
 		repos.userRepo,
 		processors.notificationProcessor,
 	)
@@ -137,15 +138,16 @@ func (a *App) Initialize(cfg *config.Config) error {
 		selfOrderHandler,
 		services.expenseService,
 		validators.expenseValidator,
+		a.redisClient,
 	)
 
 	return nil
 }
 
 func (a *App) Start(port string) error {
-	// Start the omset milestone scheduler (checks every hour)
+	// Start the omset milestone scheduler (checks every 5 minutes for daily omset milestones)
 	if a.omsetScheduler != nil {
-		a.omsetScheduler.Start(1 * time.Hour)
+		a.omsetScheduler.Start(5 * time.Minute)
 	}
 
 	engine := a.router.Init()

internal/constants/expense.go

@@ -0,0 +1,28 @@
+package constants
+
+type ExpenseStatus string
+
+const (
+	ExpenseStatusDraft    ExpenseStatus = "draft"
+	ExpenseStatusSent     ExpenseStatus = "sent"
+	ExpenseStatusApproved ExpenseStatus = "approved"
+	ExpenseStatusCancel   ExpenseStatus = "cancel"
+)
+
+func GetAllExpenseStatuses() []ExpenseStatus {
+	return []ExpenseStatus{
+		ExpenseStatusDraft,
+		ExpenseStatusSent,
+		ExpenseStatusApproved,
+		ExpenseStatusCancel,
+	}
+}
+
+func IsValidExpenseStatus(status ExpenseStatus) bool {
+	for _, validStatus := range GetAllExpenseStatuses() {
+		if status == validStatus {
+			return true
+		}
+	}
+	return false
+}

internal/contract/analytics_contract.go

@@ -239,18 +239,67 @@ type DashboardOverview struct {
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID
 	OutletID       *string `form:"outlet_id,omitempty"`
-	Date           string  `form:"date" validate:"required"`
+	DateFrom       string  `form:"date_from" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
+	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID           uuid.UUID                `json:"organization_id"`
 	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
-	Date                     time.Time                `json:"date"`
+	DateFrom                 time.Time                `json:"date_from"`
+	DateTo                   time.Time                `json:"date_to"`
+	GroupBy                  string                   `json:"group_by"`
+	Summary                  ProfitLossSummary        `json:"summary"`
+	Data                     []ProfitLossData         `json:"data"`
+	ProductData              []ProductProfitData      `json:"product_data"`
 	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
 	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
 	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
 }
 
+type ProfitLossSummary struct {
+	TotalRevenue       float64 `json:"total_revenue"`
+	TotalCost          float64 `json:"total_cost"`
+	GrossProfit        float64 `json:"gross_profit"`
+	GrossProfitMargin  float64 `json:"gross_profit_margin"`
+	TotalTax           float64 `json:"total_tax"`
+	TotalDiscount      float64 `json:"total_discount"`
+	NetProfit          float64 `json:"net_profit"`
+	NetProfitMargin    float64 `json:"net_profit_margin"`
+	TotalOrders        int64   `json:"total_orders"`
+	AverageProfit      float64 `json:"average_profit"`
+	ProfitabilityRatio float64 `json:"profitability_ratio"`
+}
+
+type ProfitLossData struct {
+	Date              time.Time `json:"date"`
+	Revenue           float64   `json:"revenue"`
+	Cost              float64   `json:"cost"`
+	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	Tax               float64   `json:"tax"`
+	Discount          float64   `json:"discount"`
+	NetProfit         float64   `json:"net_profit"`
+	NetProfitMargin   float64   `json:"net_profit_margin"`
+	Orders            int64     `json:"orders"`
+}
+
+type ProductProfitData struct {
+	ProductID         uuid.UUID `json:"product_id"`
+	ProductName       string    `json:"product_name"`
+	CategoryID        uuid.UUID `json:"category_id"`
+	CategoryName      string    `json:"category_name"`
+	QuantitySold      int64     `json:"quantity_sold"`
+	Revenue           float64   `json:"revenue"`
+	Cost              float64   `json:"cost"`
+	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	AveragePrice      float64   `json:"average_price"`
+	AverageCost       float64   `json:"average_cost"`
+	ProfitPerUnit     float64   `json:"profit_per_unit"`
+}
+
 type ProfitLossSummaryRow struct {
 	ID           string                 `json:"id"`
 	Label        string                 `json:"label"`

internal/contract/expense_contract.go

@@ -7,11 +7,11 @@ import (
 )
 
 type CreateExpenseRequest struct {
-	ExpenseName     string                     `json:"expense_name" validate:"required"`
 	Receiver        string                     `json:"receiver" validate:"required"`
 	TransactionDate string                     `json:"transaction_date" validate:"required"`
 	CodeNumber      string                     `json:"code_number" validate:"required"`
 	OutletID        string                     `json:"outlet_id" validate:"required"`
+	Status          *string                    `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
 	Description     *string                    `json:"description,omitempty"`
 	Tax             float64                    `json:"tax"`
 	Total           float64                    `json:"total" validate:"required"`
@@ -20,16 +20,17 @@ type CreateExpenseRequest struct {
 
 type CreateExpenseItemRequest struct {
 	ChartOfAccountID string  `json:"chart_of_account_id" validate:"required"`
+	Item             string  `json:"item" validate:"required"`
 	Description      *string `json:"description,omitempty"`
 	Amount           float64 `json:"amount" validate:"required"`
 }
 
 type UpdateExpenseRequest struct {
-	ExpenseName     *string                    `json:"expense_name,omitempty"`
 	Receiver        *string                    `json:"receiver,omitempty"`
 	TransactionDate *string                    `json:"transaction_date,omitempty"`
 	CodeNumber      *string                    `json:"code_number,omitempty"`
 	OutletID        *string                    `json:"outlet_id,omitempty"`
+	Status          *string                    `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
 	Description     *string                    `json:"description,omitempty"`
 	Tax             *float64                   `json:"tax,omitempty"`
 	Total           *float64                   `json:"total,omitempty"`
@@ -39,6 +40,7 @@ type UpdateExpenseRequest struct {
 
 type UpdateExpenseItemRequest struct {
 	ChartOfAccountID *string  `json:"chart_of_account_id,omitempty"`
+	Item             *string  `json:"item,omitempty"`
 	Description      *string  `json:"description,omitempty"`
 	Amount           *float64 `json:"amount,omitempty"`
 }
@@ -47,10 +49,10 @@ type ExpenseResponse struct {
 	ID              uuid.UUID             `json:"id"`
 	OrganizationID  uuid.UUID             `json:"organization_id"`
 	OutletID        uuid.UUID             `json:"outlet_id"`
-	ExpenseName     string                `json:"expense_name"`
 	Receiver        string                `json:"receiver"`
 	TransactionDate time.Time             `json:"transaction_date"`
 	CodeNumber      string                `json:"code_number"`
+	Status          string                `json:"status"`
 	Description     *string               `json:"description"`
 	Tax             float64               `json:"tax"`
 	Total           float64               `json:"total"`
@@ -65,6 +67,7 @@ type ExpenseItemResponse struct {
 	ExpenseID          uuid.UUID `json:"expense_id"`
 	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
 	ChartOfAccountName string    `json:"chart_of_account_name,omitempty"`
+	Item               string    `json:"item"`
 	Description        *string   `json:"description"`
 	Amount             float64   `json:"amount"`
 	CreatedAt          time.Time `json:"created_at"`
@@ -76,6 +79,7 @@ type ListExpenseRequest struct {
 	Limit     int    `json:"limit" validate:"min=1,max=100"`
 	Search    string `json:"search,omitempty"`
 	OutletID  string `json:"outlet_id,omitempty"`
+	Status    string `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
 	StartDate string `json:"start_date,omitempty"`
 	EndDate   string `json:"end_date,omitempty"`
 }

internal/contract/purchase_order_contract.go

@@ -9,8 +9,8 @@ import (
 type CreatePurchaseOrderRequest struct {
 	VendorID          uuid.UUID                        `json:"vendor_id" validate:"required"`
 	PONumber          string                           `json:"po_number" validate:"required,min=1,max=50"`
-	TransactionDate   string                           `json:"transaction_date" validate:"required"` // Format: YYYY-MM-DD
-	DueDate           string                           `json:"due_date" validate:"required"`          // Format: YYYY-MM-DD
+	TransactionDate   string                           `json:"transaction_date" validate:"required"`    // Format: YYYY-MM-DD
+	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
 	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
 	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
 	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
@@ -30,7 +30,7 @@ type UpdatePurchaseOrderRequest struct {
 	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty" validate:"omitempty"`
 	PONumber          *string                          `json:"po_number,omitempty" validate:"omitempty,min=1,max=50"`
 	TransactionDate   *string                          `json:"transaction_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
-	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"`          // Format: YYYY-MM-DD
+	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"`         // Format: YYYY-MM-DD
 	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
 	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
 	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
@@ -53,7 +53,7 @@ type PurchaseOrderResponse struct {
 	VendorID        uuid.UUID                         `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         time.Time                         `json:"due_date"`
+	DueDate         *time.Time                        `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`

internal/entities/analytics.go

@@ -114,6 +114,9 @@ type DashboardOverview struct {
 }
 
 type ProfitLossAnalytics struct {
+	Summary                 ProfitLossSummary
+	Data                    []ProfitLossData
+	ProductData             []ProductProfitData
 	TodayRevenue            float64
 	TodayCost               float64
 	MtdRevenue              float64
@@ -123,12 +126,54 @@ type ProfitLossAnalytics struct {
 	OperationalExpenseItems []OperationalExpenseItem
 }
 
+type ProfitLossSummary struct {
+	TotalRevenue       float64
+	TotalCost          float64
+	GrossProfit        float64
+	GrossProfitMargin  float64
+	TotalTax           float64
+	TotalDiscount      float64
+	NetProfit          float64
+	NetProfitMargin    float64
+	TotalOrders        int64
+	AverageProfit      float64
+	ProfitabilityRatio float64
+}
+
+type ProfitLossData struct {
+	Date              time.Time
+	Revenue           float64
+	Cost              float64
+	GrossProfit       float64
+	GrossProfitMargin float64
+	Tax               float64
+	Discount          float64
+	NetProfit         float64
+	NetProfitMargin   float64
+	Orders            int64
+}
+
+type ProductProfitData struct {
+	ProductID         uuid.UUID
+	ProductName       string
+	CategoryID        uuid.UUID
+	CategoryName      string
+	QuantitySold      int64
+	Revenue           float64
+	Cost              float64
+	GrossProfit       float64
+	GrossProfitMargin float64
+	AveragePrice      float64
+	AverageCost       float64
+	ProfitPerUnit     float64
+}
+
 type ExpenseCategoryTotal struct {
 	CategoryName string
 	Amount       float64
 }
 
 type OperationalExpenseItem struct {
-	Description string
-	Amount      float64
+	Item   string
+	Amount float64
 }

internal/entities/expense.go

@@ -12,10 +12,10 @@ type Expense struct {
 	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
 	OrganizationID  uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id"`
 	OutletID        uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
-	ExpenseName     string    `gorm:"not null;size:255" json:"expense_name"`
 	Receiver        string    `gorm:"not null;size:255" json:"receiver"`
 	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date"`
 	CodeNumber      string    `gorm:"not null;size:50" json:"code_number"`
+	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status"`
 	Description     *string   `gorm:"type:text" json:"description"`
 	Tax             float64   `gorm:"type:decimal(15,2);not null;default:0" json:"tax"`
 	Total           float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total"`

internal/entities/expense_item.go

@@ -12,6 +12,7 @@ type ExpenseItem struct {
 	ID               uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
 	ExpenseID        uuid.UUID `gorm:"type:uuid;not null;index" json:"expense_id"`
 	ChartOfAccountID uuid.UUID `gorm:"type:uuid;not null;index" json:"chart_of_account_id"`
+	Item             string    `gorm:"not null;size:255" json:"item"`
 	Description      *string   `gorm:"type:text" json:"description"`
 	Amount           float64   `gorm:"type:decimal(15,2);not null;default:0" json:"amount"`
 	CreatedAt        time.Time `gorm:"autoCreateTime" json:"created_at"`

internal/entities/purchase_order.go

@@ -9,18 +9,18 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID  uuid.UUID `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
-	VendorID        uuid.UUID `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
-	PONumber        string    `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
-	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
-	DueDate         time.Time `gorm:"type:date;not null" json:"due_date" validate:"required"`
-	Reference       *string   `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
-	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
-	Message         *string   `gorm:"type:text" json:"message" validate:"omitempty"`
-	TotalAmount     float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
-	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+	ID              uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	OrganizationID  uuid.UUID  `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
+	VendorID        uuid.UUID  `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
+	PONumber        string     `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
+	TransactionDate time.Time  `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
+	DueDate         *time.Time `gorm:"type:date" json:"due_date" validate:"omitempty"`
+	Reference       *string    `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
+	Status          string     `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
+	Message         *string    `gorm:"type:text" json:"message" validate:"omitempty"`
+	TotalAmount     float64    `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
+	CreatedAt       time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt       time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization *Organization             `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
 	Vendor       *Vendor                   `gorm:"foreignKey:VendorID" json:"vendor,omitempty"`

internal/handler/common.go

@@ -1,6 +1,8 @@
 package handler
 
 import (
+	"apskel-pos-be/internal/logger"
+	"fmt"
 	"net/http"
 	"time"
 )
@@ -47,7 +49,7 @@ func (m *CommonMiddleware) Recovery(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		defer func() {
 			if err := recover(); err != nil {
-
+				logger.FromContext(r.Context()).Error("Recovery", fmt.Sprintf("panic recovered: %v", err))
 				http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 			}
 		}()

internal/handler/expense_handler.go

@@ -164,6 +164,10 @@ func (h *ExpenseHandler) ListExpenses(c *gin.Context) {
 		req.Search = search
 	}
 
+	if status := c.Query("status"); status != "" {
+		req.Status = status
+	}
+
 	// Prioritize outlet_id from context (e.g. outlet-scoped user),
 	// fall back to query param if context has no outlet.
 	if contextInfo.OutletID != uuid.Nil {

internal/mappers/expense_mapper.go

@@ -14,10 +14,10 @@ func ExpenseEntityToModel(entity *entities.Expense) *models.Expense {
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
 		OutletID:        entity.OutletID,
-		ExpenseName:     entity.ExpenseName,
 		Receiver:        entity.Receiver,
 		TransactionDate: entity.TransactionDate,
 		CodeNumber:      entity.CodeNumber,
+		Status:          entity.Status,
 		Description:     entity.Description,
 		Tax:             entity.Tax,
 		Total:           entity.Total,
@@ -36,10 +36,10 @@ func ExpenseModelToEntity(model *models.Expense) *entities.Expense {
 		ID:              model.ID,
 		OrganizationID:  model.OrganizationID,
 		OutletID:        model.OutletID,
-		ExpenseName:     model.ExpenseName,
 		Receiver:        model.Receiver,
 		TransactionDate: model.TransactionDate,
 		CodeNumber:      model.CodeNumber,
+		Status:          model.Status,
 		Description:     model.Description,
 		Tax:             model.Tax,
 		Total:           model.Total,
@@ -58,10 +58,10 @@ func ExpenseEntityToResponse(entity *entities.Expense) *models.ExpenseResponse {
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
 		OutletID:        entity.OutletID,
-		ExpenseName:     entity.ExpenseName,
 		Receiver:        entity.Receiver,
 		TransactionDate: entity.TransactionDate,
 		CodeNumber:      entity.CodeNumber,
+		Status:          entity.Status,
 		Description:     entity.Description,
 		Tax:             entity.Tax,
 		Total:           entity.Total,
@@ -98,6 +98,7 @@ func ExpenseItemEntityToResponse(entity *entities.ExpenseItem) *models.ExpenseIt
 		ID:               entity.ID,
 		ExpenseID:        entity.ExpenseID,
 		ChartOfAccountID: entity.ChartOfAccountID,
+		Item:             entity.Item,
 		Description:      entity.Description,
 		Amount:           entity.Amount,
 		CreatedAt:        entity.CreatedAt,

internal/middleware/idempotency.go

@@ -0,0 +1,137 @@
+package middleware
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/redis/go-redis/v9"
+)
+
+const (
+	IdempotencyKeyHeader = "X-Idempotency-Key"
+	idempotencyTTL       = 24 * time.Hour
+	idempotencyPrefix    = "idempotency:"
+)
+
+type cachedResponse struct {
+	StatusCode int               `json:"status_code"`
+	Headers    map[string]string `json:"headers"`
+	Body       string            `json:"body"`
+}
+
+// IdempotencyMiddleware returns a Gin middleware that ensures idempotent processing
+// for mutating operations. Client must send X-Idempotency-Key header.
+func IdempotencyMiddleware(redisClient *redis.Client) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		key := c.GetHeader(IdempotencyKeyHeader)
+		if key == "" {
+			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{
+				"success": false,
+				"errors": []gin.H{
+					{
+						"code":   "missing_idempotency_key",
+						"entity": "IdempotencyMiddleware",
+						"cause":  "X-Idempotency-Key header is required",
+					},
+				},
+			})
+			return
+		}
+
+		redisKey := fmt.Sprintf("%s%s", idempotencyPrefix, key)
+		ctx := context.Background()
+
+		fmt.Printf("[DEBUG] IdempotencyMiddleware: key=%s redisKey=%s\n", key, redisKey)
+
+		// Check if key already exists (request was already processed)
+		cached, err := redisClient.Get(ctx, redisKey).Result()
+		if err == nil {
+			// Key exists — return cached response
+			fmt.Printf("[DEBUG] IdempotencyMiddleware: cache HIT for key=%s\n", key)
+			var resp cachedResponse
+			if err := json.Unmarshal([]byte(cached), &resp); err == nil {
+				for k, v := range resp.Headers {
+					c.Writer.Header().Set(k, v)
+				}
+				c.Writer.Header().Set("X-Idempotent-Replay", "true")
+				c.Data(resp.StatusCode, "application/json", []byte(resp.Body))
+				c.Abort()
+				return
+			}
+		} else {
+			fmt.Printf("[DEBUG] IdempotencyMiddleware: cache MISS for key=%s err=%v\n", key, err)
+		}
+
+		// Mark key as in-progress to prevent concurrent duplicates
+		set, err := redisClient.SetNX(ctx, redisKey, "processing", idempotencyTTL).Result()
+		if err != nil {
+			// Redis error — proceed without idempotency (fail open)
+			c.Next()
+			return
+		}
+		if !set {
+			// Another request with the same key is being processed
+			c.AbortWithStatusJSON(http.StatusConflict, gin.H{
+				"success": false,
+				"errors": []gin.H{
+					{
+						"code":   "request_in_progress",
+						"entity": "IdempotencyMiddleware",
+						"cause":  "A request with this idempotency key is already being processed",
+					},
+				},
+			})
+			return
+		}
+
+		// Capture response using a custom writer
+		writer := &responseCapture{
+			ResponseWriter: c.Writer,
+			body:           &bytes.Buffer{},
+		}
+		c.Writer = writer
+
+		c.Next()
+
+		// After handler completes, cache the response only if successful (2xx)
+		statusCode := writer.Status()
+		if statusCode >= 200 && statusCode < 300 {
+			resp := cachedResponse{
+				StatusCode: statusCode,
+				Headers: map[string]string{
+					"Content-Type": writer.Header().Get("Content-Type"),
+				},
+				Body: writer.body.String(),
+			}
+
+			respJSON, err := json.Marshal(resp)
+			if err == nil {
+				redisClient.Set(ctx, redisKey, string(respJSON), idempotencyTTL)
+			}
+		} else {
+			// Remove the in-progress key so the client can retry with the same key
+			redisClient.Del(ctx, redisKey)
+		}
+	}
+}
+
+// responseCapture wraps gin.ResponseWriter to capture the response body
+type responseCapture struct {
+	gin.ResponseWriter
+	body *bytes.Buffer
+}
+
+func (w *responseCapture) Write(b []byte) (int, error) {
+	w.body.Write(b)
+	return w.ResponseWriter.Write(b)
+}
+
+func (w *responseCapture) WriteString(s string) (int, error) {
+	w.body.WriteString(s)
+	return w.ResponseWriter.WriteString(s)
+}

internal/models/analytics.go

@@ -249,18 +249,67 @@ type DashboardOverview struct {
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
 	OutletID       *uuid.UUID `validate:"omitempty"`
-	Date           time.Time  `validate:"required"`
+	DateFrom       time.Time  `validate:"required"`
+	DateTo         time.Time  `validate:"required"`
+	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
 }
 
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID           uuid.UUID                `json:"organization_id"`
 	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
-	Date                     time.Time                `json:"date"`
+	DateFrom                 time.Time                `json:"date_from"`
+	DateTo                   time.Time                `json:"date_to"`
+	GroupBy                  string                   `json:"group_by"`
+	Summary                  ProfitLossSummary        `json:"summary"`
+	Data                     []ProfitLossData         `json:"data"`
+	ProductData              []ProductProfitData      `json:"product_data"`
 	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
 	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
 	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
 }
 
+type ProfitLossSummary struct {
+	TotalRevenue       float64 `json:"total_revenue"`
+	TotalCost          float64 `json:"total_cost"`
+	GrossProfit        float64 `json:"gross_profit"`
+	GrossProfitMargin  float64 `json:"gross_profit_margin"`
+	TotalTax           float64 `json:"total_tax"`
+	TotalDiscount      float64 `json:"total_discount"`
+	NetProfit          float64 `json:"net_profit"`
+	NetProfitMargin    float64 `json:"net_profit_margin"`
+	TotalOrders        int64   `json:"total_orders"`
+	AverageProfit      float64 `json:"average_profit"`
+	ProfitabilityRatio float64 `json:"profitability_ratio"`
+}
+
+type ProfitLossData struct {
+	Date              time.Time `json:"date"`
+	Revenue           float64   `json:"revenue"`
+	Cost              float64   `json:"cost"`
+	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	Tax               float64   `json:"tax"`
+	Discount          float64   `json:"discount"`
+	NetProfit         float64   `json:"net_profit"`
+	NetProfitMargin   float64   `json:"net_profit_margin"`
+	Orders            int64     `json:"orders"`
+}
+
+type ProductProfitData struct {
+	ProductID         uuid.UUID `json:"product_id"`
+	ProductName       string    `json:"product_name"`
+	CategoryID        uuid.UUID `json:"category_id"`
+	CategoryName      string    `json:"category_name"`
+	QuantitySold      int64     `json:"quantity_sold"`
+	Revenue           float64   `json:"revenue"`
+	Cost              float64   `json:"cost"`
+	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	AveragePrice      float64   `json:"average_price"`
+	AverageCost       float64   `json:"average_cost"`
+	ProfitPerUnit     float64   `json:"profit_per_unit"`
+}
+
 type ProfitLossSummaryRow struct {
 	ID           string                 `json:"id"`
 	Label        string                 `json:"label"`

internal/models/expense.go

@@ -10,10 +10,10 @@ type Expense struct {
 	ID              uuid.UUID `json:"id"`
 	OrganizationID  uuid.UUID `json:"organization_id"`
 	OutletID        uuid.UUID `json:"outlet_id"`
-	ExpenseName     string    `json:"expense_name"`
 	Receiver        string    `json:"receiver"`
 	TransactionDate time.Time `json:"transaction_date"`
 	CodeNumber      string    `json:"code_number"`
+	Status          string    `json:"status"`
 	Description     *string   `json:"description"`
 	Tax             float64   `json:"tax"`
 	Total           float64   `json:"total"`
@@ -26,6 +26,7 @@ type ExpenseItem struct {
 	ID               uuid.UUID `json:"id"`
 	ExpenseID        uuid.UUID `json:"expense_id"`
 	ChartOfAccountID uuid.UUID `json:"chart_of_account_id"`
+	Item             string    `json:"item"`
 	Description      *string   `json:"description"`
 	Amount           float64   `json:"amount"`
 	CreatedAt        time.Time `json:"created_at"`
@@ -36,10 +37,10 @@ type ExpenseResponse struct {
 	ID              uuid.UUID             `json:"id"`
 	OrganizationID  uuid.UUID             `json:"organization_id"`
 	OutletID        uuid.UUID             `json:"outlet_id"`
-	ExpenseName     string                `json:"expense_name"`
 	Receiver        string                `json:"receiver"`
 	TransactionDate time.Time             `json:"transaction_date"`
 	CodeNumber      string                `json:"code_number"`
+	Status          string                `json:"status"`
 	Description     *string               `json:"description"`
 	Tax             float64               `json:"tax"`
 	Total           float64               `json:"total"`
@@ -54,6 +55,7 @@ type ExpenseItemResponse struct {
 	ExpenseID          uuid.UUID `json:"expense_id"`
 	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
 	ChartOfAccountName string    `json:"chart_of_account_name,omitempty"`
+	Item               string    `json:"item"`
 	Description        *string   `json:"description"`
 	Amount             float64   `json:"amount"`
 	CreatedAt          time.Time `json:"created_at"`
@@ -61,11 +63,11 @@ type ExpenseItemResponse struct {
 }
 
 type CreateExpenseRequest struct {
-	ExpenseName     string                     `json:"expense_name"`
 	Receiver        string                     `json:"receiver"`
 	TransactionDate string                     `json:"transaction_date"`
 	CodeNumber      string                     `json:"code_number"`
 	OutletID        string                     `json:"outlet_id"`
+	Status          *string                    `json:"status,omitempty"`
 	Description     *string                    `json:"description"`
 	Tax             float64                    `json:"tax"`
 	Total           float64                    `json:"total"`
@@ -74,16 +76,17 @@ type CreateExpenseRequest struct {
 
 type CreateExpenseItemRequest struct {
 	ChartOfAccountID string  `json:"chart_of_account_id"`
+	Item             string  `json:"item"`
 	Description      *string `json:"description,omitempty"`
 	Amount           float64 `json:"amount"`
 }
 
 type UpdateExpenseRequest struct {
-	ExpenseName     *string                    `json:"expense_name,omitempty"`
 	Receiver        *string                    `json:"receiver,omitempty"`
 	TransactionDate *string                    `json:"transaction_date,omitempty"`
 	CodeNumber      *string                    `json:"code_number,omitempty"`
 	OutletID        *string                    `json:"outlet_id,omitempty"`
+	Status          *string                    `json:"status,omitempty"`
 	Description     *string                    `json:"description,omitempty"`
 	Tax             *float64                   `json:"tax,omitempty"`
 	Total           *float64                   `json:"total,omitempty"`
@@ -93,6 +96,7 @@ type UpdateExpenseRequest struct {
 
 type UpdateExpenseItemRequest struct {
 	ChartOfAccountID *string  `json:"chart_of_account_id,omitempty"`
+	Item             *string  `json:"item,omitempty"`
 	Description      *string  `json:"description,omitempty"`
 	Amount           *float64 `json:"amount,omitempty"`
 }
@@ -102,6 +106,7 @@ type ListExpenseRequest struct {
 	Limit     int    `json:"limit"`
 	Search    string `json:"search,omitempty"`
 	OutletID  string `json:"outlet_id,omitempty"`
+	Status    string `json:"status,omitempty"`
 	StartDate string `json:"start_date,omitempty"`
 	EndDate   string `json:"end_date,omitempty"`
 }

internal/models/purchase_order.go

@@ -7,18 +7,18 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID `json:"id"`
-	OrganizationID  uuid.UUID `json:"organization_id"`
-	VendorID        uuid.UUID `json:"vendor_id"`
-	PONumber        string    `json:"po_number"`
-	TransactionDate time.Time `json:"transaction_date"`
-	DueDate         time.Time `json:"due_date"`
-	Reference       *string   `json:"reference"`
-	Status          string    `json:"status"`
-	Message         *string   `json:"message"`
-	TotalAmount     float64   `json:"total_amount"`
-	CreatedAt       time.Time `json:"created_at"`
-	UpdatedAt       time.Time `json:"updated_at"`
+	ID              uuid.UUID  `json:"id"`
+	OrganizationID  uuid.UUID  `json:"organization_id"`
+	VendorID        uuid.UUID  `json:"vendor_id"`
+	PONumber        string     `json:"po_number"`
+	TransactionDate time.Time  `json:"transaction_date"`
+	DueDate         *time.Time `json:"due_date"`
+	Reference       *string    `json:"reference"`
+	Status          string     `json:"status"`
+	Message         *string    `json:"message"`
+	TotalAmount     float64    `json:"total_amount"`
+	CreatedAt       time.Time  `json:"created_at"`
+	UpdatedAt       time.Time  `json:"updated_at"`
 }
 
 type PurchaseOrderItem struct {
@@ -46,7 +46,7 @@ type PurchaseOrderResponse struct {
 	VendorID        uuid.UUID                         `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         time.Time                         `json:"due_date"`
+	DueDate         *time.Time                        `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`
@@ -84,7 +84,7 @@ type CreatePurchaseOrderRequest struct {
 	VendorID          uuid.UUID                        `json:"vendor_id"`
 	PONumber          string                           `json:"po_number"`
 	TransactionDate   time.Time                        `json:"transaction_date"`
-	DueDate           time.Time                        `json:"due_date"`
+	DueDate           *time.Time                       `json:"due_date,omitempty"`
 	Reference         *string                          `json:"reference,omitempty"`
 	Status            *string                          `json:"status,omitempty"`
 	Message           *string                          `json:"message,omitempty"`

internal/processor/analytics_processor.go

@@ -398,15 +398,61 @@ func (p *AnalyticsProcessorImpl) GetDashboardAnalytics(ctx context.Context, req
 }
 
 func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error) {
-	if req.Date.IsZero() {
-		return nil, fmt.Errorf("date is required")
+	if req.DateFrom.IsZero() {
+		return nil, fmt.Errorf("date_from is required")
 	}
 
-	result, err := p.analyticsRepo.GetProfitLossAnalytics(ctx, req.OrganizationID, req.OutletID, req.Date)
+	if req.DateTo.IsZero() {
+		return nil, fmt.Errorf("date_to is required")
+	}
+
+	if req.DateFrom.After(req.DateTo) {
+		return nil, fmt.Errorf("date_from cannot be after date_to")
+	}
+
+	if req.GroupBy == "" {
+		req.GroupBy = "day"
+	}
+
+	result, err := p.analyticsRepo.GetProfitLossAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo, req.GroupBy)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get profit/loss analytics: %w", err)
 	}
 
+	data := make([]models.ProfitLossData, len(result.Data))
+	for i, item := range result.Data {
+		data[i] = models.ProfitLossData{
+			Date:              item.Date,
+			Revenue:           item.Revenue,
+			Cost:              item.Cost,
+			GrossProfit:       item.GrossProfit,
+			GrossProfitMargin: item.GrossProfitMargin,
+			Tax:               item.Tax,
+			Discount:          item.Discount,
+			NetProfit:         item.NetProfit,
+			NetProfitMargin:   item.NetProfitMargin,
+			Orders:            item.Orders,
+		}
+	}
+
+	productData := make([]models.ProductProfitData, len(result.ProductData))
+	for i, item := range result.ProductData {
+		productData[i] = models.ProductProfitData{
+			ProductID:         item.ProductID,
+			ProductName:       item.ProductName,
+			CategoryID:        item.CategoryID,
+			CategoryName:      item.CategoryName,
+			QuantitySold:      item.QuantitySold,
+			Revenue:           item.Revenue,
+			Cost:              item.Cost,
+			GrossProfit:       item.GrossProfit,
+			GrossProfitMargin: item.GrossProfitMargin,
+			AveragePrice:      item.AveragePrice,
+			AverageCost:       item.AverageCost,
+			ProfitPerUnit:     item.ProfitPerUnit,
+		}
+	}
+
 	todayPromosi := getExpenseAmountByCategory(result.TodayExpenseByCategory, "promosi")
 	todayLainLain := getExpenseAmountByCategory(result.TodayExpenseByCategory, "lain")
 	todayTotalOps := todayPromosi + todayLainLain
@@ -498,16 +544,33 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 	var opsTotal float64
 	for i, item := range result.OperationalExpenseItems {
 		opsItems[i] = models.OperationalExpenseItem{
-			Item:    item.Description,
+			Item:    item.Item,
 			Nominal: item.Amount,
 		}
 		opsTotal += item.Amount
 	}
 
 	return &models.ProfitLossAnalyticsResponse{
-		OrganizationID:           req.OrganizationID,
-		OutletID:                 req.OutletID,
-		Date:                     req.Date,
+		OrganizationID: req.OrganizationID,
+		OutletID:       req.OutletID,
+		DateFrom:       req.DateFrom,
+		DateTo:         req.DateTo,
+		GroupBy:        req.GroupBy,
+		Summary: models.ProfitLossSummary{
+			TotalRevenue:       result.Summary.TotalRevenue,
+			TotalCost:          result.Summary.TotalCost,
+			GrossProfit:        result.Summary.GrossProfit,
+			GrossProfitMargin:  result.Summary.GrossProfitMargin,
+			TotalTax:           result.Summary.TotalTax,
+			TotalDiscount:      result.Summary.TotalDiscount,
+			NetProfit:          result.Summary.NetProfit,
+			NetProfitMargin:    result.Summary.NetProfitMargin,
+			TotalOrders:        result.Summary.TotalOrders,
+			AverageProfit:      result.Summary.AverageProfit,
+			ProfitabilityRatio: result.Summary.ProfitabilityRatio,
+		},
+		Data:                     data,
+		ProductData:              productData,
 		MainSummary:              mainSummary,
 		OperationalExpenses:      opsItems,
 		OperationalExpensesTotal: opsTotal,

internal/processor/analytics_processor_test.go

@@ -14,6 +14,8 @@ import (
 
 type analyticsRepositoryStub struct {
 	purchasingResult *entities.PurchasingAnalytics
+	profitLossResult *entities.ProfitLossAnalytics
+	profitLossGroup  string
 }
 
 func (analyticsRepositoryStub) GetPaymentMethodAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.PaymentMethodAnalytics, error) {
@@ -40,8 +42,9 @@ func (analyticsRepositoryStub) GetDashboardOverview(context.Context, uuid.UUID,
 	return nil, nil
 }
 
-func (analyticsRepositoryStub) GetProfitLossAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time) (*entities.ProfitLossAnalytics, error) {
-	return nil, nil
+func (s analyticsRepositoryStub) GetProfitLossAnalytics(_ context.Context, _ uuid.UUID, _ *uuid.UUID, _, _ time.Time, groupBy string) (*entities.ProfitLossAnalytics, error) {
+	s.profitLossGroup = groupBy
+	return s.profitLossResult, nil
 }
 
 type expenseRepositoryStub struct{}
@@ -88,3 +91,77 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 	require.Equal(t, outletName, *result.OutletName)
 	require.Equal(t, float64(125), result.Summary.TotalPurchases)
 }
+
+func TestAnalyticsProcessorGetProfitLossAnalyticsMapsOverviewAndReportFields(t *testing.T) {
+	productID := uuid.New()
+	categoryID := uuid.New()
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+		profitLossResult: &entities.ProfitLossAnalytics{
+			Summary: entities.ProfitLossSummary{
+				TotalRevenue:       1000,
+				TotalCost:          400,
+				GrossProfit:        600,
+				GrossProfitMargin:  60,
+				TotalTax:           50,
+				TotalDiscount:      25,
+				NetProfit:          575,
+				NetProfitMargin:    57.5,
+				TotalOrders:        10,
+				AverageProfit:      57.5,
+				ProfitabilityRatio: 150,
+			},
+			Data: []entities.ProfitLossData{
+				{
+					Date:              now,
+					Revenue:           1000,
+					Cost:              400,
+					GrossProfit:       600,
+					GrossProfitMargin: 60,
+					Tax:               50,
+					Discount:          25,
+					NetProfit:         575,
+					NetProfitMargin:   57.5,
+					Orders:            10,
+				},
+			},
+			ProductData: []entities.ProductProfitData{
+				{
+					ProductID:         productID,
+					ProductName:       "Nasi",
+					CategoryID:        categoryID,
+					CategoryName:      "Food",
+					QuantitySold:      5,
+					Revenue:           500,
+					Cost:              200,
+					GrossProfit:       300,
+					GrossProfitMargin: 60,
+					AveragePrice:      100,
+					AverageCost:       40,
+					ProfitPerUnit:     60,
+				},
+			},
+			TodayRevenue: 1000,
+			TodayCost:    400,
+			MtdRevenue:   2000,
+			MtdCost:      800,
+		},
+	}, expenseRepositoryStub{})
+
+	result, err := processor.GetProfitLossAnalytics(context.Background(), &models.ProfitLossAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Equal(t, "day", result.GroupBy)
+	require.Equal(t, float64(1000), result.Summary.TotalRevenue)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(575), result.Data[0].NetProfit)
+	require.Len(t, result.ProductData, 1)
+	require.Equal(t, productID, result.ProductData[0].ProductID)
+	require.NotEmpty(t, result.MainSummary)
+	require.Equal(t, "total_omset", result.MainSummary[0].ID)
+}

internal/processor/expense_processor.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/mappers"
 	"apskel-pos-be/internal/models"
@@ -41,13 +42,18 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
 		return nil, fmt.Errorf("invalid transaction_date format, expected YYYY-MM-DD: %w", err)
 	}
 
+	status := string(constants.ExpenseStatusDraft)
+	if req.Status != nil {
+		status = *req.Status
+	}
+
 	expenseEntity := &entities.Expense{
 		OrganizationID:  organizationID,
 		OutletID:        outletID,
-		ExpenseName:     req.ExpenseName,
 		Receiver:        req.Receiver,
 		TransactionDate: transactionDate,
 		CodeNumber:      req.CodeNumber,
+		Status:          status,
 		Description:     req.Description,
 		Tax:             req.Tax,
 		Total:           req.Total,
@@ -67,6 +73,7 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
 		itemEntity := &entities.ExpenseItem{
 			ExpenseID:        expenseEntity.ID,
 			ChartOfAccountID: chartOfAccountID,
+			Item:             itemReq.Item,
 			Description:      itemReq.Description,
 			Amount:           itemReq.Amount,
 		}
@@ -91,9 +98,6 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 		return nil, fmt.Errorf("expense not found: %w", err)
 	}
 
-	if req.ExpenseName != nil {
-		expenseEntity.ExpenseName = *req.ExpenseName
-	}
 	if req.Receiver != nil {
 		expenseEntity.Receiver = *req.Receiver
 	}
@@ -107,6 +111,9 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 	if req.CodeNumber != nil {
 		expenseEntity.CodeNumber = *req.CodeNumber
 	}
+	if req.Status != nil {
+		expenseEntity.Status = *req.Status
+	}
 	if req.OutletID != nil {
 		outletID, err := uuid.Parse(*req.OutletID)
 		if err != nil {
@@ -146,10 +153,15 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 			if itemReq.Amount != nil {
 				amount = *itemReq.Amount
 			}
+			item := ""
+			if itemReq.Item != nil {
+				item = *itemReq.Item
+			}
 
 			itemEntity := &entities.ExpenseItem{
 				ExpenseID:        expenseEntity.ID,
 				ChartOfAccountID: chartOfAccountID,
+				Item:             item,
 				Description:      itemReq.Description,
 				Amount:           amount,
 			}

internal/processor/expense_processor_test.go

@@ -0,0 +1,136 @@
+package processor
+
+import (
+	"context"
+	"testing"
+
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+type expenseRepositoryCaptureStub struct {
+	createdExpense *entities.Expense
+	createdItems   []*entities.ExpenseItem
+}
+
+func (s *expenseRepositoryCaptureStub) Create(_ context.Context, expense *entities.Expense) error {
+	if expense.ID == uuid.Nil {
+		expense.ID = uuid.New()
+	}
+	s.createdExpense = expense
+	return nil
+}
+
+func (s *expenseRepositoryCaptureStub) GetByID(context.Context, uuid.UUID) (*entities.Expense, error) {
+	if s.createdExpense == nil {
+		return nil, nil
+	}
+	items := make([]entities.ExpenseItem, len(s.createdItems))
+	for i, item := range s.createdItems {
+		items[i] = *item
+	}
+	s.createdExpense.Items = items
+	return s.createdExpense, nil
+}
+
+func (*expenseRepositoryCaptureStub) GetByIDAndOrganizationID(context.Context, uuid.UUID, uuid.UUID) (*entities.Expense, error) {
+	return nil, nil
+}
+func (*expenseRepositoryCaptureStub) Update(context.Context, *entities.Expense) error { return nil }
+func (*expenseRepositoryCaptureStub) Delete(context.Context, uuid.UUID) error         { return nil }
+func (*expenseRepositoryCaptureStub) List(context.Context, uuid.UUID, map[string]interface{}, int, int) ([]*entities.Expense, int64, error) {
+	return nil, 0, nil
+}
+func (s *expenseRepositoryCaptureStub) CreateItem(_ context.Context, item *entities.ExpenseItem) error {
+	if item.ID == uuid.Nil {
+		item.ID = uuid.New()
+	}
+	s.createdItems = append(s.createdItems, item)
+	return nil
+}
+func (*expenseRepositoryCaptureStub) DeleteItemsByExpenseID(context.Context, uuid.UUID) error {
+	return nil
+}
+
+func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+	chartOfAccountID := uuid.New()
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: chartOfAccountID.String(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Len(t, repo.createdItems, 1)
+	require.Equal(t, "Cleaning supplies", repo.createdItems[0].Item)
+	require.Len(t, resp.Items, 1)
+	require.Equal(t, "Cleaning supplies", resp.Items[0].Item)
+}
+
+func TestExpenseProcessorCreateDefaultsStatusToDraft(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "draft", repo.createdExpense.Status)
+	require.Equal(t, "draft", resp.Status)
+}
+
+func TestExpenseProcessorCreatePersistsProvidedStatus(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+	status := "approved"
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Status:          &status,
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "approved", repo.createdExpense.Status)
+	require.Equal(t, "approved", resp.Status)
+}

internal/processor/order_processor.go

@@ -338,7 +338,7 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
 			ProductID:        itemReq.ProductID,
 			ProductVariantID: itemReq.ProductVariantID,
 			Quantity:         itemReq.Quantity,
-			UnitPrice:        unitPrice, // Use price from database
+			UnitPrice:        unitPrice,
 			TotalPrice:       itemTotalPrice,
 			UnitCost:         unitCost,
 			TotalCost:        itemTotalCost,
@@ -594,6 +594,10 @@ func (p *OrderProcessorImpl) VoidOrder(ctx context.Context, req *models.VoidOrde
 				return fmt.Errorf("order item does not belong to this order")
 			}
 
+			if orderItem.Status == entities.OrderItemStatusCancelled {
+				return fmt.Errorf("order item %s is already cancelled", orderItemID)
+			}
+
 			if itemVoid.Quantity > orderItem.Quantity {
 				return fmt.Errorf("void quantity cannot exceed original quantity for item %d", itemVoid.OrderItemID)
 			}
@@ -614,9 +618,15 @@ func (p *OrderProcessorImpl) VoidOrder(ctx context.Context, req *models.VoidOrde
 			return fmt.Errorf("outlet not found: %w", err)
 		}
 
+		// Reload order to get latest state
+		order, err = p.orderRepo.GetByID(ctx, req.OrderID)
+		if err != nil {
+			return fmt.Errorf("failed to reload order: %w", err)
+		}
+
 		order.Subtotal -= totalVoidedAmount
 		order.TotalCost -= totalVoidedCost
-		order.TaxAmount = order.Subtotal * outlet.TaxRate // Recalculate tax using outlet's tax rate
+		order.TaxAmount = order.Subtotal * outlet.TaxRate
 		order.TotalAmount = order.Subtotal + order.TaxAmount - order.DiscountAmount
 
 		if err := p.orderRepo.Update(ctx, order); err != nil {

internal/processor/purchase_order_processor.go

@@ -175,7 +175,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 		poEntity.TransactionDate = *req.TransactionDate
 	}
 	if req.DueDate != nil {
-		poEntity.DueDate = *req.DueDate
+		poEntity.DueDate = req.DueDate
 	}
 	if req.Reference != nil {
 		poEntity.Reference = req.Reference

internal/repository/analytics_repository.go

@@ -17,7 +17,7 @@ type AnalyticsRepository interface {
 	GetProductAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, limit int) ([]*entities.ProductAnalytics, error)
 	GetProductAnalyticsPerCategory(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.ProductAnalyticsPerCategory, error)
 	GetDashboardOverview(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (*entities.DashboardOverview, error)
-	GetProfitLossAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, date time.Time) (*entities.ProfitLossAnalytics, error)
+	GetProfitLossAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.ProfitLossAnalytics, error)
 }
 
 type AnalyticsRepositoryImpl struct {
@@ -432,11 +432,138 @@ func (r *AnalyticsRepositoryImpl) GetDashboardOverview(ctx context.Context, orga
 	return &result, nil
 }
 
-func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, date time.Time) (*entities.ProfitLossAnalytics, error) {
-	mtdStart := time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location())
-	todayStart := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, date.Location())
+func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.ProfitLossAnalytics, error) {
+	mtdStart := time.Date(dateTo.Year(), dateTo.Month(), 1, 0, 0, 0, 0, dateTo.Location())
+	todayStart := time.Date(dateTo.Year(), dateTo.Month(), dateTo.Day(), 0, 0, 0, 0, dateTo.Location())
 	todayEnd := todayStart.Add(24 * time.Hour).Add(-time.Nanosecond)
 
+	var summary entities.ProfitLossSummary
+	summaryQuery := r.db.WithContext(ctx).
+		Table("orders o").
+		Select(`
+			COALESCE(SUM(o.total_amount), 0) as total_revenue,
+			COALESCE(SUM(o.total_cost), 0) as total_cost,
+			COALESCE(SUM(o.total_amount - o.total_cost), 0) as gross_profit,
+			CASE
+				WHEN SUM(o.total_amount) > 0
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100
+				ELSE 0
+			END as gross_profit_margin,
+			COALESCE(SUM(o.tax_amount), 0) as total_tax,
+			COALESCE(SUM(o.discount_amount), 0) as total_discount,
+			COALESCE(SUM(o.total_amount - o.total_cost - o.discount_amount), 0) as net_profit,
+			CASE
+				WHEN SUM(o.total_amount) > 0
+				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100
+				ELSE 0
+			END as net_profit_margin,
+			COUNT(o.id) as total_orders,
+			CASE
+				WHEN COUNT(o.id) > 0
+				THEN SUM(o.total_amount - o.total_cost - o.discount_amount) / COUNT(o.id)
+				ELSE 0
+			END as average_profit,
+			CASE
+				WHEN SUM(o.total_cost) > 0
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_cost)) * 100
+				ELSE 0
+			END as profitability_ratio
+		`).
+		Where("o.organization_id = ?", organizationID).
+		Where("o.status = ?", entities.OrderStatusCompleted).
+		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+		Where("o.is_void = false AND o.is_refund = false").
+		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
+	summaryQuery = r.resolveOutletID(summaryQuery, outletID, "o.outlet_id")
+	if err := summaryQuery.Scan(&summary).Error; err != nil {
+		return nil, err
+	}
+
+	var timeFormat string
+	switch groupBy {
+	case "hour":
+		timeFormat = "DATE_TRUNC('hour', o.created_at)"
+	case "week":
+		timeFormat = "DATE_TRUNC('week', o.created_at)"
+	case "month":
+		timeFormat = "DATE_TRUNC('month', o.created_at)"
+	default:
+		timeFormat = "DATE_TRUNC('day', o.created_at)"
+	}
+
+	var data []entities.ProfitLossData
+	dataQuery := r.db.WithContext(ctx).
+		Table("orders o").
+		Select(`
+			`+timeFormat+` as date,
+			COALESCE(SUM(o.total_amount), 0) as revenue,
+			COALESCE(SUM(o.total_cost), 0) as cost,
+			COALESCE(SUM(o.total_amount - o.total_cost), 0) as gross_profit,
+			CASE
+				WHEN SUM(o.total_amount) > 0
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100
+				ELSE 0
+			END as gross_profit_margin,
+			COALESCE(SUM(o.tax_amount), 0) as tax,
+			COALESCE(SUM(o.discount_amount), 0) as discount,
+			COALESCE(SUM(o.total_amount - o.total_cost - o.discount_amount), 0) as net_profit,
+			CASE
+				WHEN SUM(o.total_amount) > 0
+				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100
+				ELSE 0
+			END as net_profit_margin,
+			COUNT(o.id) as orders
+		`).
+		Where("o.organization_id = ?", organizationID).
+		Where("o.status = ?", entities.OrderStatusCompleted).
+		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+		Where("o.is_void = false AND o.is_refund = false").
+		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo).
+		Group(timeFormat).
+		Order(timeFormat)
+	dataQuery = r.resolveOutletID(dataQuery, outletID, "o.outlet_id")
+	if err := dataQuery.Scan(&data).Error; err != nil {
+		return nil, err
+	}
+
+	var productData []entities.ProductProfitData
+	productQuery := r.db.WithContext(ctx).
+		Table("order_items oi").
+		Select(`
+			p.id as product_id,
+			p.name as product_name,
+			c.id as category_id,
+			c.name as category_name,
+			SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.quantity - COALESCE(oi.refund_quantity, 0) ELSE 0 END) as quantity_sold,
+			SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END) as revenue,
+			SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0)) ELSE 0 END) as cost,
+			SUM(CASE WHEN oi.is_fully_refunded = false THEN (oi.total_price - COALESCE(oi.refund_amount, 0)) - (oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0))) ELSE 0 END) as gross_profit,
+			CASE
+				WHEN SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END) > 0
+				THEN (SUM(CASE WHEN oi.is_fully_refunded = false THEN (oi.total_price - COALESCE(oi.refund_amount, 0)) - (oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0))) ELSE 0 END) / SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END)) * 100
+				ELSE 0
+			END as gross_profit_margin,
+			AVG(CASE WHEN oi.is_fully_refunded = false THEN oi.unit_price ELSE NULL END) as average_price,
+			AVG(CASE WHEN oi.is_fully_refunded = false THEN oi.unit_cost ELSE NULL END) as average_cost,
+			AVG(CASE WHEN oi.is_fully_refunded = false THEN oi.unit_price - oi.unit_cost ELSE NULL END) as profit_per_unit
+		`).
+		Joins("JOIN orders o ON oi.order_id = o.id").
+		Joins("JOIN products p ON oi.product_id = p.id").
+		Joins("JOIN categories c ON p.category_id = c.id").
+		Where("o.organization_id = ?", organizationID).
+		Where("o.status = ?", entities.OrderStatusCompleted).
+		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+		Where("o.is_void = false AND o.is_refund = false").
+		Where("oi.status != ?", entities.OrderItemStatusCancelled).
+		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo).
+		Group("p.id, p.name, c.id, c.name").
+		Order("p.name ASC").
+		Limit(1000)
+	productQuery = r.resolveOutletID(productQuery, outletID, "o.outlet_id")
+	if err := productQuery.Scan(&productData).Error; err != nil {
+		return nil, err
+	}
+
 	type revenueCostResult struct {
 		Revenue float64
 		Cost    float64
@@ -492,6 +619,9 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 	}
 
 	return &entities.ProfitLossAnalytics{
+		Summary:                 summary,
+		Data:                    data,
+		ProductData:             productData,
 		TodayRevenue:            todayRC.Revenue,
 		TodayCost:               todayRC.Cost,
 		MtdRevenue:              mtdRC.Revenue,
@@ -512,6 +642,7 @@ func (r *AnalyticsRepositoryImpl) getExpenseByCategory(ctx context.Context, orga
 		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
 		Joins("LEFT JOIN chart_of_accounts parent_coa ON coa.parent_id = parent_coa.id").
 		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
 		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
 
 	if outletID != nil {
@@ -531,10 +662,11 @@ func (r *AnalyticsRepositoryImpl) getOperationalExpenseItems(ctx context.Context
 
 	query := r.db.WithContext(ctx).
 		Table("expense_items ei").
-		Select(`COALESCE(ei.description, coa.name) as description, COALESCE(SUM(ei.amount), 0) as amount`).
+		Select(`COALESCE(NULLIF(ei.item, ''), ei.description, coa.name) as item, COALESCE(SUM(ei.amount), 0) as amount`).
 		Joins("JOIN expenses e ON ei.expense_id = e.id").
 		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
 		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
 		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
 
 	if outletID != nil {
@@ -542,7 +674,7 @@ func (r *AnalyticsRepositoryImpl) getOperationalExpenseItems(ctx context.Context
 	}
 
 	err := query.
-		Group("COALESCE(ei.description, coa.name)").
+		Group("COALESCE(NULLIF(ei.item, ''), ei.description, coa.name)").
 		Order("amount DESC").
 		Scan(&results).Error
 

internal/repository/expense_repository.go

@@ -68,13 +68,26 @@ func (r *ExpenseRepositoryImpl) List(ctx context.Context, organizationID uuid.UU
 		case "search":
 			if searchStr, ok := value.(string); ok && searchStr != "" {
 				searchPattern := "%" + strings.ToLower(searchStr) + "%"
-				query = query.Where("LOWER(expense_name) LIKE ? OR LOWER(receiver) LIKE ? OR LOWER(code_number) LIKE ? OR LOWER(description) LIKE ?",
-					searchPattern, searchPattern, searchPattern, searchPattern)
+				query = query.Where(`
+					LOWER(receiver) LIKE ?
+					OR LOWER(code_number) LIKE ?
+					OR LOWER(description) LIKE ?
+					OR EXISTS (
+						SELECT 1
+						FROM expense_items ei
+						WHERE ei.expense_id = expenses.id
+						  AND LOWER(ei.item) LIKE ?
+					)
+				`, searchPattern, searchPattern, searchPattern, searchPattern)
 			}
 		case "outlet_id":
 			if outletID, ok := value.(uuid.UUID); ok {
 				query = query.Where("outlet_id = ?", outletID)
 			}
+		case "status":
+			if status, ok := value.(string); ok && status != "" {
+				query = query.Where("status = ?", status)
+			}
 		case "start_date":
 			if startDate, ok := value.(time.Time); ok {
 				query = query.Where("transaction_date >= ?", startDate)

internal/repository/organization_repository.go

@@ -2,6 +2,8 @@ package repository
 
 import (
 	"context"
+	"time"
+
 	"github.com/google/uuid"
 
 	"apskel-pos-be/internal/entities"
@@ -110,3 +112,29 @@ func (r *OrganizationRepositoryImpl) GetTotalOmset(ctx context.Context, organiza
 		Scan(&total).Error
 	return total, err
 }
+
+// GetTodayOmset returns the total revenue from completed orders for an organization on the current calendar day.
+func (r *OrganizationRepositoryImpl) GetTodayOmset(ctx context.Context, organizationID uuid.UUID) (float64, error) {
+	var total float64
+	err := r.db.WithContext(ctx).
+		Table("orders").
+		Where(
+			"organization_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ? AND created_at >= ? AND created_at < ?",
+			organizationID, "completed", false, false,
+			todayStart(), tomorrowStart(),
+		).
+		Select("COALESCE(SUM(total_amount), 0)").
+		Scan(&total).Error
+	return total, err
+}
+
+// todayStart returns midnight of the current local day.
+func todayStart() time.Time {
+	now := time.Now()
+	return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+}
+
+// tomorrowStart returns midnight of the next local day.
+func tomorrowStart() time.Time {
+	return todayStart().AddDate(0, 0, 1)
+}

internal/repository/outlet_repository.go

@@ -3,6 +3,7 @@ package repository
 import (
 	"apskel-pos-be/internal/entities"
 	"context"
+	"time"
 
 	"github.com/google/uuid"
 	"gorm.io/gorm"
@@ -103,3 +104,22 @@ func (r *OutletRepositoryImpl) Count(ctx context.Context, filters map[string]int
 	err := query.Count(&count).Error
 	return count, err
 }
+
+// GetTodayOmset returns the total revenue from completed orders for an outlet on the current calendar day.
+func (r *OutletRepositoryImpl) GetTodayOmset(ctx context.Context, outletID uuid.UUID) (float64, error) {
+	var total float64
+	now := time.Now()
+	todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	tomorrowStart := todayStart.AddDate(0, 0, 1)
+
+	err := r.db.WithContext(ctx).
+		Table("orders").
+		Where(
+			"outlet_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ? AND created_at >= ? AND created_at < ?",
+			outletID, "completed", false, false,
+			todayStart, tomorrowStart,
+		).
+		Select("COALESCE(SUM(total_amount), 0)").
+		Scan(&total).Error
+	return total, err
+}

internal/repository/tx_manager.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"database/sql"
 
 	"gorm.io/gorm"
 )
@@ -37,3 +38,15 @@ func (m *TxManager) WithTransaction(ctx context.Context, fn func(ctx context.Con
 		return fn(ctxTx)
 	})
 }
+
+// WithTransactionOptions runs fn inside a DB transaction with custom TxOptions (e.g. isolation level).
+func (m *TxManager) WithTransactionOptions(ctx context.Context, opts *sql.TxOptions, fn func(ctx context.Context) error) error {
+	if m == nil || m.db == nil {
+		return fn(ctx)
+	}
+
+	return m.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		ctxTx := context.WithValue(ctx, txKey, tx)
+		return fn(ctxTx)
+	}, opts)
+}

internal/router/router.go

@@ -9,6 +9,7 @@ import (
 	"apskel-pos-be/internal/validator"
 
 	"github.com/gin-gonic/gin"
+	"github.com/redis/go-redis/v9"
 )
 
 type Router struct {
@@ -53,9 +54,10 @@ type Router struct {
 	expenseHandler                    *handler.ExpenseHandler
 	authMiddleware                    *middleware.AuthMiddleware
 	customerAuthMiddleware            *middleware.CustomerAuthMiddleware
+	redisClient                       *redis.Client
 }
 
-func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, userDeviceService service.UserDeviceService, userDeviceValidator validator.UserDeviceValidator, notificationService service.NotificationService, notificationValidator validator.NotificationValidator, productOutletPriceService service.ProductOutletPriceService, productOutletPriceValidator validator.ProductOutletPriceValidator, selfOrderHandler *handler.SelfOrderHandler, expenseService *service.ExpenseServiceImpl, expenseValidator *validator.ExpenseValidatorImpl) *Router {
+func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, userDeviceService service.UserDeviceService, userDeviceValidator validator.UserDeviceValidator, notificationService service.NotificationService, notificationValidator validator.NotificationValidator, productOutletPriceService service.ProductOutletPriceService, productOutletPriceValidator validator.ProductOutletPriceValidator, selfOrderHandler *handler.SelfOrderHandler, expenseService *service.ExpenseServiceImpl, expenseValidator *validator.ExpenseValidatorImpl, redisClient *redis.Client) *Router {
 
 	return &Router{
 		config:                            cfg,
@@ -99,6 +101,7 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
 		selfOrderHandler:                  selfOrderHandler,
 		productOutletPriceHandler:         handler.NewProductOutletPriceHandler(productOutletPriceService, productOutletPriceValidator),
 		expenseHandler:                    handler.NewExpenseHandler(expenseService, expenseValidator),
+		redisClient:                       redisClient,
 	}
 }
 
@@ -274,19 +277,19 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				orders.GET("", r.orderHandler.ListOrders)
 				orders.GET("/:id", r.orderHandler.GetOrderByID)
 				orders.POST("", r.orderHandler.CreateOrder)
-				orders.POST("/:id/add-items", r.orderHandler.AddToOrder)
+				orders.POST("/:id/add-items", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.AddToOrder)
 				orders.PUT("/:id", r.orderHandler.UpdateOrder)
 				orders.PUT("/:id/customer", r.orderHandler.SetOrderCustomer)
-				orders.POST("/void", r.orderHandler.VoidOrder)
-				orders.POST("/:id/refund", r.orderHandler.RefundOrder)
+				orders.POST("/void", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.VoidOrder)
+				orders.POST("/:id/refund", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.RefundOrder)
 				orders.POST("/split-bill", r.orderHandler.SplitBill)
 			}
 
 			payments := protected.Group("/payments")
 			payments.Use(r.authMiddleware.RequireAdminOrManager())
 			{
-				payments.POST("", r.orderHandler.CreatePayment)
-				payments.POST("/:id/refund", r.orderHandler.RefundPayment)
+				payments.POST("", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.CreatePayment)
+				payments.POST("/:id/refund", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.RefundPayment)
 			}
 
 			paymentMethods := protected.Group("/payment-methods")

internal/service/analytics_service.go

@@ -134,18 +134,6 @@ func (s *AnalyticsServiceImpl) validatePaymentMethodAnalyticsRequest(req *models
 		return fmt.Errorf("date_from cannot be after date_to")
 	}
 
-	if req.GroupBy != "" {
-		validGroupBy := map[string]bool{
-			"day":   true,
-			"hour":  true,
-			"week":  true,
-			"month": true,
-		}
-		if !validGroupBy[req.GroupBy] {
-			return fmt.Errorf("invalid group_by value: %s", req.GroupBy)
-		}
-	}
-
 	return nil
 }
 
@@ -306,8 +294,28 @@ func (s *AnalyticsServiceImpl) validateProfitLossAnalyticsRequest(req *models.Pr
 		return fmt.Errorf("organization_id is required")
 	}
 
-	if req.Date.IsZero() {
-		return fmt.Errorf("date is required")
+	if req.DateFrom.IsZero() {
+		return fmt.Errorf("date_from is required")
+	}
+
+	if req.DateTo.IsZero() {
+		return fmt.Errorf("date_to is required")
+	}
+
+	if req.DateFrom.After(req.DateTo) {
+		return fmt.Errorf("date_from cannot be after date_to")
+	}
+
+	if req.GroupBy != "" {
+		validGroupBy := map[string]bool{
+			"day":   true,
+			"hour":  true,
+			"week":  true,
+			"month": true,
+		}
+		if !validGroupBy[req.GroupBy] {
+			return fmt.Errorf("invalid group_by value: %s", req.GroupBy)
+		}
 	}
 
 	return nil

internal/service/analytics_service_test.go

@@ -119,3 +119,74 @@ func TestAnalyticsServiceGetPurchasingAnalyticsAllowsEmptyGroupBy(t *testing.T)
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 }
+
+func TestAnalyticsServiceGetProfitLossAnalyticsValidation(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	tests := []struct {
+		name    string
+		req     *models.ProfitLossAnalyticsRequest
+		wantErr string
+	}{
+		{
+			name: "missing date_from",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateTo:         now,
+			},
+			wantErr: "date_from is required",
+		},
+		{
+			name: "missing date_to",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now,
+			},
+			wantErr: "date_to is required",
+		},
+		{
+			name: "reversed dates",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now.AddDate(0, 0, 1),
+				DateTo:         now,
+			},
+			wantErr: "date_from cannot be after date_to",
+		},
+		{
+			name: "invalid group_by",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now,
+				DateTo:         now,
+				GroupBy:        "quarter",
+			},
+			wantErr: "invalid group_by value: quarter",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			resp, err := service.GetProfitLossAnalytics(context.Background(), tt.req)
+
+			require.Nil(t, resp)
+			require.Error(t, err)
+			require.Contains(t, err.Error(), tt.wantErr)
+		})
+	}
+}
+
+func TestAnalyticsServiceGetProfitLossAnalyticsAllowsEmptyGroupBy(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	resp, err := service.GetProfitLossAnalytics(context.Background(), &models.ProfitLossAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.Nil(t, resp)
+}

internal/service/expense_service.go

@@ -87,6 +87,9 @@ func (s *ExpenseServiceImpl) ListExpenses(ctx context.Context, apctx *appcontext
 	if modelReq.Search != "" {
 		filters["search"] = modelReq.Search
 	}
+	if modelReq.Status != "" {
+		filters["status"] = modelReq.Status
+	}
 	if modelReq.OutletID != "" {
 		outletID, err := uuid.Parse(modelReq.OutletID)
 		if err == nil {

internal/service/omset_milestone_scheduler.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"math"
 	"sync"
 	"time"
 
 	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/processor"
 	"apskel-pos-be/internal/repository"
@@ -17,32 +17,38 @@ import (
 )
 
 const (
-	defaultCheckInterval = 1 * time.Hour
+	defaultCheckInterval = 5 * time.Minute
 	OmsetMillionRupiah   = 1_000_000.0
 )
 
-// OmsetMilestoneScheduler periodically checks each organization's total omset
-// and sends a notification to owner/admin users when a milestone is reached.
+// OmsetMilestoneScheduler periodically checks each outlet's omset for the
+// current calendar day and sends a notification every time it crosses a new
+// multiple of OmsetMillionRupiah (1 jt, 2 jt, 3 jt, …).
 //
-// NOTE: Milestone tracking is in-memory; notifications may re-trigger after a restart.
-// For persistent tracking, persist the notified state in the database.
+// The notified state is keyed by "outletID:YYYY-MM-DD:N" so each multiple is
+// only notified once per day. State resets naturally on the next day (new key).
+// NOTE: state is in-memory; a server restart within the same day may re-send
+// notifications for already-crossed milestones.
 type OmsetMilestoneScheduler struct {
 	orgRepo          *repository.OrganizationRepositoryImpl
+	outletRepo       *repository.OutletRepositoryImpl
 	userRepo         *repository.UserRepositoryImpl
 	notificationProc processor.NotificationProcessor
 
 	mu       sync.Mutex
-	notified map[string]bool // "orgID:milestone" -> already notified
+	notified map[string]bool // "outletID:YYYY-MM-DD:N" -> already notified
 	stopCh   chan struct{}
 }
 
 func NewOmsetMilestoneScheduler(
 	orgRepo *repository.OrganizationRepositoryImpl,
+	outletRepo *repository.OutletRepositoryImpl,
 	userRepo *repository.UserRepositoryImpl,
 	notificationProc processor.NotificationProcessor,
 ) *OmsetMilestoneScheduler {
 	return &OmsetMilestoneScheduler{
 		orgRepo:          orgRepo,
+		outletRepo:       outletRepo,
 		userRepo:         userRepo,
 		notificationProc: notificationProc,
 		notified:         make(map[string]bool),
@@ -57,8 +63,8 @@ func (s *OmsetMilestoneScheduler) Start(interval time.Duration) {
 	}
 
 	go func() {
-		// Perform an initial check immediately.
-		s.checkAllOrganizations()
+		// Perform an initial check immediately on startup.
+		s.checkAllOutlets()
 
 		ticker := time.NewTicker(interval)
 		defer ticker.Stop()
@@ -66,7 +72,7 @@ func (s *OmsetMilestoneScheduler) Start(interval time.Duration) {
 		for {
 			select {
 			case <-ticker.C:
-				s.checkAllOrganizations()
+				s.checkAllOutlets()
 			case <-s.stopCh:
 				log.Println("Omset milestone scheduler stopped")
 				return
@@ -74,7 +80,7 @@ func (s *OmsetMilestoneScheduler) Start(interval time.Duration) {
 		}
 	}()
 
-	log.Println("Omset milestone scheduler started")
+	log.Printf("Omset milestone scheduler started (interval: %s)", interval)
 }
 
 // Stop signals the scheduler to stop.
@@ -82,7 +88,7 @@ func (s *OmsetMilestoneScheduler) Stop() {
 	close(s.stopCh)
 }
 
-func (s *OmsetMilestoneScheduler) checkAllOrganizations() {
+func (s *OmsetMilestoneScheduler) checkAllOutlets() {
 	ctx := context.Background()
 
 	orgs, _, err := s.orgRepo.List(ctx, nil, 1000, 0)
@@ -92,25 +98,38 @@ func (s *OmsetMilestoneScheduler) checkAllOrganizations() {
 	}
 
 	for _, org := range orgs {
-		s.checkOrganization(ctx, org)
-	}
-}
-
-func (s *OmsetMilestoneScheduler) checkOrganization(ctx context.Context, org *entities.Organization) {
-	totalOmset, err := s.orgRepo.GetTotalOmset(ctx, org.ID)
-	if err != nil {
-		log.Printf("OmsetMilestoneScheduler: failed to get total omset for org %s: %v", org.ID, err)
-		return
-	}
-
-	milestones := []float64{OmsetMillionRupiah}
-
-	for _, milestone := range milestones {
-		if totalOmset < milestone {
+		outlets, err := s.outletRepo.GetByOrganizationID(ctx, org.ID)
+		if err != nil {
+			log.Printf("OmsetMilestoneScheduler: failed to list outlets for org %s: %v", org.ID, err)
 			continue
 		}
 
-		key := fmt.Sprintf("%s:%.0f", org.ID.String(), milestone)
+		for _, outlet := range outlets {
+			if !outlet.IsActive {
+				continue
+			}
+			s.checkOutlet(ctx, org.ID, outlet.ID, outlet.Name)
+		}
+	}
+}
+
+func (s *OmsetMilestoneScheduler) checkOutlet(ctx context.Context, organizationID, outletID uuid.UUID, outletName string) {
+	todayOmset, err := s.outletRepo.GetTodayOmset(ctx, outletID)
+	if err != nil {
+		log.Printf("OmsetMilestoneScheduler: failed to get today's omset for outlet %s: %v", outletID, err)
+		return
+	}
+
+	if todayOmset < OmsetMillionRupiah {
+		return
+	}
+
+	// How many full multiples of 1 juta have been crossed today?
+	crossedMultiple := int(math.Floor(todayOmset / OmsetMillionRupiah))
+	today := time.Now().Format("2006-01-02")
+
+	for n := 1; n <= crossedMultiple; n++ {
+		key := fmt.Sprintf("%s:%s:%d", outletID.String(), today, n)
 
 		s.mu.Lock()
 		if s.notified[key] {
@@ -120,23 +139,31 @@ func (s *OmsetMilestoneScheduler) checkOrganization(ctx context.Context, org *en
 		s.notified[key] = true
 		s.mu.Unlock()
 
-		s.sendMilestoneNotification(ctx, org, totalOmset, milestone)
+		milestone := float64(n) * OmsetMillionRupiah
+		s.sendMilestoneNotification(ctx, organizationID, outletID, outletName, todayOmset, milestone, n)
 	}
 }
 
-func (s *OmsetMilestoneScheduler) sendMilestoneNotification(ctx context.Context, org *entities.Organization, totalOmset float64, milestone float64) {
-	users, err := s.userRepo.GetByOrganizationID(ctx, org.ID)
+func (s *OmsetMilestoneScheduler) sendMilestoneNotification(
+	ctx context.Context,
+	organizationID, outletID uuid.UUID,
+	outletName string,
+	todayOmset, milestone float64,
+	multiple int,
+) {
+	// Fetch all users in the org, then filter to owner and manager only.
+	// These roles are not assigned to a specific outlet, so we query by org.
+	users, err := s.userRepo.GetByOrganizationID(ctx, organizationID)
 	if err != nil {
-		log.Printf("OmsetMilestoneScheduler: failed to get users for org %s: %v", org.ID, err)
+		log.Printf("OmsetMilestoneScheduler: failed to get users for org %s: %v", organizationID, err)
 		return
 	}
 
-	// Notify owner and admin users.
 	var receiverIDs []uuid.UUID
-	for _, user := range users {
-		roleStr := string(user.Role)
-		if roleStr == string(constants.RoleOwner) || roleStr == string(constants.RoleAdmin) {
-			receiverIDs = append(receiverIDs, user.ID)
+	for _, u := range users {
+		role := string(u.Role)
+		if role == string(constants.RoleOwner) || role == string(constants.RoleManager) {
+			receiverIDs = append(receiverIDs, u.ID)
 		}
 	}
 
@@ -144,28 +171,34 @@ func (s *OmsetMilestoneScheduler) sendMilestoneNotification(ctx context.Context,
 		return
 	}
 
-	orgID := org.ID
-	title := "🎉 Selamat! Omset Telah Mencapai 1 Juta Rupiah"
-	body := fmt.Sprintf("Organisasi %s telah mencapai omset Rp %.0f. Terus tingkatkan prestasinya!", org.Name, totalOmset)
+	title := fmt.Sprintf("🎉 Omset %s Hari Ini Mencapai Rp %.0f!", outletName, milestone)
+	body := fmt.Sprintf(
+		"Selamat! Omset outlet %s hari ini sudah menembus Rp %.0f (total hari ini: Rp %.0f). Terus semangat!",
+		outletName, milestone, todayOmset,
+	)
 
 	notifReq := &models.SendNotificationRequest{
 		Title:          title,
 		Body:           body,
 		Type:           "milestone",
 		Category:       "omset_milestone",
-		NotifiableType: "organization",
-		NotifiableID:   &orgID,
+		NotifiableType: "outlet",
+		NotifiableID:   &outletID,
 		ReceiverIDs:    receiverIDs,
 		Data: map[string]interface{}{
-			"organization_id": org.ID.String(),
-			"total_omset":     totalOmset,
+			"organization_id": organizationID.String(),
+			"outlet_id":       outletID.String(),
+			"outlet_name":     outletName,
+			"today_omset":     todayOmset,
 			"milestone":       milestone,
+			"multiple":        multiple,
 		},
 	}
 
 	if _, err := s.notificationProc.Send(ctx, notifReq); err != nil {
-		log.Printf("OmsetMilestoneScheduler: failed to send notification for org %s: %v", org.ID, err)
+		log.Printf("OmsetMilestoneScheduler: failed to send notification for outlet %s: %v", outletID, err)
 	} else {
-		log.Printf("OmsetMilestoneScheduler: sent milestone notification to org %s (omset: %.0f)", org.ID, totalOmset)
+		log.Printf("OmsetMilestoneScheduler: sent milestone x%d (Rp %.0f) for outlet %s (today omset: %.0f)",
+			multiple, milestone, outletName, todayOmset)
 	}
 }

internal/service/order_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"apskel-pos-be/internal/appcontext"
 	"context"
+	"database/sql"
 	"fmt"
 	"time"
 
@@ -228,7 +229,9 @@ func (s *OrderServiceImpl) AddToOrder(ctx context.Context, orderID uuid.UUID, re
 	var response *models.AddToOrderResponse
 	var ingredientTransactions []*contract.CreateOrderIngredientTransactionRequest
 
-	err := s.txManager.WithTransaction(ctx, func(txCtx context.Context) error {
+	err := s.txManager.WithTransactionOptions(ctx, &sql.TxOptions{
+		Isolation: sql.LevelSerializable,
+	}, func(txCtx context.Context) error {
 		addResp, err := s.orderProcessor.AddToOrder(txCtx, orderID, req)
 		if err != nil {
 			return fmt.Errorf("failed to add items to order: %w", err)
@@ -305,8 +308,16 @@ func (s *OrderServiceImpl) VoidOrder(ctx context.Context, req *models.VoidOrderR
 		return fmt.Errorf("invalid user ID")
 	}
 
-	if err := s.orderProcessor.VoidOrder(ctx, req, voidedBy); err != nil {
-		return fmt.Errorf("failed to void order: %w", err)
+	err := s.txManager.WithTransactionOptions(ctx, &sql.TxOptions{
+		Isolation: sql.LevelSerializable,
+	}, func(txCtx context.Context) error {
+		if err := s.orderProcessor.VoidOrder(txCtx, req, voidedBy); err != nil {
+			return fmt.Errorf("failed to void order: %w", err)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
 	}
 
 	if err := s.handleTableReleaseOnVoid(ctx, req.OrderID); err != nil {
@@ -561,9 +572,14 @@ func (s *OrderServiceImpl) validateCreatePaymentRequest(req *models.CreatePaymen
 				return fmt.Errorf("payment item amount must be greater than zero for item %d", i+1)
 			}
 
+			fmt.Printf("[DEBUG] CreatePayment order_id=%s item[%d] order_item_id=%s amount=%.10f\n",
+				req.OrderID, i, item.OrderItemID, item.Amount)
 			totalItemAmount += item.Amount
 		}
 
+		fmt.Printf("[DEBUG] CreatePayment order_id=%s total_amount=%.10f sum_items=%.10f diff=%.10f\n",
+			req.OrderID, req.Amount, totalItemAmount, req.Amount-totalItemAmount)
+
 		if totalItemAmount != req.Amount {
 			return fmt.Errorf("sum of payment item amounts must equal total payment amount")
 		}

internal/service/report_service.go

@@ -113,7 +113,7 @@ func (s *ReportServiceImpl) GenerateDailyTransactionPDF(ctx context.Context, org
 	end := day.Add(24*time.Hour - time.Nanosecond)
 
 	salesReq := &models.SalesAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end, GroupBy: "day"}
-	plReq := &models.ProfitLossAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, Date: day}
+	plReq := &models.ProfitLossAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end}
 	productReq := &models.ProductAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end, Limit: 1000}
 
 	sales, err := s.analyticsService.GetSalesAnalytics(ctx, salesReq)

internal/transformer/analytics_transformer.go

@@ -432,19 +432,25 @@ func ProfitLossAnalyticsContractToModel(req *contract.ProfitLossAnalyticsRequest
 		return nil, fmt.Errorf("request cannot be nil")
 	}
 
-	dateTime, err := util.ParseDateToJakartaTime(req.Date)
+	dateFrom, dateTo, err := util.ParseDateRangeToJakartaTime(req.DateFrom, req.DateTo)
 	if err != nil {
-		return nil, fmt.Errorf("invalid date format: %w", err)
+		return nil, fmt.Errorf("invalid date range: %w", err)
 	}
 
-	if dateTime == nil {
-		return nil, fmt.Errorf("date is required")
+	if dateFrom == nil {
+		return nil, fmt.Errorf("date_from is required")
+	}
+
+	if dateTo == nil {
+		return nil, fmt.Errorf("date_to is required")
 	}
 
 	return &models.ProfitLossAnalyticsRequest{
 		OrganizationID: req.OrganizationID,
 		OutletID:       parseOutletID(req.OutletID),
-		Date:           *dateTime,
+		DateFrom:       *dateFrom,
+		DateTo:         *dateTo,
+		GroupBy:        req.GroupBy,
 	}, nil
 }
 
@@ -458,6 +464,40 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 		mainSummary[i] = profitLossSummaryRowModelToContract(row)
 	}
 
+	data := make([]contract.ProfitLossData, len(resp.Data))
+	for i, item := range resp.Data {
+		data[i] = contract.ProfitLossData{
+			Date:              item.Date,
+			Revenue:           item.Revenue,
+			Cost:              item.Cost,
+			GrossProfit:       item.GrossProfit,
+			GrossProfitMargin: item.GrossProfitMargin,
+			Tax:               item.Tax,
+			Discount:          item.Discount,
+			NetProfit:         item.NetProfit,
+			NetProfitMargin:   item.NetProfitMargin,
+			Orders:            item.Orders,
+		}
+	}
+
+	productData := make([]contract.ProductProfitData, len(resp.ProductData))
+	for i, item := range resp.ProductData {
+		productData[i] = contract.ProductProfitData{
+			ProductID:         item.ProductID,
+			ProductName:       item.ProductName,
+			CategoryID:        item.CategoryID,
+			CategoryName:      item.CategoryName,
+			QuantitySold:      item.QuantitySold,
+			Revenue:           item.Revenue,
+			Cost:              item.Cost,
+			GrossProfit:       item.GrossProfit,
+			GrossProfitMargin: item.GrossProfitMargin,
+			AveragePrice:      item.AveragePrice,
+			AverageCost:       item.AverageCost,
+			ProfitPerUnit:     item.ProfitPerUnit,
+		}
+	}
+
 	opsItems := make([]contract.OperationalExpenseItem, len(resp.OperationalExpenses))
 	for i, item := range resp.OperationalExpenses {
 		opsItems[i] = contract.OperationalExpenseItem{
@@ -467,9 +507,26 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 	}
 
 	return &contract.ProfitLossAnalyticsResponse{
-		OrganizationID:           resp.OrganizationID,
-		OutletID:                 resp.OutletID,
-		Date:                     resp.Date,
+		OrganizationID: resp.OrganizationID,
+		OutletID:       resp.OutletID,
+		DateFrom:       resp.DateFrom,
+		DateTo:         resp.DateTo,
+		GroupBy:        resp.GroupBy,
+		Summary: contract.ProfitLossSummary{
+			TotalRevenue:       resp.Summary.TotalRevenue,
+			TotalCost:          resp.Summary.TotalCost,
+			GrossProfit:        resp.Summary.GrossProfit,
+			GrossProfitMargin:  resp.Summary.GrossProfitMargin,
+			TotalTax:           resp.Summary.TotalTax,
+			TotalDiscount:      resp.Summary.TotalDiscount,
+			NetProfit:          resp.Summary.NetProfit,
+			NetProfitMargin:    resp.Summary.NetProfitMargin,
+			TotalOrders:        resp.Summary.TotalOrders,
+			AverageProfit:      resp.Summary.AverageProfit,
+			ProfitabilityRatio: resp.Summary.ProfitabilityRatio,
+		},
+		Data:                     data,
+		ProductData:              productData,
 		MainSummary:              mainSummary,
 		OperationalExpenses:      opsItems,
 		OperationalExpensesTotal: resp.OperationalExpensesTotal,

internal/transformer/analytics_transformer_test.go

@@ -74,3 +74,81 @@ func TestPurchasingAnalyticsModelToContractOmitsNilOutletName(t *testing.T) {
 	require.NoError(t, err)
 	require.NotContains(t, string(payload), "outlet_name")
 }
+
+func TestProfitLossAnalyticsContractToModelParsesDateRange(t *testing.T) {
+	orgID := uuid.New()
+	outletID := uuid.New().String()
+
+	result, err := ProfitLossAnalyticsContractToModel(&contract.ProfitLossAnalyticsRequest{
+		OrganizationID: orgID,
+		OutletID:       &outletID,
+		DateFrom:       "01-05-2026",
+		DateTo:         "29-05-2026",
+		GroupBy:        "week",
+	})
+
+	require.NoError(t, err)
+	require.Equal(t, orgID, result.OrganizationID)
+	require.NotNil(t, result.OutletID)
+	require.Equal(t, outletID, result.OutletID.String())
+	require.Equal(t, "week", result.GroupBy)
+
+	location, err := time.LoadLocation("Asia/Jakarta")
+	require.NoError(t, err)
+	require.Equal(t, time.Date(2026, 5, 1, 0, 0, 0, 0, location), result.DateFrom)
+	require.Equal(t, time.Date(2026, 5, 29, 23, 59, 59, int(time.Second-time.Nanosecond), location), result.DateTo)
+}
+
+func TestProfitLossAnalyticsModelToContractCopiesDateRange(t *testing.T) {
+	dateFrom := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+	dateTo := time.Date(2026, 5, 29, 23, 59, 59, int(time.Second-time.Nanosecond), time.UTC)
+	productID := uuid.New()
+	categoryID := uuid.New()
+
+	result := ProfitLossAnalyticsModelToContract(&models.ProfitLossAnalyticsResponse{
+		OrganizationID: uuid.New(),
+		DateFrom:       dateFrom,
+		DateTo:         dateTo,
+		GroupBy:        "month",
+		Summary: models.ProfitLossSummary{
+			TotalRevenue: 1000,
+			NetProfit:    500,
+		},
+		Data: []models.ProfitLossData{
+			{
+				Date:      dateFrom,
+				Revenue:   1000,
+				NetProfit: 500,
+			},
+		},
+		ProductData: []models.ProductProfitData{
+			{
+				ProductID:    productID,
+				ProductName:  "Nasi",
+				CategoryID:   categoryID,
+				CategoryName: "Food",
+				Revenue:      1000,
+				GrossProfit:  500,
+			},
+		},
+		MainSummary: []models.ProfitLossSummaryRow{
+			{
+				ID:           "total_omset",
+				Label:        "TOTAL OMSET",
+				TodayNominal: 1000,
+			},
+		},
+	})
+
+	require.NotNil(t, result)
+	require.Equal(t, dateFrom, result.DateFrom)
+	require.Equal(t, dateTo, result.DateTo)
+	require.Equal(t, "month", result.GroupBy)
+	require.Equal(t, float64(1000), result.Summary.TotalRevenue)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(500), result.Data[0].NetProfit)
+	require.Len(t, result.ProductData, 1)
+	require.Equal(t, productID, result.ProductData[0].ProductID)
+	require.Len(t, result.MainSummary, 1)
+	require.Equal(t, "total_omset", result.MainSummary[0].ID)
+}

internal/transformer/expense_transformer.go

@@ -12,11 +12,11 @@ func CreateExpenseRequestToModel(req *contract.CreateExpenseRequest) *models.Cre
 	}
 
 	return &models.CreateExpenseRequest{
-		ExpenseName:     req.ExpenseName,
 		Receiver:        req.Receiver,
 		TransactionDate: req.TransactionDate,
 		CodeNumber:      req.CodeNumber,
 		OutletID:        req.OutletID,
+		Status:          req.Status,
 		Description:     req.Description,
 		Tax:             req.Tax,
 		Total:           req.Total,
@@ -27,6 +27,7 @@ func CreateExpenseRequestToModel(req *contract.CreateExpenseRequest) *models.Cre
 func CreateExpenseItemRequestToModel(req *contract.CreateExpenseItemRequest) models.CreateExpenseItemRequest {
 	return models.CreateExpenseItemRequest{
 		ChartOfAccountID: req.ChartOfAccountID,
+		Item:             req.Item,
 		Description:      req.Description,
 		Amount:           req.Amount,
 	}
@@ -34,11 +35,11 @@ func CreateExpenseItemRequestToModel(req *contract.CreateExpenseItemRequest) mod
 
 func UpdateExpenseRequestToModel(req *contract.UpdateExpenseRequest) *models.UpdateExpenseRequest {
 	modelReq := &models.UpdateExpenseRequest{
-		ExpenseName:     req.ExpenseName,
 		Receiver:        req.Receiver,
 		TransactionDate: req.TransactionDate,
 		CodeNumber:      req.CodeNumber,
 		OutletID:        req.OutletID,
+		Status:          req.Status,
 		Description:     req.Description,
 		Tax:             req.Tax,
 		Total:           req.Total,
@@ -59,6 +60,7 @@ func UpdateExpenseRequestToModel(req *contract.UpdateExpenseRequest) *models.Upd
 func UpdateExpenseItemRequestToModel(req *contract.UpdateExpenseItemRequest) models.UpdateExpenseItemRequest {
 	return models.UpdateExpenseItemRequest{
 		ChartOfAccountID: req.ChartOfAccountID,
+		Item:             req.Item,
 		Description:      req.Description,
 		Amount:           req.Amount,
 	}
@@ -70,6 +72,7 @@ func ListExpenseRequestToModel(req *contract.ListExpenseRequest) *models.ListExp
 		Limit:     req.Limit,
 		Search:    req.Search,
 		OutletID:  req.OutletID,
+		Status:    req.Status,
 		StartDate: req.StartDate,
 		EndDate:   req.EndDate,
 	}
@@ -89,10 +92,10 @@ func ExpenseModelResponseToResponse(expense *models.ExpenseResponse) *contract.E
 		ID:              expense.ID,
 		OrganizationID:  expense.OrganizationID,
 		OutletID:        expense.OutletID,
-		ExpenseName:     expense.ExpenseName,
 		Receiver:        expense.Receiver,
 		TransactionDate: expense.TransactionDate,
 		CodeNumber:      expense.CodeNumber,
+		Status:          expense.Status,
 		Description:     expense.Description,
 		Tax:             expense.Tax,
 		Total:           expense.Total,
@@ -109,6 +112,7 @@ func ExpenseItemModelResponseToResponse(item *models.ExpenseItemResponse) contra
 		ExpenseID:          item.ExpenseID,
 		ChartOfAccountID:   item.ChartOfAccountID,
 		ChartOfAccountName: item.ChartOfAccountName,
+		Item:               item.Item,
 		Description:        item.Description,
 		Amount:             item.Amount,
 		CreatedAt:          item.CreatedAt,

internal/transformer/purchase_order_transformer.go

@@ -25,10 +25,14 @@ func CreatePurchaseOrderRequestToModel(req *contract.CreatePurchaseOrderRequest)
 		return nil, err
 	}
 
-	// Parse due date
-	dueDate, err := time.Parse("2006-01-02", req.DueDate)
-	if err != nil {
-		return nil, err
+	// Parse due date if provided
+	var dueDate *time.Time
+	if req.DueDate != nil && *req.DueDate != "" {
+		parsedDate, err := time.Parse("2006-01-02", *req.DueDate)
+		if err != nil {
+			return nil, err
+		}
+		dueDate = &parsedDate
 	}
 
 	return &models.CreatePurchaseOrderRequest{

internal/transformer/purchase_order_transformer_test.go

@@ -0,0 +1,43 @@
+package transformer
+
+import (
+	"encoding/json"
+	"testing"
+
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCreatePurchaseOrderRequestToModelAllowsMissingDueDate(t *testing.T) {
+	result, err := CreatePurchaseOrderRequestToModel(&contract.CreatePurchaseOrderRequest{
+		VendorID:        uuid.New(),
+		PONumber:        "PO-001",
+		TransactionDate: "2026-05-29",
+		Items: []contract.CreatePurchaseOrderItemRequest{
+			{
+				IngredientID: uuid.New(),
+				Quantity:     1,
+				UnitID:       uuid.New(),
+				Amount:       1000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.Nil(t, result.DueDate)
+}
+
+func TestPurchaseOrderModelResponseToResponseIncludesNullDueDate(t *testing.T) {
+	result := PurchaseOrderModelResponseToResponse(&models.PurchaseOrderResponse{
+		ID:       uuid.New(),
+		VendorID: uuid.New(),
+		PONumber: "PO-001",
+	})
+
+	payload, err := json.Marshal(result)
+	require.NoError(t, err)
+	require.Contains(t, string(payload), `"due_date":null`)
+}

internal/util/http_util.go

@@ -16,6 +16,12 @@ func HandleResponse(w http.ResponseWriter, r *http.Request, response *contract.R
 	} else {
 		responseError := response.GetErrors()[0]
 		statusCode = MapErrorCodeToHttpStatus(responseError.GetCode())
+		logger.FromContext(r.Context()).WithFields(map[string]interface{}{
+			"error_code":   responseError.GetCode(),
+			"error_entity": responseError.GetEntity(),
+			"error_cause":  responseError.GetCause(),
+			"status_code":  statusCode,
+		}).Error(methodName)
 	}
 	WriteResponse(w, r, *response, statusCode, methodName)
 }

internal/validator/expense_validator.go

@@ -28,10 +28,6 @@ func (v *ExpenseValidatorImpl) ValidateCreateExpenseRequest(req *contract.Create
 		return errors.New("request body is required"), constants.MissingFieldErrorCode
 	}
 
-	if strings.TrimSpace(req.ExpenseName) == "" {
-		return errors.New("expense_name is required"), constants.MissingFieldErrorCode
-	}
-
 	if strings.TrimSpace(req.Receiver) == "" {
 		return errors.New("receiver is required"), constants.MissingFieldErrorCode
 	}
@@ -52,6 +48,10 @@ func (v *ExpenseValidatorImpl) ValidateCreateExpenseRequest(req *contract.Create
 		return errors.New("outlet_id must be a valid UUID"), constants.MalformedFieldErrorCode
 	}
 
+	if req.Status != nil && !constants.IsValidExpenseStatus(constants.ExpenseStatus(*req.Status)) {
+		return errors.New("status must be one of: draft, sent, approved, cancel"), constants.MalformedFieldErrorCode
+	}
+
 	if req.Total <= 0 {
 		return errors.New("total must be greater than 0"), constants.MalformedFieldErrorCode
 	}
@@ -68,6 +68,9 @@ func (v *ExpenseValidatorImpl) ValidateCreateExpenseRequest(req *contract.Create
 		if strings.TrimSpace(item.ChartOfAccountID) == "" {
 			return fmt.Errorf("item %d: chart_of_account_id is required", i), constants.MissingFieldErrorCode
 		}
+		if strings.TrimSpace(item.Item) == "" {
+			return fmt.Errorf("item %d: item is required", i), constants.MissingFieldErrorCode
+		}
 		if _, err := uuid.Parse(item.ChartOfAccountID); err != nil {
 			return fmt.Errorf("item %d: chart_of_account_id must be a valid UUID", i), constants.MalformedFieldErrorCode
 		}
@@ -84,10 +87,6 @@ func (v *ExpenseValidatorImpl) ValidateUpdateExpenseRequest(req *contract.Update
 		return errors.New("request body is required"), constants.MissingFieldErrorCode
 	}
 
-	if req.ExpenseName != nil && strings.TrimSpace(*req.ExpenseName) == "" {
-		return errors.New("expense_name cannot be empty"), constants.MalformedFieldErrorCode
-	}
-
 	if req.Receiver != nil && strings.TrimSpace(*req.Receiver) == "" {
 		return errors.New("receiver cannot be empty"), constants.MalformedFieldErrorCode
 	}
@@ -96,6 +95,10 @@ func (v *ExpenseValidatorImpl) ValidateUpdateExpenseRequest(req *contract.Update
 		return errors.New("code_number cannot be empty"), constants.MalformedFieldErrorCode
 	}
 
+	if req.Status != nil && !constants.IsValidExpenseStatus(constants.ExpenseStatus(*req.Status)) {
+		return errors.New("status must be one of: draft, sent, approved, cancel"), constants.MalformedFieldErrorCode
+	}
+
 	if req.OutletID != nil {
 		if strings.TrimSpace(*req.OutletID) == "" {
 			return errors.New("outlet_id cannot be empty"), constants.MalformedFieldErrorCode
@@ -123,6 +126,9 @@ func (v *ExpenseValidatorImpl) ValidateUpdateExpenseRequest(req *contract.Update
 					return fmt.Errorf("item %d: chart_of_account_id must be a valid UUID", i), constants.MalformedFieldErrorCode
 				}
 			}
+			if item.Item != nil && strings.TrimSpace(*item.Item) == "" {
+				return fmt.Errorf("item %d: item cannot be empty", i), constants.MalformedFieldErrorCode
+			}
 			if item.Amount != nil && *item.Amount <= 0 {
 				return fmt.Errorf("item %d: amount must be greater than 0", i), constants.MalformedFieldErrorCode
 			}
@@ -145,5 +151,9 @@ func (v *ExpenseValidatorImpl) ValidateListExpenseRequest(req *contract.ListExpe
 		return errors.New("limit must be between 1 and 100"), constants.MalformedFieldErrorCode
 	}
 
+	if req.Status != "" && !constants.IsValidExpenseStatus(constants.ExpenseStatus(req.Status)) {
+		return errors.New("status must be one of: draft, sent, approved, cancel"), constants.MalformedFieldErrorCode
+	}
+
 	return nil, ""
 }

internal/validator/expense_validator_test.go

@@ -0,0 +1,158 @@
+package validator
+
+import (
+	"testing"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func TestExpenseValidatorCreateRequiresItemName(t *testing.T) {
+	v := NewExpenseValidator()
+
+	req := &contract.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []contract.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Amount:           10000,
+			},
+		},
+	}
+
+	err, code := v.ValidateCreateExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MissingFieldErrorCode, code)
+	require.Contains(t, err.Error(), "item 0: item is required")
+}
+
+func TestExpenseValidatorCreateDoesNotRequireHeaderExpenseName(t *testing.T) {
+	v := NewExpenseValidator()
+
+	req := &contract.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []contract.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	}
+
+	err, code := v.ValidateCreateExpenseRequest(req)
+
+	require.NoError(t, err)
+	require.Empty(t, code)
+}
+
+func TestExpenseValidatorCreateAllowsValidOptionalStatus(t *testing.T) {
+	v := NewExpenseValidator()
+	status := "approved"
+
+	req := &contract.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Status:          &status,
+		Total:           10000,
+		Items: []contract.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	}
+
+	err, code := v.ValidateCreateExpenseRequest(req)
+
+	require.NoError(t, err)
+	require.Empty(t, code)
+}
+
+func TestExpenseValidatorCreateRejectsInvalidStatus(t *testing.T) {
+	v := NewExpenseValidator()
+	status := "cancelled"
+
+	req := &contract.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Status:          &status,
+		Total:           10000,
+		Items: []contract.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	}
+
+	err, code := v.ValidateCreateExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "status must be one of: draft, sent, approved, cancel")
+}
+
+func TestExpenseValidatorUpdateRejectsEmptyItemNameWhenProvided(t *testing.T) {
+	v := NewExpenseValidator()
+	empty := " "
+
+	req := &contract.UpdateExpenseRequest{
+		Items: []contract.UpdateExpenseItemRequest{
+			{Item: &empty},
+		},
+	}
+
+	err, code := v.ValidateUpdateExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "item 0: item cannot be empty")
+}
+
+func TestExpenseValidatorUpdateRejectsInvalidStatus(t *testing.T) {
+	v := NewExpenseValidator()
+	status := "cancelled"
+
+	req := &contract.UpdateExpenseRequest{Status: &status}
+
+	err, code := v.ValidateUpdateExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "status must be one of: draft, sent, approved, cancel")
+}
+
+func TestExpenseValidatorListRejectsInvalidStatus(t *testing.T) {
+	v := NewExpenseValidator()
+
+	req := &contract.ListExpenseRequest{
+		Page:   1,
+		Limit:  10,
+		Status: "cancelled",
+	}
+
+	err, code := v.ValidateListExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "status must be one of: draft, sent, approved, cancel")
+}

internal/validator/purchase_order_validator.go

@@ -47,18 +47,19 @@ func (v *PurchaseOrderValidatorImpl) ValidateCreatePurchaseOrderRequest(req *con
 		return errors.New("transaction_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
 	}
 
-	// Validate due date
-	if strings.TrimSpace(req.DueDate) == "" {
-		return errors.New("due_date is required"), constants.MissingFieldErrorCode
-	}
-	dueDate, err := time.Parse("2006-01-02", req.DueDate)
-	if err != nil {
-		return errors.New("due_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
-	}
+	if req.DueDate != nil {
+		if strings.TrimSpace(*req.DueDate) == "" {
+			return errors.New("due_date cannot be empty"), constants.MalformedFieldErrorCode
+		}
 
-	// Check if due date is after transaction date
-	if dueDate.Before(transactionDate) {
-		return errors.New("due_date must be after transaction_date"), constants.MalformedFieldErrorCode
+		dueDate, err := time.Parse("2006-01-02", *req.DueDate)
+		if err != nil {
+			return errors.New("due_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
+		}
+
+		if dueDate.Before(transactionDate) {
+			return errors.New("due_date must be after transaction_date"), constants.MalformedFieldErrorCode
+		}
 	}
 
 	if req.Reference != nil && len(*req.Reference) > 100 {
@@ -100,22 +101,27 @@ func (v *PurchaseOrderValidatorImpl) ValidateUpdatePurchaseOrderRequest(req *con
 		}
 	}
 
-	// Validate dates if both are provided
-	if req.TransactionDate != nil && req.DueDate != nil {
-		if *req.TransactionDate != "" && *req.DueDate != "" {
-			transactionDate, err := time.Parse("2006-01-02", *req.TransactionDate)
-			if err != nil {
-				return errors.New("transaction_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
-			}
-			
-			dueDate, err := time.Parse("2006-01-02", *req.DueDate)
-			if err != nil {
-				return errors.New("due_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
-			}
-			
-			if dueDate.Before(transactionDate) {
-				return errors.New("due_date must be after transaction_date"), constants.MalformedFieldErrorCode
-			}
+	var transactionDate *time.Time
+	if req.TransactionDate != nil && *req.TransactionDate != "" {
+		parsedDate, err := time.Parse("2006-01-02", *req.TransactionDate)
+		if err != nil {
+			return errors.New("transaction_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
+		}
+		transactionDate = &parsedDate
+	}
+
+	if req.DueDate != nil {
+		if strings.TrimSpace(*req.DueDate) == "" {
+			return errors.New("due_date cannot be empty"), constants.MalformedFieldErrorCode
+		}
+
+		dueDate, err := time.Parse("2006-01-02", *req.DueDate)
+		if err != nil {
+			return errors.New("due_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
+		}
+
+		if transactionDate != nil && dueDate.Before(*transactionDate) {
+			return errors.New("due_date must be after transaction_date"), constants.MalformedFieldErrorCode
 		}
 	}
 

internal/validator/purchase_order_validator_test.go

@@ -0,0 +1,62 @@
+package validator
+
+import (
+	"testing"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func validCreatePurchaseOrderRequest() *contract.CreatePurchaseOrderRequest {
+	return &contract.CreatePurchaseOrderRequest{
+		VendorID:        uuid.New(),
+		PONumber:        "PO-001",
+		TransactionDate: "2026-05-29",
+		Items: []contract.CreatePurchaseOrderItemRequest{
+			{
+				IngredientID: uuid.New(),
+				Quantity:     1,
+				UnitID:       uuid.New(),
+				Amount:       1000,
+			},
+		},
+	}
+}
+
+func TestPurchaseOrderValidatorCreateAllowsMissingDueDate(t *testing.T) {
+	validator := NewPurchaseOrderValidator()
+
+	err, code := validator.ValidateCreatePurchaseOrderRequest(validCreatePurchaseOrderRequest())
+
+	require.NoError(t, err)
+	require.Empty(t, code)
+}
+
+func TestPurchaseOrderValidatorCreateRejectsInvalidDueDate(t *testing.T) {
+	validator := NewPurchaseOrderValidator()
+	req := validCreatePurchaseOrderRequest()
+	dueDate := "29-05-2026"
+	req.DueDate = &dueDate
+
+	err, code := validator.ValidateCreatePurchaseOrderRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "due_date must be in YYYY-MM-DD format")
+}
+
+func TestPurchaseOrderValidatorCreateRejectsDueDateBeforeTransactionDate(t *testing.T) {
+	validator := NewPurchaseOrderValidator()
+	req := validCreatePurchaseOrderRequest()
+	dueDate := "2026-05-28"
+	req.DueDate = &dueDate
+
+	err, code := validator.ValidateCreatePurchaseOrderRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "due_date must be after transaction_date")
+}

migrations/000072_add_expense_name_to_expenses.down.sql

@@ -1,2 +1,16 @@
-DROP INDEX IF EXISTS idx_expenses_expense_name;
-ALTER TABLE expenses DROP COLUMN expense_name;
+ALTER TABLE expenses ADD COLUMN IF NOT EXISTS expense_name VARCHAR(255) NOT NULL DEFAULT '';
+
+UPDATE expenses e
+SET expense_name = first_item.item
+FROM (
+    SELECT DISTINCT ON (expense_id) expense_id, item
+    FROM expense_items
+    WHERE COALESCE(item, '') != ''
+    ORDER BY expense_id, created_at ASC
+) first_item
+WHERE e.id = first_item.expense_id
+  AND COALESCE(e.expense_name, '') = '';
+
+CREATE INDEX IF NOT EXISTS idx_expenses_expense_name ON expenses(expense_name);
+DROP INDEX IF EXISTS idx_expense_items_item;
+ALTER TABLE expense_items DROP COLUMN IF EXISTS item;

migrations/000072_add_expense_name_to_expenses.up.sql

@@ -1,2 +1,21 @@
-ALTER TABLE expenses ADD COLUMN expense_name VARCHAR(255) NOT NULL DEFAULT '';
-CREATE INDEX idx_expenses_expense_name ON expenses(expense_name);
+ALTER TABLE expense_items ADD COLUMN IF NOT EXISTS item VARCHAR(255) NOT NULL DEFAULT '';
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_name = 'expenses'
+          AND column_name = 'expense_name'
+    ) THEN
+        UPDATE expense_items ei
+        SET item = e.expense_name
+        FROM expenses e
+        WHERE ei.expense_id = e.id
+          AND COALESCE(ei.item, '') = '';
+    END IF;
+END $$;
+
+DROP INDEX IF EXISTS idx_expenses_expense_name;
+ALTER TABLE expenses DROP COLUMN IF EXISTS expense_name;
+CREATE INDEX IF NOT EXISTS idx_expense_items_item ON expense_items(item);

migrations/000073_add_status_to_expenses.down.sql

@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS idx_expenses_status;
+ALTER TABLE expenses DROP CONSTRAINT IF EXISTS expenses_status_check;
+ALTER TABLE expenses DROP COLUMN IF EXISTS status;

migrations/000073_add_status_to_expenses.up.sql

@@ -0,0 +1,10 @@
+ALTER TABLE expenses ADD COLUMN IF NOT EXISTS status VARCHAR(20) NOT NULL DEFAULT 'draft';
+
+UPDATE expenses
+SET status = 'approved'
+WHERE status = 'draft';
+
+ALTER TABLE expenses DROP CONSTRAINT IF EXISTS expenses_status_check;
+ALTER TABLE expenses ADD CONSTRAINT expenses_status_check CHECK (status IN ('draft', 'sent', 'approved', 'cancel'));
+
+CREATE INDEX IF NOT EXISTS idx_expenses_status ON expenses(status);

migrations/000074_make_purchase_order_due_date_nullable.down.sql

@@ -0,0 +1,6 @@
+UPDATE purchase_orders
+SET due_date = transaction_date
+WHERE due_date IS NULL;
+
+ALTER TABLE purchase_orders
+    ALTER COLUMN due_date SET NOT NULL;

migrations/000074_make_purchase_order_due_date_nullable.up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE purchase_orders
+    ALTER COLUMN due_date DROP NOT NULL;