add product migrations

Dockerfile

@@ -1,5 +1,5 @@
 # 1) Build stage
-FROM golang:1.24-alpine AS build
+FROM golang:1.21-alpine AS build
 RUN apk --no-cache add ca-certificates tzdata git curl
 WORKDIR /src
 COPY go.mod go.sum ./

internal/app/app.go

@@ -65,7 +65,6 @@ func (a *App) Initialize(cfg *config.Config) error {
 		repos.userRepo,
 		repos.sessionRepo,
 		repos.orderRepo,
-		services.productOutletPriceService,
 	)
 
 	a.router = router.NewRouter(
@@ -132,11 +131,7 @@ func (a *App) Initialize(cfg *config.Config) error {
 		validators.userDeviceValidator,
 		services.notificationService,
 		validators.notificationValidator,
-		services.productOutletPriceService,
-		validators.productOutletPriceValidator,
 		selfOrderHandler,
-		services.expenseService,
-		validators.expenseValidator,
 	)
 
 	return nil
@@ -237,8 +232,6 @@ type repositories struct {
 	notificationRepo               *repository.NotificationRepositoryImpl
 	notificationReceiverRepo       *repository.NotificationReceiverRepositoryImpl
 	notificationDeliveryRepo       *repository.NotificationDeliveryRepositoryImpl
-	productOutletPriceRepo         *repository.ProductOutletPriceRepositoryImpl
-	expenseRepo                    *repository.ExpenseRepositoryImpl
 }
 
 func (a *App) initRepositories() *repositories {
@@ -290,8 +283,6 @@ func (a *App) initRepositories() *repositories {
 		notificationRepo:               repository.NewNotificationRepository(a.db),
 		notificationReceiverRepo:       repository.NewNotificationReceiverRepository(a.db),
 		notificationDeliveryRepo:       repository.NewNotificationDeliveryRepository(a.db),
-		productOutletPriceRepo:         repository.NewProductOutletPriceRepositoryImpl(a.db),
-		expenseRepo:                    repository.NewExpenseRepositoryImpl(a.db),
 	}
 }
 
@@ -336,8 +327,6 @@ type processors struct {
 	inventoryMovementService            service.InventoryMovementService
 	userDeviceProcessor                 *processor.UserDeviceProcessorImpl
 	notificationProcessor               *processor.NotificationProcessorImpl
-	productOutletPriceProcessor         processor.ProductOutletPriceProcessor
-	expenseProcessor                    *processor.ExpenseProcessorImpl
 }
 
 func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors {
@@ -352,14 +341,14 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		outletProcessor:                     processor.NewOutletProcessorImpl(repos.outletRepo),
 		outletSettingProcessor:              processor.NewOutletSettingProcessorImpl(repos.outletSettingRepo, repos.outletRepo),
 		categoryProcessor:                   processor.NewCategoryProcessorImpl(repos.categoryRepo),
-		productProcessor:                    processor.NewProductProcessorImpl(repos.productRepo, repos.categoryRepo, repos.productVariantRepo, repos.inventoryRepo, repos.outletRepo, repos.productOutletPriceRepo),
+		productProcessor:                    processor.NewProductProcessorImpl(repos.productRepo, repos.categoryRepo, repos.productVariantRepo, repos.inventoryRepo, repos.outletRepo),
 		productVariantProcessor:             processor.NewProductVariantProcessorImpl(repos.productVariantRepo, repos.productRepo),
 		inventoryProcessor:                  processor.NewInventoryProcessorImpl(repos.inventoryRepo, repos.productRepo, repos.outletRepo, repos.ingredientRepo, repos.inventoryMovementRepo),
-		orderProcessor:                      processor.NewOrderProcessorImpl(repos.orderRepo, repos.orderItemRepo, repos.paymentRepo, repos.paymentOrderItemRepo, repos.productRepo, repos.paymentMethodRepo, repos.inventoryRepo, repos.inventoryMovementRepo, repos.productVariantRepo, repos.outletRepo, repos.customerRepo, repos.txManager, repos.productRecipeRepo, repos.ingredientRepo, inventoryMovementService, repos.productOutletPriceRepo),
+		orderProcessor:                      processor.NewOrderProcessorImpl(repos.orderRepo, repos.orderItemRepo, repos.paymentRepo, repos.paymentOrderItemRepo, repos.productRepo, repos.paymentMethodRepo, repos.inventoryRepo, repos.inventoryMovementRepo, repos.productVariantRepo, repos.outletRepo, repos.customerRepo, repos.txManager, repos.productRecipeRepo, repos.ingredientRepo, inventoryMovementService),
 		paymentMethodProcessor:              processor.NewPaymentMethodProcessorImpl(repos.paymentMethodRepo),
 		fileProcessor:                       processor.NewFileProcessorImpl(repos.fileRepo, fileClient),
 		customerProcessor:                   processor.NewCustomerProcessor(repos.customerRepo),
-		analyticsProcessor:                  processor.NewAnalyticsProcessorImpl(repos.analyticsRepo, repos.expenseRepo),
+		analyticsProcessor:                  processor.NewAnalyticsProcessorImpl(repos.analyticsRepo),
 		tableProcessor:                      processor.NewTableProcessor(repos.tableRepo, repos.orderRepo),
 		unitProcessor:                       processor.NewUnitProcessor(repos.unitRepo),
 		ingredientProcessor:                 processor.NewIngredientProcessor(repos.ingredientRepo, repos.unitRepo, repos.ingredientCompositionRepo),
@@ -387,8 +376,6 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		inventoryMovementService:            inventoryMovementService,
 		userDeviceProcessor:                 processor.NewUserDeviceProcessorImpl(repos.userDeviceRepo),
 		notificationProcessor:               buildNotificationProcessor(cfg, repos),
-		productOutletPriceProcessor:         processor.NewProductOutletPriceProcessorImpl(repos.productOutletPriceRepo, repos.productRepo, repos.outletRepo),
-		expenseProcessor:                    processor.NewExpenseProcessorImpl(repos.expenseRepo),
 	}
 }
 
@@ -427,8 +414,6 @@ type services struct {
 	spinGameService                   service.SpinGameService
 	userDeviceService                 service.UserDeviceService
 	notificationService               service.NotificationService
-	productOutletPriceService         service.ProductOutletPriceService
-	expenseService                    *service.ExpenseServiceImpl
 }
 
 func (a *App) initServices(processors *processors, repos *repositories, cfg *config.Config) *services {
@@ -505,8 +490,6 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		spinGameService:                   spinGameService,
 		userDeviceService:                 userDeviceService,
 		notificationService:               notificationService,
-		productOutletPriceService:         service.NewProductOutletPriceService(processors.productOutletPriceProcessor),
-		expenseService:                    service.NewExpenseService(processors.expenseProcessor),
 	}
 }
 
@@ -548,8 +531,6 @@ type validators struct {
 	customerAuthValidator               validator.CustomerAuthValidator
 	userDeviceValidator                 *validator.UserDeviceValidatorImpl
 	notificationValidator               *validator.NotificationValidatorImpl
-	productOutletPriceValidator         *validator.ProductOutletPriceValidatorImpl
-	expenseValidator                    *validator.ExpenseValidatorImpl
 }
 
 func (a *App) initValidators() *validators {
@@ -579,8 +560,6 @@ func (a *App) initValidators() *validators {
 		customerAuthValidator:               validator.NewCustomerAuthValidator(),
 		userDeviceValidator:                 validator.NewUserDeviceValidator(),
 		notificationValidator:               validator.NewNotificationValidator(),
-		productOutletPriceValidator:         validator.NewProductOutletPriceValidator(),
-		expenseValidator:                    validator.NewExpenseValidator(),
 	}
 }
 

internal/constants/error.go

@@ -59,8 +59,6 @@ const (
 	UserDeviceServiceEntity   = "user_device_service"
 	NotificationServiceEntity = "notification_service"
 	NotificationHandlerEntity = "notification_handler"
-	ProductOutletPriceServiceEntity = "product_outlet_price_service"
-	ExpenseServiceEntity            = "expense_service"
 )
 
 var HttpErrorMap = map[string]int{

internal/constants/expense.go

@@ -1,28 +0,0 @@
-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

@@ -83,63 +83,6 @@ type SalesAnalyticsData struct {
 	NetSales float64   `json:"net_sales"`
 }
 
-type PurchasingAnalyticsRequest struct {
-	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
-	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 PurchasingAnalyticsResponse struct {
-	OrganizationID uuid.UUID                  `json:"organization_id"`
-	OutletID       *uuid.UUID                 `json:"outlet_id,omitempty"`
-	OutletName     *string                    `json:"outlet_name,omitempty"`
-	DateFrom       time.Time                  `json:"date_from"`
-	DateTo         time.Time                  `json:"date_to"`
-	GroupBy        string                     `json:"group_by"`
-	Summary        PurchasingSummary          `json:"summary"`
-	Data           []PurchasingAnalyticsData  `json:"data"`
-	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
-	VendorData     []PurchasingVendorData     `json:"vendor_data"`
-}
-
-type PurchasingSummary struct {
-	TotalPurchases            float64 `json:"total_purchases"`
-	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
-	TotalQuantity             float64 `json:"total_quantity"`
-	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
-	TotalIngredients          int64   `json:"total_ingredients"`
-	TotalVendors              int64   `json:"total_vendors"`
-}
-
-type PurchasingAnalyticsData struct {
-	Date           time.Time `json:"date"`
-	Purchases      float64   `json:"purchases"`
-	PurchaseOrders int64     `json:"purchase_orders"`
-	Quantity       float64   `json:"quantity"`
-	Ingredients    int64     `json:"ingredients"`
-	Vendors        int64     `json:"vendors"`
-}
-
-type PurchasingIngredientData struct {
-	IngredientID       uuid.UUID `json:"ingredient_id"`
-	IngredientName     string    `json:"ingredient_name"`
-	Quantity           float64   `json:"quantity"`
-	TotalCost          float64   `json:"total_cost"`
-	AverageUnitCost    float64   `json:"average_unit_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-}
-
-type PurchasingVendorData struct {
-	VendorID           uuid.UUID `json:"vendor_id"`
-	VendorName         string    `json:"vendor_name"`
-	TotalCost          float64   `json:"total_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-	IngredientCount    int64     `json:"ingredient_count"`
-	Quantity           float64   `json:"quantity"`
-}
-
 // ProductAnalyticsRequest represents the request for product analytics
 type ProductAnalyticsRequest struct {
 	OrganizationID uuid.UUID
@@ -236,6 +179,7 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
+// ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID
 	OutletID       *string `form:"outlet_id,omitempty"`
@@ -244,6 +188,7 @@ type ProfitLossAnalyticsRequest struct {
 	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
+// ProfitLossAnalyticsResponse represents the response for profit and loss analytics
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID uuid.UUID           `json:"organization_id"`
 	OutletID       *uuid.UUID          `json:"outlet_id,omitempty"`
@@ -253,11 +198,9 @@ type ProfitLossAnalyticsResponse struct {
 	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"`
 }
 
+// ProfitLossSummary represents the summary of profit and loss analytics
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -272,6 +215,7 @@ type ProfitLossSummary struct {
 	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
+// ProfitLossData represents individual profit and loss data point by time period
 type ProfitLossData struct {
 	Date              time.Time `json:"date"`
 	Revenue           float64   `json:"revenue"`
@@ -285,6 +229,7 @@ type ProfitLossData struct {
 	Orders            int64     `json:"orders"`
 }
 
+// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
 	ProductID         uuid.UUID `json:"product_id"`
 	ProductName       string    `json:"product_name"`
@@ -299,19 +244,3 @@ type ProductProfitData struct {
 	AverageCost       float64   `json:"average_cost"`
 	ProfitPerUnit     float64   `json:"profit_per_unit"`
 }
-
-type ProfitLossSummaryRow struct {
-	ID           string                 `json:"id"`
-	Label        string                 `json:"label"`
-	IsBold       bool                   `json:"is_bold"`
-	TodayNominal float64                `json:"today_nominal"`
-	TodayPct     float64                `json:"today_pct"`
-	MtdNominal   float64                `json:"mtd_nominal"`
-	MtdPct       float64                `json:"mtd_pct"`
-	SubItems     []ProfitLossSummaryRow `json:"sub_items,omitempty"`
-}
-
-type OperationalExpenseItem struct {
-	Item    string  `json:"item"`
-	Nominal float64 `json:"nominal"`
-}

internal/contract/category_contract.go

@@ -8,18 +8,18 @@ import (
 
 type CreateCategoryRequest struct {
 	Name         string                 `json:"name" validate:"required,min=1,max=255"`
+	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
-	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	Order        *int                   `json:"order,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 }
 
 type UpdateCategoryRequest struct {
 	Name         *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
+	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
-	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	Order        *int                   `json:"order,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 }
@@ -37,7 +37,7 @@ type ListCategoriesRequest struct {
 type CategoryResponse struct {
 	ID             uuid.UUID              `json:"id"`
 	OrganizationID uuid.UUID              `json:"organization_id"`
-	OutletID       *uuid.UUID             `json:"outlet_id"`
+	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
 	Name           string                 `json:"name"`
 	Description    *string                `json:"description"`
 	BusinessType   string                 `json:"business_type"`

internal/contract/expense_contract.go

@@ -1,93 +0,0 @@
-package contract
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type CreateExpenseRequest struct {
-	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"`
-	Items           []CreateExpenseItemRequest `json:"items" validate:"required"`
-}
-
-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 {
-	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"`
-	Reserved1       *string                    `json:"reserved1,omitempty"`
-	Items           []UpdateExpenseItemRequest `json:"items,omitempty"`
-}
-
-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"`
-}
-
-type ExpenseResponse struct {
-	ID              uuid.UUID             `json:"id"`
-	OrganizationID  uuid.UUID             `json:"organization_id"`
-	OutletID        uuid.UUID             `json:"outlet_id"`
-	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"`
-	Reserved1       *string               `json:"reserved1,omitempty"`
-	CreatedAt       time.Time             `json:"created_at"`
-	UpdatedAt       time.Time             `json:"updated_at"`
-	Items           []ExpenseItemResponse `json:"items,omitempty"`
-}
-
-type ExpenseItemResponse struct {
-	ID                 uuid.UUID `json:"id"`
-	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"`
-	UpdatedAt          time.Time `json:"updated_at"`
-}
-
-type ListExpenseRequest struct {
-	Page      int    `json:"page" validate:"min=1"`
-	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"`
-}
-
-type ListExpenseResponse struct {
-	Expenses   []ExpenseResponse `json:"expenses"`
-	TotalCount int               `json:"total_count"`
-	Page       int               `json:"page"`
-	Limit      int               `json:"limit"`
-	TotalPages int               `json:"total_pages"`
-}

internal/contract/order_contract.go

@@ -98,8 +98,6 @@ type OrderItemResponse struct {
 	ProductName        string                   `json:"product_name"`
 	ProductVariantID   *uuid.UUID               `json:"product_variant_id"`
 	ProductVariantName *string                  `json:"product_variant_name,omitempty"`
-	CategoryID         *uuid.UUID               `json:"category_id,omitempty"`
-	CategoryName       *string                  `json:"category_name,omitempty"`
 	Quantity           int                      `json:"quantity"`
 	UnitPrice          float64                  `json:"unit_price"`
 	TotalPrice         float64                  `json:"total_price"`
@@ -110,7 +108,6 @@ type OrderItemResponse struct {
 	CreatedAt          time.Time                `json:"created_at"`
 	UpdatedAt          time.Time                `json:"updated_at"`
 	PrinterType        string                   `json:"printer_type"`
-	PrintToChecker     bool                     `json:"print_to_checker"`
 	PaidQuantity       int                      `json:"paid_quantity"`
 }
 

internal/contract/product_contract.go

@@ -7,8 +7,8 @@ import (
 )
 
 type CreateProductRequest struct {
-	CategoryID      uuid.UUID                     `json:"category_id" validate:"required"`
 	OutletID        *uuid.UUID                    `json:"outlet_id,omitempty"`
+	CategoryID      uuid.UUID                     `json:"category_id" validate:"required"`
 	SKU             *string                       `json:"sku,omitempty"`
 	Name            string                        `json:"name" validate:"required,min=1,max=255"`
 	Description     *string                       `json:"description,omitempty"`
@@ -17,13 +17,12 @@ type CreateProductRequest struct {
 	BusinessType    *string                       `json:"business_type,omitempty"`
 	ImageURL        *string                       `json:"image_url,omitempty" validate:"omitempty,max=500"`
 	PrinterType     *string                       `json:"printer_type,omitempty" validate:"omitempty,max=50"`
-	PrintToChecker  *bool                         `json:"print_to_checker,omitempty"`
 	Metadata        map[string]interface{}        `json:"metadata,omitempty"`
 	IsActive        *bool                         `json:"is_active,omitempty"`
 	Variants        []CreateProductVariantRequest `json:"variants,omitempty"`
-	InitialStock    *int                          `json:"initial_stock,omitempty" validate:"omitempty,min=0"`
+	InitialStock    *int                          `json:"initial_stock,omitempty" validate:"omitempty,min=0"` // Initial stock quantity for all outlets
-	ReorderLevel    *int                          `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
+	ReorderLevel    *int                          `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Reorder level for all outlets
-	CreateInventory bool                          `json:"create_inventory,omitempty"`
+	CreateInventory bool                          `json:"create_inventory,omitempty"`                         // Whether to create inventory records for all outlets
 }
 
 type UpdateProductRequest struct {
@@ -37,10 +36,10 @@ type UpdateProductRequest struct {
 	BusinessType *string                `json:"business_type,omitempty"`
 	ImageURL     *string                `json:"image_url,omitempty" validate:"omitempty,max=500"`
 	PrinterType  *string                `json:"printer_type,omitempty" validate:"omitempty,max=50"`
-	PrintToChecker *bool                  `json:"print_to_checker,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 	IsActive     *bool                  `json:"is_active,omitempty"`
-	ReorderLevel   *int                   `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
+	// Stock management fields
+	ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Update reorder level for all existing inventory records
 }
 
 type CreateProductVariantRequest struct {
@@ -61,19 +60,17 @@ type UpdateProductVariantRequest struct {
 type ProductResponse struct {
 	ID             uuid.UUID                `json:"id"`
 	OrganizationID uuid.UUID                `json:"organization_id"`
+	OutletID       *uuid.UUID               `json:"outlet_id"`
 	CategoryID     uuid.UUID                `json:"category_id"`
 	CategoryName   string                   `json:"category_name"`
 	SKU            *string                  `json:"sku"`
 	Name           string                   `json:"name"`
 	Description    *string                  `json:"description"`
 	Price          float64                  `json:"price"`
-	OutletPrice    *float64                     `json:"outlet_price,omitempty"`
-	OutletPrices   []ProductOutletPriceResponse `json:"outlet_prices,omitempty"`
 	Cost           float64                  `json:"cost"`
 	BusinessType   string                   `json:"business_type"`
 	ImageURL       *string                  `json:"image_url"`
 	PrinterType    string                   `json:"printer_type"`
-	PrintToChecker bool                         `json:"print_to_checker"`
 	Metadata       map[string]interface{}   `json:"metadata"`
 	IsActive       bool                     `json:"is_active"`
 	CreatedAt      time.Time                `json:"created_at"`

internal/contract/product_outlet_price_contract.go

@@ -1,46 +0,0 @@
-package contract
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type CreateProductOutletPriceRequest struct {
-	ProductID      uuid.UUID `json:"product_id" validate:"required"`
-	OutletID       uuid.UUID `json:"outlet_id" validate:"required"`
-	Price          float64   `json:"price" validate:"required,min=0"`
-	PrintToChecker bool      `json:"print_to_checker"`
-}
-
-type UpdateProductOutletPriceRequest struct {
-	Price          float64 `json:"price" validate:"required,min=0"`
-	PrintToChecker *bool   `json:"print_to_checker"`
-}
-
-type ProductOutletPriceResponse struct {
-	ID             uuid.UUID `json:"id,omitempty"`
-	ProductID      uuid.UUID `json:"product_id,omitempty"`
-	OutletID       uuid.UUID `json:"outlet_id"`
-	OutletName     string    `json:"outlet_name,omitempty"`
-	Price          float64   `json:"price"`
-	PrintToChecker bool      `json:"print_to_checker"`
-	CreatedAt      time.Time `json:"created_at,omitempty"`
-	UpdatedAt      time.Time `json:"updated_at,omitempty"`
-}
-
-type ListProductOutletPricesResponse struct {
-	Prices     []ProductOutletPriceResponse `json:"prices"`
-	TotalCount int                          `json:"total_count"`
-}
-
-type BulkCreateProductOutletPriceRequest struct {
-	ProductID uuid.UUID                                  `json:"product_id" validate:"required"`
-	Prices    []CreateProductOutletPricePerOutletRequest `json:"prices" validate:"required,dive"`
-}
-
-type CreateProductOutletPricePerOutletRequest struct {
-	OutletID       uuid.UUID `json:"outlet_id" validate:"required"`
-	Price          float64   `json:"price" validate:"required,min=0"`
-	PrintToChecker bool      `json:"print_to_checker"`
-}

internal/contract/purchase_order_contract.go

@@ -10,7 +10,7 @@ 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,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
+	DueDate           string                           `json:"due_date" validate:"required"`          // 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

@@ -27,51 +27,6 @@ type SalesAnalytics struct {
 	NetSales float64   `json:"net_sales"`
 }
 
-// PurchasingAnalytics represents purchasing analytics data
-type PurchasingAnalytics struct {
-	OutletName     *string                    `json:"outlet_name,omitempty"`
-	Summary        PurchasingSummary          `json:"summary"`
-	Data           []PurchasingAnalyticsData  `json:"data"`
-	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
-	VendorData     []PurchasingVendorData     `json:"vendor_data"`
-}
-
-type PurchasingSummary struct {
-	TotalPurchases            float64 `json:"total_purchases"`
-	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
-	TotalQuantity             float64 `json:"total_quantity"`
-	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
-	TotalIngredients          int64   `json:"total_ingredients"`
-	TotalVendors              int64   `json:"total_vendors"`
-}
-
-type PurchasingAnalyticsData struct {
-	Date           time.Time `json:"date"`
-	Purchases      float64   `json:"purchases"`
-	PurchaseOrders int64     `json:"purchase_orders"`
-	Quantity       float64   `json:"quantity"`
-	Ingredients    int64     `json:"ingredients"`
-	Vendors        int64     `json:"vendors"`
-}
-
-type PurchasingIngredientData struct {
-	IngredientID       uuid.UUID `json:"ingredient_id"`
-	IngredientName     string    `json:"ingredient_name"`
-	Quantity           float64   `json:"quantity"`
-	TotalCost          float64   `json:"total_cost"`
-	AverageUnitCost    float64   `json:"average_unit_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-}
-
-type PurchasingVendorData struct {
-	VendorID           uuid.UUID `json:"vendor_id"`
-	VendorName         string    `json:"vendor_name"`
-	TotalCost          float64   `json:"total_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-	IngredientCount    int64     `json:"ingredient_count"`
-	Quantity           float64   `json:"quantity"`
-}
-
 type ProductAnalytics struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
@@ -113,67 +68,54 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
+// ProfitLossAnalytics represents profit and loss analytics data
 type ProfitLossAnalytics struct {
-	Summary                 ProfitLossSummary
+	Summary     ProfitLossSummary   `json:"summary"`
-	Data                    []ProfitLossData
+	Data        []ProfitLossData    `json:"data"`
-	ProductData             []ProductProfitData
+	ProductData []ProductProfitData `json:"product_data"`
-	TodayRevenue            float64
-	TodayCost               float64
-	MtdRevenue              float64
-	MtdCost                 float64
-	TodayExpenseByCategory  []ExpenseCategoryTotal
-	MtdExpenseByCategory    []ExpenseCategoryTotal
-	OperationalExpenseItems []OperationalExpenseItem
 }
 
+// ProfitLossSummary represents profit and loss summary data
 type ProfitLossSummary struct {
-	TotalRevenue       float64
+	TotalRevenue       float64 `json:"total_revenue"`
-	TotalCost          float64
+	TotalCost          float64 `json:"total_cost"`
-	GrossProfit        float64
+	GrossProfit        float64 `json:"gross_profit"`
-	GrossProfitMargin  float64
+	GrossProfitMargin  float64 `json:"gross_profit_margin"`
-	TotalTax           float64
+	TotalTax           float64 `json:"total_tax"`
-	TotalDiscount      float64
+	TotalDiscount      float64 `json:"total_discount"`
-	NetProfit          float64
+	NetProfit          float64 `json:"net_profit"`
-	NetProfitMargin    float64
+	NetProfitMargin    float64 `json:"net_profit_margin"`
-	TotalOrders        int64
+	TotalOrders        int64   `json:"total_orders"`
-	AverageProfit      float64
+	AverageProfit      float64 `json:"average_profit"`
-	ProfitabilityRatio float64
+	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
+// ProfitLossData represents profit and loss data by time period
 type ProfitLossData struct {
-	Date              time.Time
+	Date              time.Time `json:"date"`
-	Revenue           float64
+	Revenue           float64   `json:"revenue"`
-	Cost              float64
+	Cost              float64   `json:"cost"`
-	GrossProfit       float64
+	GrossProfit       float64   `json:"gross_profit"`
-	GrossProfitMargin float64
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
-	Tax               float64
+	Tax               float64   `json:"tax"`
-	Discount          float64
+	Discount          float64   `json:"discount"`
-	NetProfit         float64
+	NetProfit         float64   `json:"net_profit"`
-	NetProfitMargin   float64
+	NetProfitMargin   float64   `json:"net_profit_margin"`
-	Orders            int64
+	Orders            int64     `json:"orders"`
 }
 
+// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
-	ProductID         uuid.UUID
+	ProductID         uuid.UUID `json:"product_id"`
-	ProductName       string
+	ProductName       string    `json:"product_name"`
-	CategoryID        uuid.UUID
+	CategoryID        uuid.UUID `json:"category_id"`
-	CategoryName      string
+	CategoryName      string    `json:"category_name"`
-	QuantitySold      int64
+	QuantitySold      int64     `json:"quantity_sold"`
-	Revenue           float64
+	Revenue           float64   `json:"revenue"`
-	Cost              float64
+	Cost              float64   `json:"cost"`
-	GrossProfit       float64
+	GrossProfit       float64   `json:"gross_profit"`
-	GrossProfitMargin float64
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
-	AveragePrice      float64
+	AveragePrice      float64   `json:"average_price"`
-	AverageCost       float64
+	AverageCost       float64   `json:"average_cost"`
-	ProfitPerUnit     float64
+	ProfitPerUnit     float64   `json:"profit_per_unit"`
-}
-
-type ExpenseCategoryTotal struct {
-	CategoryName string
-	Amount       float64
-}
-
-type OperationalExpenseItem struct {
-	Item   string
-	Amount float64
 }

internal/entities/category.go

@@ -33,7 +33,7 @@ func (m *Metadata) Scan(value interface{}) error {
 type Category 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" validate:"required"`
-	OutletID       *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id"`
+	OutletID       *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id,omitempty"`
 	Name           string     `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
 	Description    *string    `gorm:"type:text" json:"description"`
 	Order          int        `gorm:"default:0" json:"order"`
@@ -43,6 +43,7 @@ type Category struct {
 	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet       Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
 	Products     []Product    `gorm:"foreignKey:CategoryID" json:"products,omitempty"`
 }
 

internal/entities/entities.go

@@ -41,8 +41,6 @@ func GetAllEntities() []interface{} {
 		&Notification{},
 		&NotificationReceiver{},
 		&NotificationDelivery{},
-		&ProductOutletPrice{},
-		&Expense{},
 	}
 }
 

internal/entities/expense.go

@@ -1,40 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-
-	"gorm.io/gorm"
-)
-
-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"`
-	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"`
-	Reserved1       *string   `gorm:"type:text" json:"reserved1"`
-	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Organization *Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Outlet       *Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
-	Items        []ExpenseItem `gorm:"foreignKey:ExpenseID" json:"items,omitempty"`
-}
-
-func (e *Expense) BeforeCreate(tx *gorm.DB) error {
-	if e.ID == uuid.Nil {
-		e.ID = uuid.New()
-	}
-	return nil
-}
-
-func (Expense) TableName() string {
-	return "expenses"
-}

internal/entities/expense_item.go

@@ -1,34 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-
-	"gorm.io/gorm"
-)
-
-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"`
-	UpdatedAt        time.Time `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Expense        *Expense        `gorm:"foreignKey:ExpenseID" json:"expense,omitempty"`
-	ChartOfAccount *ChartOfAccount `gorm:"foreignKey:ChartOfAccountID" json:"chart_of_account,omitempty"`
-}
-
-func (e *ExpenseItem) BeforeCreate(tx *gorm.DB) error {
-	if e.ID == uuid.Nil {
-		e.ID = uuid.New()
-	}
-	return nil
-}
-
-func (ExpenseItem) TableName() string {
-	return "expense_items"
-}

internal/entities/product.go

@@ -10,6 +10,7 @@ import (
 type Product 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" validate:"required"`
+	OutletID       *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id"`
 	CategoryID     uuid.UUID  `gorm:"type:uuid;not null;index" json:"category_id" validate:"required"`
 	SKU            *string    `gorm:"size:100;index" json:"sku"`
 	Name           string     `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
@@ -27,13 +28,13 @@ type Product struct {
 	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization       Organization        `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet             *Outlet             `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
 	Category           Category            `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
 	Unit               *Unit               `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
 	ProductVariants    []ProductVariant    `gorm:"foreignKey:ProductID" json:"variants,omitempty"`
 	ProductRecipes []ProductRecipe `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
 	Inventory          []Inventory         `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
 	OrderItems         []OrderItem         `gorm:"foreignKey:ProductID" json:"order_items,omitempty"`
-	ProductOutletPrices []ProductOutletPrice `gorm:"foreignKey:ProductID" json:"product_outlet_prices,omitempty"`
 }
 
 func (p *Product) BeforeCreate(tx *gorm.DB) error {

internal/entities/product_outlet_price.go

@@ -1,32 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type ProductOutletPrice struct {
-	ID             uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	ProductID      uuid.UUID `gorm:"type:uuid;not null;index" json:"product_id"`
-	OutletID       uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
-	Price          float64   `gorm:"type:decimal(10,2);not null" json:"price"`
-	PrintToChecker bool      `gorm:"not null;default:true" json:"print_to_checker"`
-	CreatedAt      time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt      time.Time `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Product Product `gorm:"foreignKey:ProductID" json:"product,omitempty"`
-	Outlet  Outlet  `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
-}
-
-func (p *ProductOutletPrice) BeforeCreate(tx *gorm.DB) error {
-	if p.ID == uuid.Nil {
-		p.ID = uuid.New()
-	}
-	return nil
-}
-
-func (ProductOutletPrice) TableName() string {
-	return "product_outlet_prices"
-}

internal/entities/purchase_order.go

@@ -14,7 +14,7 @@ type PurchaseOrder struct {
 	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"`
+	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"`

internal/handler/analytics_handler.go

@@ -85,30 +85,6 @@ func (h *AnalyticsHandler) GetSalesAnalytics(c *gin.Context) {
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetSalesAnalytics")
 }
 
-func (h *AnalyticsHandler) GetPurchasingAnalytics(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.PurchasingAnalyticsRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetPurchasingAnalytics", err.Error())}), "AnalyticsHandler::GetPurchasingAnalytics")
-		return
-	}
-
-	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
-	modelReq := transformer.PurchasingAnalyticsContractToModel(&req)
-
-	response, err := h.analyticsService.GetPurchasingAnalytics(ctx, modelReq)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetPurchasingAnalytics", err.Error())}), "AnalyticsHandler::GetPurchasingAnalytics")
-		return
-	}
-
-	contractResp := transformer.PurchasingAnalyticsModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetPurchasingAnalytics")
-}
-
 func (h *AnalyticsHandler) GetProductAnalytics(c *gin.Context) {
 	ctx := c.Request.Context()
 	contextInfo := appcontext.FromGinContext(ctx)

internal/handler/category_handler.go

@@ -44,11 +44,6 @@ func (h *CategoryHandler) CreateCategory(c *gin.Context) {
 		return
 	}
 
-	// Inject outlet_id from context if user has one and request doesn't provide it
-	if req.OutletID == nil && contextInfo.OutletID != uuid.Nil {
-		req.OutletID = &contextInfo.OutletID
-	}
-
 	validationError, validationErrorCode := h.categoryValidator.ValidateCreateCategoryRequest(&req)
 	if validationError != nil {
 		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
@@ -154,11 +149,6 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
 		OrganizationID: &contextInfo.OrganizationID,
 	}
 
-	// Inject outlet_id from context if user has one
-	if contextInfo.OutletID != uuid.Nil {
-		req.OutletID = &contextInfo.OutletID
-	}
-
 	// Parse query parameters
 	if pageStr := c.Query("page"); pageStr != "" {
 		if page, err := strconv.Atoi(pageStr); err == nil {
@@ -180,17 +170,18 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
 		req.BusinessType = businessType
 	}
 
+	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
+		if outletID, err := uuid.Parse(outletIDStr); err == nil {
+			req.OutletID = &outletID
+		}
+	}
+
 	if organizationIDStr := c.Query("organization_id"); organizationIDStr != "" {
 		if organizationID, err := uuid.Parse(organizationIDStr); err == nil {
 			req.OrganizationID = &organizationID
 		}
 	}
 
-	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
-		if outletID, err := uuid.Parse(outletIDStr); err == nil {
-			req.OutletID = &outletID
-		}
-	}
 	validationError, validationErrorCode := h.categoryValidator.ValidateListCategoriesRequest(req)
 	if validationError != nil {
 		logger.FromContext(ctx).WithError(validationError).Error("CategoryHandler::ListCategories -> request validation failed")

internal/handler/expense_handler.go

@@ -1,201 +0,0 @@
-package handler
-
-import (
-	"apskel-pos-be/internal/appcontext"
-	"apskel-pos-be/internal/util"
-	"strconv"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/logger"
-	"apskel-pos-be/internal/service"
-	"apskel-pos-be/internal/validator"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-type ExpenseHandler struct {
-	expenseService   service.ExpenseService
-	expenseValidator validator.ExpenseValidator
-}
-
-func NewExpenseHandler(
-	expenseService service.ExpenseService,
-	expenseValidator validator.ExpenseValidator,
-) *ExpenseHandler {
-	return &ExpenseHandler{
-		expenseService:   expenseService,
-		expenseValidator: expenseValidator,
-	}
-}
-
-func (h *ExpenseHandler) CreateExpense(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.CreateExpenseRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::CreateExpense -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::CreateExpense")
-		return
-	}
-
-	validationError, validationErrorCode := h.expenseValidator.ValidateCreateExpenseRequest(&req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::CreateExpense")
-		return
-	}
-
-	expenseResponse := h.expenseService.CreateExpense(ctx, contextInfo, &req)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::CreateExpense -> Failed to create expense from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::CreateExpense")
-}
-
-func (h *ExpenseHandler) UpdateExpense(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	expenseIDStr := c.Param("id")
-	expenseID, err := uuid.Parse(expenseIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::UpdateExpense -> Invalid expense ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
-		return
-	}
-
-	var req contract.UpdateExpenseRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::UpdateExpense -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "Invalid request body")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
-		return
-	}
-
-	validationError, validationErrorCode := h.expenseValidator.ValidateUpdateExpenseRequest(&req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
-		return
-	}
-
-	expenseResponse := h.expenseService.UpdateExpense(ctx, contextInfo, expenseID, &req)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::UpdateExpense -> Failed to update expense from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::UpdateExpense")
-}
-
-func (h *ExpenseHandler) DeleteExpense(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	expenseIDStr := c.Param("id")
-	expenseID, err := uuid.Parse(expenseIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::DeleteExpense -> Invalid expense ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::DeleteExpense")
-		return
-	}
-
-	expenseResponse := h.expenseService.DeleteExpense(ctx, contextInfo, expenseID)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::DeleteExpense -> Failed to delete expense from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::DeleteExpense")
-}
-
-func (h *ExpenseHandler) GetExpense(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	expenseIDStr := c.Param("id")
-	expenseID, err := uuid.Parse(expenseIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::GetExpense -> Invalid expense ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::GetExpense")
-		return
-	}
-
-	expenseResponse := h.expenseService.GetExpenseByID(ctx, contextInfo, expenseID)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::GetExpense -> Failed to get expense from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::GetExpense")
-}
-
-func (h *ExpenseHandler) ListExpenses(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	req := &contract.ListExpenseRequest{
-		Page:  1,
-		Limit: 10,
-	}
-
-	if pageStr := c.Query("page"); pageStr != "" {
-		if page, err := strconv.Atoi(pageStr); err == nil {
-			req.Page = page
-		}
-	}
-
-	if limitStr := c.Query("limit"); limitStr != "" {
-		if limit, err := strconv.Atoi(limitStr); err == nil {
-			req.Limit = limit
-		}
-	}
-
-	if search := c.Query("search"); search != "" {
-		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 {
-		req.OutletID = contextInfo.OutletID.String()
-	} else if outletID := c.Query("outlet_id"); outletID != "" {
-		req.OutletID = outletID
-	}
-
-	if startDate := c.Query("start_date"); startDate != "" {
-		req.StartDate = startDate
-	}
-
-	if endDate := c.Query("end_date"); endDate != "" {
-		req.EndDate = endDate
-	}
-
-	validationError, validationErrorCode := h.expenseValidator.ValidateListExpenseRequest(req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::ListExpenses")
-		return
-	}
-
-	expenseResponse := h.expenseService.ListExpenses(ctx, contextInfo, req)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::ListExpenses -> Failed to list expenses from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::ListExpenses")
-}

internal/handler/order_handler.go

@@ -137,10 +137,6 @@ func (h *OrderHandler) ListOrders(c *gin.Context) {
 	}
 
 	modelReq.OrganizationID = &contextInfo.OrganizationID
-	if modelReq.OutletID == nil && contextInfo.OutletID != uuid.Nil {
-		modelReq.OutletID = &contextInfo.OutletID
-	}
-
 	response, err := h.orderService.ListOrders(c.Request.Context(), modelReq)
 	if err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "OrderHandler::ListOrders", err.Error())}), "OrderHandler::ListOrders")

internal/handler/product_handler.go

@@ -60,7 +60,6 @@ func (h *ProductHandler) CreateProduct(c *gin.Context) {
 
 func (h *ProductHandler) UpdateProduct(c *gin.Context) {
 	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
 
 	productIDStr := c.Param("id")
 	productID, err := uuid.Parse(productIDStr)
@@ -86,7 +85,7 @@ func (h *ProductHandler) UpdateProduct(c *gin.Context) {
 		return
 	}
 
-	productResponse := h.productService.UpdateProduct(ctx, contextInfo, productID, &req)
+	productResponse := h.productService.UpdateProduct(ctx, productID, &req)
 	if productResponse.HasErrors() {
 		errorResp := productResponse.GetErrors()[0]
 		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::UpdateProduct -> Failed to update product from service")
@@ -118,7 +117,6 @@ func (h *ProductHandler) DeleteProduct(c *gin.Context) {
 
 func (h *ProductHandler) GetProduct(c *gin.Context) {
 	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
 
 	productIDStr := c.Param("id")
 	productID, err := uuid.Parse(productIDStr)
@@ -129,7 +127,7 @@ func (h *ProductHandler) GetProduct(c *gin.Context) {
 		return
 	}
 
-	productResponse := h.productService.GetProductByID(ctx, productID, contextInfo.OutletID)
+	productResponse := h.productService.GetProductByID(ctx, productID)
 	if productResponse.HasErrors() {
 		errorResp := productResponse.GetErrors()[0]
 		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::GetProduct -> Failed to get product from service")
@@ -174,89 +172,10 @@ func (h *ProductHandler) ListProducts(c *gin.Context) {
 		}
 	}
 
-	if categoryIDStr := c.Query("category_id"); categoryIDStr != "" {
-		if categoryID, err := uuid.Parse(categoryIDStr); err == nil {
-			req.CategoryID = &categoryID
-		}
-	}
-
-	if isActiveStr := c.Query("is_active"); isActiveStr != "" {
-		if isActive, err := strconv.ParseBool(isActiveStr); err == nil {
-			req.IsActive = &isActive
-		}
-	}
-
 	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
 		if outletID, err := uuid.Parse(outletIDStr); err == nil {
 			req.OutletID = &outletID
 		}
-	} else if contextInfo.OutletID != uuid.Nil {
-		req.OutletID = &contextInfo.OutletID
-	}
-
-	if minPriceStr := c.Query("min_price"); minPriceStr != "" {
-		if minPrice, err := strconv.ParseFloat(minPriceStr, 64); err == nil {
-			req.MinPrice = &minPrice
-		}
-	}
-
-	if maxPriceStr := c.Query("max_price"); maxPriceStr != "" {
-		if maxPrice, err := strconv.ParseFloat(maxPriceStr, 64); err == nil {
-			req.MaxPrice = &maxPrice
-		}
-	}
-
-	validationError, validationErrorCode := h.productValidator.ValidateListProductsRequest(req)
-	if validationError != nil {
-		logger.FromContext(ctx).WithError(validationError).Error("ProductHandler::ListProducts -> request validation failed")
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductHandler::ListProducts")
-		return
-	}
-
-	productsResponse := h.productService.ListProducts(ctx, req)
-	if productsResponse.HasErrors() {
-		errorResp := productsResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::ListProducts -> Failed to list products from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, productsResponse, "ProductHandler::ListProducts")
-}
-
-func (h *ProductHandler) ListProductAll(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	req := &contract.ListProductsRequest{
-		Page:           1,
-		Limit:          10,
-		OrganizationID: &contextInfo.OrganizationID,
-	}
-
-	if pageStr := c.Query("page"); pageStr != "" {
-		if page, err := strconv.Atoi(pageStr); err == nil {
-			req.Page = page
-		}
-	}
-
-	if limitStr := c.Query("limit"); limitStr != "" {
-		if limit, err := strconv.Atoi(limitStr); err == nil {
-			req.Limit = limit
-		}
-	}
-
-	if search := c.Query("search"); search != "" {
-		req.Search = search
-	}
-
-	if businessType := c.Query("business_type"); businessType != "" {
-		req.BusinessType = businessType
-	}
-
-	if organizationIDStr := c.Query("organization_id"); organizationIDStr != "" {
-		if organizationID, err := uuid.Parse(organizationIDStr); err == nil {
-			req.OrganizationID = &organizationID
-		}
 	}
 
 	if categoryIDStr := c.Query("category_id"); categoryIDStr != "" {
@@ -271,12 +190,6 @@ func (h *ProductHandler) ListProductAll(c *gin.Context) {
 		}
 	}
 
-	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
-		if outletID, err := uuid.Parse(outletIDStr); err == nil {
-			req.OutletID = &outletID
-		}
-	}
-
 	if minPriceStr := c.Query("min_price"); minPriceStr != "" {
 		if minPrice, err := strconv.ParseFloat(minPriceStr, 64); err == nil {
 			req.MinPrice = &minPrice

internal/handler/product_outlet_price_handler.go

@@ -1,135 +0,0 @@
-package handler
-
-import (
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/logger"
-	"apskel-pos-be/internal/service"
-	"apskel-pos-be/internal/util"
-	"apskel-pos-be/internal/validator"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-type ProductOutletPriceHandler struct {
-	service   service.ProductOutletPriceService
-	validator validator.ProductOutletPriceValidator
-}
-
-func NewProductOutletPriceHandler(svc service.ProductOutletPriceService, v validator.ProductOutletPriceValidator) *ProductOutletPriceHandler {
-	return &ProductOutletPriceHandler{
-		service:   svc,
-		validator: v,
-	}
-}
-
-func (h *ProductOutletPriceHandler) Upsert(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	var req contract.CreateProductOutletPriceRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ProductOutletPriceHandler::Upsert -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Upsert")
-		return
-	}
-
-	if validationErr, code := h.validator.ValidateCreateRequest(&req); validationErr != nil {
-		validationResponseError := contract.NewResponseError(code, constants.RequestEntity, validationErr.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Upsert")
-		return
-	}
-
-	resp := h.service.Upsert(ctx, &req)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::Upsert")
-}
-
-func (h *ProductOutletPriceHandler) GetByProductAndOutlet(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	productIDStr := c.Param("product_id")
-	productID, err := uuid.Parse(productIDStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid product ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProductAndOutlet")
-		return
-	}
-
-	outletIDStr := c.Param("outlet_id")
-	outletID, err := uuid.Parse(outletIDStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid outlet ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProductAndOutlet")
-		return
-	}
-
-	resp := h.service.GetByProductAndOutlet(ctx, productID, outletID)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByProductAndOutlet")
-}
-
-func (h *ProductOutletPriceHandler) GetByProduct(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	productIDStr := c.Param("product_id")
-	productID, err := uuid.Parse(productIDStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid product ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProduct")
-		return
-	}
-
-	resp := h.service.GetByProduct(ctx, productID)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByProduct")
-}
-
-func (h *ProductOutletPriceHandler) GetByOutlet(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	outletIDStr := c.Param("outlet_id")
-	outletID, err := uuid.Parse(outletIDStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid outlet ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByOutlet")
-		return
-	}
-
-	resp := h.service.GetByOutlet(ctx, outletID)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByOutlet")
-}
-
-func (h *ProductOutletPriceHandler) Delete(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	idStr := c.Param("id")
-	id, err := uuid.Parse(idStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Delete")
-		return
-	}
-
-	resp := h.service.Delete(ctx, id)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::Delete")
-}
-
-func (h *ProductOutletPriceHandler) BulkUpsert(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	var req contract.BulkCreateProductOutletPriceRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ProductOutletPriceHandler::BulkUpsert -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::BulkUpsert")
-		return
-	}
-
-	if validationErr, code := h.validator.ValidateBulkCreateRequest(&req); validationErr != nil {
-		validationResponseError := contract.NewResponseError(code, constants.RequestEntity, validationErr.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::BulkUpsert")
-		return
-	}
-
-	resp := h.service.BulkUpsert(ctx, &req)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::BulkUpsert")
-}

internal/handler/self_order_handler.go

@@ -29,7 +29,6 @@ type SelfOrderHandler struct {
 	userRepo        processor.UserRepository
 	sessionRepo     repository.SessionRepository
 	orderRepo       repository.OrderRepository
-	productOutletPriceService service.ProductOutletPriceService
 }
 
 func NewSelfOrderHandler(
@@ -41,7 +40,6 @@ func NewSelfOrderHandler(
 	userRepo processor.UserRepository,
 	sessionRepo repository.SessionRepository,
 	orderRepo repository.OrderRepository,
-	productOutletPriceService service.ProductOutletPriceService,
 ) *SelfOrderHandler {
 	return &SelfOrderHandler{
 		orderService:    orderService,
@@ -52,7 +50,6 @@ func NewSelfOrderHandler(
 		userRepo:        userRepo,
 		sessionRepo:     sessionRepo,
 		orderRepo:       orderRepo,
-		productOutletPriceService: productOutletPriceService,
 	}
 }
 
@@ -219,29 +216,16 @@ func (h *SelfOrderHandler) GetMenu(c *gin.Context) {
 		return
 	}
 
-	menu := h.buildMenuResponse(ctx, outlet, table, catList.Categories, prodList.Products)
+	menu := h.buildMenuResponse(outlet, table, catList.Categories, prodList.Products)
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(menu), "SelfOrderHandler::GetMenu")
 }
 
 func (h *SelfOrderHandler) buildMenuResponse(
-	ctx context.Context,
 	outlet *entities.Outlet,
 	table *entities.Table,
 	categories []contract.CategoryResponse,
 	products []contract.ProductResponse,
 ) *contract.SelfOrderMenuResponse {
-	outletPriceMap := make(map[uuid.UUID]float64)
-	if h.productOutletPriceService != nil {
-		priceResp := h.productOutletPriceService.GetByOutlet(ctx, outlet.ID)
-		if priceResp != nil && !priceResp.HasErrors() {
-			if priceList, ok := priceResp.Data.(*contract.ListProductOutletPricesResponse); ok {
-				for _, p := range priceList.Prices {
-					outletPriceMap[p.ProductID] = p.Price
-				}
-			}
-		}
-	}
-
 	productMap := make(map[uuid.UUID][]contract.ProductResponse)
 	for _, p := range products {
 		productMap[p.CategoryID] = append(productMap[p.CategoryID], p)
@@ -252,15 +236,11 @@ func (h *SelfOrderHandler) buildMenuResponse(
 		menuItems := make([]contract.SelfOrderMenuItem, 0)
 		if prods, ok := productMap[cat.ID]; ok {
 			for _, p := range prods {
-				price := p.Price
-				if outletPrice, exists := outletPriceMap[p.ID]; exists {
-					price = outletPrice
-				}
 				item := contract.SelfOrderMenuItem{
 					ID:          p.ID,
 					Name:        p.Name,
 					Description: p.Description,
-					Price:       price,
+					Price:       p.Price,
 					ImageURL:    p.ImageURL,
 				}
 				for _, v := range p.Variants {

internal/handler/table_handler.go

@@ -150,11 +150,6 @@ func (h *TableHandler) List(c *gin.Context) {
 		Limit:          100,
 	}
 
-	// Fallback to context outlet ID if not provided in query
-	if query.OutletID == "" && contextInfo.OutletID != uuid.Nil {
-		query.OutletID = contextInfo.OutletID.String()
-	}
-
 	if pageStr := c.Query("page"); pageStr != "" {
 		if page, err := strconv.Atoi(pageStr); err == nil && page > 0 {
 			query.Page = page

internal/mappers/category_mapper.go

@@ -13,12 +13,11 @@ func CategoryEntityToModel(entity *entities.Category) *models.Category {
 	return &models.Category{
 		ID:             entity.ID,
 		OrganizationID: entity.OrganizationID,
-		OutletID:       entity.OutletID,
 		Name:           entity.Name,
 		Description:    entity.Description,
-		ImageURL:       nil,
+		ImageURL:       nil,  // Entity doesn't have ImageURL, model does
-		Order:          entity.Order,
+		Order:      	entity.Order,    // Entity doesn't have SortOrder, model does
-		IsActive:       true,
+		IsActive:       true, // Entity doesn't have IsActive, default to true
 		CreatedAt:      entity.CreatedAt,
 		UpdatedAt:      entity.UpdatedAt,
 	}
@@ -33,14 +32,14 @@ func CategoryModelToEntity(model *models.Category) *entities.Category {
 	if model.ImageURL != nil {
 		metadata["image_url"] = *model.ImageURL
 	}
+	// metadata["sort_order"] = model.SortOrder
 
 	return &entities.Category{
 		ID:             model.ID,
 		OrganizationID: model.OrganizationID,
-		OutletID:       model.OutletID,
 		Name:           model.Name,
 		Description:    model.Description,
-		BusinessType:   "restaurant",
+		BusinessType:   "restaurant", // Default business type
 		Order:          model.Order,
 		Metadata:       metadata,
 		CreatedAt:      model.CreatedAt,
@@ -57,14 +56,14 @@ func CreateCategoryRequestToEntity(req *models.CreateCategoryRequest) *entities.
 	if req.ImageURL != nil {
 		metadata["image_url"] = *req.ImageURL
 	}
+	// metadata["sort_order"] = req.SortOrder
 
 	return &entities.Category{
 		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
 		Name:           req.Name,
 		Description:    req.Description,
 		Order:          req.Order,
-		BusinessType:   "restaurant",
+		BusinessType:   "restaurant", // Default business type
 		Metadata:       metadata,
 	}
 }
@@ -88,12 +87,11 @@ func CategoryEntityToResponse(entity *entities.Category) *models.CategoryRespons
 	return &models.CategoryResponse{
 		ID:             entity.ID,
 		OrganizationID: entity.OrganizationID,
-		OutletID:       entity.OutletID,
 		Name:           entity.Name,
 		Description:    entity.Description,
 		ImageURL:       imageURL,
 		Order:      	entity.Order,
-		IsActive:       true,
+		IsActive:       true, // Default to true since entity doesn't have this field
 		CreatedAt:      entity.CreatedAt,
 		UpdatedAt:      entity.UpdatedAt,
 	}
@@ -123,10 +121,6 @@ func UpdateCategoryEntityFromRequest(entity *entities.Category, req *models.Upda
 	if req.Order != nil {
 		entity.Order = *req.Order
 	}
-
-	if req.OutletID != nil {
-		entity.OutletID = req.OutletID
-	}
 }
 
 func CategoryEntitiesToModels(entities []*entities.Category) []*models.Category {

internal/mappers/expense_mapper.go

@@ -1,128 +0,0 @@
-package mappers
-
-import (
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/models"
-)
-
-func ExpenseEntityToModel(entity *entities.Expense) *models.Expense {
-	if entity == nil {
-		return nil
-	}
-
-	return &models.Expense{
-		ID:              entity.ID,
-		OrganizationID:  entity.OrganizationID,
-		OutletID:        entity.OutletID,
-		Receiver:        entity.Receiver,
-		TransactionDate: entity.TransactionDate,
-		CodeNumber:      entity.CodeNumber,
-		Status:          entity.Status,
-		Description:     entity.Description,
-		Tax:             entity.Tax,
-		Total:           entity.Total,
-		Reserved1:       entity.Reserved1,
-		CreatedAt:       entity.CreatedAt,
-		UpdatedAt:       entity.UpdatedAt,
-	}
-}
-
-func ExpenseModelToEntity(model *models.Expense) *entities.Expense {
-	if model == nil {
-		return nil
-	}
-
-	return &entities.Expense{
-		ID:              model.ID,
-		OrganizationID:  model.OrganizationID,
-		OutletID:        model.OutletID,
-		Receiver:        model.Receiver,
-		TransactionDate: model.TransactionDate,
-		CodeNumber:      model.CodeNumber,
-		Status:          model.Status,
-		Description:     model.Description,
-		Tax:             model.Tax,
-		Total:           model.Total,
-		Reserved1:       model.Reserved1,
-		CreatedAt:       model.CreatedAt,
-		UpdatedAt:       model.UpdatedAt,
-	}
-}
-
-func ExpenseEntityToResponse(entity *entities.Expense) *models.ExpenseResponse {
-	if entity == nil {
-		return nil
-	}
-
-	resp := &models.ExpenseResponse{
-		ID:              entity.ID,
-		OrganizationID:  entity.OrganizationID,
-		OutletID:        entity.OutletID,
-		Receiver:        entity.Receiver,
-		TransactionDate: entity.TransactionDate,
-		CodeNumber:      entity.CodeNumber,
-		Status:          entity.Status,
-		Description:     entity.Description,
-		Tax:             entity.Tax,
-		Total:           entity.Total,
-		Reserved1:       entity.Reserved1,
-		CreatedAt:       entity.CreatedAt,
-		UpdatedAt:       entity.UpdatedAt,
-	}
-
-	if entity.Items != nil {
-		resp.Items = ExpenseItemEntitiesToResponses(entity.Items)
-	}
-
-	return resp
-}
-
-func ExpenseEntitiesToResponses(entities []*entities.Expense) []*models.ExpenseResponse {
-	if entities == nil {
-		return nil
-	}
-
-	responses := make([]*models.ExpenseResponse, len(entities))
-	for i, entity := range entities {
-		responses[i] = ExpenseEntityToResponse(entity)
-	}
-	return responses
-}
-
-func ExpenseItemEntityToResponse(entity *entities.ExpenseItem) *models.ExpenseItemResponse {
-	if entity == nil {
-		return nil
-	}
-
-	response := &models.ExpenseItemResponse{
-		ID:               entity.ID,
-		ExpenseID:        entity.ExpenseID,
-		ChartOfAccountID: entity.ChartOfAccountID,
-		Item:             entity.Item,
-		Description:      entity.Description,
-		Amount:           entity.Amount,
-		CreatedAt:        entity.CreatedAt,
-		UpdatedAt:        entity.UpdatedAt,
-	}
-
-	if entity.ChartOfAccount != nil {
-		response.ChartOfAccountName = entity.ChartOfAccount.Name
-	}
-
-	return response
-}
-
-func ExpenseItemEntitiesToResponses(entities []entities.ExpenseItem) []models.ExpenseItemResponse {
-	if entities == nil {
-		return nil
-	}
-
-	responses := make([]models.ExpenseItemResponse, len(entities))
-	for i, entity := range entities {
-		response := ExpenseItemEntityToResponse(&entity)
-		if response != nil {
-			responses[i] = *response
-		}
-	}
-	return responses
-}

internal/mappers/order_mapper.go

@@ -82,7 +82,7 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
 		}
 
 		for i, item := range order.OrderItems {
-			resp := OrderItemEntityToResponse(&item, order.OutletID)
+			resp := OrderItemEntityToResponse(&item)
 			if resp != nil {
 				resp.PaidQuantity = paidQtyByOrderItem[item.ID]
 				response.OrderItems[i] = *resp
@@ -101,20 +101,11 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
 	return response
 }
 
-func OrderItemEntityToResponse(item *entities.OrderItem, outletID uuid.UUID) *models.OrderItemResponse {
+func OrderItemEntityToResponse(item *entities.OrderItem) *models.OrderItemResponse {
 	if item == nil {
 		return nil
 	}
 
-	// Resolve print_to_checker from preloaded outlet prices
-	printToChecker := true // default
-	for _, op := range item.Product.ProductOutletPrices {
-		if op.OutletID == outletID {
-			printToChecker = op.PrintToChecker
-			break
-		}
-	}
-
 	response := &models.OrderItemResponse{
 		ID:                  item.ID,
 		OrderID:             item.OrderID,
@@ -139,19 +130,10 @@ func OrderItemEntityToResponse(item *entities.OrderItem, outletID uuid.UUID) *mo
 		CreatedAt:           item.CreatedAt,
 		UpdatedAt:           item.UpdatedAt,
 		PrinterType:         item.Product.PrinterType,
-		PrintToChecker:      printToChecker,
 	}
 
 	if item.Product.ID != uuid.Nil {
 		response.ProductName = item.Product.Name
-		if item.Product.CategoryID != uuid.Nil {
-			categoryID := item.Product.CategoryID
-			response.CategoryID = &categoryID
-		}
-		if item.Product.Category.ID != uuid.Nil {
-			categoryName := item.Product.Category.Name
-			response.CategoryName = &categoryName
-		}
 	}
 
 	if item.ProductVariant != nil {
@@ -334,14 +316,14 @@ func OrderEntitiesToResponses(orders []*entities.Order) []models.OrderResponse {
 	return responses
 }
 
-func OrderItemEntitiesToResponses(items []*entities.OrderItem, outletID uuid.UUID) []models.OrderItemResponse {
+func OrderItemEntitiesToResponses(items []*entities.OrderItem) []models.OrderItemResponse {
 	if items == nil {
 		return nil
 	}
 
 	responses := make([]models.OrderItemResponse, len(items))
 	for i, item := range items {
-		response := OrderItemEntityToResponse(item, outletID)
+		response := OrderItemEntityToResponse(item)
 		if response != nil {
 			responses[i] = *response
 		}

internal/mappers/order_mapper_test.go

@@ -45,7 +45,7 @@ func TestOrderItemEntityToResponse_WithProductNames(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
+	result := OrderItemEntityToResponse(orderItem)
 
 	// Assert
 	assert.NotNil(t, result)
@@ -89,7 +89,7 @@ func TestOrderItemEntityToResponse_WithoutProductVariant(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
+	result := OrderItemEntityToResponse(orderItem)
 
 	// Assert
 	assert.NotNil(t, result)
@@ -129,7 +129,7 @@ func TestOrderItemEntityToResponse_WithoutProductPreload(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
+	result := OrderItemEntityToResponse(orderItem)
 
 	// Assert
 	assert.NotNil(t, result)

internal/mappers/product_mapper.go

@@ -135,7 +135,6 @@ func ProductEntityToResponse(entity *entities.Product) *models.ProductResponse {
 		Name:           entity.Name,
 		Description:    entity.Description,
 		Price:          entity.Price,
-		OutletPrice:    nil, // populated by processor when outletID is available
 		Cost:           entity.Cost,
 		BusinessType:   constants.BusinessType(entity.BusinessType),
 		ImageURL:       entity.ImageURL,

internal/mappers/product_outlet_price_mapper.go

@@ -1,50 +0,0 @@
-package mappers
-
-import (
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/models"
-)
-
-func ProductOutletPriceEntityToModel(entity *entities.ProductOutletPrice) *models.ProductOutletPrice {
-	if entity == nil {
-		return nil
-	}
-
-	return &models.ProductOutletPrice{
-		ID:             entity.ID,
-		ProductID:      entity.ProductID,
-		OutletID:       entity.OutletID,
-		Price:          entity.Price,
-		PrintToChecker: entity.PrintToChecker,
-		CreatedAt:      entity.CreatedAt,
-		UpdatedAt:      entity.UpdatedAt,
-	}
-}
-
-func ProductOutletPriceModelToEntity(model *models.ProductOutletPrice) *entities.ProductOutletPrice {
-	if model == nil {
-		return nil
-	}
-
-	return &entities.ProductOutletPrice{
-		ID:             model.ID,
-		ProductID:      model.ProductID,
-		OutletID:       model.OutletID,
-		Price:          model.Price,
-		PrintToChecker: model.PrintToChecker,
-		CreatedAt:      model.CreatedAt,
-		UpdatedAt:      model.UpdatedAt,
-	}
-}
-
-func ProductOutletPriceEntitiesToModels(entities []*entities.ProductOutletPrice) []*models.ProductOutletPrice {
-	if entities == nil {
-		return nil
-	}
-
-	models := make([]*models.ProductOutletPrice, len(entities))
-	for i, entity := range entities {
-		models[i] = ProductOutletPriceEntityToModel(entity)
-	}
-	return models
-}

internal/middleware/auth_middleware.go

@@ -11,7 +11,6 @@ import (
 	"apskel-pos-be/internal/service"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 type AuthMiddleware struct {
@@ -46,13 +45,9 @@ func (m *AuthMiddleware) RequireAuth() gin.HandlerFunc {
 		setKeyInContext(c, appcontext.OrganizationIDKey, userResponse.OrganizationID.String())
 		setKeyInContext(c, appcontext.UserIDKey, userResponse.ID.String())
 
-		// Always override OutletID from token to prevent header injection.
+		if userResponse.Role != "superadmin" {
-		// Set empty string if user has no outlet, so PopulateContext header value is ignored.
+			setKeyInContext(c, appcontext.OutletIDKey, userResponse.OutletID.String())
-		outletIDStr := ""
-		if userResponse.OutletID != nil && *userResponse.OutletID != uuid.Nil {
-			outletIDStr = userResponse.OutletID.String()
 		}
-		setKeyInContext(c, appcontext.OutletIDKey, outletIDStr)
 
 		logger.FromContext(c.Request.Context()).Infof("AuthMiddleware::RequireAuth -> User authenticated: %s", userResponse.Email)
 		c.Next()

internal/models/analytics.go

@@ -87,69 +87,6 @@ type SalesAnalyticsData struct {
 	NetSales float64   `json:"net_sales"`
 }
 
-// PurchasingAnalyticsRequest represents the request for purchasing analytics
-type PurchasingAnalyticsRequest struct {
-	OrganizationID uuid.UUID  `validate:"required"`
-	OutletID       *uuid.UUID `validate:"omitempty"`
-	DateFrom       time.Time  `validate:"required"`
-	DateTo         time.Time  `validate:"required"`
-	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
-}
-
-// PurchasingAnalyticsResponse represents the response for purchasing analytics
-type PurchasingAnalyticsResponse struct {
-	OrganizationID uuid.UUID                  `json:"organization_id"`
-	OutletID       *uuid.UUID                 `json:"outlet_id,omitempty"`
-	OutletName     *string                    `json:"outlet_name,omitempty"`
-	DateFrom       time.Time                  `json:"date_from"`
-	DateTo         time.Time                  `json:"date_to"`
-	GroupBy        string                     `json:"group_by"`
-	Summary        PurchasingSummary          `json:"summary"`
-	Data           []PurchasingAnalyticsData  `json:"data"`
-	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
-	VendorData     []PurchasingVendorData     `json:"vendor_data"`
-}
-
-// PurchasingSummary represents the summary of purchasing analytics
-type PurchasingSummary struct {
-	TotalPurchases            float64 `json:"total_purchases"`
-	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
-	TotalQuantity             float64 `json:"total_quantity"`
-	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
-	TotalIngredients          int64   `json:"total_ingredients"`
-	TotalVendors              int64   `json:"total_vendors"`
-}
-
-// PurchasingAnalyticsData represents purchasing analytics by time period
-type PurchasingAnalyticsData struct {
-	Date           time.Time `json:"date"`
-	Purchases      float64   `json:"purchases"`
-	PurchaseOrders int64     `json:"purchase_orders"`
-	Quantity       float64   `json:"quantity"`
-	Ingredients    int64     `json:"ingredients"`
-	Vendors        int64     `json:"vendors"`
-}
-
-// PurchasingIngredientData represents purchasing analytics for an ingredient
-type PurchasingIngredientData struct {
-	IngredientID       uuid.UUID `json:"ingredient_id"`
-	IngredientName     string    `json:"ingredient_name"`
-	Quantity           float64   `json:"quantity"`
-	TotalCost          float64   `json:"total_cost"`
-	AverageUnitCost    float64   `json:"average_unit_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-}
-
-// PurchasingVendorData represents purchasing analytics for a vendor
-type PurchasingVendorData struct {
-	VendorID           uuid.UUID `json:"vendor_id"`
-	VendorName         string    `json:"vendor_name"`
-	TotalCost          float64   `json:"total_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-	IngredientCount    int64     `json:"ingredient_count"`
-	Quantity           float64   `json:"quantity"`
-}
-
 // ProductAnalyticsRequest represents the request for product analytics
 type ProductAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
@@ -246,6 +183,7 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
+// ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
 	OutletID       *uuid.UUID `validate:"omitempty"`
@@ -254,6 +192,7 @@ type ProfitLossAnalyticsRequest struct {
 	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
 }
 
+// ProfitLossAnalyticsResponse represents the response for profit and loss analytics
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID uuid.UUID           `json:"organization_id"`
 	OutletID       *uuid.UUID          `json:"outlet_id,omitempty"`
@@ -263,11 +202,9 @@ type ProfitLossAnalyticsResponse struct {
 	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"`
 }
 
+// ProfitLossSummary represents the summary of profit and loss analytics
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -282,6 +219,7 @@ type ProfitLossSummary struct {
 	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
+// ProfitLossData represents individual profit and loss data point by time period
 type ProfitLossData struct {
 	Date              time.Time `json:"date"`
 	Revenue           float64   `json:"revenue"`
@@ -295,6 +233,7 @@ type ProfitLossData struct {
 	Orders            int64     `json:"orders"`
 }
 
+// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
 	ProductID         uuid.UUID `json:"product_id"`
 	ProductName       string    `json:"product_name"`
@@ -309,19 +248,3 @@ type ProductProfitData struct {
 	AverageCost       float64   `json:"average_cost"`
 	ProfitPerUnit     float64   `json:"profit_per_unit"`
 }
-
-type ProfitLossSummaryRow struct {
-	ID           string                 `json:"id"`
-	Label        string                 `json:"label"`
-	IsBold       bool                   `json:"is_bold"`
-	TodayNominal float64                `json:"today_nominal"`
-	TodayPct     float64                `json:"today_pct"`
-	MtdNominal   float64                `json:"mtd_nominal"`
-	MtdPct       float64                `json:"mtd_pct"`
-	SubItems     []ProfitLossSummaryRow `json:"sub_items,omitempty"`
-}
-
-type OperationalExpenseItem struct {
-	Item    string  `json:"item"`
-	Nominal float64 `json:"nominal"`
-}

internal/models/category.go

@@ -29,10 +29,10 @@ type CreateCategoryRequest struct {
 }
 
 type UpdateCategoryRequest struct {
+	OutletID    *uuid.UUID `validate:"omitempty,required"`
 	Name        *string    `validate:"omitempty,min=1,max=255"`
 	Description *string    `validate:"omitempty,max=1000"`
 	ImageURL    *string    `validate:"omitempty,url"`
-	OutletID    *uuid.UUID
 	Order       *int       `validate:"omitempty,min=0"`
 	IsActive    *bool
 }

internal/models/expense.go

@@ -1,120 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type Expense struct {
-	ID              uuid.UUID `json:"id"`
-	OrganizationID  uuid.UUID `json:"organization_id"`
-	OutletID        uuid.UUID `json:"outlet_id"`
-	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"`
-	Reserved1       *string   `json:"reserved1"`
-	CreatedAt       time.Time `json:"created_at"`
-	UpdatedAt       time.Time `json:"updated_at"`
-}
-
-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"`
-	UpdatedAt        time.Time `json:"updated_at"`
-}
-
-type ExpenseResponse struct {
-	ID              uuid.UUID             `json:"id"`
-	OrganizationID  uuid.UUID             `json:"organization_id"`
-	OutletID        uuid.UUID             `json:"outlet_id"`
-	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"`
-	Reserved1       *string               `json:"reserved1"`
-	CreatedAt       time.Time             `json:"created_at"`
-	UpdatedAt       time.Time             `json:"updated_at"`
-	Items           []ExpenseItemResponse `json:"items,omitempty"`
-}
-
-type ExpenseItemResponse struct {
-	ID                 uuid.UUID `json:"id"`
-	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"`
-	UpdatedAt          time.Time `json:"updated_at"`
-}
-
-type CreateExpenseRequest struct {
-	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"`
-	Items           []CreateExpenseItemRequest `json:"items"`
-}
-
-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 {
-	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"`
-	Reserved1       *string                    `json:"reserved1,omitempty"`
-	Items           []UpdateExpenseItemRequest `json:"items,omitempty"`
-}
-
-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"`
-}
-
-type ListExpenseRequest struct {
-	Page      int    `json:"page"`
-	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"`
-}
-
-type ListExpenseResponse struct {
-	Expenses   []*ExpenseResponse `json:"expenses"`
-	TotalCount int                `json:"total_count"`
-	Page       int                `json:"page"`
-	Limit      int                `json:"limit"`
-	TotalPages int                `json:"total_pages"`
-}

internal/models/order.go

@@ -188,8 +188,6 @@ type OrderItemResponse struct {
 	ProductName         string
 	ProductVariantID    *uuid.UUID
 	ProductVariantName  *string
-	CategoryID          *uuid.UUID
-	CategoryName        *string
 	Quantity            int
 	UnitPrice           float64
 	TotalPrice          float64
@@ -209,7 +207,6 @@ type OrderItemResponse struct {
 	CreatedAt           time.Time
 	UpdatedAt           time.Time
 	PrinterType         string
-	PrintToChecker      bool
 	PaidQuantity        int
 }
 

internal/models/product.go

@@ -10,6 +10,7 @@ import (
 type Product struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	CategoryID     uuid.UUID
 	SKU            *string
 	Name           string
@@ -40,7 +41,7 @@ type ProductVariant struct {
 
 type CreateProductRequest struct {
 	OrganizationID uuid.UUID              `validate:"required"`
-	OutletID       uuid.UUID              `validate:"omitempty"` // If set, upsert product_outlet_prices on create
+	OutletID       *uuid.UUID             `validate:"omitempty"`
 	CategoryID     uuid.UUID              `validate:"required"`
 	SKU            *string                `validate:"omitempty,max=100"`
 	Name           string                 `validate:"required,min=1,max=255"`
@@ -50,7 +51,6 @@ type CreateProductRequest struct {
 	BusinessType   constants.BusinessType `validate:"required"`
 	ImageURL       *string                `validate:"omitempty,max=500"`
 	PrinterType    *string                `validate:"omitempty,max=50"`
-	PrintToChecker *bool                  `validate:"omitempty"`
 	UnitID         *uuid.UUID             `validate:"omitempty"`
 	HasIngredients bool                   `validate:"omitempty"`
 	Metadata       map[string]interface{}
@@ -62,7 +62,7 @@ type CreateProductRequest struct {
 }
 
 type UpdateProductRequest struct {
-	OutletID       uuid.UUID  `validate:"omitempty"` // If set, upsert product_outlet_prices on update
+	OutletID       *uuid.UUID `validate:"omitempty"`
 	CategoryID     *uuid.UUID `validate:"omitempty"`
 	SKU            *string    `validate:"omitempty,max=100"`
 	Name           *string    `validate:"omitempty,min=1,max=255"`
@@ -71,7 +71,6 @@ type UpdateProductRequest struct {
 	Cost           *float64   `validate:"omitempty,min=0"`
 	ImageURL       *string    `validate:"omitempty,max=500"`
 	PrinterType    *string    `validate:"omitempty,max=50"`
-	PrintToChecker *bool      `validate:"omitempty"`
 	UnitID         *uuid.UUID `validate:"omitempty"`
 	HasIngredients *bool      `validate:"omitempty"`
 	Metadata       map[string]interface{}
@@ -98,19 +97,17 @@ type UpdateProductVariantRequest struct {
 type ProductResponse struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	CategoryID     uuid.UUID
 	CategoryName   string
 	SKU            *string
 	Name           string
 	Description    *string
 	Price          float64
-	OutletPrice    *float64      // outlet-specific price, nil if not set
-	OutletPrices   []OutletPrice // all outlet prices, populated when no outletID in context
 	Cost           float64
 	BusinessType   constants.BusinessType
 	ImageURL       *string
 	PrinterType    string
-	PrintToChecker bool
 	UnitID         *uuid.UUID
 	HasIngredients bool
 	Metadata       map[string]interface{}
@@ -120,13 +117,6 @@ type ProductResponse struct {
 	Variants       []ProductVariantResponse
 }
 
-type OutletPrice struct {
-	OutletID       uuid.UUID
-	OutletName     string
-	Price          float64
-	PrintToChecker bool
-}
-
 type ProductVariantResponse struct {
 	ID            uuid.UUID
 	ProductID     uuid.UUID

internal/models/product_outlet_price.go

@@ -1,38 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type ProductOutletPrice struct {
-	ID             uuid.UUID
-	ProductID      uuid.UUID
-	OutletID       uuid.UUID
-	Price          float64
-	PrintToChecker bool
-	CreatedAt      time.Time
-	UpdatedAt      time.Time
-}
-
-type CreateProductOutletPriceRequest struct {
-	ProductID      uuid.UUID `validate:"required"`
-	OutletID       uuid.UUID `validate:"required"`
-	Price          float64   `validate:"required,min=0"`
-	PrintToChecker bool
-}
-
-type UpdateProductOutletPriceRequest struct {
-	Price          *float64 `validate:"required,min=0"`
-	PrintToChecker *bool
-}
-
-type ProductOutletPriceResponse struct {
-	ID        uuid.UUID `json:"id"`
-	ProductID uuid.UUID `json:"product_id"`
-	OutletID  uuid.UUID `json:"outlet_id"`
-	Price     float64   `json:"price"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
-}

internal/models/purchase_order.go

@@ -12,7 +12,7 @@ type PurchaseOrder 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"`
@@ -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,omitempty"`
+	DueDate           time.Time                        `json:"due_date"`
 	Reference         *string                          `json:"reference,omitempty"`
 	Status            *string                          `json:"status,omitempty"`
 	Message           *string                          `json:"message,omitempty"`

internal/processor/analytics_processor.go

@@ -3,10 +3,8 @@ package processor
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
-	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/repository"
 )
@@ -14,7 +12,6 @@ import (
 type AnalyticsProcessor interface {
 	GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error)
 	GetSalesAnalytics(ctx context.Context, req *models.SalesAnalyticsRequest) (*models.SalesAnalyticsResponse, error)
-	GetPurchasingAnalytics(ctx context.Context, req *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error)
 	GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error)
 	GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
 	GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
@@ -23,13 +20,11 @@ type AnalyticsProcessor interface {
 
 type AnalyticsProcessorImpl struct {
 	analyticsRepo repository.AnalyticsRepository
-	expenseRepo   ExpenseRepository
 }
 
-func NewAnalyticsProcessorImpl(analyticsRepo repository.AnalyticsRepository, expenseRepo ExpenseRepository) *AnalyticsProcessorImpl {
+func NewAnalyticsProcessorImpl(analyticsRepo repository.AnalyticsRepository) *AnalyticsProcessorImpl {
 	return &AnalyticsProcessorImpl{
 		analyticsRepo: analyticsRepo,
-		expenseRepo:   expenseRepo,
 	}
 }
 
@@ -169,77 +164,6 @@ func (p *AnalyticsProcessorImpl) GetSalesAnalytics(ctx context.Context, req *mod
 	}, nil
 }
 
-func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error) {
-	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.GetPurchasingAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo, req.GroupBy)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get purchasing analytics: %w", err)
-	}
-
-	data := make([]models.PurchasingAnalyticsData, len(result.Data))
-	for i, item := range result.Data {
-		data[i] = models.PurchasingAnalyticsData{
-			Date:           item.Date,
-			Purchases:      item.Purchases,
-			PurchaseOrders: item.PurchaseOrders,
-			Quantity:       item.Quantity,
-			Ingredients:    item.Ingredients,
-			Vendors:        item.Vendors,
-		}
-	}
-
-	ingredientData := make([]models.PurchasingIngredientData, len(result.IngredientData))
-	for i, item := range result.IngredientData {
-		ingredientData[i] = models.PurchasingIngredientData{
-			IngredientID:       item.IngredientID,
-			IngredientName:     item.IngredientName,
-			Quantity:           item.Quantity,
-			TotalCost:          item.TotalCost,
-			AverageUnitCost:    item.AverageUnitCost,
-			PurchaseOrderCount: item.PurchaseOrderCount,
-		}
-	}
-
-	vendorData := make([]models.PurchasingVendorData, len(result.VendorData))
-	for i, item := range result.VendorData {
-		vendorData[i] = models.PurchasingVendorData{
-			VendorID:           item.VendorID,
-			VendorName:         item.VendorName,
-			TotalCost:          item.TotalCost,
-			PurchaseOrderCount: item.PurchaseOrderCount,
-			IngredientCount:    item.IngredientCount,
-			Quantity:           item.Quantity,
-		}
-	}
-
-	return &models.PurchasingAnalyticsResponse{
-		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
-		OutletName:     result.OutletName,
-		DateFrom:       req.DateFrom,
-		DateTo:         req.DateTo,
-		GroupBy:        req.GroupBy,
-		Summary: models.PurchasingSummary{
-			TotalPurchases:            result.Summary.TotalPurchases,
-			TotalPurchaseOrders:       result.Summary.TotalPurchaseOrders,
-			TotalQuantity:             result.Summary.TotalQuantity,
-			AveragePurchaseOrderValue: result.Summary.AveragePurchaseOrderValue,
-			TotalIngredients:          result.Summary.TotalIngredients,
-			TotalVendors:              result.Summary.TotalVendors,
-		},
-		Data:           data,
-		IngredientData: ingredientData,
-		VendorData:     vendorData,
-	}, nil
-}
-
 func (p *AnalyticsProcessorImpl) GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error) {
 	// Validate date range
 	if req.DateFrom.After(req.DateTo) {
@@ -398,27 +322,17 @@ func (p *AnalyticsProcessorImpl) GetDashboardAnalytics(ctx context.Context, req
 }
 
 func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error) {
-	if req.DateFrom.IsZero() {
-		return nil, fmt.Errorf("date_from is required")
-	}
-
-	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 == "" {
+	// Get analytics data from repository
-		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)
 	}
 
+	// Transform entities to models
 	data := make([]models.ProfitLossData, len(result.Data))
 	for i, item := range result.Data {
 		data[i] = models.ProfitLossData{
@@ -453,103 +367,6 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 		}
 	}
 
-	todayPromosi := getExpenseAmountByCategory(result.TodayExpenseByCategory, "promosi")
-	todayLainLain := getExpenseAmountByCategory(result.TodayExpenseByCategory, "lain")
-	todayTotalOps := todayPromosi + todayLainLain
-	todayGaji := getExpenseAmountByCategory(result.TodayExpenseByCategory, "gaji")
-
-	mtdPromosi := getExpenseAmountByCategory(result.MtdExpenseByCategory, "promosi")
-	mtdLainLain := getExpenseAmountByCategory(result.MtdExpenseByCategory, "lain")
-	mtdTotalOps := mtdPromosi + mtdLainLain
-	mtdGaji := getExpenseAmountByCategory(result.MtdExpenseByCategory, "gaji")
-
-	todayGrossProfit := result.TodayRevenue - result.TodayCost
-	mtdGrossProfit := result.MtdRevenue - result.MtdCost
-
-	todayProfitBeforeGaji := todayGrossProfit - todayTotalOps
-	mtdProfitBeforeGaji := mtdGrossProfit - mtdTotalOps
-
-	todayNetProfit := todayProfitBeforeGaji - todayGaji
-	mtdNetProfit := mtdProfitBeforeGaji - mtdGaji
-
-	todayPct := func(nominal float64) float64 {
-		if result.TodayRevenue == 0 {
-			return 0
-		}
-		return (nominal / result.TodayRevenue) * 100
-	}
-	mtdPct := func(nominal float64) float64 {
-		if result.MtdRevenue == 0 {
-			return 0
-		}
-		return (nominal / result.MtdRevenue) * 100
-	}
-
-	mainSummary := []models.ProfitLossSummaryRow{
-		{
-			ID: "total_omset", Label: "TOTAL OMSET",
-			TodayNominal: result.TodayRevenue, TodayPct: todayPct(result.TodayRevenue),
-			MtdNominal: result.MtdRevenue, MtdPct: mtdPct(result.MtdRevenue),
-		},
-		{
-			ID: "hpp", Label: "HPP",
-			TodayNominal: result.TodayCost, TodayPct: todayPct(result.TodayCost),
-			MtdNominal: result.MtdCost, MtdPct: mtdPct(result.MtdCost),
-		},
-		{
-			ID: "laba_kotor", Label: "Laba Kotor (1-2)",
-			TodayNominal: todayGrossProfit, TodayPct: todayPct(todayGrossProfit),
-			MtdNominal: mtdGrossProfit, MtdPct: mtdPct(mtdGrossProfit),
-		},
-		{
-			ID: "biaya_ops", Label: "BIAYA OPS",
-			TodayNominal: todayTotalOps, TodayPct: todayPct(todayTotalOps),
-			MtdNominal: mtdTotalOps, MtdPct: mtdPct(mtdTotalOps),
-			SubItems: []models.ProfitLossSummaryRow{
-				{
-					ID: "by_promosi", Label: "1. By Promosi",
-					TodayNominal: todayPromosi, TodayPct: todayPct(todayPromosi),
-					MtdNominal: mtdPromosi, MtdPct: mtdPct(mtdPromosi),
-				},
-				{
-					ID: "by_lain_lain", Label: "2. By Lain lain",
-					TodayNominal: todayLainLain, TodayPct: todayPct(todayLainLain),
-					MtdNominal: mtdLainLain, MtdPct: mtdPct(mtdLainLain),
-				},
-				{
-					ID: "total_biaya_ops", Label: "Total Biaya OPS (4.1+4.2)", IsBold: true,
-					TodayNominal: todayTotalOps, TodayPct: todayPct(todayTotalOps),
-					MtdNominal: mtdTotalOps, MtdPct: mtdPct(mtdTotalOps),
-				},
-			},
-		},
-		{
-			ID: "laba_rugi_sblm_gaji", Label: "Laba/Rugi sblm Gaji (3-4)",
-			TodayNominal: todayProfitBeforeGaji, TodayPct: todayPct(todayProfitBeforeGaji),
-			MtdNominal: mtdProfitBeforeGaji, MtdPct: mtdPct(mtdProfitBeforeGaji),
-		},
-		{
-			ID: "biaya_gaji", Label: "BIAYA GAJI",
-			TodayNominal: todayGaji, TodayPct: todayPct(todayGaji),
-			MtdNominal: mtdGaji, MtdPct: mtdPct(mtdGaji),
-		},
-		{
-			ID: "laba_rugi", Label: "Laba/Rugi (5-6)", IsBold: true,
-			TodayNominal: todayNetProfit, TodayPct: todayPct(todayNetProfit),
-			MtdNominal: mtdNetProfit, MtdPct: mtdPct(mtdNetProfit),
-		},
-	}
-
-	opsItems := make([]models.OperationalExpenseItem, len(result.OperationalExpenseItems))
-	var opsTotal float64
-	for i, item := range result.OperationalExpenseItems {
-		opsItems[i] = models.OperationalExpenseItem{
-			Item:    item.Item,
-			Nominal: item.Amount,
-		}
-		opsTotal += item.Amount
-	}
-
 	return &models.ProfitLossAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
@@ -571,17 +388,5 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 		},
 		Data:        data,
 		ProductData: productData,
-		MainSummary:              mainSummary,
-		OperationalExpenses:      opsItems,
-		OperationalExpensesTotal: opsTotal,
 	}, nil
 }
-
-func getExpenseAmountByCategory(categories []entities.ExpenseCategoryTotal, keyword string) float64 {
-	for _, cat := range categories {
-		if strings.Contains(strings.ToLower(cat.CategoryName), keyword) {
-			return cat.Amount
-		}
-	}
-	return 0
-}

internal/processor/analytics_processor_test.go

@@ -1,167 +0,0 @@
-package processor
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/models"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
-)
-
-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) {
-	return nil, nil
-}
-
-func (analyticsRepositoryStub) GetSalesAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time, string) ([]*entities.SalesAnalytics, error) {
-	return nil, nil
-}
-
-func (s analyticsRepositoryStub) GetPurchasingAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time, string) (*entities.PurchasingAnalytics, error) {
-	return s.purchasingResult, nil
-}
-
-func (analyticsRepositoryStub) GetProductAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time, int) ([]*entities.ProductAnalytics, error) {
-	return nil, nil
-}
-
-func (analyticsRepositoryStub) GetProductAnalyticsPerCategory(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.ProductAnalyticsPerCategory, error) {
-	return nil, nil
-}
-
-func (analyticsRepositoryStub) GetDashboardOverview(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) (*entities.DashboardOverview, 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{}
-
-func (expenseRepositoryStub) Create(context.Context, *entities.Expense) error { return nil }
-func (expenseRepositoryStub) GetByID(context.Context, uuid.UUID) (*entities.Expense, error) {
-	return nil, nil
-}
-func (expenseRepositoryStub) GetByIDAndOrganizationID(context.Context, uuid.UUID, uuid.UUID) (*entities.Expense, error) {
-	return nil, nil
-}
-func (expenseRepositoryStub) Update(context.Context, *entities.Expense) error { return nil }
-func (expenseRepositoryStub) Delete(context.Context, uuid.UUID) error         { return nil }
-func (expenseRepositoryStub) List(context.Context, uuid.UUID, map[string]interface{}, int, int) ([]*entities.Expense, int64, error) {
-	return nil, 0, nil
-}
-func (expenseRepositoryStub) CreateItem(context.Context, *entities.ExpenseItem) error { return nil }
-func (expenseRepositoryStub) DeleteItemsByExpenseID(context.Context, uuid.UUID) error { return nil }
-
-func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T) {
-	outletID := uuid.New()
-	outletName := "Main Outlet"
-	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
-		purchasingResult: &entities.PurchasingAnalytics{
-			OutletName: &outletName,
-			Summary: entities.PurchasingSummary{
-				TotalPurchases: 125,
-			},
-		},
-	}, expenseRepositoryStub{})
-
-	result, err := processor.GetPurchasingAnalytics(context.Background(), &models.PurchasingAnalyticsRequest{
-		OrganizationID: uuid.New(),
-		OutletID:       &outletID,
-		DateFrom:       now,
-		DateTo:         now,
-	})
-
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.Equal(t, &outletID, result.OutletID)
-	require.NotNil(t, result.OutletName)
-	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/category_processor.go

@@ -55,6 +55,7 @@ func (p *CategoryProcessorImpl) CreateCategory(ctx context.Context, req *models.
 
 	// Map request to entity
 	categoryEntity := mappers.CreateCategoryRequestToEntity(req)
+	categoryEntity.OutletID = req.OutletID
 
 	// Create category
 	if err := p.categoryRepo.Create(ctx, categoryEntity); err != nil {
@@ -86,6 +87,9 @@ func (p *CategoryProcessorImpl) UpdateCategory(ctx context.Context, id uuid.UUID
 
 	// Apply updates to entity
 	mappers.UpdateCategoryEntityFromRequest(existingCategory, req)
+	if req.OutletID != nil {
+		existingCategory.OutletID = req.OutletID
+	}
 
 	// Update category
 	if err := p.categoryRepo.Update(ctx, existingCategory); err != nil {

internal/processor/expense_processor.go

@@ -1,223 +0,0 @@
-package processor
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/mappers"
-	"apskel-pos-be/internal/models"
-
-	"github.com/google/uuid"
-)
-
-type ExpenseProcessor interface {
-	CreateExpense(ctx context.Context, organizationID uuid.UUID, req *models.CreateExpenseRequest) (*models.ExpenseResponse, error)
-	UpdateExpense(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdateExpenseRequest) (*models.ExpenseResponse, error)
-	DeleteExpense(ctx context.Context, id, organizationID uuid.UUID) error
-	GetExpenseByID(ctx context.Context, id, organizationID uuid.UUID) (*models.ExpenseResponse, error)
-	ListExpenses(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.ExpenseResponse, int, error)
-}
-
-type ExpenseProcessorImpl struct {
-	expenseRepo ExpenseRepository
-}
-
-func NewExpenseProcessorImpl(expenseRepo ExpenseRepository) *ExpenseProcessorImpl {
-	return &ExpenseProcessorImpl{
-		expenseRepo: expenseRepo,
-	}
-}
-
-func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID uuid.UUID, req *models.CreateExpenseRequest) (*models.ExpenseResponse, error) {
-	outletID, err := uuid.Parse(req.OutletID)
-	if err != nil {
-		return nil, fmt.Errorf("invalid outlet_id: %w", err)
-	}
-
-	transactionDate, err := time.Parse("2006-01-02", req.TransactionDate)
-	if err != nil {
-		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,
-		Receiver:        req.Receiver,
-		TransactionDate: transactionDate,
-		CodeNumber:      req.CodeNumber,
-		Status:          status,
-		Description:     req.Description,
-		Tax:             req.Tax,
-		Total:           req.Total,
-	}
-
-	err = p.expenseRepo.Create(ctx, expenseEntity)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create expense: %w", err)
-	}
-
-	for _, itemReq := range req.Items {
-		chartOfAccountID, err := uuid.Parse(itemReq.ChartOfAccountID)
-		if err != nil {
-			return nil, fmt.Errorf("invalid chart_of_account_id for item: %w", err)
-		}
-
-		itemEntity := &entities.ExpenseItem{
-			ExpenseID:        expenseEntity.ID,
-			ChartOfAccountID: chartOfAccountID,
-			Item:             itemReq.Item,
-			Description:      itemReq.Description,
-			Amount:           itemReq.Amount,
-		}
-
-		err = p.expenseRepo.CreateItem(ctx, itemEntity)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create expense item: %w", err)
-		}
-	}
-
-	created, err := p.expenseRepo.GetByID(ctx, expenseEntity.ID)
-	if err != nil {
-		return mappers.ExpenseEntityToResponse(expenseEntity), nil
-	}
-
-	return mappers.ExpenseEntityToResponse(created), nil
-}
-
-func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdateExpenseRequest) (*models.ExpenseResponse, error) {
-	expenseEntity, err := p.expenseRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
-	if err != nil {
-		return nil, fmt.Errorf("expense not found: %w", err)
-	}
-
-	if req.Receiver != nil {
-		expenseEntity.Receiver = *req.Receiver
-	}
-	if req.TransactionDate != nil {
-		parsedDate, err := time.Parse("2006-01-02", *req.TransactionDate)
-		if err != nil {
-			return nil, fmt.Errorf("invalid transaction_date format, expected YYYY-MM-DD: %w", err)
-		}
-		expenseEntity.TransactionDate = parsedDate
-	}
-	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 {
-			return nil, fmt.Errorf("invalid outlet_id: %w", err)
-		}
-		expenseEntity.OutletID = outletID
-	}
-	if req.Description != nil {
-		expenseEntity.Description = req.Description
-	}
-	if req.Tax != nil {
-		expenseEntity.Tax = *req.Tax
-	}
-	if req.Total != nil {
-		expenseEntity.Total = *req.Total
-	}
-	if req.Reserved1 != nil {
-		expenseEntity.Reserved1 = req.Reserved1
-	}
-
-	if req.Items != nil {
-		err = p.expenseRepo.DeleteItemsByExpenseID(ctx, expenseEntity.ID)
-		if err != nil {
-			return nil, fmt.Errorf("failed to delete existing items: %w", err)
-		}
-
-		for _, itemReq := range req.Items {
-			chartOfAccountID := uuid.Nil
-			if itemReq.ChartOfAccountID != nil {
-				chartOfAccountID, err = uuid.Parse(*itemReq.ChartOfAccountID)
-				if err != nil {
-					return nil, fmt.Errorf("invalid chart_of_account_id for item: %w", err)
-				}
-			}
-
-			amount := 0.0
-			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,
-			}
-
-			err = p.expenseRepo.CreateItem(ctx, itemEntity)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create expense item: %w", err)
-			}
-		}
-	}
-
-	err = p.expenseRepo.Update(ctx, expenseEntity)
-	if err != nil {
-		return nil, fmt.Errorf("failed to update expense: %w", err)
-	}
-
-	updated, err := p.expenseRepo.GetByID(ctx, id)
-	if err != nil {
-		return mappers.ExpenseEntityToResponse(expenseEntity), nil
-	}
-
-	return mappers.ExpenseEntityToResponse(updated), nil
-}
-
-func (p *ExpenseProcessorImpl) DeleteExpense(ctx context.Context, id, organizationID uuid.UUID) error {
-	_, err := p.expenseRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
-	if err != nil {
-		return fmt.Errorf("expense not found: %w", err)
-	}
-
-	err = p.expenseRepo.Delete(ctx, id)
-	if err != nil {
-		return fmt.Errorf("failed to delete expense: %w", err)
-	}
-
-	return nil
-}
-
-func (p *ExpenseProcessorImpl) GetExpenseByID(ctx context.Context, id, organizationID uuid.UUID) (*models.ExpenseResponse, error) {
-	expenseEntity, err := p.expenseRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
-	if err != nil {
-		return nil, fmt.Errorf("expense not found: %w", err)
-	}
-
-	return mappers.ExpenseEntityToResponse(expenseEntity), nil
-}
-
-func (p *ExpenseProcessorImpl) ListExpenses(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.ExpenseResponse, int, error) {
-	offset := (page - 1) * limit
-	expenseEntities, total, err := p.expenseRepo.List(ctx, organizationID, filters, limit, offset)
-	if err != nil {
-		return nil, 0, fmt.Errorf("failed to list expenses: %w", err)
-	}
-
-	expenseResponses := mappers.ExpenseEntitiesToResponses(expenseEntities)
-	totalPages := int((total + int64(limit) - 1) / int64(limit))
-
-	return expenseResponses, totalPages, nil
-}

internal/processor/expense_processor_test.go

@@ -1,136 +0,0 @@
-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/expense_repository.go

@@ -1,19 +0,0 @@
-package processor
-
-import (
-	"apskel-pos-be/internal/entities"
-	"context"
-
-	"github.com/google/uuid"
-)
-
-type ExpenseRepository interface {
-	Create(ctx context.Context, expense *entities.Expense) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.Expense, error)
-	GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.Expense, error)
-	Update(ctx context.Context, expense *entities.Expense) error
-	Delete(ctx context.Context, id uuid.UUID) error
-	List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.Expense, int64, error)
-	CreateItem(ctx context.Context, item *entities.ExpenseItem) error
-	DeleteItemsByExpenseID(ctx context.Context, expenseID uuid.UUID) error
-}

internal/processor/order_processor.go

@@ -1,6 +1,7 @@
 package processor
 
 import (
+	"apskel-pos-be/internal/constants"
 	"context"
 	"errors"
 	"fmt"
@@ -107,7 +108,6 @@ type OrderProcessorImpl struct {
 	productRecipeRepo        *repository.ProductRecipeRepository
 	ingredientRepo           IngredientRepository
 	inventoryMovementService InventoryMovementService
-	productOutletPriceRepo   repository.ProductOutletPriceRepository
 }
 
 func NewOrderProcessorImpl(
@@ -126,7 +126,6 @@ func NewOrderProcessorImpl(
 	productRecipeRepo *repository.ProductRecipeRepository,
 	ingredientRepo IngredientRepository,
 	inventoryMovementService InventoryMovementService,
-	productOutletPriceRepo repository.ProductOutletPriceRepository,
 ) *OrderProcessorImpl {
 	return &OrderProcessorImpl{
 		orderRepo:                orderRepo,
@@ -145,7 +144,6 @@ func NewOrderProcessorImpl(
 		productRecipeRepo:        productRecipeRepo,
 		ingredientRepo:           ingredientRepo,
 		inventoryMovementService: inventoryMovementService,
-		productOutletPriceRepo:   productOutletPriceRepo,
 	}
 }
 
@@ -172,12 +170,6 @@ func (p *OrderProcessorImpl) CreateOrder(ctx context.Context, req *models.Create
 		unitPrice := product.Price
 		unitCost := product.Cost
 
-		if p.productOutletPriceRepo != nil {
-			if outletPrice, err := p.productOutletPriceRepo.GetByProductAndOutlet(ctx, itemReq.ProductID, req.OutletID); err == nil {
-				unitPrice = outletPrice.Price
-			}
-		}
-
 		if itemReq.ProductVariantID != nil {
 			variant, err := p.productVariantRepo.GetByID(ctx, *itemReq.ProductVariantID)
 			if err != nil {
@@ -301,12 +293,6 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
 		unitPrice := product.Price
 		unitCost := product.Cost
 
-		if p.productOutletPriceRepo != nil {
-			if outletPrice, err := p.productOutletPriceRepo.GetByProductAndOutlet(ctx, itemReq.ProductID, order.OutletID); err == nil {
-				unitPrice = outletPrice.Price
-			}
-		}
-
 		// Handle product variant if specified
 		if itemReq.ProductVariantID != nil {
 			variant, err := p.productVariantRepo.GetByID(ctx, *itemReq.ProductVariantID)
@@ -387,10 +373,31 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
 			return nil, fmt.Errorf("failed to create order item: %w", err)
 		}
 
-		itemResponse := mappers.OrderItemEntityToResponse(orderItem, order.OutletID)
+		itemResponse := models.OrderItemResponse{
-		if itemResponse != nil {
+			ID:                  orderItem.ID,
-			addedItemResponses = append(addedItemResponses, *itemResponse)
+			OrderID:             orderItem.OrderID,
+			ProductID:           orderItem.ProductID,
+			ProductVariantID:    orderItem.ProductVariantID,
+			Quantity:            orderItem.Quantity,
+			UnitPrice:           orderItem.UnitPrice,
+			TotalPrice:          orderItem.TotalPrice,
+			UnitCost:            orderItem.UnitCost,
+			TotalCost:           orderItem.TotalCost,
+			RefundAmount:        orderItem.RefundAmount,
+			RefundQuantity:      orderItem.RefundQuantity,
+			IsPartiallyRefunded: orderItem.IsPartiallyRefunded,
+			IsFullyRefunded:     orderItem.IsFullyRefunded,
+			RefundReason:        orderItem.RefundReason,
+			RefundedAt:          orderItem.RefundedAt,
+			RefundedBy:          orderItem.RefundedBy,
+			Modifiers:           []map[string]interface{}(orderItem.Modifiers),
+			Notes:               orderItem.Notes,
+			Metadata:            map[string]interface{}(orderItem.Metadata),
+			Status:              constants.OrderItemStatus(orderItem.Status),
+			CreatedAt:           orderItem.CreatedAt,
+			UpdatedAt:           orderItem.UpdatedAt,
 		}
+		addedItemResponses = append(addedItemResponses, itemResponse)
 	}
 
 	orderWithRelations, err := p.orderRepo.GetWithRelations(ctx, orderID)

internal/processor/product_outlet_price_processor.go

@@ -1,122 +0,0 @@
-package processor
-
-import (
-	"context"
-	"fmt"
-
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/mappers"
-	"apskel-pos-be/internal/models"
-	"apskel-pos-be/internal/repository"
-
-	"github.com/google/uuid"
-)
-
-type ProductOutletPriceProcessor interface {
-	Upsert(ctx context.Context, req *models.CreateProductOutletPriceRequest) (*models.ProductOutletPrice, error)
-	GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) (*models.ProductOutletPrice, error)
-	GetByProduct(ctx context.Context, productID uuid.UUID) ([]*models.ProductOutletPrice, error)
-	GetByOutlet(ctx context.Context, outletID uuid.UUID) ([]*models.ProductOutletPrice, error)
-	Delete(ctx context.Context, id uuid.UUID) error
-	ResolvePrice(ctx context.Context, productID, outletID uuid.UUID, fallbackPrice float64) float64
-	BulkUpsert(ctx context.Context, productID uuid.UUID, prices []models.CreateProductOutletPriceRequest) ([]*models.ProductOutletPrice, error)
-}
-
-type ProductOutletPriceProcessorImpl struct {
-	repo        repository.ProductOutletPriceRepository
-	productRepo ProductRepository
-	outletRepo  OutletRepository
-}
-
-func NewProductOutletPriceProcessorImpl(repo repository.ProductOutletPriceRepository, productRepo ProductRepository, outletRepo OutletRepository) *ProductOutletPriceProcessorImpl {
-	return &ProductOutletPriceProcessorImpl{
-		repo:        repo,
-		productRepo: productRepo,
-		outletRepo:  outletRepo,
-	}
-}
-
-func (p *ProductOutletPriceProcessorImpl) Upsert(ctx context.Context, req *models.CreateProductOutletPriceRequest) (*models.ProductOutletPrice, error) {
-	if _, err := p.productRepo.GetByID(ctx, req.ProductID); err != nil {
-		return nil, fmt.Errorf("product not found: %w", err)
-	}
-
-	if _, err := p.outletRepo.GetByID(ctx, req.OutletID); err != nil {
-		return nil, fmt.Errorf("outlet not found: %w", err)
-	}
-
-	entity := &entities.ProductOutletPrice{
-		ProductID:      req.ProductID,
-		OutletID:       req.OutletID,
-		Price:          req.Price,
-		PrintToChecker: req.PrintToChecker,
-	}
-
-	if err := p.repo.Upsert(ctx, entity); err != nil {
-		return nil, fmt.Errorf("failed to upsert product outlet price: %w", err)
-	}
-
-	actual, err := p.repo.GetByProductAndOutlet(ctx, req.ProductID, req.OutletID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to retrieve upserted product outlet price: %w", err)
-	}
-
-	return mappers.ProductOutletPriceEntityToModel(actual), nil
-}
-
-func (p *ProductOutletPriceProcessorImpl) GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) (*models.ProductOutletPrice, error) {
-	entity, err := p.repo.GetByProductAndOutlet(ctx, productID, outletID)
-	if err != nil {
-		return nil, fmt.Errorf("product outlet price not found: %w", err)
-	}
-
-	return mappers.ProductOutletPriceEntityToModel(entity), nil
-}
-
-func (p *ProductOutletPriceProcessorImpl) GetByProduct(ctx context.Context, productID uuid.UUID) ([]*models.ProductOutletPrice, error) {
-	entities, err := p.repo.GetByProduct(ctx, productID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get product outlet prices: %w", err)
-	}
-
-	return mappers.ProductOutletPriceEntitiesToModels(entities), nil
-}
-
-func (p *ProductOutletPriceProcessorImpl) GetByOutlet(ctx context.Context, outletID uuid.UUID) ([]*models.ProductOutletPrice, error) {
-	entities, err := p.repo.GetByOutlet(ctx, outletID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get outlet prices: %w", err)
-	}
-
-	return mappers.ProductOutletPriceEntitiesToModels(entities), nil
-}
-
-func (p *ProductOutletPriceProcessorImpl) Delete(ctx context.Context, id uuid.UUID) error {
-	if err := p.repo.Delete(ctx, id); err != nil {
-		return fmt.Errorf("failed to delete product outlet price: %w", err)
-	}
-	return nil
-}
-
-func (p *ProductOutletPriceProcessorImpl) ResolvePrice(ctx context.Context, productID, outletID uuid.UUID, fallbackPrice float64) float64 {
-	outletPrice, err := p.repo.GetByProductAndOutlet(ctx, productID, outletID)
-	if err != nil {
-		return fallbackPrice
-	}
-	return outletPrice.Price
-}
-
-func (p *ProductOutletPriceProcessorImpl) BulkUpsert(ctx context.Context, productID uuid.UUID, prices []models.CreateProductOutletPriceRequest) ([]*models.ProductOutletPrice, error) {
-	var results []*models.ProductOutletPrice
-
-	for _, req := range prices {
-		req.ProductID = productID
-		result, err := p.Upsert(ctx, &req)
-		if err != nil {
-			return nil, fmt.Errorf("failed to upsert price for outlet %s: %w", req.OutletID, err)
-		}
-		results = append(results, result)
-	}
-
-	return results, nil
-}

internal/processor/product_processor.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/logger"
 	"apskel-pos-be/internal/mappers"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/repository"
@@ -17,9 +16,8 @@ type ProductProcessor interface {
 	CreateProduct(ctx context.Context, req *models.CreateProductRequest) (*models.ProductResponse, error)
 	UpdateProduct(ctx context.Context, id uuid.UUID, req *models.UpdateProductRequest) (*models.ProductResponse, error)
 	DeleteProduct(ctx context.Context, id uuid.UUID) error
-	GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) (*models.ProductResponse, error)
+	GetProductByID(ctx context.Context, id uuid.UUID) (*models.ProductResponse, error)
 	ListProducts(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error)
-	ListProductsAll(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error)
 }
 
 type ProductRepository interface {
@@ -34,13 +32,11 @@ type ProductRepository interface {
 	Update(ctx context.Context, product *entities.Product) error
 	Delete(ctx context.Context, id uuid.UUID) error
 	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Product, int64, error)
-	ListWithOutletPrice(ctx context.Context, filters map[string]interface{}, outletID uuid.UUID, limit, offset int) ([]*entities.Product, int64, error)
 	Count(ctx context.Context, filters map[string]interface{}) (int64, error)
 	GetBySKU(ctx context.Context, organizationID uuid.UUID, sku string) (*entities.Product, error)
 	ExistsBySKU(ctx context.Context, organizationID uuid.UUID, sku string, excludeID *uuid.UUID) (bool, error)
 	GetByName(ctx context.Context, organizationID uuid.UUID, name string) (*entities.Product, error)
 	ExistsByName(ctx context.Context, organizationID uuid.UUID, name string, excludeID *uuid.UUID) (bool, error)
-	ExistsByNameInOutlet(ctx context.Context, organizationID uuid.UUID, outletID uuid.UUID, name string, excludeID *uuid.UUID) (bool, error)
 	UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error
 	GetLowCostProducts(ctx context.Context, organizationID uuid.UUID, maxCost float64) ([]*entities.Product, error)
 }
@@ -51,17 +47,15 @@ type ProductProcessorImpl struct {
 	productVariantRepo repository.ProductVariantRepository
 	inventoryRepo      repository.InventoryRepository
 	outletRepo         OutletRepository
-	outletPriceRepo    repository.ProductOutletPriceRepository
 }
 
-func NewProductProcessorImpl(productRepo ProductRepository, categoryRepo CategoryRepository, productVariantRepo repository.ProductVariantRepository, inventoryRepo repository.InventoryRepository, outletRepo OutletRepository, outletPriceRepo repository.ProductOutletPriceRepository) *ProductProcessorImpl {
+func NewProductProcessorImpl(productRepo ProductRepository, categoryRepo CategoryRepository, productVariantRepo repository.ProductVariantRepository, inventoryRepo repository.InventoryRepository, outletRepo OutletRepository) *ProductProcessorImpl {
 	return &ProductProcessorImpl{
 		productRepo:        productRepo,
 		categoryRepo:       categoryRepo,
 		productVariantRepo: productVariantRepo,
 		inventoryRepo:      inventoryRepo,
 		outletRepo:         outletRepo,
-		outletPriceRepo:    outletPriceRepo,
 	}
 }
 
@@ -81,12 +75,12 @@ func (p *ProductProcessorImpl) CreateProduct(ctx context.Context, req *models.Cr
 		}
 	}
 
-	exists, err := p.productRepo.ExistsByNameInOutlet(ctx, req.OrganizationID, req.OutletID, req.Name, nil)
+	exists, err := p.productRepo.ExistsByName(ctx, req.OrganizationID, req.Name, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check product name uniqueness: %w", err)
 	}
 	if exists {
-		return nil, fmt.Errorf("product with name '%s' already exists for this outlet", req.Name)
+		return nil, fmt.Errorf("product with name '%s' already exists for this organization", req.Name)
 	}
 
 	productEntity := mappers.CreateProductRequestToEntity(req)
@@ -124,23 +118,6 @@ func (p *ProductProcessorImpl) CreateProduct(ctx context.Context, req *models.Cr
 		}
 	}
 
-	// Upsert outlet-specific price if outlet context is present
-	if req.OutletID != uuid.Nil {
-		printToChecker := true // default
-		if req.PrintToChecker != nil {
-			printToChecker = *req.PrintToChecker
-		}
-		outletPriceEntity := &entities.ProductOutletPrice{
-			ProductID:      productEntity.ID,
-			OutletID:       req.OutletID,
-			Price:          req.Price,
-			PrintToChecker: printToChecker,
-		}
-		if err := p.outletPriceRepo.Upsert(ctx, outletPriceEntity); err != nil {
-			return nil, fmt.Errorf("failed to assign outlet price: %w", err)
-		}
-	}
-
 	productWithCategory, err := p.productRepo.GetWithCategory(ctx, productEntity.ID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to retrieve created product: %w", err)
@@ -180,12 +157,12 @@ func (p *ProductProcessorImpl) UpdateProduct(ctx context.Context, id uuid.UUID,
 	}
 
 	if req.Name != nil && *req.Name != existingProduct.Name {
-		exists, err := p.productRepo.ExistsByNameInOutlet(ctx, existingProduct.OrganizationID, req.OutletID, *req.Name, &id)
+		exists, err := p.productRepo.ExistsByName(ctx, existingProduct.OrganizationID, *req.Name, &id)
 		if err != nil {
 			return nil, fmt.Errorf("failed to check product name uniqueness: %w", err)
 		}
 		if exists {
-			return nil, fmt.Errorf("product with name '%s' already exists for this outlet", *req.Name)
+			return nil, fmt.Errorf("product with name '%s' already exists for this organization", *req.Name)
 		}
 	}
 
@@ -202,41 +179,6 @@ func (p *ProductProcessorImpl) UpdateProduct(ctx context.Context, id uuid.UUID,
 		}
 	}
 
-	// Upsert outlet-specific price if outlet context is present and price or print_to_checker is provided
-	if req.OutletID != uuid.Nil && (req.Price != nil || req.PrintToChecker != nil) {
-		// Fetch existing outlet price to use as fallback for fields not provided
-		existing, _ := p.outletPriceRepo.GetByProductAndOutlet(ctx, id, req.OutletID)
-
-		price := float64(0)
-		if existing != nil {
-			price = existing.Price
-		}
-		if req.Price != nil {
-			price = *req.Price
-		}
-
-		printToChecker := true // default
-		if existing != nil {
-			printToChecker = existing.PrintToChecker
-		}
-		if req.PrintToChecker != nil {
-			printToChecker = *req.PrintToChecker
-		}
-
-		outletPriceEntity := &entities.ProductOutletPrice{
-			ProductID:      id,
-			OutletID:       req.OutletID,
-			Price:          price,
-			PrintToChecker: printToChecker,
-		}
-		logger.FromContext(ctx).Infof("ProductProcessor::UpdateProduct -> upserting outlet price: productID=%s outletID=%s price=%f printToChecker=%v", id, req.OutletID, price, printToChecker)
-		if err := p.outletPriceRepo.Upsert(ctx, outletPriceEntity); err != nil {
-			return nil, fmt.Errorf("failed to assign outlet price: %w", err)
-		}
-	} else {
-		logger.FromContext(ctx).Infof("ProductProcessor::UpdateProduct -> skipping outlet price upsert: outletID=%s price=%v printToChecker=%v", req.OutletID, req.Price, req.PrintToChecker)
-	}
-
 	productWithCategory, err := p.productRepo.GetWithCategory(ctx, id)
 	if err != nil {
 		return nil, fmt.Errorf("failed to retrieve updated product: %w", err)
@@ -272,106 +214,19 @@ func (p *ProductProcessorImpl) DeleteProduct(ctx context.Context, id uuid.UUID)
 	return nil
 }
 
-func (p *ProductProcessorImpl) GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) (*models.ProductResponse, error) {
+func (p *ProductProcessorImpl) GetProductByID(ctx context.Context, id uuid.UUID) (*models.ProductResponse, error) {
 	productEntity, err := p.productRepo.GetWithCategory(ctx, id)
 	if err != nil {
 		return nil, fmt.Errorf("product not found: %w", err)
 	}
 
 	response := mappers.ProductEntityToResponse(productEntity)
-
-	if outletID != uuid.Nil {
-		// Attach outlet-specific price
-		outletPrice, err := p.outletPriceRepo.GetByProductAndOutlet(ctx, id, outletID)
-		if err == nil {
-			response.OutletPrice = &outletPrice.Price
-			response.PrintToChecker = outletPrice.PrintToChecker
-		}
-	} else {
-		// No outlet context — return all outlet prices for this product
-		outletPrices, err := p.outletPriceRepo.GetByProductWithOutlet(ctx, id)
-		if err == nil && len(outletPrices) > 0 {
-			prices := make([]models.OutletPrice, len(outletPrices))
-			for i, op := range outletPrices {
-				prices[i] = models.OutletPrice{
-					OutletID:       op.OutletID,
-					OutletName:     op.Outlet.Name,
-					Price:          op.Price,
-					PrintToChecker: op.PrintToChecker,
-				}
-			}
-			response.OutletPrices = prices
-		}
-	}
-
 	return response, nil
 }
 
 func (p *ProductProcessorImpl) ListProducts(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error) {
 	offset := (page - 1) * limit
 
-	// Extract outletID from filters — it's not a products column so remove it before querying
-	var outletID uuid.UUID
-	if oid, ok := filters["outlet_id"]; ok {
-		outletID = oid.(uuid.UUID)
-		delete(filters, "outlet_id")
-	}
-
-	// Use the JOIN-based query when an outlet is specified so we get outlet-specific
-	// prices in a single round-trip; fall back to the plain List otherwise.
-	var (
-		productEntities []*entities.Product
-		total           int64
-		err             error
-	)
-	if outletID != uuid.Nil {
-		productEntities, total, err = p.productRepo.ListWithOutletPrice(ctx, filters, outletID, limit, offset)
-	} else {
-		productEntities, total, err = p.productRepo.List(ctx, filters, limit, offset)
-	}
-	if err != nil {
-		return nil, 0, fmt.Errorf("failed to list products: %w", err)
-	}
-
-	responses := make([]models.ProductResponse, len(productEntities))
-	if outletID != uuid.Nil && len(productEntities) > 0 {
-		// Bulk-fetch outlet prices to populate OutletPrice and PrintToChecker per product
-		productIDs := make([]uuid.UUID, len(productEntities))
-		for i, e := range productEntities {
-			productIDs[i] = e.ID
-		}
-		outletPrices, opErr := p.outletPriceRepo.GetByProductsAndOutlet(ctx, productIDs, outletID)
-		priceMap := make(map[uuid.UUID]*entities.ProductOutletPrice)
-		if opErr == nil {
-			for _, op := range outletPrices {
-				priceMap[op.ProductID] = op
-			}
-		}
-		for i, entity := range productEntities {
-			response := mappers.ProductEntityToResponse(entity)
-			if response != nil {
-				if op, ok := priceMap[entity.ID]; ok {
-					response.OutletPrice = &op.Price
-					response.PrintToChecker = op.PrintToChecker
-				}
-				responses[i] = *response
-			}
-		}
-	} else {
-		for i, entity := range productEntities {
-			response := mappers.ProductEntityToResponse(entity)
-			if response != nil {
-				responses[i] = *response
-			}
-		}
-	}
-
-	return responses, int(total), nil
-}
-
-func (p *ProductProcessorImpl) ListProductsAll(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error) {
-	offset := (page - 1) * limit
-
 	productEntities, total, err := p.productRepo.List(ctx, filters, limit, offset)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to list products: %w", err)

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

@@ -13,7 +13,6 @@ import (
 type AnalyticsRepository interface {
 	GetPaymentMethodAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.PaymentMethodAnalytics, error)
 	GetSalesAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) ([]*entities.SalesAnalytics, error)
-	GetPurchasingAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.PurchasingAnalytics, error)
 	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)
@@ -123,159 +122,6 @@ func (r *AnalyticsRepositoryImpl) GetSalesAnalytics(ctx context.Context, organiz
 	return results, err
 }
 
-func (r *AnalyticsRepositoryImpl) GetPurchasingAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.PurchasingAnalytics, error) {
-	var summary entities.PurchasingSummary
-	var outletName *string
-
-	if outletID != nil {
-		var outlet struct {
-			Name string
-		}
-		result := r.db.WithContext(ctx).
-			Table("outlets").
-			Select("name").
-			Where("id = ? AND organization_id = ?", *outletID, organizationID).
-			Limit(1).
-			Scan(&outlet)
-		if result.Error != nil {
-			return nil, result.Error
-		}
-		if result.RowsAffected > 0 {
-			outletName = &outlet.Name
-		}
-	}
-
-	summaryQuery := r.db.WithContext(ctx).
-		Table("inventory_movements im").
-		Select(`
-			COALESCE(SUM(im.total_cost), 0) as total_purchases,
-			COUNT(DISTINCT im.reference_id) as total_purchase_orders,
-			COALESCE(SUM(im.quantity), 0) as total_quantity,
-			CASE
-				WHEN COUNT(DISTINCT im.reference_id) > 0
-				THEN COALESCE(SUM(im.total_cost), 0) / COUNT(DISTINCT im.reference_id)
-				ELSE 0
-			END as average_purchase_order_value,
-			COUNT(DISTINCT im.item_id) as total_ingredients,
-			COUNT(DISTINCT po.vendor_id) as total_vendors
-		`).
-		Joins("LEFT JOIN purchase_orders po ON im.reference_id = po.id").
-		Where("im.organization_id = ?", organizationID).
-		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
-		Where("im.item_type = ?", "INGREDIENT").
-		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
-		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo)
-
-	summaryQuery = r.resolveOutletID(summaryQuery, outletID, "im.outlet_id")
-
-	if err := summaryQuery.Scan(&summary).Error; err != nil {
-		return nil, err
-	}
-
-	var dateFormat string
-	switch groupBy {
-	case "hour":
-		dateFormat = "DATE_TRUNC('hour', im.created_at)"
-	case "week":
-		dateFormat = "DATE_TRUNC('week', im.created_at)"
-	case "month":
-		dateFormat = "DATE_TRUNC('month', im.created_at)"
-	default:
-		dateFormat = "DATE_TRUNC('day', im.created_at)"
-	}
-
-	var data []entities.PurchasingAnalyticsData
-	dataQuery := r.db.WithContext(ctx).
-		Table("inventory_movements im").
-		Select(`
-			`+dateFormat+` as date,
-			COALESCE(SUM(im.total_cost), 0) as purchases,
-			COUNT(DISTINCT im.reference_id) as purchase_orders,
-			COALESCE(SUM(im.quantity), 0) as quantity,
-			COUNT(DISTINCT im.item_id) as ingredients,
-			COUNT(DISTINCT po.vendor_id) as vendors
-		`).
-		Joins("LEFT JOIN purchase_orders po ON im.reference_id = po.id").
-		Where("im.organization_id = ?", organizationID).
-		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
-		Where("im.item_type = ?", "INGREDIENT").
-		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
-		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
-		Group(dateFormat).
-		Order(dateFormat)
-
-	dataQuery = r.resolveOutletID(dataQuery, outletID, "im.outlet_id")
-
-	if err := dataQuery.Scan(&data).Error; err != nil {
-		return nil, err
-	}
-
-	var ingredientData []entities.PurchasingIngredientData
-	ingredientQuery := r.db.WithContext(ctx).
-		Table("inventory_movements im").
-		Select(`
-			i.id as ingredient_id,
-			i.name as ingredient_name,
-			COALESCE(SUM(im.quantity), 0) as quantity,
-			COALESCE(SUM(im.total_cost), 0) as total_cost,
-			CASE
-				WHEN SUM(im.quantity) > 0
-				THEN COALESCE(SUM(im.total_cost), 0) / SUM(im.quantity)
-				ELSE 0
-			END as average_unit_cost,
-			COUNT(DISTINCT im.reference_id) as purchase_order_count
-		`).
-		Joins("JOIN ingredients i ON im.item_id = i.id").
-		Where("im.organization_id = ?", organizationID).
-		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
-		Where("im.item_type = ?", "INGREDIENT").
-		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
-		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
-		Group("i.id, i.name").
-		Order("total_cost DESC")
-
-	ingredientQuery = r.resolveOutletID(ingredientQuery, outletID, "im.outlet_id")
-
-	if err := ingredientQuery.Scan(&ingredientData).Error; err != nil {
-		return nil, err
-	}
-
-	var vendorData []entities.PurchasingVendorData
-	vendorQuery := r.db.WithContext(ctx).
-		Table("inventory_movements im").
-		Select(`
-			v.id as vendor_id,
-			v.name as vendor_name,
-			COALESCE(SUM(im.total_cost), 0) as total_cost,
-			COUNT(DISTINCT im.reference_id) as purchase_order_count,
-			COUNT(DISTINCT im.item_id) as ingredient_count,
-			COALESCE(SUM(im.quantity), 0) as quantity
-		`).
-		Joins("JOIN purchase_orders po ON im.reference_id = po.id").
-		Joins("JOIN vendors v ON po.vendor_id = v.id").
-		Where("im.organization_id = ?", organizationID).
-		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
-		Where("im.item_type = ?", "INGREDIENT").
-		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
-		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
-		Group("v.id, v.name").
-		Order("total_cost DESC")
-
-	vendorQuery = r.resolveOutletID(vendorQuery, outletID, "im.outlet_id")
-
-	if err := vendorQuery.Scan(&vendorData).Error; err != nil {
-		return nil, err
-	}
-
-	return &entities.PurchasingAnalytics{
-		OutletName:     outletName,
-		Summary:        summary,
-		Data:           data,
-		IngredientData: ingredientData,
-		VendorData:     vendorData,
-	}, nil
-}
-
 func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, limit int) ([]*entities.ProductAnalytics, error) {
 	var results []*entities.ProductAnalytics
 
@@ -433,11 +279,9 @@ func (r *AnalyticsRepositoryImpl) GetDashboardOverview(ctx context.Context, orga
 }
 
 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())
+	// Summary query
-	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(`
@@ -474,11 +318,15 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		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 {
+
+	err := summaryQuery.Scan(&summary).Error
+	if err != nil {
 		return nil, err
 	}
 
+	// Time series data query
 	var timeFormat string
 	switch groupBy {
 	case "hour":
@@ -487,11 +335,12 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		timeFormat = "DATE_TRUNC('week', o.created_at)"
 	case "month":
 		timeFormat = "DATE_TRUNC('month', o.created_at)"
-	default:
+	default: // day
 		timeFormat = "DATE_TRUNC('day', o.created_at)"
 	}
 
 	var data []entities.ProfitLossData
+
 	dataQuery := r.db.WithContext(ctx).
 		Table("orders o").
 		Select(`
@@ -521,12 +370,17 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		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 {
+
+	err = dataQuery.Scan(&data).Error
+	if err != nil {
 		return nil, err
 	}
 
+	// Product profit data query
 	var productData []entities.ProductProfitData
+
 	productQuery := r.db.WithContext(ctx).
 		Table("order_items oi").
 		Select(`
@@ -559,61 +413,10 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		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 {
+	err = productQuery.Scan(&productData).Error
-		Revenue float64
-		Cost    float64
-	}
-
-	var todayRC revenueCostResult
-	todayQuery := r.db.WithContext(ctx).
-		Table("orders o").
-		Select(`
-			COALESCE(SUM(o.total_amount), 0) as revenue,
-			COALESCE(SUM(o.total_cost), 0) as cost
-		`).
-		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 <= ?", todayStart, todayEnd)
-	todayQuery = r.resolveOutletID(todayQuery, outletID, "o.outlet_id")
-	if err := todayQuery.Scan(&todayRC).Error; err != nil {
-		return nil, err
-	}
-
-	var mtdRC revenueCostResult
-	mtdQuery := r.db.WithContext(ctx).
-		Table("orders o").
-		Select(`
-			COALESCE(SUM(o.total_amount), 0) as revenue,
-			COALESCE(SUM(o.total_cost), 0) as cost
-		`).
-		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 <= ?", mtdStart, todayEnd)
-	mtdQuery = r.resolveOutletID(mtdQuery, outletID, "o.outlet_id")
-	if err := mtdQuery.Scan(&mtdRC).Error; err != nil {
-		return nil, err
-	}
-
-	todayExpenseByCategory, err := r.getExpenseByCategory(ctx, organizationID, outletID, todayStart, todayEnd)
-	if err != nil {
-		return nil, err
-	}
-
-	mtdExpenseByCategory, err := r.getExpenseByCategory(ctx, organizationID, outletID, mtdStart, todayEnd)
-	if err != nil {
-		return nil, err
-	}
-
-	opsItems, err := r.getOperationalExpenseItems(ctx, organizationID, outletID, mtdStart, todayEnd)
 	if err != nil {
 		return nil, err
 	}
@@ -622,61 +425,5 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Summary:     summary,
 		Data:        data,
 		ProductData: productData,
-		TodayRevenue:            todayRC.Revenue,
-		TodayCost:               todayRC.Cost,
-		MtdRevenue:              mtdRC.Revenue,
-		MtdCost:                 mtdRC.Cost,
-		TodayExpenseByCategory:  todayExpenseByCategory,
-		MtdExpenseByCategory:    mtdExpenseByCategory,
-		OperationalExpenseItems: opsItems,
 	}, nil
 }
-
-func (r *AnalyticsRepositoryImpl) getExpenseByCategory(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.ExpenseCategoryTotal, error) {
-	var results []entities.ExpenseCategoryTotal
-
-	query := r.db.WithContext(ctx).
-		Table("expense_items ei").
-		Select(`COALESCE(parent_coa.name, 'Lain-lain') as category_name, 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").
-		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 {
-		query = query.Where("e.outlet_id = ?", *outletID)
-	}
-
-	err := query.
-		Group("parent_coa.name").
-		Order("parent_coa.name").
-		Scan(&results).Error
-
-	return results, err
-}
-
-func (r *AnalyticsRepositoryImpl) getOperationalExpenseItems(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.OperationalExpenseItem, error) {
-	var results []entities.OperationalExpenseItem
-
-	query := r.db.WithContext(ctx).
-		Table("expense_items ei").
-		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 {
-		query = query.Where("e.outlet_id = ?", *outletID)
-	}
-
-	err := query.
-		Group("COALESCE(NULLIF(ei.item, ''), ei.description, coa.name)").
-		Order("amount DESC").
-		Scan(&results).Error
-
-	return results, err
-}

internal/repository/category_repository.go

@@ -25,7 +25,7 @@ func (r *CategoryRepositoryImpl) Create(ctx context.Context, category *entities.
 
 func (r *CategoryRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Category, error) {
 	var category entities.Category
-	err := r.db.WithContext(ctx).First(&category, "id = ?", id).Error
+	err := r.db.WithContext(ctx).Preload("Outlet").First(&category, "id = ?", id).Error
 	if err != nil {
 		return nil, err
 	}
@@ -34,7 +34,7 @@ func (r *CategoryRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*en
 
 func (r *CategoryRepositoryImpl) GetWithProducts(ctx context.Context, id uuid.UUID) (*entities.Category, error) {
 	var category entities.Category
-	err := r.db.WithContext(ctx).Preload("Products").First(&category, "id = ?", id).Error
+	err := r.db.WithContext(ctx).Preload("Products").Preload("Outlet").First(&category, "id = ?", id).Error
 	if err != nil {
 		return nil, err
 	}
@@ -72,9 +72,6 @@ func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]in
 		case "search":
 			searchValue := "%" + value.(string) + "%"
 			query = query.Where("name ILIKE ? OR description ILIKE ?", searchValue, searchValue)
-		case "outlet_id":
-			// Include outlet-specific categories AND global categories (outlet_id IS NULL)
-			query = query.Where("outlet_id = ? OR outlet_id IS NULL", value)
 		default:
 			query = query.Where(key+" = ?", value)
 		}
@@ -84,7 +81,7 @@ func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]in
 		return nil, 0, err
 	}
 
-	err := query.Order("\"order\" ASC").Limit(limit).Offset(offset).Find(&categories).Error
+	err := query.Preload("Outlet").Order("\"order\" ASC").Limit(limit).Offset(offset).Find(&categories).Error
 	return categories, total, err
 }
 

internal/repository/expense_repository.go

@@ -1,123 +0,0 @@
-package repository
-
-import (
-	"context"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-
-	"apskel-pos-be/internal/entities"
-
-	"gorm.io/gorm"
-)
-
-type ExpenseRepositoryImpl struct {
-	db *gorm.DB
-}
-
-func NewExpenseRepositoryImpl(db *gorm.DB) *ExpenseRepositoryImpl {
-	return &ExpenseRepositoryImpl{
-		db: db,
-	}
-}
-
-func (r *ExpenseRepositoryImpl) Create(ctx context.Context, expense *entities.Expense) error {
-	return r.db.WithContext(ctx).Create(expense).Error
-}
-
-func (r *ExpenseRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Expense, error) {
-	var expense entities.Expense
-	err := r.db.WithContext(ctx).
-		Preload("Items.ChartOfAccount").
-		First(&expense, "id = ?", id).Error
-	if err != nil {
-		return nil, err
-	}
-	return &expense, nil
-}
-
-func (r *ExpenseRepositoryImpl) GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.Expense, error) {
-	var expense entities.Expense
-	err := r.db.WithContext(ctx).
-		Preload("Items.ChartOfAccount").
-		Where("id = ? AND organization_id = ?", id, organizationID).
-		First(&expense).Error
-	if err != nil {
-		return nil, err
-	}
-	return &expense, nil
-}
-
-func (r *ExpenseRepositoryImpl) Update(ctx context.Context, expense *entities.Expense) error {
-	return r.db.WithContext(ctx).Save(expense).Error
-}
-
-func (r *ExpenseRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
-	return r.db.WithContext(ctx).Delete(&entities.Expense{}, "id = ?", id).Error
-}
-
-func (r *ExpenseRepositoryImpl) List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.Expense, int64, error) {
-	var expenses []*entities.Expense
-	var total int64
-
-	query := r.db.WithContext(ctx).Model(&entities.Expense{}).Where("organization_id = ?", organizationID)
-
-	for key, value := range filters {
-		switch key {
-		case "search":
-			if searchStr, ok := value.(string); ok && searchStr != "" {
-				searchPattern := "%" + strings.ToLower(searchStr) + "%"
-				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)
-			}
-		case "end_date":
-			if endDate, ok := value.(time.Time); ok {
-				query = query.Where("transaction_date <= ?", endDate)
-			}
-		default:
-			query = query.Where(key+" = ?", value)
-		}
-	}
-
-	if err := query.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	err := query.
-		Preload("Items.ChartOfAccount").
-		Order("created_at DESC").
-		Limit(limit).
-		Offset(offset).
-		Find(&expenses).Error
-	return expenses, total, err
-}
-
-func (r *ExpenseRepositoryImpl) CreateItem(ctx context.Context, item *entities.ExpenseItem) error {
-	return r.db.WithContext(ctx).Create(item).Error
-}
-
-func (r *ExpenseRepositoryImpl) DeleteItemsByExpenseID(ctx context.Context, expenseID uuid.UUID) error {
-	return r.db.WithContext(ctx).Delete(&entities.ExpenseItem{}, "expense_id = ?", expenseID).Error
-}

internal/repository/order_repository.go

@@ -60,8 +60,6 @@ func (r *OrderRepositoryImpl) GetWithRelations(ctx context.Context, id uuid.UUID
 		Preload("User").
 		Preload("OrderItems").
 		Preload("OrderItems.Product").
-		Preload("OrderItems.Product.Category").
-		Preload("OrderItems.Product.ProductOutletPrices").
 		Preload("OrderItems.ProductVariant").
 		Preload("Payments").
 		Preload("Payments.PaymentMethod").
@@ -100,54 +98,36 @@ func (r *OrderRepositoryImpl) List(ctx context.Context, filters map[string]inter
 	var orders []*entities.Order
 	var total int64
 
-	// organization_id is mandatory to prevent cross-org data leaks
+	query := r.db.WithContext(ctx).Model(&entities.Order{}).
-	organizationID, ok := filters["organization_id"]
-	if !ok {
-		return nil, 0, fmt.Errorf("organization_id is required for listing orders")
-	}
-
-	baseQuery := r.db.WithContext(ctx).Model(&entities.Order{}).
-		Where("organization_id = ?", organizationID)
-
-	// outlet_id is optional — if present, scope to that outlet; otherwise return all outlets in the org
-	if outletID, exists := filters["outlet_id"]; exists {
-		baseQuery = baseQuery.Where("outlet_id = ?", outletID)
-	}
-
-	for key, value := range filters {
-		switch key {
-		case "organization_id", "outlet_id":
-			// already handled above
-		case "search":
-			searchValue := "%" + value.(string) + "%"
-			baseQuery = baseQuery.Where("order_number ILIKE ?", searchValue)
-		case "date_from":
-			baseQuery = baseQuery.Where("created_at >= ?", value)
-		case "date_to":
-			baseQuery = baseQuery.Where("created_at <= ?", value)
-		default:
-			baseQuery = baseQuery.Where(key+" = ?", value)
-		}
-	}
-
-	// Use separate queries for count and find to avoid GORM state mutation issues
-	if err := baseQuery.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	err := baseQuery.
 		Preload("Organization").
 		Preload("Outlet").
 		Preload("User").
 		Preload("OrderItems").
 		Preload("OrderItems.Product").
-		Preload("OrderItems.Product.Category").
-		Preload("OrderItems.Product.ProductOutletPrices").
 		Preload("OrderItems.ProductVariant").
 		Preload("Payments").
 		Preload("Payments.PaymentMethod").
-		Preload("Payments.PaymentOrderItems").
+		Preload("Payments.PaymentOrderItems")
-		Limit(limit).Offset(offset).Order("created_at DESC").Find(&orders).Error
+
+	for key, value := range filters {
+		switch key {
+		case "search":
+			searchValue := "%" + value.(string) + "%"
+			query = query.Where("order_number ILIKE ?", searchValue)
+		case "date_from":
+			query = query.Where("created_at >= ?", value)
+		case "date_to":
+			query = query.Where("created_at <= ?", value)
+		default:
+			query = query.Where(key+" = ?", value)
+		}
+	}
+
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := query.Limit(limit).Offset(offset).Order("created_at DESC").Find(&orders).Error
 	return orders, total, err
 }
 
@@ -159,8 +139,6 @@ func (r *OrderRepositoryImpl) ListBySessionID(ctx context.Context, sessionID str
 		Preload("User").
 		Preload("OrderItems").
 		Preload("OrderItems.Product").
-		Preload("OrderItems.Product.Category").
-		Preload("OrderItems.Product.ProductOutletPrices").
 		Preload("OrderItems.ProductVariant").
 		Preload("Payments").
 		Preload("Payments.PaymentMethod").

internal/repository/organization_repository.go

@@ -105,7 +105,7 @@ func (r *OrganizationRepositoryImpl) GetTotalOmset(ctx context.Context, organiza
 	var total float64
 	err := r.db.WithContext(ctx).
 		Table("orders").
-		Where("organization_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ?", organizationID, "completed", false, false).
+		Where("organization_id = ? AND payment_status = ?", organizationID, "completed").
 		Select("COALESCE(SUM(total_amount), 0)").
 		Scan(&total).Error
 	return total, err

internal/repository/product_outlet_price_repository.go

@@ -1,92 +0,0 @@
-package repository
-
-import (
-	"context"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type ProductOutletPriceRepository interface {
-	GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) (*entities.ProductOutletPrice, error)
-	GetByProduct(ctx context.Context, productID uuid.UUID) ([]*entities.ProductOutletPrice, error)
-	GetByProductWithOutlet(ctx context.Context, productID uuid.UUID) ([]*entities.ProductOutletPrice, error)
-	GetByOutlet(ctx context.Context, outletID uuid.UUID) ([]*entities.ProductOutletPrice, error)
-	GetByProductsAndOutlet(ctx context.Context, productIDs []uuid.UUID, outletID uuid.UUID) ([]*entities.ProductOutletPrice, error)
-	Upsert(ctx context.Context, price *entities.ProductOutletPrice) error
-	Delete(ctx context.Context, id uuid.UUID) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.ProductOutletPrice, error)
-}
-
-type ProductOutletPriceRepositoryImpl struct {
-	db *gorm.DB
-}
-
-func NewProductOutletPriceRepositoryImpl(db *gorm.DB) *ProductOutletPriceRepositoryImpl {
-	return &ProductOutletPriceRepositoryImpl{
-		db: db,
-	}
-}
-
-func (r *ProductOutletPriceRepositoryImpl) GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) (*entities.ProductOutletPrice, error) {
-	var price entities.ProductOutletPrice
-	err := r.db.WithContext(ctx).Where("product_id = ? AND outlet_id = ?", productID, outletID).First(&price).Error
-	if err != nil {
-		return nil, err
-	}
-	return &price, nil
-}
-
-func (r *ProductOutletPriceRepositoryImpl) GetByProduct(ctx context.Context, productID uuid.UUID) ([]*entities.ProductOutletPrice, error) {
-	var prices []*entities.ProductOutletPrice
-	err := r.db.WithContext(ctx).Where("product_id = ?", productID).Find(&prices).Error
-	return prices, err
-}
-
-func (r *ProductOutletPriceRepositoryImpl) GetByOutlet(ctx context.Context, outletID uuid.UUID) ([]*entities.ProductOutletPrice, error) {
-	var prices []*entities.ProductOutletPrice
-	err := r.db.WithContext(ctx).Where("outlet_id = ?", outletID).Find(&prices).Error
-	return prices, err
-}
-
-func (r *ProductOutletPriceRepositoryImpl) Upsert(ctx context.Context, price *entities.ProductOutletPrice) error {
-	if price.ID == uuid.Nil {
-		price.ID = uuid.New()
-	}
-	return r.db.WithContext(ctx).Exec(`
-		INSERT INTO product_outlet_prices (id, product_id, outlet_id, price, print_to_checker, created_at, updated_at)
-		VALUES (?, ?, ?, ?, ?, NOW(), NOW())
-		ON CONFLICT (product_id, outlet_id)
-		DO UPDATE SET
-			price = EXCLUDED.price,
-			print_to_checker = EXCLUDED.print_to_checker,
-			updated_at = NOW()
-	`, price.ID, price.ProductID, price.OutletID, price.Price, price.PrintToChecker).Error
-}
-
-func (r *ProductOutletPriceRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
-	return r.db.WithContext(ctx).Delete(&entities.ProductOutletPrice{}, "id = ?", id).Error
-}
-
-func (r *ProductOutletPriceRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.ProductOutletPrice, error) {
-	var price entities.ProductOutletPrice
-	err := r.db.WithContext(ctx).First(&price, "id = ?", id).Error
-	if err != nil {
-		return nil, err
-	}
-	return &price, nil
-}
-
-func (r *ProductOutletPriceRepositoryImpl) GetByProductsAndOutlet(ctx context.Context, productIDs []uuid.UUID, outletID uuid.UUID) ([]*entities.ProductOutletPrice, error) {
-	var prices []*entities.ProductOutletPrice
-	err := r.db.WithContext(ctx).Where("product_id IN ? AND outlet_id = ?", productIDs, outletID).Find(&prices).Error
-	return prices, err
-}
-
-func (r *ProductOutletPriceRepositoryImpl) GetByProductWithOutlet(ctx context.Context, productID uuid.UUID) ([]*entities.ProductOutletPrice, error) {
-	var prices []*entities.ProductOutletPrice
-	err := r.db.WithContext(ctx).Preload("Outlet").Where("product_id = ?", productID).Find(&prices).Error
-	return prices, err
-}

internal/repository/product_repository.go

@@ -178,26 +178,6 @@ func (r *ProductRepositoryImpl) ExistsByName(ctx context.Context, organizationID
 	return count > 0, err
 }
 
-// ExistsByNameInOutlet checks name uniqueness scoped to a specific outlet via product_outlet_prices.
-// Falls back to organization-scoped check when outletID is zero.
-func (r *ProductRepositoryImpl) ExistsByNameInOutlet(ctx context.Context, organizationID uuid.UUID, outletID uuid.UUID, name string, excludeID *uuid.UUID) (bool, error) {
-	if outletID == uuid.Nil {
-		return r.ExistsByName(ctx, organizationID, name, excludeID)
-	}
-
-	query := r.db.WithContext(ctx).Model(&entities.Product{}).
-		Joins("INNER JOIN product_outlet_prices pop ON pop.product_id = products.id AND pop.outlet_id = ?", outletID).
-		Where("products.organization_id = ? AND products.name = ?", organizationID, name)
-
-	if excludeID != nil {
-		query = query.Where("products.id != ?", *excludeID)
-	}
-
-	var count int64
-	err := query.Count(&count).Error
-	return count > 0, err
-}
-
 func (r *ProductRepositoryImpl) UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error {
 	return r.db.WithContext(ctx).Model(&entities.Product{}).
 		Where("id = ?", id).
@@ -209,47 +189,3 @@ func (r *ProductRepositoryImpl) GetLowCostProducts(ctx context.Context, organiza
 	err := r.db.WithContext(ctx).Where("organization_id = ? AND cost <= ? AND is_active = ?", organizationID, maxCost, true).Find(&products).Error
 	return products, err
 }
-
-// ListWithOutletPrice fetches products with the same filters as List, but overrides
-// each product's Price with the outlet-specific price from product_outlet_prices when
-// outletID is provided. A single LEFT JOIN is used so no second round-trip is needed.
-func (r *ProductRepositoryImpl) ListWithOutletPrice(ctx context.Context, filters map[string]interface{}, outletID uuid.UUID, limit, offset int) ([]*entities.Product, int64, error) {
-	var products []*entities.Product
-	var total int64
-
-	// Base query with category and variant preloads
-	query := r.db.WithContext(ctx).Model(&entities.Product{}).
-		Preload("Category").
-		Preload("ProductVariants")
-
-	// Apply filters
-	for key, value := range filters {
-		switch key {
-		case "search":
-			searchValue := "%" + value.(string) + "%"
-			query = query.Where("products.name ILIKE ? OR products.description ILIKE ? OR products.sku ILIKE ?", searchValue, searchValue, searchValue)
-		case "price_min":
-			query = query.Where("products.price >= ?", value)
-		case "price_max":
-			query = query.Where("products.price <= ?", value)
-		default:
-			query = query.Where("products."+key+" = ?", value)
-		}
-	}
-
-	// When outletID is provided, INNER JOIN product_outlet_prices so only products
-	// that have been explicitly assigned to this outlet are returned, with their
-	// outlet-specific price.
-	if outletID != uuid.Nil {
-		query = query.
-			Joins("INNER JOIN product_outlet_prices pop ON pop.product_id = products.id AND pop.outlet_id = ?", outletID).
-			Select("products.*, pop.price AS price")
-	}
-
-	if err := query.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	err := query.Limit(limit).Offset(offset).Find(&products).Error
-	return products, total, err
-}

internal/repository/tx_manager.go

@@ -28,10 +28,6 @@ func NewTxManager(db *gorm.DB) *TxManager { return &TxManager{db: db} }
 
 // WithTransaction runs fn inside a DB transaction, injecting the *gorm.DB tx into ctx.
 func (m *TxManager) WithTransaction(ctx context.Context, 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)

internal/router/router.go

@@ -49,13 +49,11 @@ type Router struct {
 	userDeviceHandler                 *handler.UserDeviceHandler
 	notificationHandler               *handler.NotificationHandler
 	selfOrderHandler                  *handler.SelfOrderHandler
-	productOutletPriceHandler         *handler.ProductOutletPriceHandler
-	expenseHandler                    *handler.ExpenseHandler
 	authMiddleware                    *middleware.AuthMiddleware
 	customerAuthMiddleware            *middleware.CustomerAuthMiddleware
 }
 
-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, selfOrderHandler *handler.SelfOrderHandler) *Router {
 
 	return &Router{
 		config:                            cfg,
@@ -97,8 +95,6 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
 		userDeviceHandler:                 handler.NewUserDeviceHandler(userDeviceService, userDeviceValidator),
 		notificationHandler:               handler.NewNotificationHandler(notificationService, notificationValidator),
 		selfOrderHandler:                  selfOrderHandler,
-		productOutletPriceHandler:         handler.NewProductOutletPriceHandler(productOutletPriceService, productOutletPriceValidator),
-		expenseHandler:                    handler.NewExpenseHandler(expenseService, expenseValidator),
 	}
 }
 
@@ -227,23 +223,11 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			{
 				products.POST("", r.productHandler.CreateProduct)
 				products.GET("", r.productHandler.ListProducts)
-				products.GET("/all", r.productHandler.ListProductAll)
 				products.GET("/:id", r.productHandler.GetProduct)
 				products.PUT("/:id", r.productHandler.UpdateProduct)
 				products.DELETE("/:id", r.productHandler.DeleteProduct)
 			}
 
-			productOutletPrices := protected.Group("/product-outlet-prices")
-			productOutletPrices.Use(r.authMiddleware.RequireAdminOrManager())
-			{
-				productOutletPrices.POST("", r.productOutletPriceHandler.Upsert)
-				productOutletPrices.POST("/bulk", r.productOutletPriceHandler.BulkUpsert)
-				productOutletPrices.GET("/product/:product_id", r.productOutletPriceHandler.GetByProduct)
-				productOutletPrices.GET("/outlet/:outlet_id", r.productOutletPriceHandler.GetByOutlet)
-				productOutletPrices.GET("/product/:product_id/outlet/:outlet_id", r.productOutletPriceHandler.GetByProductAndOutlet)
-				productOutletPrices.DELETE("/:id", r.productOutletPriceHandler.Delete)
-			}
-
 			productVariants := protected.Group("/product-variants")
 			{
 				productVariants.POST("", r.productVariantHandler.CreateProductVariant)
@@ -327,7 +311,6 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			{
 				analytics.GET("/payment-methods", r.analyticsHandler.GetPaymentMethodAnalytics)
 				analytics.GET("/sales", r.analyticsHandler.GetSalesAnalytics)
-				analytics.GET("/purchasing", r.analyticsHandler.GetPurchasingAnalytics)
 				analytics.GET("/products", r.analyticsHandler.GetProductAnalytics)
 				analytics.GET("/categories", r.analyticsHandler.GetProductAnalyticsPerCategory)
 				analytics.GET("/dashboard", r.analyticsHandler.GetDashboardAnalytics)
@@ -446,16 +429,6 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				accounts.GET("/:id/balance", r.accountHandler.GetAccountBalance)
 			}
 
-			expenses := protected.Group("/expenses")
-			expenses.Use(r.authMiddleware.RequireAdminOrManager())
-			{
-				expenses.POST("", r.expenseHandler.CreateExpense)
-				expenses.GET("", r.expenseHandler.ListExpenses)
-				expenses.GET("/:id", r.expenseHandler.GetExpense)
-				expenses.PUT("/:id", r.expenseHandler.UpdateExpense)
-				expenses.DELETE("/:id", r.expenseHandler.DeleteExpense)
-			}
-
 			orderIngredientTransactions := protected.Group("/order-ingredient-transactions")
 			orderIngredientTransactions.Use(r.authMiddleware.RequireAdminOrManager())
 			{

internal/service/analytics_service.go

@@ -13,7 +13,6 @@ import (
 type AnalyticsService interface {
 	GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error)
 	GetSalesAnalytics(ctx context.Context, req *models.SalesAnalyticsRequest) (*models.SalesAnalyticsResponse, error)
-	GetPurchasingAnalytics(ctx context.Context, req *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error)
 	GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error)
 	GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
 	GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
@@ -58,19 +57,6 @@ func (s *AnalyticsServiceImpl) GetSalesAnalytics(ctx context.Context, req *model
 	return response, nil
 }
 
-func (s *AnalyticsServiceImpl) GetPurchasingAnalytics(ctx context.Context, req *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error) {
-	if err := s.validatePurchasingAnalyticsRequest(req); err != nil {
-		return nil, fmt.Errorf("validation error: %w", err)
-	}
-
-	response, err := s.analyticsProcessor.GetPurchasingAnalytics(ctx, req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get purchasing analytics: %w", err)
-	}
-
-	return response, nil
-}
-
 func (s *AnalyticsServiceImpl) GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error) {
 	// Validate request
 	if err := s.validateProductAnalyticsRequest(req); err != nil {
@@ -134,6 +120,18 @@ 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
 }
 
@@ -170,42 +168,6 @@ func (s *AnalyticsServiceImpl) validateSalesAnalyticsRequest(req *models.SalesAn
 	return nil
 }
 
-func (s *AnalyticsServiceImpl) validatePurchasingAnalyticsRequest(req *models.PurchasingAnalyticsRequest) error {
-	if req == nil {
-		return fmt.Errorf("request cannot be nil")
-	}
-
-	if req.OrganizationID == uuid.Nil {
-		return fmt.Errorf("organization ID 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
-}
-
 func (s *AnalyticsServiceImpl) validateProductAnalyticsRequest(req *models.ProductAnalyticsRequest) error {
 	if req.OrganizationID == uuid.Nil {
 		return fmt.Errorf("organization ID is required")
@@ -306,16 +268,8 @@ func (s *AnalyticsServiceImpl) validateProfitLossAnalyticsRequest(req *models.Pr
 		return fmt.Errorf("date_from cannot be after date_to")
 	}
 
-	if req.GroupBy != "" {
+	if req.GroupBy != "" && req.GroupBy != "hour" && req.GroupBy != "day" && req.GroupBy != "week" && req.GroupBy != "month" {
-		validGroupBy := map[string]bool{
+		return fmt.Errorf("invalid group_by value, must be one of: hour, day, week, month")
-			"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

@@ -1,192 +0,0 @@
-package service
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"apskel-pos-be/internal/models"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
-)
-
-type analyticsProcessorStub struct{}
-
-func (analyticsProcessorStub) GetPaymentMethodAnalytics(context.Context, *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error) {
-	return nil, nil
-}
-
-func (analyticsProcessorStub) GetSalesAnalytics(context.Context, *models.SalesAnalyticsRequest) (*models.SalesAnalyticsResponse, error) {
-	return nil, nil
-}
-
-func (analyticsProcessorStub) GetPurchasingAnalytics(context.Context, *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error) {
-	return &models.PurchasingAnalyticsResponse{}, nil
-}
-
-func (analyticsProcessorStub) GetProductAnalytics(context.Context, *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error) {
-	return nil, nil
-}
-
-func (analyticsProcessorStub) GetProductAnalyticsPerCategory(context.Context, *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error) {
-	return nil, nil
-}
-
-func (analyticsProcessorStub) GetDashboardAnalytics(context.Context, *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error) {
-	return nil, nil
-}
-
-func (analyticsProcessorStub) GetProfitLossAnalytics(context.Context, *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error) {
-	return nil, nil
-}
-
-func TestAnalyticsServiceGetPurchasingAnalyticsValidation(t *testing.T) {
-	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
-	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-
-	tests := []struct {
-		name    string
-		req     *models.PurchasingAnalyticsRequest
-		wantErr string
-	}{
-		{
-			name: "missing organization",
-			req: &models.PurchasingAnalyticsRequest{
-				DateFrom: now,
-				DateTo:   now,
-			},
-			wantErr: "organization ID is required",
-		},
-		{
-			name: "missing date_from",
-			req: &models.PurchasingAnalyticsRequest{
-				OrganizationID: uuid.New(),
-				DateTo:         now,
-			},
-			wantErr: "date_from is required",
-		},
-		{
-			name: "missing date_to",
-			req: &models.PurchasingAnalyticsRequest{
-				OrganizationID: uuid.New(),
-				DateFrom:       now,
-			},
-			wantErr: "date_to is required",
-		},
-		{
-			name: "reversed dates",
-			req: &models.PurchasingAnalyticsRequest{
-				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.PurchasingAnalyticsRequest{
-				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.GetPurchasingAnalytics(context.Background(), tt.req)
-
-			require.Nil(t, resp)
-			require.Error(t, err)
-			require.Contains(t, err.Error(), tt.wantErr)
-		})
-	}
-}
-
-func TestAnalyticsServiceGetPurchasingAnalyticsAllowsEmptyGroupBy(t *testing.T) {
-	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
-	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-
-	resp, err := service.GetPurchasingAnalytics(context.Background(), &models.PurchasingAnalyticsRequest{
-		OrganizationID: uuid.New(),
-		DateFrom:       now,
-		DateTo:         now,
-	})
-
-	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/category_service.go

@@ -85,12 +85,12 @@ func (s *CategoryServiceImpl) ListCategories(ctx context.Context, req *contract.
 	if req.OrganizationID != nil {
 		filters["organization_id"] = *req.OrganizationID
 	}
-	if req.OutletID != nil {
-		filters["outlet_id"] = *req.OutletID
-	}
 	if req.BusinessType != "" {
 		filters["business_type"] = req.BusinessType
 	}
+	if req.OutletID != nil {
+		filters["outlet_id"] = *req.OutletID
+	}
 	if req.Search != "" {
 		filters["search"] = req.Search
 	}

internal/service/expense_service.go

@@ -1,128 +0,0 @@
-package service
-
-import (
-	"apskel-pos-be/internal/appcontext"
-	"context"
-	"time"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/processor"
-	"apskel-pos-be/internal/transformer"
-
-	"github.com/google/uuid"
-)
-
-type ExpenseService interface {
-	CreateExpense(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.CreateExpenseRequest) *contract.Response
-	UpdateExpense(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID, req *contract.UpdateExpenseRequest) *contract.Response
-	DeleteExpense(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID) *contract.Response
-	GetExpenseByID(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID) *contract.Response
-	ListExpenses(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.ListExpenseRequest) *contract.Response
-}
-
-type ExpenseServiceImpl struct {
-	expenseProcessor processor.ExpenseProcessor
-}
-
-func NewExpenseService(expenseProcessor processor.ExpenseProcessor) *ExpenseServiceImpl {
-	return &ExpenseServiceImpl{
-		expenseProcessor: expenseProcessor,
-	}
-}
-
-func (s *ExpenseServiceImpl) CreateExpense(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.CreateExpenseRequest) *contract.Response {
-	modelReq := transformer.CreateExpenseRequestToModel(req)
-
-	expenseResponse, err := s.expenseProcessor.CreateExpense(ctx, apctx.OrganizationID, modelReq)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponse := transformer.ExpenseModelResponseToResponse(expenseResponse)
-	return contract.BuildSuccessResponse(contractResponse)
-}
-
-func (s *ExpenseServiceImpl) UpdateExpense(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID, req *contract.UpdateExpenseRequest) *contract.Response {
-	modelReq := transformer.UpdateExpenseRequestToModel(req)
-
-	expenseResponse, err := s.expenseProcessor.UpdateExpense(ctx, id, apctx.OrganizationID, modelReq)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponse := transformer.ExpenseModelResponseToResponse(expenseResponse)
-	return contract.BuildSuccessResponse(contractResponse)
-}
-
-func (s *ExpenseServiceImpl) DeleteExpense(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID) *contract.Response {
-	err := s.expenseProcessor.DeleteExpense(ctx, id, apctx.OrganizationID)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	return contract.BuildSuccessResponse(map[string]interface{}{
-		"message": "Expense deleted successfully",
-	})
-}
-
-func (s *ExpenseServiceImpl) GetExpenseByID(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID) *contract.Response {
-	expenseResponse, err := s.expenseProcessor.GetExpenseByID(ctx, id, apctx.OrganizationID)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponse := transformer.ExpenseModelResponseToResponse(expenseResponse)
-	return contract.BuildSuccessResponse(contractResponse)
-}
-
-func (s *ExpenseServiceImpl) ListExpenses(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.ListExpenseRequest) *contract.Response {
-	modelReq := transformer.ListExpenseRequestToModel(req)
-
-	filters := make(map[string]interface{})
-	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 {
-			filters["outlet_id"] = outletID
-		}
-	}
-	if modelReq.StartDate != "" {
-		if startDate, err := time.Parse("2006-01-02", modelReq.StartDate); err == nil {
-			filters["start_date"] = startDate
-		}
-	}
-	if modelReq.EndDate != "" {
-		if endDate, err := time.Parse("2006-01-02", modelReq.EndDate); err == nil {
-			// include the full end date day
-			filters["end_date"] = endDate.Add(24*time.Hour - time.Nanosecond)
-		}
-	}
-
-	expenses, totalPages, err := s.expenseProcessor.ListExpenses(ctx, apctx.OrganizationID, filters, modelReq.Page, modelReq.Limit)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponses := transformer.ExpenseModelResponsesToResponses(expenses)
-
-	response := contract.ListExpenseResponse{
-		Expenses:   contractResponses,
-		TotalCount: len(contractResponses),
-		Page:       modelReq.Page,
-		Limit:      modelReq.Limit,
-		TotalPages: totalPages,
-	}
-
-	return contract.BuildSuccessResponse(response)
-}

internal/service/order_service.go

@@ -199,7 +199,7 @@ func (s *OrderServiceImpl) createIngredientTransactions(ctx context.Context, ord
 		// Calculate waste quantities
 		transactions, err := s.calculateWasteQuantities(productRecipes, float64(orderItem.Quantity))
 		if err != nil {
-			return nil, fmt.Errorf("failed to calculate waste quantities for product %s: %w", orderItem.ProductID, err)
+			return nil, fmt.Errorf("failed to calculate waste quantities for product %s: %w", err)
 		}
 
 		// Set common fields for all transactions

internal/service/order_service_table_test.go

@@ -114,14 +114,6 @@ func (m *MockTableRepository) GetByID(ctx context.Context, id uuid.UUID) (*entit
 	return args.Get(0).(*entities.Table), args.Error(1)
 }
 
-func (m *MockTableRepository) GetByToken(ctx context.Context, token string) (*entities.Table, error) {
-	args := m.Called(ctx, token)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).(*entities.Table), args.Error(1)
-}
-
 func (m *MockTableRepository) GetByOutletID(ctx context.Context, outletID uuid.UUID) ([]entities.Table, error) {
 	args := m.Called(ctx, outletID)
 	if args.Get(0) == nil {
@@ -190,11 +182,6 @@ func (m *MockTableRepository) GetByOrderID(ctx context.Context, orderID uuid.UUI
 	return args.Get(0).(*entities.Table), args.Error(1)
 }
 
-func (m *MockTableRepository) UpdateToken(ctx context.Context, tableID uuid.UUID, token string) error {
-	args := m.Called(ctx, tableID, token)
-	return args.Error(0)
-}
-
 func TestCreateOrderWithTableOccupation(t *testing.T) {
 	// Setup
 	ctx := context.Background()

internal/service/product_outlet_price_service.go

@@ -1,126 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/models"
-	"apskel-pos-be/internal/processor"
-	"apskel-pos-be/internal/transformer"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type ProductOutletPriceService interface {
-	Upsert(ctx context.Context, req *contract.CreateProductOutletPriceRequest) *contract.Response
-	GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) *contract.Response
-	GetByProduct(ctx context.Context, productID uuid.UUID) *contract.Response
-	GetByOutlet(ctx context.Context, outletID uuid.UUID) *contract.Response
-	Delete(ctx context.Context, id uuid.UUID) *contract.Response
-	BulkUpsert(ctx context.Context, req *contract.BulkCreateProductOutletPriceRequest) *contract.Response
-}
-
-type ProductOutletPriceServiceImpl struct {
-	processor processor.ProductOutletPriceProcessor
-}
-
-func NewProductOutletPriceService(proc processor.ProductOutletPriceProcessor) *ProductOutletPriceServiceImpl {
-	return &ProductOutletPriceServiceImpl{
-		processor: proc,
-	}
-}
-
-func (s *ProductOutletPriceServiceImpl) Upsert(ctx context.Context, req *contract.CreateProductOutletPriceRequest) *contract.Response {
-	modelReq := transformer.CreateProductOutletPriceRequestToModel(req)
-
-	result, err := s.processor.Upsert(ctx, modelReq)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductOutletPriceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResp := transformer.ProductOutletPriceModelToResponse(result)
-	return contract.BuildSuccessResponse(contractResp)
-}
-
-func (s *ProductOutletPriceServiceImpl) GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) *contract.Response {
-	result, err := s.processor.GetByProductAndOutlet(ctx, productID, outletID)
-	if err != nil {
-		code := constants.InternalServerErrorCode
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			code = constants.NotFoundErrorCode
-		}
-		errorResp := contract.NewResponseError(code, constants.ProductOutletPriceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResp := transformer.ProductOutletPriceModelToResponse(result)
-	return contract.BuildSuccessResponse(contractResp)
-}
-
-func (s *ProductOutletPriceServiceImpl) GetByProduct(ctx context.Context, productID uuid.UUID) *contract.Response {
-	results, err := s.processor.GetByProduct(ctx, productID)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductOutletPriceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResps := transformer.ProductOutletPriceModelsToResponses(results)
-	return contract.BuildSuccessResponse(&contract.ListProductOutletPricesResponse{
-		Prices:     contractResps,
-		TotalCount: len(contractResps),
-	})
-}
-
-func (s *ProductOutletPriceServiceImpl) GetByOutlet(ctx context.Context, outletID uuid.UUID) *contract.Response {
-	results, err := s.processor.GetByOutlet(ctx, outletID)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductOutletPriceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResps := transformer.ProductOutletPriceModelsToResponses(results)
-	return contract.BuildSuccessResponse(&contract.ListProductOutletPricesResponse{
-		Prices:     contractResps,
-		TotalCount: len(contractResps),
-	})
-}
-
-func (s *ProductOutletPriceServiceImpl) Delete(ctx context.Context, id uuid.UUID) *contract.Response {
-	err := s.processor.Delete(ctx, id)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductOutletPriceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	return contract.BuildSuccessResponse(map[string]interface{}{
-		"message": "Product outlet price deleted successfully",
-	})
-}
-
-func (s *ProductOutletPriceServiceImpl) BulkUpsert(ctx context.Context, req *contract.BulkCreateProductOutletPriceRequest) *contract.Response {
-	prices := make([]models.CreateProductOutletPriceRequest, len(req.Prices))
-	for i, p := range req.Prices {
-		prices[i] = models.CreateProductOutletPriceRequest{
-			ProductID:      req.ProductID,
-			OutletID:       p.OutletID,
-			Price:          p.Price,
-			PrintToChecker: p.PrintToChecker,
-		}
-	}
-
-	results, err := s.processor.BulkUpsert(ctx, req.ProductID, prices)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductOutletPriceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResps := transformer.ProductOutletPriceModelsToResponses(results)
-	return contract.BuildSuccessResponse(&contract.ListProductOutletPricesResponse{
-		Prices:     contractResps,
-		TotalCount: len(contractResps),
-	})
-}

internal/service/product_service.go

@@ -14,11 +14,10 @@ import (
 
 type ProductService interface {
 	CreateProduct(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.CreateProductRequest) *contract.Response
-	UpdateProduct(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID, req *contract.UpdateProductRequest) *contract.Response
+	UpdateProduct(ctx context.Context, id uuid.UUID, req *contract.UpdateProductRequest) *contract.Response
 	DeleteProduct(ctx context.Context, id uuid.UUID) *contract.Response
-	GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) *contract.Response
+	GetProductByID(ctx context.Context, id uuid.UUID) *contract.Response
 	ListProducts(ctx context.Context, req *contract.ListProductsRequest) *contract.Response
-	ListProductsAll(ctx context.Context, req *contract.ListProductsRequest) *contract.Response
 }
 
 type ProductServiceImpl struct {
@@ -44,8 +43,8 @@ func (s *ProductServiceImpl) CreateProduct(ctx context.Context, apctx *appcontex
 	return contract.BuildSuccessResponse(contractResponse)
 }
 
-func (s *ProductServiceImpl) UpdateProduct(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID, req *contract.UpdateProductRequest) *contract.Response {
+func (s *ProductServiceImpl) UpdateProduct(ctx context.Context, id uuid.UUID, req *contract.UpdateProductRequest) *contract.Response {
-	modelReq := transformer.UpdateProductRequestToModel(apctx, req)
+	modelReq := transformer.UpdateProductRequestToModel(req)
 
 	productResponse, err := s.productProcessor.UpdateProduct(ctx, id, modelReq)
 	if err != nil {
@@ -69,8 +68,8 @@ func (s *ProductServiceImpl) DeleteProduct(ctx context.Context, id uuid.UUID) *c
 	})
 }
 
-func (s *ProductServiceImpl) GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) *contract.Response {
+func (s *ProductServiceImpl) GetProductByID(ctx context.Context, id uuid.UUID) *contract.Response {
-	productResponse, err := s.productProcessor.GetProductByID(ctx, id, outletID)
+	productResponse, err := s.productProcessor.GetProductByID(ctx, id)
 	if err != nil {
 		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductServiceEntity, err.Error())
 		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
@@ -133,57 +132,3 @@ func (s *ProductServiceImpl) ListProducts(ctx context.Context, req *contract.Lis
 
 	return contract.BuildSuccessResponse(listResponse)
 }
-
-func (s *ProductServiceImpl) ListProductsAll(ctx context.Context, req *contract.ListProductsRequest) *contract.Response {
-	// Build filters
-	filters := make(map[string]interface{})
-	if req.OrganizationID != nil {
-		filters["organization_id"] = *req.OrganizationID
-	}
-	if req.OutletID != nil {
-		filters["outlet_id"] = *req.OutletID
-	}
-	if req.CategoryID != nil {
-		filters["category_id"] = *req.CategoryID
-	}
-	if req.BusinessType != "" {
-		filters["business_type"] = req.BusinessType
-	}
-	if req.IsActive != nil {
-		filters["is_active"] = *req.IsActive
-	}
-	if req.Search != "" {
-		filters["search"] = req.Search
-	}
-	if req.MinPrice != nil {
-		filters["price_min"] = *req.MinPrice
-	}
-	if req.MaxPrice != nil {
-		filters["price_max"] = *req.MaxPrice
-	}
-
-	products, totalCount, err := s.productProcessor.ListProducts(ctx, filters, req.Page, req.Limit)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	// Convert to contract responses
-	contractResponses := transformer.ProductsToResponses(products)
-
-	// Calculate total pages
-	totalPages := totalCount / req.Limit
-	if totalCount%req.Limit > 0 {
-		totalPages++
-	}
-
-	listResponse := &contract.ListProductsResponse{
-		Products:   contractResponses,
-		TotalCount: totalCount,
-		Page:       req.Page,
-		Limit:      req.Limit,
-		TotalPages: totalPages,
-	}
-
-	return contract.BuildSuccessResponse(listResponse)
-}

internal/service/report_service.go

@@ -113,8 +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, DateFrom: start, DateTo: end}
+	plReq := &models.ProfitLossAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end, GroupBy: "day"}
-	productReq := &models.ProductAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end, Limit: 1000}
 
 	sales, err := s.analyticsService.GetSalesAnalytics(ctx, salesReq)
 	if err != nil {
@@ -124,15 +123,6 @@ func (s *ReportServiceImpl) GenerateDailyTransactionPDF(ctx context.Context, org
 	if err != nil {
 		return "", "", fmt.Errorf("get profit/loss analytics: %w", err)
 	}
-	products, err := s.analyticsService.GetProductAnalytics(ctx, productReq)
-	if err != nil {
-		return "", "", fmt.Errorf("get product analytics: %w", err)
-	}
-
-	totalOmset := getPLNominalByID(pl.MainSummary, "total_omset")
-	hpp := getPLNominalByID(pl.MainSummary, "hpp")
-	labaKotor := getPLNominalByID(pl.MainSummary, "laba_kotor")
-	labaKotorPct := getPLPctByID(pl.MainSummary, "laba_kotor")
 
 	data := reportTemplateData{
 		OrganizationName: org.Name,
@@ -143,28 +133,28 @@ func (s *ReportServiceImpl) GenerateDailyTransactionPDF(ctx context.Context, org
 		GeneratedBy:      generatedBy,
 		PrintTime:        time.Now().Format("02/01/2006 15:04:05"),
 		Summary: reportSummary{
-			TotalTransactions:  sales.Summary.TotalOrders,
+			TotalTransactions:  pl.Summary.TotalOrders,
 			TotalItems:         sales.Summary.TotalItems,
-			GrossSales:         formatCurrency(totalOmset),
+			GrossSales:         formatCurrency(pl.Summary.TotalRevenue),
-			Discount:           formatCurrency(sales.Summary.TotalDiscount),
+			Discount:           formatCurrency(pl.Summary.TotalDiscount),
-			Tax:                formatCurrency(sales.Summary.TotalTax),
+			Tax:                formatCurrency(pl.Summary.TotalTax),
 			NetSales:           formatCurrency(sales.Summary.NetSales),
-			COGS:               formatCurrency(hpp),
+			COGS:               formatCurrency(pl.Summary.TotalCost),
-			GrossProfit:        formatCurrency(labaKotor),
+			GrossProfit:        formatCurrency(pl.Summary.GrossProfit),
-			GrossMarginPercent: fmt.Sprintf("%.2f", labaKotorPct),
+			GrossMarginPercent: fmt.Sprintf("%.2f", pl.Summary.GrossProfitMargin),
 		},
 	}
 
-	items := make([]reportItem, 0, len(products.Data))
+	items := make([]reportItem, 0, len(pl.ProductData))
-	for _, p := range products.Data {
+	for _, p := range pl.ProductData {
 		items = append(items, reportItem{
 			Name:        p.ProductName,
 			Quantity:    p.QuantitySold,
 			GrossSales:  formatCurrency(p.Revenue),
 			Discount:    formatCurrency(0),
 			NetSales:    formatCurrency(p.Revenue),
-			COGS:        formatCurrency(p.StandardHppTotal),
+			COGS:        formatCurrency(p.Cost),
-			GrossProfit: formatCurrency(p.Revenue - p.StandardHppTotal),
+			GrossProfit: formatCurrency(p.GrossProfit),
 		})
 	}
 	data.Items = items
@@ -200,21 +190,3 @@ func (s *ReportServiceImpl) GenerateDailyTransactionPDF(ctx context.Context, org
 
 	return publicURL, fileName, nil
 }
-
-func getPLNominalByID(rows []models.ProfitLossSummaryRow, id string) float64 {
-	for _, row := range rows {
-		if row.ID == id {
-			return row.TodayNominal
-		}
-	}
-	return 0
-}
-
-func getPLPctByID(rows []models.ProfitLossSummaryRow, id string) float64 {
-	for _, row := range rows {
-		if row.ID == id {
-			return row.TodayPct
-		}
-	}
-	return 0
-}

internal/transformer/analytics_transformer.go

@@ -138,91 +138,6 @@ func SalesAnalyticsModelToContract(resp *models.SalesAnalyticsResponse) *contrac
 	}
 }
 
-// PurchasingAnalyticsContractToModel converts contract request to model
-func PurchasingAnalyticsContractToModel(req *contract.PurchasingAnalyticsRequest) *models.PurchasingAnalyticsRequest {
-	var dateFrom, dateTo time.Time
-
-	if fromTime, toTime, err := util.ParseDateRangeToJakartaTime(req.DateFrom, req.DateTo); err == nil {
-		if fromTime != nil {
-			dateFrom = *fromTime
-		}
-		if toTime != nil {
-			dateTo = *toTime
-		}
-	}
-
-	return &models.PurchasingAnalyticsRequest{
-		OrganizationID: req.OrganizationID,
-		OutletID:       parseOutletID(req.OutletID),
-		DateFrom:       dateFrom,
-		DateTo:         dateTo,
-		GroupBy:        req.GroupBy,
-	}
-}
-
-// PurchasingAnalyticsModelToContract converts model response to contract
-func PurchasingAnalyticsModelToContract(resp *models.PurchasingAnalyticsResponse) *contract.PurchasingAnalyticsResponse {
-	if resp == nil {
-		return nil
-	}
-
-	data := make([]contract.PurchasingAnalyticsData, len(resp.Data))
-	for i, item := range resp.Data {
-		data[i] = contract.PurchasingAnalyticsData{
-			Date:           item.Date,
-			Purchases:      item.Purchases,
-			PurchaseOrders: item.PurchaseOrders,
-			Quantity:       item.Quantity,
-			Ingredients:    item.Ingredients,
-			Vendors:        item.Vendors,
-		}
-	}
-
-	ingredientData := make([]contract.PurchasingIngredientData, len(resp.IngredientData))
-	for i, item := range resp.IngredientData {
-		ingredientData[i] = contract.PurchasingIngredientData{
-			IngredientID:       item.IngredientID,
-			IngredientName:     item.IngredientName,
-			Quantity:           item.Quantity,
-			TotalCost:          item.TotalCost,
-			AverageUnitCost:    item.AverageUnitCost,
-			PurchaseOrderCount: item.PurchaseOrderCount,
-		}
-	}
-
-	vendorData := make([]contract.PurchasingVendorData, len(resp.VendorData))
-	for i, item := range resp.VendorData {
-		vendorData[i] = contract.PurchasingVendorData{
-			VendorID:           item.VendorID,
-			VendorName:         item.VendorName,
-			TotalCost:          item.TotalCost,
-			PurchaseOrderCount: item.PurchaseOrderCount,
-			IngredientCount:    item.IngredientCount,
-			Quantity:           item.Quantity,
-		}
-	}
-
-	return &contract.PurchasingAnalyticsResponse{
-		OrganizationID: resp.OrganizationID,
-		OutletID:       resp.OutletID,
-		OutletName:     resp.OutletName,
-		DateFrom:       resp.DateFrom,
-		DateTo:         resp.DateTo,
-		GroupBy:        resp.GroupBy,
-		Summary: contract.PurchasingSummary{
-			TotalPurchases:            resp.Summary.TotalPurchases,
-			TotalPurchaseOrders:       resp.Summary.TotalPurchaseOrders,
-			TotalQuantity:             resp.Summary.TotalQuantity,
-			AveragePurchaseOrderValue: resp.Summary.AveragePurchaseOrderValue,
-			TotalIngredients:          resp.Summary.TotalIngredients,
-			TotalVendors:              resp.Summary.TotalVendors,
-		},
-		Data:           data,
-		IngredientData: ingredientData,
-		VendorData:     vendorData,
-	}
-}
-
 // ProductAnalyticsContractToModel converts contract request to model
 func ProductAnalyticsContractToModel(req *contract.ProductAnalyticsRequest) *models.ProductAnalyticsRequest {
 	var dateFrom, dateTo time.Time
@@ -427,22 +342,20 @@ func DashboardAnalyticsModelToContract(resp *models.DashboardAnalyticsResponse)
 	}
 }
 
+// ProfitLossAnalyticsContractToModel transforms contract request to model
 func ProfitLossAnalyticsContractToModel(req *contract.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsRequest, error) {
 	if req == nil {
 		return nil, fmt.Errorf("request cannot be nil")
 	}
 
+	// Parse date range using utility function
 	dateFrom, dateTo, err := util.ParseDateRangeToJakartaTime(req.DateFrom, req.DateTo)
 	if err != nil {
-		return nil, fmt.Errorf("invalid date range: %w", err)
+		return nil, fmt.Errorf("invalid date format: %w", err)
 	}
 
-	if dateFrom == nil {
+	if dateFrom == nil || dateTo == nil {
-		return nil, fmt.Errorf("date_from is required")
+		return nil, fmt.Errorf("both date_from and date_to are required")
-	}
-
-	if dateTo == nil {
-		return nil, fmt.Errorf("date_to is required")
 	}
 
 	return &models.ProfitLossAnalyticsRequest{
@@ -454,16 +367,13 @@ func ProfitLossAnalyticsContractToModel(req *contract.ProfitLossAnalyticsRequest
 	}, nil
 }
 
+// ProfitLossAnalyticsModelToContract transforms model response to contract
 func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse) *contract.ProfitLossAnalyticsResponse {
 	if resp == nil {
 		return nil
 	}
 
-	mainSummary := make([]contract.ProfitLossSummaryRow, len(resp.MainSummary))
+	// Transform profit/loss data
-	for i, row := range resp.MainSummary {
-		mainSummary[i] = profitLossSummaryRowModelToContract(row)
-	}
-
 	data := make([]contract.ProfitLossData, len(resp.Data))
 	for i, item := range resp.Data {
 		data[i] = contract.ProfitLossData{
@@ -480,6 +390,7 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 		}
 	}
 
+	// Transform product profit data
 	productData := make([]contract.ProductProfitData, len(resp.ProductData))
 	for i, item := range resp.ProductData {
 		productData[i] = contract.ProductProfitData{
@@ -498,14 +409,6 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 		}
 	}
 
-	opsItems := make([]contract.OperationalExpenseItem, len(resp.OperationalExpenses))
-	for i, item := range resp.OperationalExpenses {
-		opsItems[i] = contract.OperationalExpenseItem{
-			Item:    item.Item,
-			Nominal: item.Nominal,
-		}
-	}
-
 	return &contract.ProfitLossAnalyticsResponse{
 		OrganizationID: resp.OrganizationID,
 		OutletID:       resp.OutletID,
@@ -527,25 +430,5 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 		},
 		Data:        data,
 		ProductData: productData,
-		MainSummary:              mainSummary,
-		OperationalExpenses:      opsItems,
-		OperationalExpensesTotal: resp.OperationalExpensesTotal,
-	}
-}
-
-func profitLossSummaryRowModelToContract(row models.ProfitLossSummaryRow) contract.ProfitLossSummaryRow {
-	subItems := make([]contract.ProfitLossSummaryRow, len(row.SubItems))
-	for i, sub := range row.SubItems {
-		subItems[i] = profitLossSummaryRowModelToContract(sub)
-	}
-	return contract.ProfitLossSummaryRow{
-		ID:           row.ID,
-		Label:        row.Label,
-		IsBold:       row.IsBold,
-		TodayNominal: row.TodayNominal,
-		TodayPct:     row.TodayPct,
-		MtdNominal:   row.MtdNominal,
-		MtdPct:       row.MtdPct,
-		SubItems:     subItems,
 	}
 }

internal/transformer/analytics_transformer_test.go

@@ -1,154 +0,0 @@
-package transformer
-
-import (
-	"encoding/json"
-	"testing"
-	"time"
-
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/models"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
-)
-
-func TestPurchasingAnalyticsContractToModelParsesDateRangeAndOutlet(t *testing.T) {
-	orgID := uuid.New()
-	outletID := uuid.New().String()
-
-	req := &contract.PurchasingAnalyticsRequest{
-		OrganizationID: orgID,
-		OutletID:       &outletID,
-		DateFrom:       "01-05-2026",
-		DateTo:         "02-05-2026",
-		GroupBy:        "week",
-	}
-
-	result := PurchasingAnalyticsContractToModel(req)
-
-	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, 2, 23, 59, 59, int(time.Second-time.Nanosecond), location), result.DateTo)
-}
-
-func TestPurchasingAnalyticsContractToModelIgnoresInvalidOutlet(t *testing.T) {
-	outletID := "not-a-uuid"
-
-	result := PurchasingAnalyticsContractToModel(&contract.PurchasingAnalyticsRequest{
-		OutletID: &outletID,
-		DateFrom: "01-05-2026",
-		DateTo:   "02-05-2026",
-	})
-
-	require.Nil(t, result.OutletID)
-}
-
-func TestPurchasingAnalyticsModelToContractCopiesOutletName(t *testing.T) {
-	outletID := uuid.New()
-	outletName := "Main Outlet"
-
-	result := PurchasingAnalyticsModelToContract(&models.PurchasingAnalyticsResponse{
-		OrganizationID: uuid.New(),
-		OutletID:       &outletID,
-		OutletName:     &outletName,
-	})
-
-	require.NotNil(t, result)
-	require.Equal(t, &outletID, result.OutletID)
-	require.NotNil(t, result.OutletName)
-	require.Equal(t, outletName, *result.OutletName)
-}
-
-func TestPurchasingAnalyticsModelToContractOmitsNilOutletName(t *testing.T) {
-	result := PurchasingAnalyticsModelToContract(&models.PurchasingAnalyticsResponse{
-		OrganizationID: uuid.New(),
-	})
-
-	payload, err := json.Marshal(result)
-	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/category_transformer.go

@@ -7,26 +7,22 @@ import (
 )
 
 func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateCategoryRequest) *models.CreateCategoryRequest {
-	order := 0
-	if req.Order != nil {
-		order = *req.Order
-	}
 	return &models.CreateCategoryRequest{
 		OrganizationID: apctx.OrganizationID,
 		OutletID:       req.OutletID,
 		Name:           req.Name,
 		Description:    req.Description,
 		ImageURL:       nil,
-		Order:          order,
+		Order:      	*req.Order,
 	}
 }
 
 func UpdateCategoryRequestToModel(req *contract.UpdateCategoryRequest) *models.UpdateCategoryRequest {
 	return &models.UpdateCategoryRequest{
+		OutletID:    req.OutletID,
 		Name:        req.Name,
 		Description: req.Description,
 		ImageURL:    nil,
-		OutletID:    req.OutletID,
 		Order:   	 req.Order,
 		IsActive:    nil,
 	}
@@ -43,7 +39,7 @@ func CategoryModelResponseToResponse(cat *models.CategoryResponse) *contract.Cat
 		OutletID:       cat.OutletID,
 		Name:           cat.Name,
 		Description:    cat.Description,
-		BusinessType:   "restaurant",
+		BusinessType:   "restaurant", // Default business type
 		Order:          cat.Order,
 		Metadata:       map[string]interface{}{},
 		CreatedAt:      cat.CreatedAt,

internal/transformer/expense_transformer.go

@@ -1,136 +0,0 @@
-package transformer
-
-import (
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/models"
-)
-
-func CreateExpenseRequestToModel(req *contract.CreateExpenseRequest) *models.CreateExpenseRequest {
-	items := make([]models.CreateExpenseItemRequest, len(req.Items))
-	for i, item := range req.Items {
-		items[i] = CreateExpenseItemRequestToModel(&item)
-	}
-
-	return &models.CreateExpenseRequest{
-		Receiver:        req.Receiver,
-		TransactionDate: req.TransactionDate,
-		CodeNumber:      req.CodeNumber,
-		OutletID:        req.OutletID,
-		Status:          req.Status,
-		Description:     req.Description,
-		Tax:             req.Tax,
-		Total:           req.Total,
-		Items:           items,
-	}
-}
-
-func CreateExpenseItemRequestToModel(req *contract.CreateExpenseItemRequest) models.CreateExpenseItemRequest {
-	return models.CreateExpenseItemRequest{
-		ChartOfAccountID: req.ChartOfAccountID,
-		Item:             req.Item,
-		Description:      req.Description,
-		Amount:           req.Amount,
-	}
-}
-
-func UpdateExpenseRequestToModel(req *contract.UpdateExpenseRequest) *models.UpdateExpenseRequest {
-	modelReq := &models.UpdateExpenseRequest{
-		Receiver:        req.Receiver,
-		TransactionDate: req.TransactionDate,
-		CodeNumber:      req.CodeNumber,
-		OutletID:        req.OutletID,
-		Status:          req.Status,
-		Description:     req.Description,
-		Tax:             req.Tax,
-		Total:           req.Total,
-		Reserved1:       req.Reserved1,
-	}
-
-	if req.Items != nil {
-		items := make([]models.UpdateExpenseItemRequest, len(req.Items))
-		for i, item := range req.Items {
-			items[i] = UpdateExpenseItemRequestToModel(&item)
-		}
-		modelReq.Items = items
-	}
-
-	return modelReq
-}
-
-func UpdateExpenseItemRequestToModel(req *contract.UpdateExpenseItemRequest) models.UpdateExpenseItemRequest {
-	return models.UpdateExpenseItemRequest{
-		ChartOfAccountID: req.ChartOfAccountID,
-		Item:             req.Item,
-		Description:      req.Description,
-		Amount:           req.Amount,
-	}
-}
-
-func ListExpenseRequestToModel(req *contract.ListExpenseRequest) *models.ListExpenseRequest {
-	return &models.ListExpenseRequest{
-		Page:      req.Page,
-		Limit:     req.Limit,
-		Search:    req.Search,
-		OutletID:  req.OutletID,
-		Status:    req.Status,
-		StartDate: req.StartDate,
-		EndDate:   req.EndDate,
-	}
-}
-
-func ExpenseModelResponseToResponse(expense *models.ExpenseResponse) *contract.ExpenseResponse {
-	if expense == nil {
-		return nil
-	}
-
-	items := make([]contract.ExpenseItemResponse, len(expense.Items))
-	for i, item := range expense.Items {
-		items[i] = ExpenseItemModelResponseToResponse(&item)
-	}
-
-	return &contract.ExpenseResponse{
-		ID:              expense.ID,
-		OrganizationID:  expense.OrganizationID,
-		OutletID:        expense.OutletID,
-		Receiver:        expense.Receiver,
-		TransactionDate: expense.TransactionDate,
-		CodeNumber:      expense.CodeNumber,
-		Status:          expense.Status,
-		Description:     expense.Description,
-		Tax:             expense.Tax,
-		Total:           expense.Total,
-		Reserved1:       expense.Reserved1,
-		CreatedAt:       expense.CreatedAt,
-		UpdatedAt:       expense.UpdatedAt,
-		Items:           items,
-	}
-}
-
-func ExpenseItemModelResponseToResponse(item *models.ExpenseItemResponse) contract.ExpenseItemResponse {
-	return contract.ExpenseItemResponse{
-		ID:                 item.ID,
-		ExpenseID:          item.ExpenseID,
-		ChartOfAccountID:   item.ChartOfAccountID,
-		ChartOfAccountName: item.ChartOfAccountName,
-		Item:               item.Item,
-		Description:        item.Description,
-		Amount:             item.Amount,
-		CreatedAt:          item.CreatedAt,
-		UpdatedAt:          item.UpdatedAt,
-	}
-}
-
-func ExpenseModelResponsesToResponses(expenses []*models.ExpenseResponse) []contract.ExpenseResponse {
-	if expenses == nil {
-		return nil
-	}
-
-	responses := make([]contract.ExpenseResponse, len(expenses))
-	for i, expense := range expenses {
-		response := ExpenseModelResponseToResponse(expense)
-		if response != nil {
-			responses[i] = *response
-		}
-	}
-	return responses
-}

internal/transformer/order_transformer.go

@@ -100,8 +100,6 @@ func OrderModelToContract(resp *models.OrderResponse) *contract.OrderResponse {
 			ProductName:        item.ProductName,
 			ProductVariantID:   item.ProductVariantID,
 			ProductVariantName: item.ProductVariantName,
-			CategoryID:         item.CategoryID,
-			CategoryName:       item.CategoryName,
 			Quantity:           item.Quantity,
 			UnitPrice:          item.UnitPrice,
 			TotalPrice:         item.TotalPrice,
@@ -112,7 +110,6 @@ func OrderModelToContract(resp *models.OrderResponse) *contract.OrderResponse {
 			CreatedAt:          item.CreatedAt,
 			UpdatedAt:          item.UpdatedAt,
 			PrinterType:        item.PrinterType,
-			PrintToChecker:     item.PrintToChecker,
 			PaidQuantity:       item.PaidQuantity,
 		}
 	}
@@ -171,8 +168,6 @@ func AddToOrderModelToContract(resp *models.AddToOrderResponse) *contract.AddToO
 			ProductName:        item.ProductName,
 			ProductVariantID:   item.ProductVariantID,
 			ProductVariantName: item.ProductVariantName,
-			CategoryID:         item.CategoryID,
-			CategoryName:       item.CategoryName,
 			Quantity:           item.Quantity,
 			UnitPrice:          item.UnitPrice,
 			TotalPrice:         item.TotalPrice,
@@ -182,7 +177,6 @@ func AddToOrderModelToContract(resp *models.AddToOrderResponse) *contract.AddToO
 			Status:             string(item.Status),
 			CreatedAt:          item.CreatedAt,
 			UpdatedAt:          item.UpdatedAt,
-			PrintToChecker:     item.PrintToChecker,
 		}
 	}
 	return &contract.AddToOrderResponse{

internal/transformer/product_outlet_price_transformer.go

@@ -1,58 +0,0 @@
-package transformer
-
-import (
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/models"
-)
-
-func CreateProductOutletPriceRequestToModel(req *contract.CreateProductOutletPriceRequest) *models.CreateProductOutletPriceRequest {
-	if req == nil {
-		return nil
-	}
-
-	return &models.CreateProductOutletPriceRequest{
-		ProductID:      req.ProductID,
-		OutletID:       req.OutletID,
-		Price:          req.Price,
-		PrintToChecker: req.PrintToChecker,
-	}
-}
-
-func UpdateProductOutletPriceRequestToModel(req *contract.UpdateProductOutletPriceRequest) *models.UpdateProductOutletPriceRequest {
-	if req == nil {
-		return nil
-	}
-
-	return &models.UpdateProductOutletPriceRequest{
-		Price:          &req.Price,
-		PrintToChecker: req.PrintToChecker,
-	}
-}
-
-func ProductOutletPriceModelToResponse(m *models.ProductOutletPrice) *contract.ProductOutletPriceResponse {
-	if m == nil {
-		return nil
-	}
-
-	return &contract.ProductOutletPriceResponse{
-		ID:             m.ID,
-		ProductID:      m.ProductID,
-		OutletID:       m.OutletID,
-		Price:          m.Price,
-		PrintToChecker: m.PrintToChecker,
-		CreatedAt:      m.CreatedAt,
-		UpdatedAt:      m.UpdatedAt,
-	}
-}
-
-func ProductOutletPriceModelsToResponses(ms []*models.ProductOutletPrice) []contract.ProductOutletPriceResponse {
-	if ms == nil {
-		return nil
-	}
-
-	responses := make([]contract.ProductOutletPriceResponse, len(ms))
-	for i, m := range ms {
-		responses[i] = *ProductOutletPriceModelToResponse(m)
-	}
-	return responses
-}

internal/transformer/product_transformer.go

@@ -5,8 +5,6 @@ import (
 	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/contract"
 	"apskel-pos-be/internal/models"
-
-	"github.com/google/uuid"
 )
 
 func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateProductRequest) *models.CreateProductRequest {
@@ -39,15 +37,9 @@ func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Cr
 		metadata = make(map[string]interface{})
 	}
 
-	// Prioritize outlet_id from context, fallback to request body
-	outletID := apctx.OutletID
-	if outletID == uuid.Nil && req.OutletID != nil {
-		outletID = *req.OutletID
-	}
-
 	return &models.CreateProductRequest{
 		OrganizationID: apctx.OrganizationID,
-		OutletID:       outletID,
+		OutletID:       req.OutletID,
 		CategoryID:     req.CategoryID,
 		SKU:            req.SKU,
 		Name:           req.Name,
@@ -57,26 +49,19 @@ func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Cr
 		BusinessType:   businessType,
 		ImageURL:       req.ImageURL,
 		PrinterType:    req.PrinterType,
-		PrintToChecker: req.PrintToChecker,
 		Metadata:       metadata,
 		Variants:       variants,
 	}
 }
 
-func UpdateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.UpdateProductRequest) *models.UpdateProductRequest {
+func UpdateProductRequestToModel(req *contract.UpdateProductRequest) *models.UpdateProductRequest {
 	metadata := req.Metadata
 	if metadata == nil {
 		metadata = make(map[string]interface{})
 	}
 
-	// Prioritize outlet_id from context, fallback to request body
-	outletID := apctx.OutletID
-	if outletID == uuid.Nil && req.OutletID != nil {
-		outletID = *req.OutletID
-	}
-
 	return &models.UpdateProductRequest{
-		OutletID:       outletID,
+		OutletID:     req.OutletID,
 		CategoryID:   req.CategoryID,
 		SKU:         req.SKU,
 		Name:        req.Name,
@@ -85,7 +70,6 @@ func UpdateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Up
 		Cost:        req.Cost,
 		ImageURL:    req.ImageURL,
 		PrinterType: req.PrinterType,
-		PrintToChecker: req.PrintToChecker,
 		Metadata:    metadata,
 		IsActive:    req.IsActive,
 	}
@@ -115,36 +99,20 @@ func ProductModelResponseToResponse(prod *models.ProductResponse) *contract.Prod
 		}
 	}
 
-	// Convert outlet prices
-	var outletPriceResponses []contract.ProductOutletPriceResponse
-	if len(prod.OutletPrices) > 0 {
-		outletPriceResponses = make([]contract.ProductOutletPriceResponse, len(prod.OutletPrices))
-		for i, op := range prod.OutletPrices {
-			outletPriceResponses[i] = contract.ProductOutletPriceResponse{
-				OutletID:       op.OutletID,
-				OutletName:     op.OutletName,
-				Price:          op.Price,
-				PrintToChecker: op.PrintToChecker,
-			}
-		}
-	}
-
 	return &contract.ProductResponse{
 		ID:             prod.ID,
 		OrganizationID: prod.OrganizationID,
+		OutletID:       prod.OutletID,
 		CategoryID:     prod.CategoryID,
 		CategoryName:   prod.CategoryName,
 		SKU:            prod.SKU,
 		Name:           prod.Name,
 		Description:    prod.Description,
 		Price:          prod.Price,
-		OutletPrice:    prod.OutletPrice,
-		OutletPrices:   outletPriceResponses,
 		Cost:           prod.Cost,
 		BusinessType:   string(prod.BusinessType),
 		ImageURL:       prod.ImageURL,
 		PrinterType:    prod.PrinterType,
-		PrintToChecker: prod.PrintToChecker,
 		Metadata:       prod.Metadata,
 		IsActive:       prod.IsActive,
 		CreatedAt:      prod.CreatedAt,

internal/transformer/purchase_order_transformer.go

@@ -25,15 +25,11 @@ func CreatePurchaseOrderRequestToModel(req *contract.CreatePurchaseOrderRequest)
 		return nil, err
 	}
 
-	// Parse due date if provided
+	// Parse due date
-	var dueDate *time.Time
+	dueDate, err := time.Parse("2006-01-02", req.DueDate)
-	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{
 		VendorID:          req.VendorID,

internal/transformer/purchase_order_transformer_test.go

@@ -1,43 +0,0 @@
-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/validator/category_validator.go

@@ -59,7 +59,7 @@ func (v *CategoryValidatorImpl) ValidateUpdateCategoryRequest(req *contract.Upda
 	}
 
 	// At least one field should be provided for update
-	if req.Name == nil && req.Description == nil && req.BusinessType == nil && req.Metadata == nil {
+	if req.Name == nil && req.Description == nil && req.BusinessType == nil && req.Metadata == nil && req.OutletID == nil {
 		return errors.New("at least one field must be provided for update"), constants.MissingFieldErrorCode
 	}
 

internal/validator/expense_validator.go

@@ -1,159 +0,0 @@
-package validator
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-
-	"github.com/google/uuid"
-)
-
-type ExpenseValidator interface {
-	ValidateCreateExpenseRequest(req *contract.CreateExpenseRequest) (error, string)
-	ValidateUpdateExpenseRequest(req *contract.UpdateExpenseRequest) (error, string)
-	ValidateListExpenseRequest(req *contract.ListExpenseRequest) (error, string)
-}
-
-type ExpenseValidatorImpl struct{}
-
-func NewExpenseValidator() *ExpenseValidatorImpl {
-	return &ExpenseValidatorImpl{}
-}
-
-func (v *ExpenseValidatorImpl) ValidateCreateExpenseRequest(req *contract.CreateExpenseRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if strings.TrimSpace(req.Receiver) == "" {
-		return errors.New("receiver is required"), constants.MissingFieldErrorCode
-	}
-
-	if strings.TrimSpace(req.TransactionDate) == "" {
-		return errors.New("transaction_date is required"), constants.MissingFieldErrorCode
-	}
-
-	if strings.TrimSpace(req.CodeNumber) == "" {
-		return errors.New("code_number is required"), constants.MissingFieldErrorCode
-	}
-
-	if strings.TrimSpace(req.OutletID) == "" {
-		return errors.New("outlet_id is required"), constants.MissingFieldErrorCode
-	}
-
-	if _, err := uuid.Parse(req.OutletID); err != nil {
-		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
-	}
-
-	if req.Tax < 0 {
-		return errors.New("tax cannot be negative"), constants.MalformedFieldErrorCode
-	}
-
-	if len(req.Items) == 0 {
-		return errors.New("at least one item is required"), constants.MissingFieldErrorCode
-	}
-
-	for i, item := range req.Items {
-		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
-		}
-		if item.Amount <= 0 {
-			return fmt.Errorf("item %d: amount must be greater than 0", i), constants.MalformedFieldErrorCode
-		}
-	}
-
-	return nil, ""
-}
-
-func (v *ExpenseValidatorImpl) ValidateUpdateExpenseRequest(req *contract.UpdateExpenseRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.Receiver != nil && strings.TrimSpace(*req.Receiver) == "" {
-		return errors.New("receiver cannot be empty"), constants.MalformedFieldErrorCode
-	}
-
-	if req.CodeNumber != nil && strings.TrimSpace(*req.CodeNumber) == "" {
-		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
-		}
-		if _, err := uuid.Parse(*req.OutletID); err != nil {
-			return errors.New("outlet_id must be a valid UUID"), constants.MalformedFieldErrorCode
-		}
-	}
-
-	if req.Total != nil && *req.Total <= 0 {
-		return errors.New("total must be greater than 0"), constants.MalformedFieldErrorCode
-	}
-
-	if req.Tax != nil && *req.Tax < 0 {
-		return errors.New("tax cannot be negative"), constants.MalformedFieldErrorCode
-	}
-
-	if req.Items != nil {
-		for i, item := range req.Items {
-			if item.ChartOfAccountID != nil {
-				if strings.TrimSpace(*item.ChartOfAccountID) == "" {
-					return fmt.Errorf("item %d: chart_of_account_id cannot be empty", i), constants.MalformedFieldErrorCode
-				}
-				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
-				}
-			}
-			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
-			}
-		}
-	}
-
-	return nil, ""
-}
-
-func (v *ExpenseValidatorImpl) ValidateListExpenseRequest(req *contract.ListExpenseRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.Page < 1 {
-		return errors.New("page must be at least 1"), constants.MalformedFieldErrorCode
-	}
-
-	if req.Limit < 1 || req.Limit > 100 {
-		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

@@ -1,158 +0,0 @@
-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/product_outlet_price_validator.go

@@ -1,80 +0,0 @@
-package validator
-
-import (
-	"errors"
-	"fmt"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-
-	"github.com/google/uuid"
-)
-
-type ProductOutletPriceValidator interface {
-	ValidateCreateRequest(req *contract.CreateProductOutletPriceRequest) (error, string)
-	ValidateUpdateRequest(req *contract.UpdateProductOutletPriceRequest) (error, string)
-	ValidateBulkCreateRequest(req *contract.BulkCreateProductOutletPriceRequest) (error, string)
-}
-
-type ProductOutletPriceValidatorImpl struct{}
-
-func NewProductOutletPriceValidator() *ProductOutletPriceValidatorImpl {
-	return &ProductOutletPriceValidatorImpl{}
-}
-
-func (v *ProductOutletPriceValidatorImpl) ValidateCreateRequest(req *contract.CreateProductOutletPriceRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.ProductID == uuid.Nil {
-		return errors.New("product_id is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.OutletID == uuid.Nil {
-		return errors.New("outlet_id is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.Price < 0 {
-		return errors.New("price must be non-negative"), constants.MalformedFieldErrorCode
-	}
-
-	return nil, ""
-}
-
-func (v *ProductOutletPriceValidatorImpl) ValidateUpdateRequest(req *contract.UpdateProductOutletPriceRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.Price < 0 {
-		return errors.New("price must be non-negative"), constants.MalformedFieldErrorCode
-	}
-
-	return nil, ""
-}
-
-func (v *ProductOutletPriceValidatorImpl) ValidateBulkCreateRequest(req *contract.BulkCreateProductOutletPriceRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.ProductID == uuid.Nil {
-		return errors.New("product_id is required"), constants.MissingFieldErrorCode
-	}
-
-	if len(req.Prices) == 0 {
-		return errors.New("at least one price entry is required"), constants.MissingFieldErrorCode
-	}
-
-	for i, p := range req.Prices {
-		if p.OutletID == uuid.Nil {
-			return errors.New("outlet_id is required for each price entry"), constants.MissingFieldErrorCode
-		}
-		if p.Price < 0 {
-			return fmt.Errorf("price at index %d must be non-negative", i), constants.MalformedFieldErrorCode
-		}
-	}
-
-	return nil, ""
-}

internal/validator/purchase_order_validator.go

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

internal/validator/purchase_order_validator_test.go

@@ -1,62 +0,0 @@
-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/000068_add_outlet_id_to_categories.down.sql

@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS idx_categories_outlet_id;
+ALTER TABLE categories DROP CONSTRAINT IF EXISTS fk_categories_outlet;
+ALTER TABLE categories DROP COLUMN IF EXISTS outlet_id;

migrations/000068_add_outlet_id_to_categories.up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE categories ADD COLUMN outlet_id UUID;
+ALTER TABLE categories ADD CONSTRAINT fk_categories_outlet FOREIGN KEY (outlet_id) REFERENCES outlets(id) ON DELETE SET NULL;
+CREATE INDEX idx_categories_outlet_id ON categories(outlet_id);

migrations/000068_create_product_outlet_prices_table.down.sql

@@ -1 +0,0 @@
-DROP TABLE IF EXISTS product_outlet_prices;

migrations/000068_create_product_outlet_prices_table.up.sql

@@ -1,12 +0,0 @@
-CREATE TABLE product_outlet_prices (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    product_id UUID NOT NULL REFERENCES products(id) ON DELETE CASCADE,
-    outlet_id UUID NOT NULL REFERENCES outlets(id) ON DELETE CASCADE,
-    price DECIMAL(10,2) NOT NULL,
-    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
-    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
-);
-
-CREATE UNIQUE INDEX idx_product_outlet_prices_product_outlet ON product_outlet_prices(product_id, outlet_id);
-CREATE INDEX idx_product_outlet_prices_product_id ON product_outlet_prices(product_id);
-CREATE INDEX idx_product_outlet_prices_outlet_id ON product_outlet_prices(outlet_id);

migrations/000069_add_outlet_id_to_categories.down.sql

@@ -1,5 +0,0 @@
--- Remove outlet_id column from categories table
-DROP INDEX IF EXISTS idx_categories_outlet_id;
-
-ALTER TABLE categories
-    DROP COLUMN IF EXISTS outlet_id;

migrations/000069_add_outlet_id_to_categories.up.sql

@@ -1,6 +0,0 @@
--- Add outlet_id column to categories table (nullable)
-ALTER TABLE categories
-    ADD COLUMN outlet_id UUID REFERENCES outlets(id) ON DELETE SET NULL;
-
--- Index for outlet_id filter
-CREATE INDEX idx_categories_outlet_id ON categories(outlet_id);

migrations/000069_add_outlet_id_to_products.down.sql

@@ -0,0 +1,8 @@
+-- Remove foreign key constraint
+ALTER TABLE products DROP CONSTRAINT IF EXISTS fk_products_outlet;
+
+-- Remove index
+DROP INDEX IF EXISTS idx_products_outlet_id;
+
+-- Remove outlet_id column
+ALTER TABLE products DROP COLUMN IF EXISTS outlet_id;

migrations/000069_add_outlet_id_to_products.up.sql

@@ -0,0 +1,8 @@
+-- Add nullable outlet_id column to products table
+ALTER TABLE products ADD COLUMN outlet_id UUID;
+
+-- Create index on outlet_id for faster queries
+CREATE INDEX idx_products_outlet_id ON products (outlet_id);
+
+-- Add foreign key constraint
+ALTER TABLE products ADD CONSTRAINT fk_products_outlet FOREIGN KEY (outlet_id) REFERENCES outlets(id) ON DELETE SET NULL;

migrations/000070_add_print_to_checker_to_product_outlet_prices.down.sql

@@ -1 +0,0 @@
-ALTER TABLE product_outlet_prices DROP COLUMN IF EXISTS print_to_checker;

migrations/000070_add_print_to_checker_to_product_outlet_prices.up.sql

@@ -1 +0,0 @@
-ALTER TABLE product_outlet_prices ADD COLUMN print_to_checker BOOLEAN NOT NULL DEFAULT TRUE;

migrations/000071_create_expenses_table.down.sql

@@ -1,2 +0,0 @@
-DROP TABLE IF EXISTS expense_items;
-DROP TABLE IF EXISTS expenses;

migrations/000071_create_expenses_table.up.sql

@@ -1,33 +0,0 @@
-CREATE TABLE expenses (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
-    outlet_id UUID NOT NULL REFERENCES outlets(id) ON DELETE CASCADE,
-    receiver VARCHAR(255) NOT NULL,
-    transaction_date DATE NOT NULL,
-    code_number VARCHAR(50) NOT NULL,
-    description TEXT,
-    tax DECIMAL(15,2) NOT NULL DEFAULT 0,
-    total DECIMAL(15,2) NOT NULL DEFAULT 0,
-    reserved1 TEXT,
-    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
-    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
-);
-
-CREATE INDEX idx_expenses_organization_id ON expenses(organization_id);
-CREATE INDEX idx_expenses_outlet_id ON expenses(outlet_id);
-CREATE INDEX idx_expenses_transaction_date ON expenses(transaction_date);
-CREATE INDEX idx_expenses_code_number ON expenses(code_number);
-CREATE INDEX idx_expenses_created_at ON expenses(created_at);
-
-CREATE TABLE expense_items (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    expense_id UUID NOT NULL REFERENCES expenses(id) ON DELETE CASCADE,
-    chart_of_account_id UUID NOT NULL REFERENCES chart_of_accounts(id) ON DELETE RESTRICT,
-    description TEXT,
-    amount DECIMAL(15,2) NOT NULL DEFAULT 0,
-    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
-    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
-);
-
-CREATE INDEX idx_expense_items_expense_id ON expense_items(expense_id);
-CREATE INDEX idx_expense_items_chart_of_account_id ON expense_items(chart_of_account_id);

migrations/000072_add_expense_name_to_expenses.down.sql

@@ -1,16 +0,0 @@
-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,21 +0,0 @@
-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

@@ -1,3 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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);