Compare commits
29
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
84222fc7f4 | ||
|
|
23ac572e3f | ||
|
|
957c1ae53d | ||
|
|
d0378b5ac4 | ||
|
|
91960f0e57 | ||
|
|
72f67cb519 | ||
|
|
35c4cf2f2f | ||
|
|
c9ef90f5ea | ||
|
|
35e7152abb | ||
|
|
d9b51a7616 | ||
|
|
b27e40b531 | ||
|
|
44aca7641f | ||
|
|
a89ff00d94 | ||
|
|
227f11359c | ||
|
|
7a737d7f83 | ||
|
|
312ea94e62 | ||
|
|
6d735c20cb | ||
|
|
cb8a830345 | ||
|
|
9c143a43aa | ||
|
|
222cadd8df | ||
|
|
cad4e6c816 | ||
|
|
50d633ee3a | ||
|
|
21fa21d089 | ||
|
|
5f379faf17 | ||
|
|
3b62504798 | ||
|
|
4130cb66df | ||
|
|
30dff17272 | ||
|
|
f8c732f0ff | ||
|
|
e92c487815 |
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
# 1) Build stage
|
# 1) Build stage
|
||||||
FROM golang:1.21-alpine AS build
|
FROM golang:1.24-alpine AS build
|
||||||
RUN apk --no-cache add ca-certificates tzdata git curl
|
RUN apk --no-cache add ca-certificates tzdata git curl
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
COPY go.mod go.sum ./
|
COPY go.mod go.sum ./
|
||||||
|
|||||||
+13
-2
@@ -65,6 +65,7 @@ func (a *App) Initialize(cfg *config.Config) error {
|
|||||||
repos.userRepo,
|
repos.userRepo,
|
||||||
repos.sessionRepo,
|
repos.sessionRepo,
|
||||||
repos.orderRepo,
|
repos.orderRepo,
|
||||||
|
services.productOutletPriceService,
|
||||||
)
|
)
|
||||||
|
|
||||||
a.router = router.NewRouter(
|
a.router = router.NewRouter(
|
||||||
@@ -131,6 +132,8 @@ func (a *App) Initialize(cfg *config.Config) error {
|
|||||||
validators.userDeviceValidator,
|
validators.userDeviceValidator,
|
||||||
services.notificationService,
|
services.notificationService,
|
||||||
validators.notificationValidator,
|
validators.notificationValidator,
|
||||||
|
services.productOutletPriceService,
|
||||||
|
validators.productOutletPriceValidator,
|
||||||
selfOrderHandler,
|
selfOrderHandler,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -232,6 +235,7 @@ type repositories struct {
|
|||||||
notificationRepo *repository.NotificationRepositoryImpl
|
notificationRepo *repository.NotificationRepositoryImpl
|
||||||
notificationReceiverRepo *repository.NotificationReceiverRepositoryImpl
|
notificationReceiverRepo *repository.NotificationReceiverRepositoryImpl
|
||||||
notificationDeliveryRepo *repository.NotificationDeliveryRepositoryImpl
|
notificationDeliveryRepo *repository.NotificationDeliveryRepositoryImpl
|
||||||
|
productOutletPriceRepo *repository.ProductOutletPriceRepositoryImpl
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) initRepositories() *repositories {
|
func (a *App) initRepositories() *repositories {
|
||||||
@@ -283,6 +287,7 @@ func (a *App) initRepositories() *repositories {
|
|||||||
notificationRepo: repository.NewNotificationRepository(a.db),
|
notificationRepo: repository.NewNotificationRepository(a.db),
|
||||||
notificationReceiverRepo: repository.NewNotificationReceiverRepository(a.db),
|
notificationReceiverRepo: repository.NewNotificationReceiverRepository(a.db),
|
||||||
notificationDeliveryRepo: repository.NewNotificationDeliveryRepository(a.db),
|
notificationDeliveryRepo: repository.NewNotificationDeliveryRepository(a.db),
|
||||||
|
productOutletPriceRepo: repository.NewProductOutletPriceRepositoryImpl(a.db),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -327,6 +332,7 @@ type processors struct {
|
|||||||
inventoryMovementService service.InventoryMovementService
|
inventoryMovementService service.InventoryMovementService
|
||||||
userDeviceProcessor *processor.UserDeviceProcessorImpl
|
userDeviceProcessor *processor.UserDeviceProcessorImpl
|
||||||
notificationProcessor *processor.NotificationProcessorImpl
|
notificationProcessor *processor.NotificationProcessorImpl
|
||||||
|
productOutletPriceProcessor processor.ProductOutletPriceProcessor
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors {
|
func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors {
|
||||||
@@ -341,10 +347,10 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
|
|||||||
outletProcessor: processor.NewOutletProcessorImpl(repos.outletRepo),
|
outletProcessor: processor.NewOutletProcessorImpl(repos.outletRepo),
|
||||||
outletSettingProcessor: processor.NewOutletSettingProcessorImpl(repos.outletSettingRepo, repos.outletRepo),
|
outletSettingProcessor: processor.NewOutletSettingProcessorImpl(repos.outletSettingRepo, repos.outletRepo),
|
||||||
categoryProcessor: processor.NewCategoryProcessorImpl(repos.categoryRepo),
|
categoryProcessor: processor.NewCategoryProcessorImpl(repos.categoryRepo),
|
||||||
productProcessor: processor.NewProductProcessorImpl(repos.productRepo, repos.categoryRepo, repos.productVariantRepo, repos.inventoryRepo, repos.outletRepo),
|
productProcessor: processor.NewProductProcessorImpl(repos.productRepo, repos.categoryRepo, repos.productVariantRepo, repos.inventoryRepo, repos.outletRepo, repos.productOutletPriceRepo),
|
||||||
productVariantProcessor: processor.NewProductVariantProcessorImpl(repos.productVariantRepo, repos.productRepo),
|
productVariantProcessor: processor.NewProductVariantProcessorImpl(repos.productVariantRepo, repos.productRepo),
|
||||||
inventoryProcessor: processor.NewInventoryProcessorImpl(repos.inventoryRepo, repos.productRepo, repos.outletRepo, repos.ingredientRepo, repos.inventoryMovementRepo),
|
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),
|
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),
|
||||||
paymentMethodProcessor: processor.NewPaymentMethodProcessorImpl(repos.paymentMethodRepo),
|
paymentMethodProcessor: processor.NewPaymentMethodProcessorImpl(repos.paymentMethodRepo),
|
||||||
fileProcessor: processor.NewFileProcessorImpl(repos.fileRepo, fileClient),
|
fileProcessor: processor.NewFileProcessorImpl(repos.fileRepo, fileClient),
|
||||||
customerProcessor: processor.NewCustomerProcessor(repos.customerRepo),
|
customerProcessor: processor.NewCustomerProcessor(repos.customerRepo),
|
||||||
@@ -376,6 +382,7 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
|
|||||||
inventoryMovementService: inventoryMovementService,
|
inventoryMovementService: inventoryMovementService,
|
||||||
userDeviceProcessor: processor.NewUserDeviceProcessorImpl(repos.userDeviceRepo),
|
userDeviceProcessor: processor.NewUserDeviceProcessorImpl(repos.userDeviceRepo),
|
||||||
notificationProcessor: buildNotificationProcessor(cfg, repos),
|
notificationProcessor: buildNotificationProcessor(cfg, repos),
|
||||||
|
productOutletPriceProcessor: processor.NewProductOutletPriceProcessorImpl(repos.productOutletPriceRepo, repos.productRepo, repos.outletRepo),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -414,6 +421,7 @@ type services struct {
|
|||||||
spinGameService service.SpinGameService
|
spinGameService service.SpinGameService
|
||||||
userDeviceService service.UserDeviceService
|
userDeviceService service.UserDeviceService
|
||||||
notificationService service.NotificationService
|
notificationService service.NotificationService
|
||||||
|
productOutletPriceService service.ProductOutletPriceService
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) initServices(processors *processors, repos *repositories, cfg *config.Config) *services {
|
func (a *App) initServices(processors *processors, repos *repositories, cfg *config.Config) *services {
|
||||||
@@ -490,6 +498,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
|
|||||||
spinGameService: spinGameService,
|
spinGameService: spinGameService,
|
||||||
userDeviceService: userDeviceService,
|
userDeviceService: userDeviceService,
|
||||||
notificationService: notificationService,
|
notificationService: notificationService,
|
||||||
|
productOutletPriceService: service.NewProductOutletPriceService(processors.productOutletPriceProcessor),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -531,6 +540,7 @@ type validators struct {
|
|||||||
customerAuthValidator validator.CustomerAuthValidator
|
customerAuthValidator validator.CustomerAuthValidator
|
||||||
userDeviceValidator *validator.UserDeviceValidatorImpl
|
userDeviceValidator *validator.UserDeviceValidatorImpl
|
||||||
notificationValidator *validator.NotificationValidatorImpl
|
notificationValidator *validator.NotificationValidatorImpl
|
||||||
|
productOutletPriceValidator *validator.ProductOutletPriceValidatorImpl
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) initValidators() *validators {
|
func (a *App) initValidators() *validators {
|
||||||
@@ -560,6 +570,7 @@ func (a *App) initValidators() *validators {
|
|||||||
customerAuthValidator: validator.NewCustomerAuthValidator(),
|
customerAuthValidator: validator.NewCustomerAuthValidator(),
|
||||||
userDeviceValidator: validator.NewUserDeviceValidator(),
|
userDeviceValidator: validator.NewUserDeviceValidator(),
|
||||||
notificationValidator: validator.NewNotificationValidator(),
|
notificationValidator: validator.NewNotificationValidator(),
|
||||||
|
productOutletPriceValidator: validator.NewProductOutletPriceValidator(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+16
-15
@@ -44,21 +44,22 @@ const (
|
|||||||
IngredientCompositionServiceEntity = "ingredient_composition_service"
|
IngredientCompositionServiceEntity = "ingredient_composition_service"
|
||||||
TableEntity = "table"
|
TableEntity = "table"
|
||||||
// Gamification entities
|
// Gamification entities
|
||||||
CustomerPointsEntity = "customer_points"
|
CustomerPointsEntity = "customer_points"
|
||||||
CustomerTokensEntity = "customer_tokens"
|
CustomerTokensEntity = "customer_tokens"
|
||||||
TierEntity = "tier"
|
TierEntity = "tier"
|
||||||
GameEntity = "game"
|
GameEntity = "game"
|
||||||
GamePrizeEntity = "game_prize"
|
GamePrizeEntity = "game_prize"
|
||||||
GamePlayEntity = "game_play"
|
GamePlayEntity = "game_play"
|
||||||
OmsetTrackerEntity = "omset_tracker"
|
OmsetTrackerEntity = "omset_tracker"
|
||||||
RewardEntity = "reward"
|
RewardEntity = "reward"
|
||||||
CampaignEntity = "campaign"
|
CampaignEntity = "campaign"
|
||||||
CampaignRuleEntity = "campaign_rule"
|
CampaignRuleEntity = "campaign_rule"
|
||||||
CustomerEntity = "customer"
|
CustomerEntity = "customer"
|
||||||
SpinGameHandlerEntity = "spin_game_handler"
|
SpinGameHandlerEntity = "spin_game_handler"
|
||||||
UserDeviceServiceEntity = "user_device_service"
|
UserDeviceServiceEntity = "user_device_service"
|
||||||
NotificationServiceEntity = "notification_service"
|
NotificationServiceEntity = "notification_service"
|
||||||
NotificationHandlerEntity = "notification_handler"
|
NotificationHandlerEntity = "notification_handler"
|
||||||
|
ProductOutletPriceServiceEntity = "product_outlet_price_service"
|
||||||
)
|
)
|
||||||
|
|
||||||
var HttpErrorMap = map[string]int{
|
var HttpErrorMap = map[string]int{
|
||||||
|
|||||||
@@ -83,6 +83,63 @@ type SalesAnalyticsData struct {
|
|||||||
NetSales float64 `json:"net_sales"`
|
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
|
// ProductAnalyticsRequest represents the request for product analytics
|
||||||
type ProductAnalyticsRequest struct {
|
type ProductAnalyticsRequest struct {
|
||||||
OrganizationID uuid.UUID
|
OrganizationID uuid.UUID
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ type CreateCategoryRequest struct {
|
|||||||
Name string `json:"name" validate:"required,min=1,max=255"`
|
Name string `json:"name" validate:"required,min=1,max=255"`
|
||||||
Description *string `json:"description,omitempty"`
|
Description *string `json:"description,omitempty"`
|
||||||
BusinessType *string `json:"business_type,omitempty"`
|
BusinessType *string `json:"business_type,omitempty"`
|
||||||
Order *int `json:"order,omitempty"`
|
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
||||||
|
Order *int `json:"order,omitempty"`
|
||||||
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18,12 +19,14 @@ type UpdateCategoryRequest struct {
|
|||||||
Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
|
Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
|
||||||
Description *string `json:"description,omitempty"`
|
Description *string `json:"description,omitempty"`
|
||||||
BusinessType *string `json:"business_type,omitempty"`
|
BusinessType *string `json:"business_type,omitempty"`
|
||||||
Order *int `json:"order,omitempty"`
|
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
||||||
|
Order *int `json:"order,omitempty"`
|
||||||
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ListCategoriesRequest struct {
|
type ListCategoriesRequest struct {
|
||||||
OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
|
OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
|
||||||
|
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
||||||
BusinessType string `json:"business_type,omitempty"`
|
BusinessType string `json:"business_type,omitempty"`
|
||||||
Search string `json:"search,omitempty"`
|
Search string `json:"search,omitempty"`
|
||||||
Page int `json:"page" validate:"required,min=1"`
|
Page int `json:"page" validate:"required,min=1"`
|
||||||
@@ -34,10 +37,11 @@ type ListCategoriesRequest struct {
|
|||||||
type CategoryResponse struct {
|
type CategoryResponse struct {
|
||||||
ID uuid.UUID `json:"id"`
|
ID uuid.UUID `json:"id"`
|
||||||
OrganizationID uuid.UUID `json:"organization_id"`
|
OrganizationID uuid.UUID `json:"organization_id"`
|
||||||
|
OutletID *uuid.UUID `json:"outlet_id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Description *string `json:"description"`
|
Description *string `json:"description"`
|
||||||
BusinessType string `json:"business_type"`
|
BusinessType string `json:"business_type"`
|
||||||
Order int `json:"order"`
|
Order int `json:"order"`
|
||||||
Metadata map[string]interface{} `json:"metadata"`
|
Metadata map[string]interface{} `json:"metadata"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
|||||||
@@ -98,6 +98,8 @@ type OrderItemResponse struct {
|
|||||||
ProductName string `json:"product_name"`
|
ProductName string `json:"product_name"`
|
||||||
ProductVariantID *uuid.UUID `json:"product_variant_id"`
|
ProductVariantID *uuid.UUID `json:"product_variant_id"`
|
||||||
ProductVariantName *string `json:"product_variant_name,omitempty"`
|
ProductVariantName *string `json:"product_variant_name,omitempty"`
|
||||||
|
CategoryID *uuid.UUID `json:"category_id,omitempty"`
|
||||||
|
CategoryName *string `json:"category_name,omitempty"`
|
||||||
Quantity int `json:"quantity"`
|
Quantity int `json:"quantity"`
|
||||||
UnitPrice float64 `json:"unit_price"`
|
UnitPrice float64 `json:"unit_price"`
|
||||||
TotalPrice float64 `json:"total_price"`
|
TotalPrice float64 `json:"total_price"`
|
||||||
@@ -108,6 +110,7 @@ type OrderItemResponse struct {
|
|||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
PrinterType string `json:"printer_type"`
|
PrinterType string `json:"printer_type"`
|
||||||
|
PrintToChecker bool `json:"print_to_checker"`
|
||||||
PaidQuantity int `json:"paid_quantity"`
|
PaidQuantity int `json:"paid_quantity"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
|
|
||||||
type CreateProductRequest struct {
|
type CreateProductRequest struct {
|
||||||
CategoryID uuid.UUID `json:"category_id" validate:"required"`
|
CategoryID uuid.UUID `json:"category_id" validate:"required"`
|
||||||
|
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
||||||
SKU *string `json:"sku,omitempty"`
|
SKU *string `json:"sku,omitempty"`
|
||||||
Name string `json:"name" validate:"required,min=1,max=255"`
|
Name string `json:"name" validate:"required,min=1,max=255"`
|
||||||
Description *string `json:"description,omitempty"`
|
Description *string `json:"description,omitempty"`
|
||||||
@@ -16,28 +17,30 @@ type CreateProductRequest struct {
|
|||||||
BusinessType *string `json:"business_type,omitempty"`
|
BusinessType *string `json:"business_type,omitempty"`
|
||||||
ImageURL *string `json:"image_url,omitempty" validate:"omitempty,max=500"`
|
ImageURL *string `json:"image_url,omitempty" validate:"omitempty,max=500"`
|
||||||
PrinterType *string `json:"printer_type,omitempty" validate:"omitempty,max=50"`
|
PrinterType *string `json:"printer_type,omitempty" validate:"omitempty,max=50"`
|
||||||
|
PrintToChecker *bool `json:"print_to_checker,omitempty"`
|
||||||
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
||||||
IsActive *bool `json:"is_active,omitempty"`
|
IsActive *bool `json:"is_active,omitempty"`
|
||||||
Variants []CreateProductVariantRequest `json:"variants,omitempty"`
|
Variants []CreateProductVariantRequest `json:"variants,omitempty"`
|
||||||
InitialStock *int `json:"initial_stock,omitempty" validate:"omitempty,min=0"` // Initial stock quantity for all outlets
|
InitialStock *int `json:"initial_stock,omitempty" validate:"omitempty,min=0"`
|
||||||
ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Reorder level for all outlets
|
ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
|
||||||
CreateInventory bool `json:"create_inventory,omitempty"` // Whether to create inventory records for all outlets
|
CreateInventory bool `json:"create_inventory,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateProductRequest struct {
|
type UpdateProductRequest struct {
|
||||||
CategoryID *uuid.UUID `json:"category_id,omitempty"`
|
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
||||||
SKU *string `json:"sku,omitempty"`
|
CategoryID *uuid.UUID `json:"category_id,omitempty"`
|
||||||
Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
|
SKU *string `json:"sku,omitempty"`
|
||||||
Description *string `json:"description,omitempty"`
|
Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
|
||||||
Price *float64 `json:"price,omitempty" validate:"omitempty,min=0"`
|
Description *string `json:"description,omitempty"`
|
||||||
Cost *float64 `json:"cost,omitempty" validate:"omitempty,min=0"`
|
Price *float64 `json:"price,omitempty" validate:"omitempty,min=0"`
|
||||||
BusinessType *string `json:"business_type,omitempty"`
|
Cost *float64 `json:"cost,omitempty" validate:"omitempty,min=0"`
|
||||||
ImageURL *string `json:"image_url,omitempty" validate:"omitempty,max=500"`
|
BusinessType *string `json:"business_type,omitempty"`
|
||||||
PrinterType *string `json:"printer_type,omitempty" validate:"omitempty,max=50"`
|
ImageURL *string `json:"image_url,omitempty" validate:"omitempty,max=500"`
|
||||||
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
PrinterType *string `json:"printer_type,omitempty" validate:"omitempty,max=50"`
|
||||||
IsActive *bool `json:"is_active,omitempty"`
|
PrintToChecker *bool `json:"print_to_checker,omitempty"`
|
||||||
// Stock management fields
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
||||||
ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Update reorder level for all existing inventory records
|
IsActive *bool `json:"is_active,omitempty"`
|
||||||
|
ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type CreateProductVariantRequest struct {
|
type CreateProductVariantRequest struct {
|
||||||
@@ -56,24 +59,27 @@ type UpdateProductVariantRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type ProductResponse struct {
|
type ProductResponse struct {
|
||||||
ID uuid.UUID `json:"id"`
|
ID uuid.UUID `json:"id"`
|
||||||
OrganizationID uuid.UUID `json:"organization_id"`
|
OrganizationID uuid.UUID `json:"organization_id"`
|
||||||
CategoryID uuid.UUID `json:"category_id"`
|
CategoryID uuid.UUID `json:"category_id"`
|
||||||
CategoryName string `json:"category_name"`
|
CategoryName string `json:"category_name"`
|
||||||
SKU *string `json:"sku"`
|
SKU *string `json:"sku"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Description *string `json:"description"`
|
Description *string `json:"description"`
|
||||||
Price float64 `json:"price"`
|
Price float64 `json:"price"`
|
||||||
Cost float64 `json:"cost"`
|
OutletPrice *float64 `json:"outlet_price,omitempty"`
|
||||||
BusinessType string `json:"business_type"`
|
OutletPrices []ProductOutletPriceResponse `json:"outlet_prices,omitempty"`
|
||||||
ImageURL *string `json:"image_url"`
|
Cost float64 `json:"cost"`
|
||||||
PrinterType string `json:"printer_type"`
|
BusinessType string `json:"business_type"`
|
||||||
Metadata map[string]interface{} `json:"metadata"`
|
ImageURL *string `json:"image_url"`
|
||||||
IsActive bool `json:"is_active"`
|
PrinterType string `json:"printer_type"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
PrintToChecker bool `json:"print_to_checker"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
Metadata map[string]interface{} `json:"metadata"`
|
||||||
Category *CategoryResponse `json:"category,omitempty"`
|
IsActive bool `json:"is_active"`
|
||||||
Variants []ProductVariantResponse `json:"variants,omitempty"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
Category *CategoryResponse `json:"category,omitempty"`
|
||||||
|
Variants []ProductVariantResponse `json:"variants,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductVariantResponse struct {
|
type ProductVariantResponse struct {
|
||||||
@@ -89,6 +95,7 @@ type ProductVariantResponse struct {
|
|||||||
|
|
||||||
type ListProductsRequest struct {
|
type ListProductsRequest struct {
|
||||||
OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
|
OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
|
||||||
|
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
||||||
CategoryID *uuid.UUID `json:"category_id,omitempty"`
|
CategoryID *uuid.UUID `json:"category_id,omitempty"`
|
||||||
BusinessType string `json:"business_type,omitempty"`
|
BusinessType string `json:"business_type,omitempty"`
|
||||||
IsActive *bool `json:"is_active,omitempty"`
|
IsActive *bool `json:"is_active,omitempty"`
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
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"`
|
||||||
|
}
|
||||||
@@ -27,6 +27,51 @@ type SalesAnalytics struct {
|
|||||||
NetSales float64 `json:"net_sales"`
|
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 {
|
type ProductAnalytics struct {
|
||||||
ProductID uuid.UUID `json:"product_id"`
|
ProductID uuid.UUID `json:"product_id"`
|
||||||
ProductName string `json:"product_name"`
|
ProductName string `json:"product_name"`
|
||||||
|
|||||||
@@ -31,15 +31,16 @@ func (m *Metadata) Scan(value interface{}) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Category struct {
|
type Category struct {
|
||||||
ID uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
|
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"`
|
OrganizationID uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
|
||||||
Name string `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
|
OutletID *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id"`
|
||||||
Description *string `gorm:"type:text" json:"description"`
|
Name string `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
|
||||||
Order int `gorm:"default:0" json:"order"`
|
Description *string `gorm:"type:text" json:"description"`
|
||||||
BusinessType string `gorm:"size:50;default:'restaurant'" json:"business_type"`
|
Order int `gorm:"default:0" json:"order"`
|
||||||
Metadata Metadata `gorm:"type:jsonb;default:'{}'" json:"metadata"`
|
BusinessType string `gorm:"size:50;default:'restaurant'" json:"business_type"`
|
||||||
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
Metadata Metadata `gorm:"type:jsonb;default:'{}'" json:"metadata"`
|
||||||
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
||||||
|
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
||||||
|
|
||||||
Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
|
Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
|
||||||
Products []Product `gorm:"foreignKey:CategoryID" json:"products,omitempty"`
|
Products []Product `gorm:"foreignKey:CategoryID" json:"products,omitempty"`
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ func GetAllEntities() []interface{} {
|
|||||||
&Notification{},
|
&Notification{},
|
||||||
&NotificationReceiver{},
|
&NotificationReceiver{},
|
||||||
&NotificationDelivery{},
|
&NotificationDelivery{},
|
||||||
|
&ProductOutletPrice{},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,13 +26,14 @@ type Product struct {
|
|||||||
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
||||||
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
||||||
|
|
||||||
Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
|
Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
|
||||||
Category Category `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
|
Category Category `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
|
||||||
Unit *Unit `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
|
Unit *Unit `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
|
||||||
ProductVariants []ProductVariant `gorm:"foreignKey:ProductID" json:"variants,omitempty"`
|
ProductVariants []ProductVariant `gorm:"foreignKey:ProductID" json:"variants,omitempty"`
|
||||||
ProductRecipes []ProductRecipe `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
|
ProductRecipes []ProductRecipe `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
|
||||||
Inventory []Inventory `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
|
Inventory []Inventory `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
|
||||||
OrderItems []OrderItem `gorm:"foreignKey:ProductID" json:"order_items,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 {
|
func (p *Product) BeforeCreate(tx *gorm.DB) error {
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
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"
|
||||||
|
}
|
||||||
@@ -85,6 +85,30 @@ func (h *AnalyticsHandler) GetSalesAnalytics(c *gin.Context) {
|
|||||||
util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetSalesAnalytics")
|
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) {
|
func (h *AnalyticsHandler) GetProductAnalytics(c *gin.Context) {
|
||||||
ctx := c.Request.Context()
|
ctx := c.Request.Context()
|
||||||
contextInfo := appcontext.FromGinContext(ctx)
|
contextInfo := appcontext.FromGinContext(ctx)
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ func (h *CategoryHandler) CreateCategory(c *gin.Context) {
|
|||||||
contextInfo := appcontext.FromGinContext(ctx)
|
contextInfo := appcontext.FromGinContext(ctx)
|
||||||
|
|
||||||
var req contract.CreateCategoryRequest
|
var req contract.CreateCategoryRequest
|
||||||
fmt.Printf("CategoryHandler::CreateCategory -> Request: %+v\n", req)
|
fmt.Printf("CategoryHandler::CreateCategory -> Request: %+v\n", req)
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
logger.FromContext(c.Request.Context()).WithError(err).Error("CategoryHandler::CreateCategory -> request binding failed")
|
logger.FromContext(c.Request.Context()).WithError(err).Error("CategoryHandler::CreateCategory -> request binding failed")
|
||||||
validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
|
validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
|
||||||
@@ -44,6 +44,11 @@ func (h *CategoryHandler) CreateCategory(c *gin.Context) {
|
|||||||
return
|
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)
|
validationError, validationErrorCode := h.categoryValidator.ValidateCreateCategoryRequest(&req)
|
||||||
if validationError != nil {
|
if validationError != nil {
|
||||||
validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
|
validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
|
||||||
@@ -149,6 +154,11 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
|
|||||||
OrganizationID: &contextInfo.OrganizationID,
|
OrganizationID: &contextInfo.OrganizationID,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Inject outlet_id from context if user has one
|
||||||
|
if contextInfo.OutletID != uuid.Nil {
|
||||||
|
req.OutletID = &contextInfo.OutletID
|
||||||
|
}
|
||||||
|
|
||||||
// Parse query parameters
|
// Parse query parameters
|
||||||
if pageStr := c.Query("page"); pageStr != "" {
|
if pageStr := c.Query("page"); pageStr != "" {
|
||||||
if page, err := strconv.Atoi(pageStr); err == nil {
|
if page, err := strconv.Atoi(pageStr); err == nil {
|
||||||
@@ -176,6 +186,11 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
|
||||||
|
if outletID, err := uuid.Parse(outletIDStr); err == nil {
|
||||||
|
req.OutletID = &outletID
|
||||||
|
}
|
||||||
|
}
|
||||||
validationError, validationErrorCode := h.categoryValidator.ValidateListCategoriesRequest(req)
|
validationError, validationErrorCode := h.categoryValidator.ValidateListCategoriesRequest(req)
|
||||||
if validationError != nil {
|
if validationError != nil {
|
||||||
logger.FromContext(ctx).WithError(validationError).Error("CategoryHandler::ListCategories -> request validation failed")
|
logger.FromContext(ctx).WithError(validationError).Error("CategoryHandler::ListCategories -> request validation failed")
|
||||||
|
|||||||
@@ -137,6 +137,10 @@ func (h *OrderHandler) ListOrders(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
modelReq.OrganizationID = &contextInfo.OrganizationID
|
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)
|
response, err := h.orderService.ListOrders(c.Request.Context(), modelReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "OrderHandler::ListOrders", err.Error())}), "OrderHandler::ListOrders")
|
util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "OrderHandler::ListOrders", err.Error())}), "OrderHandler::ListOrders")
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ func (h *ProductHandler) CreateProduct(c *gin.Context) {
|
|||||||
|
|
||||||
func (h *ProductHandler) UpdateProduct(c *gin.Context) {
|
func (h *ProductHandler) UpdateProduct(c *gin.Context) {
|
||||||
ctx := c.Request.Context()
|
ctx := c.Request.Context()
|
||||||
|
contextInfo := appcontext.FromGinContext(ctx)
|
||||||
|
|
||||||
productIDStr := c.Param("id")
|
productIDStr := c.Param("id")
|
||||||
productID, err := uuid.Parse(productIDStr)
|
productID, err := uuid.Parse(productIDStr)
|
||||||
@@ -85,7 +86,7 @@ func (h *ProductHandler) UpdateProduct(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
productResponse := h.productService.UpdateProduct(ctx, productID, &req)
|
productResponse := h.productService.UpdateProduct(ctx, contextInfo, productID, &req)
|
||||||
if productResponse.HasErrors() {
|
if productResponse.HasErrors() {
|
||||||
errorResp := productResponse.GetErrors()[0]
|
errorResp := productResponse.GetErrors()[0]
|
||||||
logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::UpdateProduct -> Failed to update product from service")
|
logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::UpdateProduct -> Failed to update product from service")
|
||||||
@@ -117,6 +118,7 @@ func (h *ProductHandler) DeleteProduct(c *gin.Context) {
|
|||||||
|
|
||||||
func (h *ProductHandler) GetProduct(c *gin.Context) {
|
func (h *ProductHandler) GetProduct(c *gin.Context) {
|
||||||
ctx := c.Request.Context()
|
ctx := c.Request.Context()
|
||||||
|
contextInfo := appcontext.FromGinContext(ctx)
|
||||||
|
|
||||||
productIDStr := c.Param("id")
|
productIDStr := c.Param("id")
|
||||||
productID, err := uuid.Parse(productIDStr)
|
productID, err := uuid.Parse(productIDStr)
|
||||||
@@ -127,7 +129,7 @@ func (h *ProductHandler) GetProduct(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
productResponse := h.productService.GetProductByID(ctx, productID)
|
productResponse := h.productService.GetProductByID(ctx, productID, contextInfo.OutletID)
|
||||||
if productResponse.HasErrors() {
|
if productResponse.HasErrors() {
|
||||||
errorResp := productResponse.GetErrors()[0]
|
errorResp := productResponse.GetErrors()[0]
|
||||||
logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::GetProduct -> Failed to get product from service")
|
logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::GetProduct -> Failed to get product from service")
|
||||||
@@ -184,6 +186,97 @@ func (h *ProductHandler) ListProducts(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 != "" {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if minPriceStr := c.Query("min_price"); minPriceStr != "" {
|
if minPriceStr := c.Query("min_price"); minPriceStr != "" {
|
||||||
if minPrice, err := strconv.ParseFloat(minPriceStr, 64); err == nil {
|
if minPrice, err := strconv.ParseFloat(minPriceStr, 64); err == nil {
|
||||||
req.MinPrice = &minPrice
|
req.MinPrice = &minPrice
|
||||||
|
|||||||
@@ -0,0 +1,135 @@
|
|||||||
|
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")
|
||||||
|
}
|
||||||
@@ -21,14 +21,15 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type SelfOrderHandler struct {
|
type SelfOrderHandler struct {
|
||||||
orderService service.OrderService
|
orderService service.OrderService
|
||||||
categoryService service.CategoryService
|
categoryService service.CategoryService
|
||||||
productService service.ProductService
|
productService service.ProductService
|
||||||
tableRepo repository.TableRepositoryInterface
|
tableRepo repository.TableRepositoryInterface
|
||||||
outletRepo processor.OutletRepository
|
outletRepo processor.OutletRepository
|
||||||
userRepo processor.UserRepository
|
userRepo processor.UserRepository
|
||||||
sessionRepo repository.SessionRepository
|
sessionRepo repository.SessionRepository
|
||||||
orderRepo repository.OrderRepository
|
orderRepo repository.OrderRepository
|
||||||
|
productOutletPriceService service.ProductOutletPriceService
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSelfOrderHandler(
|
func NewSelfOrderHandler(
|
||||||
@@ -40,16 +41,18 @@ func NewSelfOrderHandler(
|
|||||||
userRepo processor.UserRepository,
|
userRepo processor.UserRepository,
|
||||||
sessionRepo repository.SessionRepository,
|
sessionRepo repository.SessionRepository,
|
||||||
orderRepo repository.OrderRepository,
|
orderRepo repository.OrderRepository,
|
||||||
|
productOutletPriceService service.ProductOutletPriceService,
|
||||||
) *SelfOrderHandler {
|
) *SelfOrderHandler {
|
||||||
return &SelfOrderHandler{
|
return &SelfOrderHandler{
|
||||||
orderService: orderService,
|
orderService: orderService,
|
||||||
categoryService: categoryService,
|
categoryService: categoryService,
|
||||||
productService: productService,
|
productService: productService,
|
||||||
tableRepo: tableRepo,
|
tableRepo: tableRepo,
|
||||||
outletRepo: outletRepo,
|
outletRepo: outletRepo,
|
||||||
userRepo: userRepo,
|
userRepo: userRepo,
|
||||||
sessionRepo: sessionRepo,
|
sessionRepo: sessionRepo,
|
||||||
orderRepo: orderRepo,
|
orderRepo: orderRepo,
|
||||||
|
productOutletPriceService: productOutletPriceService,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,16 +219,29 @@ func (h *SelfOrderHandler) GetMenu(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
menu := h.buildMenuResponse(outlet, table, catList.Categories, prodList.Products)
|
menu := h.buildMenuResponse(ctx, outlet, table, catList.Categories, prodList.Products)
|
||||||
util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(menu), "SelfOrderHandler::GetMenu")
|
util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(menu), "SelfOrderHandler::GetMenu")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *SelfOrderHandler) buildMenuResponse(
|
func (h *SelfOrderHandler) buildMenuResponse(
|
||||||
|
ctx context.Context,
|
||||||
outlet *entities.Outlet,
|
outlet *entities.Outlet,
|
||||||
table *entities.Table,
|
table *entities.Table,
|
||||||
categories []contract.CategoryResponse,
|
categories []contract.CategoryResponse,
|
||||||
products []contract.ProductResponse,
|
products []contract.ProductResponse,
|
||||||
) *contract.SelfOrderMenuResponse {
|
) *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)
|
productMap := make(map[uuid.UUID][]contract.ProductResponse)
|
||||||
for _, p := range products {
|
for _, p := range products {
|
||||||
productMap[p.CategoryID] = append(productMap[p.CategoryID], p)
|
productMap[p.CategoryID] = append(productMap[p.CategoryID], p)
|
||||||
@@ -236,11 +252,15 @@ func (h *SelfOrderHandler) buildMenuResponse(
|
|||||||
menuItems := make([]contract.SelfOrderMenuItem, 0)
|
menuItems := make([]contract.SelfOrderMenuItem, 0)
|
||||||
if prods, ok := productMap[cat.ID]; ok {
|
if prods, ok := productMap[cat.ID]; ok {
|
||||||
for _, p := range prods {
|
for _, p := range prods {
|
||||||
|
price := p.Price
|
||||||
|
if outletPrice, exists := outletPriceMap[p.ID]; exists {
|
||||||
|
price = outletPrice
|
||||||
|
}
|
||||||
item := contract.SelfOrderMenuItem{
|
item := contract.SelfOrderMenuItem{
|
||||||
ID: p.ID,
|
ID: p.ID,
|
||||||
Name: p.Name,
|
Name: p.Name,
|
||||||
Description: p.Description,
|
Description: p.Description,
|
||||||
Price: p.Price,
|
Price: price,
|
||||||
ImageURL: p.ImageURL,
|
ImageURL: p.ImageURL,
|
||||||
}
|
}
|
||||||
for _, v := range p.Variants {
|
for _, v := range p.Variants {
|
||||||
|
|||||||
@@ -150,6 +150,11 @@ func (h *TableHandler) List(c *gin.Context) {
|
|||||||
Limit: 100,
|
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 pageStr := c.Query("page"); pageStr != "" {
|
||||||
if page, err := strconv.Atoi(pageStr); err == nil && page > 0 {
|
if page, err := strconv.Atoi(pageStr); err == nil && page > 0 {
|
||||||
query.Page = page
|
query.Page = page
|
||||||
|
|||||||
@@ -13,11 +13,12 @@ func CategoryEntityToModel(entity *entities.Category) *models.Category {
|
|||||||
return &models.Category{
|
return &models.Category{
|
||||||
ID: entity.ID,
|
ID: entity.ID,
|
||||||
OrganizationID: entity.OrganizationID,
|
OrganizationID: entity.OrganizationID,
|
||||||
|
OutletID: entity.OutletID,
|
||||||
Name: entity.Name,
|
Name: entity.Name,
|
||||||
Description: entity.Description,
|
Description: entity.Description,
|
||||||
ImageURL: nil, // Entity doesn't have ImageURL, model does
|
ImageURL: nil,
|
||||||
Order: entity.Order, // Entity doesn't have SortOrder, model does
|
Order: entity.Order,
|
||||||
IsActive: true, // Entity doesn't have IsActive, default to true
|
IsActive: true,
|
||||||
CreatedAt: entity.CreatedAt,
|
CreatedAt: entity.CreatedAt,
|
||||||
UpdatedAt: entity.UpdatedAt,
|
UpdatedAt: entity.UpdatedAt,
|
||||||
}
|
}
|
||||||
@@ -32,14 +33,14 @@ func CategoryModelToEntity(model *models.Category) *entities.Category {
|
|||||||
if model.ImageURL != nil {
|
if model.ImageURL != nil {
|
||||||
metadata["image_url"] = *model.ImageURL
|
metadata["image_url"] = *model.ImageURL
|
||||||
}
|
}
|
||||||
// metadata["sort_order"] = model.SortOrder
|
|
||||||
|
|
||||||
return &entities.Category{
|
return &entities.Category{
|
||||||
ID: model.ID,
|
ID: model.ID,
|
||||||
OrganizationID: model.OrganizationID,
|
OrganizationID: model.OrganizationID,
|
||||||
|
OutletID: model.OutletID,
|
||||||
Name: model.Name,
|
Name: model.Name,
|
||||||
Description: model.Description,
|
Description: model.Description,
|
||||||
BusinessType: "restaurant", // Default business type
|
BusinessType: "restaurant",
|
||||||
Order: model.Order,
|
Order: model.Order,
|
||||||
Metadata: metadata,
|
Metadata: metadata,
|
||||||
CreatedAt: model.CreatedAt,
|
CreatedAt: model.CreatedAt,
|
||||||
@@ -56,14 +57,14 @@ func CreateCategoryRequestToEntity(req *models.CreateCategoryRequest) *entities.
|
|||||||
if req.ImageURL != nil {
|
if req.ImageURL != nil {
|
||||||
metadata["image_url"] = *req.ImageURL
|
metadata["image_url"] = *req.ImageURL
|
||||||
}
|
}
|
||||||
// metadata["sort_order"] = req.SortOrder
|
|
||||||
|
|
||||||
return &entities.Category{
|
return &entities.Category{
|
||||||
OrganizationID: req.OrganizationID,
|
OrganizationID: req.OrganizationID,
|
||||||
|
OutletID: req.OutletID,
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Description: req.Description,
|
Description: req.Description,
|
||||||
Order: req.Order,
|
Order: req.Order,
|
||||||
BusinessType: "restaurant", // Default business type
|
BusinessType: "restaurant",
|
||||||
Metadata: metadata,
|
Metadata: metadata,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -87,11 +88,12 @@ func CategoryEntityToResponse(entity *entities.Category) *models.CategoryRespons
|
|||||||
return &models.CategoryResponse{
|
return &models.CategoryResponse{
|
||||||
ID: entity.ID,
|
ID: entity.ID,
|
||||||
OrganizationID: entity.OrganizationID,
|
OrganizationID: entity.OrganizationID,
|
||||||
|
OutletID: entity.OutletID,
|
||||||
Name: entity.Name,
|
Name: entity.Name,
|
||||||
Description: entity.Description,
|
Description: entity.Description,
|
||||||
ImageURL: imageURL,
|
ImageURL: imageURL,
|
||||||
Order: entity.Order,
|
Order: entity.Order,
|
||||||
IsActive: true, // Default to true since entity doesn't have this field
|
IsActive: true,
|
||||||
CreatedAt: entity.CreatedAt,
|
CreatedAt: entity.CreatedAt,
|
||||||
UpdatedAt: entity.UpdatedAt,
|
UpdatedAt: entity.UpdatedAt,
|
||||||
}
|
}
|
||||||
@@ -121,6 +123,10 @@ func UpdateCategoryEntityFromRequest(entity *entities.Category, req *models.Upda
|
|||||||
if req.Order != nil {
|
if req.Order != nil {
|
||||||
entity.Order = *req.Order
|
entity.Order = *req.Order
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if req.OutletID != nil {
|
||||||
|
entity.OutletID = req.OutletID
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func CategoryEntitiesToModels(entities []*entities.Category) []*models.Category {
|
func CategoryEntitiesToModels(entities []*entities.Category) []*models.Category {
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for i, item := range order.OrderItems {
|
for i, item := range order.OrderItems {
|
||||||
resp := OrderItemEntityToResponse(&item)
|
resp := OrderItemEntityToResponse(&item, order.OutletID)
|
||||||
if resp != nil {
|
if resp != nil {
|
||||||
resp.PaidQuantity = paidQtyByOrderItem[item.ID]
|
resp.PaidQuantity = paidQtyByOrderItem[item.ID]
|
||||||
response.OrderItems[i] = *resp
|
response.OrderItems[i] = *resp
|
||||||
@@ -101,11 +101,20 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
|
|||||||
return response
|
return response
|
||||||
}
|
}
|
||||||
|
|
||||||
func OrderItemEntityToResponse(item *entities.OrderItem) *models.OrderItemResponse {
|
func OrderItemEntityToResponse(item *entities.OrderItem, outletID uuid.UUID) *models.OrderItemResponse {
|
||||||
if item == nil {
|
if item == nil {
|
||||||
return 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{
|
response := &models.OrderItemResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
OrderID: item.OrderID,
|
OrderID: item.OrderID,
|
||||||
@@ -130,10 +139,19 @@ func OrderItemEntityToResponse(item *entities.OrderItem) *models.OrderItemRespon
|
|||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
PrinterType: item.Product.PrinterType,
|
PrinterType: item.Product.PrinterType,
|
||||||
|
PrintToChecker: printToChecker,
|
||||||
}
|
}
|
||||||
|
|
||||||
if item.Product.ID != uuid.Nil {
|
if item.Product.ID != uuid.Nil {
|
||||||
response.ProductName = item.Product.Name
|
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 {
|
if item.ProductVariant != nil {
|
||||||
@@ -316,14 +334,14 @@ func OrderEntitiesToResponses(orders []*entities.Order) []models.OrderResponse {
|
|||||||
return responses
|
return responses
|
||||||
}
|
}
|
||||||
|
|
||||||
func OrderItemEntitiesToResponses(items []*entities.OrderItem) []models.OrderItemResponse {
|
func OrderItemEntitiesToResponses(items []*entities.OrderItem, outletID uuid.UUID) []models.OrderItemResponse {
|
||||||
if items == nil {
|
if items == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
responses := make([]models.OrderItemResponse, len(items))
|
responses := make([]models.OrderItemResponse, len(items))
|
||||||
for i, item := range items {
|
for i, item := range items {
|
||||||
response := OrderItemEntityToResponse(item)
|
response := OrderItemEntityToResponse(item, outletID)
|
||||||
if response != nil {
|
if response != nil {
|
||||||
responses[i] = *response
|
responses[i] = *response
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ func TestOrderItemEntityToResponse_WithProductNames(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
result := OrderItemEntityToResponse(orderItem)
|
result := OrderItemEntityToResponse(orderItem, uuid.Nil)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
assert.NotNil(t, result)
|
assert.NotNil(t, result)
|
||||||
@@ -89,7 +89,7 @@ func TestOrderItemEntityToResponse_WithoutProductVariant(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
result := OrderItemEntityToResponse(orderItem)
|
result := OrderItemEntityToResponse(orderItem, uuid.Nil)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
assert.NotNil(t, result)
|
assert.NotNil(t, result)
|
||||||
@@ -129,7 +129,7 @@ func TestOrderItemEntityToResponse_WithoutProductPreload(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
result := OrderItemEntityToResponse(orderItem)
|
result := OrderItemEntityToResponse(orderItem, uuid.Nil)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
assert.NotNil(t, result)
|
assert.NotNil(t, result)
|
||||||
|
|||||||
@@ -135,6 +135,7 @@ func ProductEntityToResponse(entity *entities.Product) *models.ProductResponse {
|
|||||||
Name: entity.Name,
|
Name: entity.Name,
|
||||||
Description: entity.Description,
|
Description: entity.Description,
|
||||||
Price: entity.Price,
|
Price: entity.Price,
|
||||||
|
OutletPrice: nil, // populated by processor when outletID is available
|
||||||
Cost: entity.Cost,
|
Cost: entity.Cost,
|
||||||
BusinessType: constants.BusinessType(entity.BusinessType),
|
BusinessType: constants.BusinessType(entity.BusinessType),
|
||||||
ImageURL: entity.ImageURL,
|
ImageURL: entity.ImageURL,
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"apskel-pos-be/internal/service"
|
"apskel-pos-be/internal/service"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AuthMiddleware struct {
|
type AuthMiddleware struct {
|
||||||
@@ -45,9 +46,13 @@ func (m *AuthMiddleware) RequireAuth() gin.HandlerFunc {
|
|||||||
setKeyInContext(c, appcontext.OrganizationIDKey, userResponse.OrganizationID.String())
|
setKeyInContext(c, appcontext.OrganizationIDKey, userResponse.OrganizationID.String())
|
||||||
setKeyInContext(c, appcontext.UserIDKey, userResponse.ID.String())
|
setKeyInContext(c, appcontext.UserIDKey, userResponse.ID.String())
|
||||||
|
|
||||||
if userResponse.Role != "superadmin" {
|
// Always override OutletID from token to prevent header injection.
|
||||||
setKeyInContext(c, appcontext.OutletIDKey, userResponse.OutletID.String())
|
// Set empty string if user has no outlet, so PopulateContext header value is ignored.
|
||||||
|
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)
|
logger.FromContext(c.Request.Context()).Infof("AuthMiddleware::RequireAuth -> User authenticated: %s", userResponse.Email)
|
||||||
c.Next()
|
c.Next()
|
||||||
|
|||||||
@@ -87,6 +87,69 @@ type SalesAnalyticsData struct {
|
|||||||
NetSales float64 `json:"net_sales"`
|
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
|
// ProductAnalyticsRequest represents the request for product analytics
|
||||||
type ProductAnalyticsRequest struct {
|
type ProductAnalyticsRequest struct {
|
||||||
OrganizationID uuid.UUID `validate:"required"`
|
OrganizationID uuid.UUID `validate:"required"`
|
||||||
|
|||||||
@@ -9,10 +9,11 @@ import (
|
|||||||
type Category struct {
|
type Category struct {
|
||||||
ID uuid.UUID
|
ID uuid.UUID
|
||||||
OrganizationID uuid.UUID
|
OrganizationID uuid.UUID
|
||||||
|
OutletID *uuid.UUID
|
||||||
Name string
|
Name string
|
||||||
Description *string
|
Description *string
|
||||||
ImageURL *string
|
ImageURL *string
|
||||||
Order int
|
Order int
|
||||||
IsActive bool
|
IsActive bool
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
@@ -20,27 +21,30 @@ type Category struct {
|
|||||||
|
|
||||||
type CreateCategoryRequest struct {
|
type CreateCategoryRequest struct {
|
||||||
OrganizationID uuid.UUID `validate:"required"`
|
OrganizationID uuid.UUID `validate:"required"`
|
||||||
Name string `validate:"required,min=1,max=255"`
|
OutletID *uuid.UUID
|
||||||
Description *string `validate:"omitempty,max=1000"`
|
Name string `validate:"required,min=1,max=255"`
|
||||||
ImageURL *string `validate:"omitempty,url"`
|
Description *string `validate:"omitempty,max=1000"`
|
||||||
Order int `validate:"min=0"`
|
ImageURL *string `validate:"omitempty,url"`
|
||||||
|
Order int `validate:"min=0"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateCategoryRequest struct {
|
type UpdateCategoryRequest struct {
|
||||||
Name *string `validate:"omitempty,min=1,max=255"`
|
Name *string `validate:"omitempty,min=1,max=255"`
|
||||||
Description *string `validate:"omitempty,max=1000"`
|
Description *string `validate:"omitempty,max=1000"`
|
||||||
ImageURL *string `validate:"omitempty,url"`
|
ImageURL *string `validate:"omitempty,url"`
|
||||||
Order *int `validate:"omitempty,min=0"`
|
OutletID *uuid.UUID
|
||||||
|
Order *int `validate:"omitempty,min=0"`
|
||||||
IsActive *bool
|
IsActive *bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type CategoryResponse struct {
|
type CategoryResponse struct {
|
||||||
ID uuid.UUID
|
ID uuid.UUID
|
||||||
OrganizationID uuid.UUID
|
OrganizationID uuid.UUID
|
||||||
|
OutletID *uuid.UUID
|
||||||
Name string
|
Name string
|
||||||
Description *string
|
Description *string
|
||||||
ImageURL *string
|
ImageURL *string
|
||||||
Order int
|
Order int
|
||||||
IsActive bool
|
IsActive bool
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
|
|||||||
@@ -188,6 +188,8 @@ type OrderItemResponse struct {
|
|||||||
ProductName string
|
ProductName string
|
||||||
ProductVariantID *uuid.UUID
|
ProductVariantID *uuid.UUID
|
||||||
ProductVariantName *string
|
ProductVariantName *string
|
||||||
|
CategoryID *uuid.UUID
|
||||||
|
CategoryName *string
|
||||||
Quantity int
|
Quantity int
|
||||||
UnitPrice float64
|
UnitPrice float64
|
||||||
TotalPrice float64
|
TotalPrice float64
|
||||||
@@ -207,6 +209,7 @@ type OrderItemResponse struct {
|
|||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
PrinterType string
|
PrinterType string
|
||||||
|
PrintToChecker bool
|
||||||
PaidQuantity int
|
PaidQuantity int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ type ProductVariant struct {
|
|||||||
|
|
||||||
type CreateProductRequest struct {
|
type CreateProductRequest struct {
|
||||||
OrganizationID uuid.UUID `validate:"required"`
|
OrganizationID uuid.UUID `validate:"required"`
|
||||||
|
OutletID uuid.UUID `validate:"omitempty"` // If set, upsert product_outlet_prices on create
|
||||||
CategoryID uuid.UUID `validate:"required"`
|
CategoryID uuid.UUID `validate:"required"`
|
||||||
SKU *string `validate:"omitempty,max=100"`
|
SKU *string `validate:"omitempty,max=100"`
|
||||||
Name string `validate:"required,min=1,max=255"`
|
Name string `validate:"required,min=1,max=255"`
|
||||||
@@ -49,6 +50,7 @@ type CreateProductRequest struct {
|
|||||||
BusinessType constants.BusinessType `validate:"required"`
|
BusinessType constants.BusinessType `validate:"required"`
|
||||||
ImageURL *string `validate:"omitempty,max=500"`
|
ImageURL *string `validate:"omitempty,max=500"`
|
||||||
PrinterType *string `validate:"omitempty,max=50"`
|
PrinterType *string `validate:"omitempty,max=50"`
|
||||||
|
PrintToChecker *bool `validate:"omitempty"`
|
||||||
UnitID *uuid.UUID `validate:"omitempty"`
|
UnitID *uuid.UUID `validate:"omitempty"`
|
||||||
HasIngredients bool `validate:"omitempty"`
|
HasIngredients bool `validate:"omitempty"`
|
||||||
Metadata map[string]interface{}
|
Metadata map[string]interface{}
|
||||||
@@ -60,6 +62,7 @@ type CreateProductRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type UpdateProductRequest struct {
|
type UpdateProductRequest struct {
|
||||||
|
OutletID uuid.UUID `validate:"omitempty"` // If set, upsert product_outlet_prices on update
|
||||||
CategoryID *uuid.UUID `validate:"omitempty"`
|
CategoryID *uuid.UUID `validate:"omitempty"`
|
||||||
SKU *string `validate:"omitempty,max=100"`
|
SKU *string `validate:"omitempty,max=100"`
|
||||||
Name *string `validate:"omitempty,min=1,max=255"`
|
Name *string `validate:"omitempty,min=1,max=255"`
|
||||||
@@ -68,6 +71,7 @@ type UpdateProductRequest struct {
|
|||||||
Cost *float64 `validate:"omitempty,min=0"`
|
Cost *float64 `validate:"omitempty,min=0"`
|
||||||
ImageURL *string `validate:"omitempty,max=500"`
|
ImageURL *string `validate:"omitempty,max=500"`
|
||||||
PrinterType *string `validate:"omitempty,max=50"`
|
PrinterType *string `validate:"omitempty,max=50"`
|
||||||
|
PrintToChecker *bool `validate:"omitempty"`
|
||||||
UnitID *uuid.UUID `validate:"omitempty"`
|
UnitID *uuid.UUID `validate:"omitempty"`
|
||||||
HasIngredients *bool `validate:"omitempty"`
|
HasIngredients *bool `validate:"omitempty"`
|
||||||
Metadata map[string]interface{}
|
Metadata map[string]interface{}
|
||||||
@@ -100,10 +104,13 @@ type ProductResponse struct {
|
|||||||
Name string
|
Name string
|
||||||
Description *string
|
Description *string
|
||||||
Price float64
|
Price float64
|
||||||
|
OutletPrice *float64 // outlet-specific price, nil if not set
|
||||||
|
OutletPrices []OutletPrice // all outlet prices, populated when no outletID in context
|
||||||
Cost float64
|
Cost float64
|
||||||
BusinessType constants.BusinessType
|
BusinessType constants.BusinessType
|
||||||
ImageURL *string
|
ImageURL *string
|
||||||
PrinterType string
|
PrinterType string
|
||||||
|
PrintToChecker bool
|
||||||
UnitID *uuid.UUID
|
UnitID *uuid.UUID
|
||||||
HasIngredients bool
|
HasIngredients bool
|
||||||
Metadata map[string]interface{}
|
Metadata map[string]interface{}
|
||||||
@@ -113,6 +120,13 @@ type ProductResponse struct {
|
|||||||
Variants []ProductVariantResponse
|
Variants []ProductVariantResponse
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type OutletPrice struct {
|
||||||
|
OutletID uuid.UUID
|
||||||
|
OutletName string
|
||||||
|
Price float64
|
||||||
|
PrintToChecker bool
|
||||||
|
}
|
||||||
|
|
||||||
type ProductVariantResponse struct {
|
type ProductVariantResponse struct {
|
||||||
ID uuid.UUID
|
ID uuid.UUID
|
||||||
ProductID uuid.UUID
|
ProductID uuid.UUID
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
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"`
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ import (
|
|||||||
type AnalyticsProcessor interface {
|
type AnalyticsProcessor interface {
|
||||||
GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error)
|
GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error)
|
||||||
GetSalesAnalytics(ctx context.Context, req *models.SalesAnalyticsRequest) (*models.SalesAnalyticsResponse, 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)
|
GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error)
|
||||||
GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
|
GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
|
||||||
GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
|
GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
|
||||||
@@ -164,6 +165,77 @@ func (p *AnalyticsProcessorImpl) GetSalesAnalytics(ctx context.Context, req *mod
|
|||||||
}, nil
|
}, 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) {
|
func (p *AnalyticsProcessorImpl) GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error) {
|
||||||
// Validate date range
|
// Validate date range
|
||||||
if req.DateFrom.After(req.DateTo) {
|
if req.DateFrom.After(req.DateTo) {
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
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 (analyticsRepositoryStub) GetProfitLossAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time, string) (*entities.ProfitLossAnalytics, error) {
|
||||||
|
return nil, 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,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
package processor
|
package processor
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"apskel-pos-be/internal/constants"
|
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -108,6 +107,7 @@ type OrderProcessorImpl struct {
|
|||||||
productRecipeRepo *repository.ProductRecipeRepository
|
productRecipeRepo *repository.ProductRecipeRepository
|
||||||
ingredientRepo IngredientRepository
|
ingredientRepo IngredientRepository
|
||||||
inventoryMovementService InventoryMovementService
|
inventoryMovementService InventoryMovementService
|
||||||
|
productOutletPriceRepo repository.ProductOutletPriceRepository
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewOrderProcessorImpl(
|
func NewOrderProcessorImpl(
|
||||||
@@ -126,6 +126,7 @@ func NewOrderProcessorImpl(
|
|||||||
productRecipeRepo *repository.ProductRecipeRepository,
|
productRecipeRepo *repository.ProductRecipeRepository,
|
||||||
ingredientRepo IngredientRepository,
|
ingredientRepo IngredientRepository,
|
||||||
inventoryMovementService InventoryMovementService,
|
inventoryMovementService InventoryMovementService,
|
||||||
|
productOutletPriceRepo repository.ProductOutletPriceRepository,
|
||||||
) *OrderProcessorImpl {
|
) *OrderProcessorImpl {
|
||||||
return &OrderProcessorImpl{
|
return &OrderProcessorImpl{
|
||||||
orderRepo: orderRepo,
|
orderRepo: orderRepo,
|
||||||
@@ -144,6 +145,7 @@ func NewOrderProcessorImpl(
|
|||||||
productRecipeRepo: productRecipeRepo,
|
productRecipeRepo: productRecipeRepo,
|
||||||
ingredientRepo: ingredientRepo,
|
ingredientRepo: ingredientRepo,
|
||||||
inventoryMovementService: inventoryMovementService,
|
inventoryMovementService: inventoryMovementService,
|
||||||
|
productOutletPriceRepo: productOutletPriceRepo,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,6 +172,12 @@ func (p *OrderProcessorImpl) CreateOrder(ctx context.Context, req *models.Create
|
|||||||
unitPrice := product.Price
|
unitPrice := product.Price
|
||||||
unitCost := product.Cost
|
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 {
|
if itemReq.ProductVariantID != nil {
|
||||||
variant, err := p.productVariantRepo.GetByID(ctx, *itemReq.ProductVariantID)
|
variant, err := p.productVariantRepo.GetByID(ctx, *itemReq.ProductVariantID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -293,6 +301,12 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
|
|||||||
unitPrice := product.Price
|
unitPrice := product.Price
|
||||||
unitCost := product.Cost
|
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
|
// Handle product variant if specified
|
||||||
if itemReq.ProductVariantID != nil {
|
if itemReq.ProductVariantID != nil {
|
||||||
variant, err := p.productVariantRepo.GetByID(ctx, *itemReq.ProductVariantID)
|
variant, err := p.productVariantRepo.GetByID(ctx, *itemReq.ProductVariantID)
|
||||||
@@ -373,31 +387,10 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
|
|||||||
return nil, fmt.Errorf("failed to create order item: %w", err)
|
return nil, fmt.Errorf("failed to create order item: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
itemResponse := models.OrderItemResponse{
|
itemResponse := mappers.OrderItemEntityToResponse(orderItem, order.OutletID)
|
||||||
ID: orderItem.ID,
|
if itemResponse != nil {
|
||||||
OrderID: orderItem.OrderID,
|
addedItemResponses = append(addedItemResponses, *itemResponse)
|
||||||
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)
|
orderWithRelations, err := p.orderRepo.GetWithRelations(ctx, orderID)
|
||||||
|
|||||||
@@ -0,0 +1,122 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"apskel-pos-be/internal/entities"
|
"apskel-pos-be/internal/entities"
|
||||||
|
"apskel-pos-be/internal/logger"
|
||||||
"apskel-pos-be/internal/mappers"
|
"apskel-pos-be/internal/mappers"
|
||||||
"apskel-pos-be/internal/models"
|
"apskel-pos-be/internal/models"
|
||||||
"apskel-pos-be/internal/repository"
|
"apskel-pos-be/internal/repository"
|
||||||
@@ -16,8 +17,9 @@ type ProductProcessor interface {
|
|||||||
CreateProduct(ctx context.Context, req *models.CreateProductRequest) (*models.ProductResponse, error)
|
CreateProduct(ctx context.Context, req *models.CreateProductRequest) (*models.ProductResponse, error)
|
||||||
UpdateProduct(ctx context.Context, id uuid.UUID, req *models.UpdateProductRequest) (*models.ProductResponse, error)
|
UpdateProduct(ctx context.Context, id uuid.UUID, req *models.UpdateProductRequest) (*models.ProductResponse, error)
|
||||||
DeleteProduct(ctx context.Context, id uuid.UUID) error
|
DeleteProduct(ctx context.Context, id uuid.UUID) error
|
||||||
GetProductByID(ctx context.Context, id uuid.UUID) (*models.ProductResponse, error)
|
GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) (*models.ProductResponse, error)
|
||||||
ListProducts(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, 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 {
|
type ProductRepository interface {
|
||||||
@@ -32,11 +34,13 @@ type ProductRepository interface {
|
|||||||
Update(ctx context.Context, product *entities.Product) error
|
Update(ctx context.Context, product *entities.Product) error
|
||||||
Delete(ctx context.Context, id uuid.UUID) error
|
Delete(ctx context.Context, id uuid.UUID) error
|
||||||
List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Product, int64, 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)
|
Count(ctx context.Context, filters map[string]interface{}) (int64, error)
|
||||||
GetBySKU(ctx context.Context, organizationID uuid.UUID, sku string) (*entities.Product, 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)
|
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)
|
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)
|
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
|
UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error
|
||||||
GetLowCostProducts(ctx context.Context, organizationID uuid.UUID, maxCost float64) ([]*entities.Product, error)
|
GetLowCostProducts(ctx context.Context, organizationID uuid.UUID, maxCost float64) ([]*entities.Product, error)
|
||||||
}
|
}
|
||||||
@@ -47,15 +51,17 @@ type ProductProcessorImpl struct {
|
|||||||
productVariantRepo repository.ProductVariantRepository
|
productVariantRepo repository.ProductVariantRepository
|
||||||
inventoryRepo repository.InventoryRepository
|
inventoryRepo repository.InventoryRepository
|
||||||
outletRepo OutletRepository
|
outletRepo OutletRepository
|
||||||
|
outletPriceRepo repository.ProductOutletPriceRepository
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewProductProcessorImpl(productRepo ProductRepository, categoryRepo CategoryRepository, productVariantRepo repository.ProductVariantRepository, inventoryRepo repository.InventoryRepository, outletRepo OutletRepository) *ProductProcessorImpl {
|
func NewProductProcessorImpl(productRepo ProductRepository, categoryRepo CategoryRepository, productVariantRepo repository.ProductVariantRepository, inventoryRepo repository.InventoryRepository, outletRepo OutletRepository, outletPriceRepo repository.ProductOutletPriceRepository) *ProductProcessorImpl {
|
||||||
return &ProductProcessorImpl{
|
return &ProductProcessorImpl{
|
||||||
productRepo: productRepo,
|
productRepo: productRepo,
|
||||||
categoryRepo: categoryRepo,
|
categoryRepo: categoryRepo,
|
||||||
productVariantRepo: productVariantRepo,
|
productVariantRepo: productVariantRepo,
|
||||||
inventoryRepo: inventoryRepo,
|
inventoryRepo: inventoryRepo,
|
||||||
outletRepo: outletRepo,
|
outletRepo: outletRepo,
|
||||||
|
outletPriceRepo: outletPriceRepo,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,12 +81,12 @@ func (p *ProductProcessorImpl) CreateProduct(ctx context.Context, req *models.Cr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
exists, err := p.productRepo.ExistsByName(ctx, req.OrganizationID, req.Name, nil)
|
exists, err := p.productRepo.ExistsByNameInOutlet(ctx, req.OrganizationID, req.OutletID, req.Name, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to check product name uniqueness: %w", err)
|
return nil, fmt.Errorf("failed to check product name uniqueness: %w", err)
|
||||||
}
|
}
|
||||||
if exists {
|
if exists {
|
||||||
return nil, fmt.Errorf("product with name '%s' already exists for this organization", req.Name)
|
return nil, fmt.Errorf("product with name '%s' already exists for this outlet", req.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
productEntity := mappers.CreateProductRequestToEntity(req)
|
productEntity := mappers.CreateProductRequestToEntity(req)
|
||||||
@@ -118,6 +124,23 @@ 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)
|
productWithCategory, err := p.productRepo.GetWithCategory(ctx, productEntity.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to retrieve created product: %w", err)
|
return nil, fmt.Errorf("failed to retrieve created product: %w", err)
|
||||||
@@ -157,12 +180,12 @@ func (p *ProductProcessorImpl) UpdateProduct(ctx context.Context, id uuid.UUID,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if req.Name != nil && *req.Name != existingProduct.Name {
|
if req.Name != nil && *req.Name != existingProduct.Name {
|
||||||
exists, err := p.productRepo.ExistsByName(ctx, existingProduct.OrganizationID, *req.Name, &id)
|
exists, err := p.productRepo.ExistsByNameInOutlet(ctx, existingProduct.OrganizationID, req.OutletID, *req.Name, &id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to check product name uniqueness: %w", err)
|
return nil, fmt.Errorf("failed to check product name uniqueness: %w", err)
|
||||||
}
|
}
|
||||||
if exists {
|
if exists {
|
||||||
return nil, fmt.Errorf("product with name '%s' already exists for this organization", *req.Name)
|
return nil, fmt.Errorf("product with name '%s' already exists for this outlet", *req.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -179,6 +202,41 @@ 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)
|
productWithCategory, err := p.productRepo.GetWithCategory(ctx, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to retrieve updated product: %w", err)
|
return nil, fmt.Errorf("failed to retrieve updated product: %w", err)
|
||||||
@@ -214,19 +272,106 @@ func (p *ProductProcessorImpl) DeleteProduct(ctx context.Context, id uuid.UUID)
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *ProductProcessorImpl) GetProductByID(ctx context.Context, id uuid.UUID) (*models.ProductResponse, error) {
|
func (p *ProductProcessorImpl) GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) (*models.ProductResponse, error) {
|
||||||
productEntity, err := p.productRepo.GetWithCategory(ctx, id)
|
productEntity, err := p.productRepo.GetWithCategory(ctx, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("product not found: %w", err)
|
return nil, fmt.Errorf("product not found: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
response := mappers.ProductEntityToResponse(productEntity)
|
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
|
return response, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *ProductProcessorImpl) ListProducts(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error) {
|
func (p *ProductProcessorImpl) ListProducts(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error) {
|
||||||
offset := (page - 1) * limit
|
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)
|
productEntities, total, err := p.productRepo.List(ctx, filters, limit, offset)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, fmt.Errorf("failed to list products: %w", err)
|
return nil, 0, fmt.Errorf("failed to list products: %w", err)
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
type AnalyticsRepository interface {
|
type AnalyticsRepository interface {
|
||||||
GetPaymentMethodAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.PaymentMethodAnalytics, error)
|
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)
|
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)
|
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)
|
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)
|
GetDashboardOverview(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (*entities.DashboardOverview, error)
|
||||||
@@ -122,6 +123,159 @@ func (r *AnalyticsRepositoryImpl) GetSalesAnalytics(ctx context.Context, organiz
|
|||||||
return results, err
|
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) {
|
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
|
var results []*entities.ProductAnalytics
|
||||||
|
|
||||||
|
|||||||
@@ -72,6 +72,9 @@ func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]in
|
|||||||
case "search":
|
case "search":
|
||||||
searchValue := "%" + value.(string) + "%"
|
searchValue := "%" + value.(string) + "%"
|
||||||
query = query.Where("name ILIKE ? OR description ILIKE ?", searchValue, searchValue)
|
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:
|
default:
|
||||||
query = query.Where(key+" = ?", value)
|
query = query.Where(key+" = ?", value)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,8 @@ func (r *OrderRepositoryImpl) GetWithRelations(ctx context.Context, id uuid.UUID
|
|||||||
Preload("User").
|
Preload("User").
|
||||||
Preload("OrderItems").
|
Preload("OrderItems").
|
||||||
Preload("OrderItems.Product").
|
Preload("OrderItems.Product").
|
||||||
|
Preload("OrderItems.Product.Category").
|
||||||
|
Preload("OrderItems.Product.ProductOutletPrices").
|
||||||
Preload("OrderItems.ProductVariant").
|
Preload("OrderItems.ProductVariant").
|
||||||
Preload("Payments").
|
Preload("Payments").
|
||||||
Preload("Payments.PaymentMethod").
|
Preload("Payments.PaymentMethod").
|
||||||
@@ -98,36 +100,54 @@ func (r *OrderRepositoryImpl) List(ctx context.Context, filters map[string]inter
|
|||||||
var orders []*entities.Order
|
var orders []*entities.Order
|
||||||
var total int64
|
var total int64
|
||||||
|
|
||||||
query := r.db.WithContext(ctx).Model(&entities.Order{}).
|
// organization_id is mandatory to prevent cross-org data leaks
|
||||||
|
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("Organization").
|
||||||
Preload("Outlet").
|
Preload("Outlet").
|
||||||
Preload("User").
|
Preload("User").
|
||||||
Preload("OrderItems").
|
Preload("OrderItems").
|
||||||
Preload("OrderItems.Product").
|
Preload("OrderItems.Product").
|
||||||
|
Preload("OrderItems.Product.Category").
|
||||||
|
Preload("OrderItems.Product.ProductOutletPrices").
|
||||||
Preload("OrderItems.ProductVariant").
|
Preload("OrderItems.ProductVariant").
|
||||||
Preload("Payments").
|
Preload("Payments").
|
||||||
Preload("Payments.PaymentMethod").
|
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
|
return orders, total, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,6 +159,8 @@ func (r *OrderRepositoryImpl) ListBySessionID(ctx context.Context, sessionID str
|
|||||||
Preload("User").
|
Preload("User").
|
||||||
Preload("OrderItems").
|
Preload("OrderItems").
|
||||||
Preload("OrderItems.Product").
|
Preload("OrderItems.Product").
|
||||||
|
Preload("OrderItems.Product.Category").
|
||||||
|
Preload("OrderItems.Product.ProductOutletPrices").
|
||||||
Preload("OrderItems.ProductVariant").
|
Preload("OrderItems.ProductVariant").
|
||||||
Preload("Payments").
|
Preload("Payments").
|
||||||
Preload("Payments.PaymentMethod").
|
Preload("Payments.PaymentMethod").
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ func (r *OrganizationRepositoryImpl) GetTotalOmset(ctx context.Context, organiza
|
|||||||
var total float64
|
var total float64
|
||||||
err := r.db.WithContext(ctx).
|
err := r.db.WithContext(ctx).
|
||||||
Table("orders").
|
Table("orders").
|
||||||
Where("organization_id = ? AND payment_status = ?", organizationID, "completed").
|
Where("organization_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ?", organizationID, "completed", false, false).
|
||||||
Select("COALESCE(SUM(total_amount), 0)").
|
Select("COALESCE(SUM(total_amount), 0)").
|
||||||
Scan(&total).Error
|
Scan(&total).Error
|
||||||
return total, err
|
return total, err
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
@@ -178,6 +178,26 @@ func (r *ProductRepositoryImpl) ExistsByName(ctx context.Context, organizationID
|
|||||||
return count > 0, err
|
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 {
|
func (r *ProductRepositoryImpl) UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error {
|
||||||
return r.db.WithContext(ctx).Model(&entities.Product{}).
|
return r.db.WithContext(ctx).Model(&entities.Product{}).
|
||||||
Where("id = ?", id).
|
Where("id = ?", id).
|
||||||
@@ -189,3 +209,47 @@ 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
|
err := r.db.WithContext(ctx).Where("organization_id = ? AND cost <= ? AND is_active = ?", organizationID, maxCost, true).Find(&products).Error
|
||||||
return products, err
|
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
|
||||||
|
}
|
||||||
|
|||||||
@@ -28,6 +28,10 @@ func NewTxManager(db *gorm.DB) *TxManager { return &TxManager{db: db} }
|
|||||||
|
|
||||||
// WithTransaction runs fn inside a DB transaction, injecting the *gorm.DB tx into ctx.
|
// 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 {
|
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 {
|
return m.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||||
ctxTx := context.WithValue(ctx, txKey, tx)
|
ctxTx := context.WithValue(ctx, txKey, tx)
|
||||||
return fn(ctxTx)
|
return fn(ctxTx)
|
||||||
|
|||||||
@@ -49,11 +49,12 @@ type Router struct {
|
|||||||
userDeviceHandler *handler.UserDeviceHandler
|
userDeviceHandler *handler.UserDeviceHandler
|
||||||
notificationHandler *handler.NotificationHandler
|
notificationHandler *handler.NotificationHandler
|
||||||
selfOrderHandler *handler.SelfOrderHandler
|
selfOrderHandler *handler.SelfOrderHandler
|
||||||
|
productOutletPriceHandler *handler.ProductOutletPriceHandler
|
||||||
authMiddleware *middleware.AuthMiddleware
|
authMiddleware *middleware.AuthMiddleware
|
||||||
customerAuthMiddleware *middleware.CustomerAuthMiddleware
|
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, selfOrderHandler *handler.SelfOrderHandler) *Router {
|
func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, userDeviceService service.UserDeviceService, userDeviceValidator validator.UserDeviceValidator, notificationService service.NotificationService, notificationValidator validator.NotificationValidator, productOutletPriceService service.ProductOutletPriceService, productOutletPriceValidator validator.ProductOutletPriceValidator, selfOrderHandler *handler.SelfOrderHandler) *Router {
|
||||||
|
|
||||||
return &Router{
|
return &Router{
|
||||||
config: cfg,
|
config: cfg,
|
||||||
@@ -95,6 +96,7 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
|
|||||||
userDeviceHandler: handler.NewUserDeviceHandler(userDeviceService, userDeviceValidator),
|
userDeviceHandler: handler.NewUserDeviceHandler(userDeviceService, userDeviceValidator),
|
||||||
notificationHandler: handler.NewNotificationHandler(notificationService, notificationValidator),
|
notificationHandler: handler.NewNotificationHandler(notificationService, notificationValidator),
|
||||||
selfOrderHandler: selfOrderHandler,
|
selfOrderHandler: selfOrderHandler,
|
||||||
|
productOutletPriceHandler: handler.NewProductOutletPriceHandler(productOutletPriceService, productOutletPriceValidator),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -223,11 +225,23 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
|
|||||||
{
|
{
|
||||||
products.POST("", r.productHandler.CreateProduct)
|
products.POST("", r.productHandler.CreateProduct)
|
||||||
products.GET("", r.productHandler.ListProducts)
|
products.GET("", r.productHandler.ListProducts)
|
||||||
|
products.GET("/all", r.productHandler.ListProductAll)
|
||||||
products.GET("/:id", r.productHandler.GetProduct)
|
products.GET("/:id", r.productHandler.GetProduct)
|
||||||
products.PUT("/:id", r.productHandler.UpdateProduct)
|
products.PUT("/:id", r.productHandler.UpdateProduct)
|
||||||
products.DELETE("/:id", r.productHandler.DeleteProduct)
|
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 := protected.Group("/product-variants")
|
||||||
{
|
{
|
||||||
productVariants.POST("", r.productVariantHandler.CreateProductVariant)
|
productVariants.POST("", r.productVariantHandler.CreateProductVariant)
|
||||||
@@ -311,6 +325,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
|
|||||||
{
|
{
|
||||||
analytics.GET("/payment-methods", r.analyticsHandler.GetPaymentMethodAnalytics)
|
analytics.GET("/payment-methods", r.analyticsHandler.GetPaymentMethodAnalytics)
|
||||||
analytics.GET("/sales", r.analyticsHandler.GetSalesAnalytics)
|
analytics.GET("/sales", r.analyticsHandler.GetSalesAnalytics)
|
||||||
|
analytics.GET("/purchasing", r.analyticsHandler.GetPurchasingAnalytics)
|
||||||
analytics.GET("/products", r.analyticsHandler.GetProductAnalytics)
|
analytics.GET("/products", r.analyticsHandler.GetProductAnalytics)
|
||||||
analytics.GET("/categories", r.analyticsHandler.GetProductAnalyticsPerCategory)
|
analytics.GET("/categories", r.analyticsHandler.GetProductAnalyticsPerCategory)
|
||||||
analytics.GET("/dashboard", r.analyticsHandler.GetDashboardAnalytics)
|
analytics.GET("/dashboard", r.analyticsHandler.GetDashboardAnalytics)
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
type AnalyticsService interface {
|
type AnalyticsService interface {
|
||||||
GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error)
|
GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error)
|
||||||
GetSalesAnalytics(ctx context.Context, req *models.SalesAnalyticsRequest) (*models.SalesAnalyticsResponse, 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)
|
GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error)
|
||||||
GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
|
GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
|
||||||
GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
|
GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
|
||||||
@@ -57,6 +58,19 @@ func (s *AnalyticsServiceImpl) GetSalesAnalytics(ctx context.Context, req *model
|
|||||||
return response, nil
|
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) {
|
func (s *AnalyticsServiceImpl) GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error) {
|
||||||
// Validate request
|
// Validate request
|
||||||
if err := s.validateProductAnalyticsRequest(req); err != nil {
|
if err := s.validateProductAnalyticsRequest(req); err != nil {
|
||||||
@@ -168,6 +182,42 @@ func (s *AnalyticsServiceImpl) validateSalesAnalyticsRequest(req *models.SalesAn
|
|||||||
return nil
|
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 {
|
func (s *AnalyticsServiceImpl) validateProductAnalyticsRequest(req *models.ProductAnalyticsRequest) error {
|
||||||
if req.OrganizationID == uuid.Nil {
|
if req.OrganizationID == uuid.Nil {
|
||||||
return fmt.Errorf("organization ID is required")
|
return fmt.Errorf("organization ID is required")
|
||||||
|
|||||||
@@ -0,0 +1,121 @@
|
|||||||
|
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)
|
||||||
|
}
|
||||||
@@ -85,6 +85,9 @@ func (s *CategoryServiceImpl) ListCategories(ctx context.Context, req *contract.
|
|||||||
if req.OrganizationID != nil {
|
if req.OrganizationID != nil {
|
||||||
filters["organization_id"] = *req.OrganizationID
|
filters["organization_id"] = *req.OrganizationID
|
||||||
}
|
}
|
||||||
|
if req.OutletID != nil {
|
||||||
|
filters["outlet_id"] = *req.OutletID
|
||||||
|
}
|
||||||
if req.BusinessType != "" {
|
if req.BusinessType != "" {
|
||||||
filters["business_type"] = req.BusinessType
|
filters["business_type"] = req.BusinessType
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -199,7 +199,7 @@ func (s *OrderServiceImpl) createIngredientTransactions(ctx context.Context, ord
|
|||||||
// Calculate waste quantities
|
// Calculate waste quantities
|
||||||
transactions, err := s.calculateWasteQuantities(productRecipes, float64(orderItem.Quantity))
|
transactions, err := s.calculateWasteQuantities(productRecipes, float64(orderItem.Quantity))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to calculate waste quantities for product %s: %w", err)
|
return nil, fmt.Errorf("failed to calculate waste quantities for product %s: %w", orderItem.ProductID, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set common fields for all transactions
|
// Set common fields for all transactions
|
||||||
|
|||||||
@@ -114,6 +114,14 @@ func (m *MockTableRepository) GetByID(ctx context.Context, id uuid.UUID) (*entit
|
|||||||
return args.Get(0).(*entities.Table), args.Error(1)
|
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) {
|
func (m *MockTableRepository) GetByOutletID(ctx context.Context, outletID uuid.UUID) ([]entities.Table, error) {
|
||||||
args := m.Called(ctx, outletID)
|
args := m.Called(ctx, outletID)
|
||||||
if args.Get(0) == nil {
|
if args.Get(0) == nil {
|
||||||
@@ -182,6 +190,11 @@ func (m *MockTableRepository) GetByOrderID(ctx context.Context, orderID uuid.UUI
|
|||||||
return args.Get(0).(*entities.Table), args.Error(1)
|
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) {
|
func TestCreateOrderWithTableOccupation(t *testing.T) {
|
||||||
// Setup
|
// Setup
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|||||||
@@ -0,0 +1,126 @@
|
|||||||
|
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),
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -14,10 +14,11 @@ import (
|
|||||||
|
|
||||||
type ProductService interface {
|
type ProductService interface {
|
||||||
CreateProduct(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.CreateProductRequest) *contract.Response
|
CreateProduct(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.CreateProductRequest) *contract.Response
|
||||||
UpdateProduct(ctx context.Context, id uuid.UUID, req *contract.UpdateProductRequest) *contract.Response
|
UpdateProduct(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID, req *contract.UpdateProductRequest) *contract.Response
|
||||||
DeleteProduct(ctx context.Context, id uuid.UUID) *contract.Response
|
DeleteProduct(ctx context.Context, id uuid.UUID) *contract.Response
|
||||||
GetProductByID(ctx context.Context, id uuid.UUID) *contract.Response
|
GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) *contract.Response
|
||||||
ListProducts(ctx context.Context, req *contract.ListProductsRequest) *contract.Response
|
ListProducts(ctx context.Context, req *contract.ListProductsRequest) *contract.Response
|
||||||
|
ListProductsAll(ctx context.Context, req *contract.ListProductsRequest) *contract.Response
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductServiceImpl struct {
|
type ProductServiceImpl struct {
|
||||||
@@ -43,8 +44,8 @@ func (s *ProductServiceImpl) CreateProduct(ctx context.Context, apctx *appcontex
|
|||||||
return contract.BuildSuccessResponse(contractResponse)
|
return contract.BuildSuccessResponse(contractResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ProductServiceImpl) UpdateProduct(ctx context.Context, id uuid.UUID, req *contract.UpdateProductRequest) *contract.Response {
|
func (s *ProductServiceImpl) UpdateProduct(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID, req *contract.UpdateProductRequest) *contract.Response {
|
||||||
modelReq := transformer.UpdateProductRequestToModel(req)
|
modelReq := transformer.UpdateProductRequestToModel(apctx, req)
|
||||||
|
|
||||||
productResponse, err := s.productProcessor.UpdateProduct(ctx, id, modelReq)
|
productResponse, err := s.productProcessor.UpdateProduct(ctx, id, modelReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -68,8 +69,8 @@ func (s *ProductServiceImpl) DeleteProduct(ctx context.Context, id uuid.UUID) *c
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ProductServiceImpl) GetProductByID(ctx context.Context, id uuid.UUID) *contract.Response {
|
func (s *ProductServiceImpl) GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) *contract.Response {
|
||||||
productResponse, err := s.productProcessor.GetProductByID(ctx, id)
|
productResponse, err := s.productProcessor.GetProductByID(ctx, id, outletID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductServiceEntity, err.Error())
|
errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductServiceEntity, err.Error())
|
||||||
return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
|
return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
|
||||||
@@ -85,6 +86,63 @@ func (s *ProductServiceImpl) ListProducts(ctx context.Context, req *contract.Lis
|
|||||||
if req.OrganizationID != nil {
|
if req.OrganizationID != nil {
|
||||||
filters["organization_id"] = *req.OrganizationID
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
if req.CategoryID != nil {
|
||||||
filters["category_id"] = *req.CategoryID
|
filters["category_id"] = *req.CategoryID
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -138,6 +138,91 @@ 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
|
// ProductAnalyticsContractToModel converts contract request to model
|
||||||
func ProductAnalyticsContractToModel(req *contract.ProductAnalyticsRequest) *models.ProductAnalyticsRequest {
|
func ProductAnalyticsContractToModel(req *contract.ProductAnalyticsRequest) *models.ProductAnalyticsRequest {
|
||||||
var dateFrom, dateTo time.Time
|
var dateFrom, dateTo time.Time
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
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")
|
||||||
|
}
|
||||||
@@ -7,12 +7,17 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateCategoryRequest) *models.CreateCategoryRequest {
|
func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateCategoryRequest) *models.CreateCategoryRequest {
|
||||||
|
order := 0
|
||||||
|
if req.Order != nil {
|
||||||
|
order = *req.Order
|
||||||
|
}
|
||||||
return &models.CreateCategoryRequest{
|
return &models.CreateCategoryRequest{
|
||||||
OrganizationID: apctx.OrganizationID,
|
OrganizationID: apctx.OrganizationID,
|
||||||
|
OutletID: req.OutletID,
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Description: req.Description,
|
Description: req.Description,
|
||||||
ImageURL: nil,
|
ImageURL: nil,
|
||||||
Order: *req.Order,
|
Order: order,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -21,7 +26,8 @@ func UpdateCategoryRequestToModel(req *contract.UpdateCategoryRequest) *models.U
|
|||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Description: req.Description,
|
Description: req.Description,
|
||||||
ImageURL: nil,
|
ImageURL: nil,
|
||||||
Order: req.Order,
|
OutletID: req.OutletID,
|
||||||
|
Order: req.Order,
|
||||||
IsActive: nil,
|
IsActive: nil,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,9 +40,10 @@ func CategoryModelResponseToResponse(cat *models.CategoryResponse) *contract.Cat
|
|||||||
return &contract.CategoryResponse{
|
return &contract.CategoryResponse{
|
||||||
ID: cat.ID,
|
ID: cat.ID,
|
||||||
OrganizationID: cat.OrganizationID,
|
OrganizationID: cat.OrganizationID,
|
||||||
|
OutletID: cat.OutletID,
|
||||||
Name: cat.Name,
|
Name: cat.Name,
|
||||||
Description: cat.Description,
|
Description: cat.Description,
|
||||||
BusinessType: "restaurant", // Default business type
|
BusinessType: "restaurant",
|
||||||
Order: cat.Order,
|
Order: cat.Order,
|
||||||
Metadata: map[string]interface{}{},
|
Metadata: map[string]interface{}{},
|
||||||
CreatedAt: cat.CreatedAt,
|
CreatedAt: cat.CreatedAt,
|
||||||
|
|||||||
@@ -100,6 +100,8 @@ func OrderModelToContract(resp *models.OrderResponse) *contract.OrderResponse {
|
|||||||
ProductName: item.ProductName,
|
ProductName: item.ProductName,
|
||||||
ProductVariantID: item.ProductVariantID,
|
ProductVariantID: item.ProductVariantID,
|
||||||
ProductVariantName: item.ProductVariantName,
|
ProductVariantName: item.ProductVariantName,
|
||||||
|
CategoryID: item.CategoryID,
|
||||||
|
CategoryName: item.CategoryName,
|
||||||
Quantity: item.Quantity,
|
Quantity: item.Quantity,
|
||||||
UnitPrice: item.UnitPrice,
|
UnitPrice: item.UnitPrice,
|
||||||
TotalPrice: item.TotalPrice,
|
TotalPrice: item.TotalPrice,
|
||||||
@@ -110,6 +112,7 @@ func OrderModelToContract(resp *models.OrderResponse) *contract.OrderResponse {
|
|||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
PrinterType: item.PrinterType,
|
PrinterType: item.PrinterType,
|
||||||
|
PrintToChecker: item.PrintToChecker,
|
||||||
PaidQuantity: item.PaidQuantity,
|
PaidQuantity: item.PaidQuantity,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -168,6 +171,8 @@ func AddToOrderModelToContract(resp *models.AddToOrderResponse) *contract.AddToO
|
|||||||
ProductName: item.ProductName,
|
ProductName: item.ProductName,
|
||||||
ProductVariantID: item.ProductVariantID,
|
ProductVariantID: item.ProductVariantID,
|
||||||
ProductVariantName: item.ProductVariantName,
|
ProductVariantName: item.ProductVariantName,
|
||||||
|
CategoryID: item.CategoryID,
|
||||||
|
CategoryName: item.CategoryName,
|
||||||
Quantity: item.Quantity,
|
Quantity: item.Quantity,
|
||||||
UnitPrice: item.UnitPrice,
|
UnitPrice: item.UnitPrice,
|
||||||
TotalPrice: item.TotalPrice,
|
TotalPrice: item.TotalPrice,
|
||||||
@@ -177,6 +182,7 @@ func AddToOrderModelToContract(resp *models.AddToOrderResponse) *contract.AddToO
|
|||||||
Status: string(item.Status),
|
Status: string(item.Status),
|
||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
|
PrintToChecker: item.PrintToChecker,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return &contract.AddToOrderResponse{
|
return &contract.AddToOrderResponse{
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
@@ -5,6 +5,8 @@ import (
|
|||||||
"apskel-pos-be/internal/constants"
|
"apskel-pos-be/internal/constants"
|
||||||
"apskel-pos-be/internal/contract"
|
"apskel-pos-be/internal/contract"
|
||||||
"apskel-pos-be/internal/models"
|
"apskel-pos-be/internal/models"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateProductRequest) *models.CreateProductRequest {
|
func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateProductRequest) *models.CreateProductRequest {
|
||||||
@@ -37,8 +39,15 @@ func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Cr
|
|||||||
metadata = make(map[string]interface{})
|
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{
|
return &models.CreateProductRequest{
|
||||||
OrganizationID: apctx.OrganizationID,
|
OrganizationID: apctx.OrganizationID,
|
||||||
|
OutletID: outletID,
|
||||||
CategoryID: req.CategoryID,
|
CategoryID: req.CategoryID,
|
||||||
SKU: req.SKU,
|
SKU: req.SKU,
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
@@ -48,28 +57,37 @@ func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Cr
|
|||||||
BusinessType: businessType,
|
BusinessType: businessType,
|
||||||
ImageURL: req.ImageURL,
|
ImageURL: req.ImageURL,
|
||||||
PrinterType: req.PrinterType,
|
PrinterType: req.PrinterType,
|
||||||
|
PrintToChecker: req.PrintToChecker,
|
||||||
Metadata: metadata,
|
Metadata: metadata,
|
||||||
Variants: variants,
|
Variants: variants,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateProductRequestToModel(req *contract.UpdateProductRequest) *models.UpdateProductRequest {
|
func UpdateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.UpdateProductRequest) *models.UpdateProductRequest {
|
||||||
metadata := req.Metadata
|
metadata := req.Metadata
|
||||||
if metadata == nil {
|
if metadata == nil {
|
||||||
metadata = make(map[string]interface{})
|
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{
|
return &models.UpdateProductRequest{
|
||||||
CategoryID: req.CategoryID,
|
OutletID: outletID,
|
||||||
SKU: req.SKU,
|
CategoryID: req.CategoryID,
|
||||||
Name: req.Name,
|
SKU: req.SKU,
|
||||||
Description: req.Description,
|
Name: req.Name,
|
||||||
Price: req.Price,
|
Description: req.Description,
|
||||||
Cost: req.Cost,
|
Price: req.Price,
|
||||||
ImageURL: req.ImageURL,
|
Cost: req.Cost,
|
||||||
PrinterType: req.PrinterType,
|
ImageURL: req.ImageURL,
|
||||||
Metadata: metadata,
|
PrinterType: req.PrinterType,
|
||||||
IsActive: req.IsActive,
|
PrintToChecker: req.PrintToChecker,
|
||||||
|
Metadata: metadata,
|
||||||
|
IsActive: req.IsActive,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,6 +115,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{
|
return &contract.ProductResponse{
|
||||||
ID: prod.ID,
|
ID: prod.ID,
|
||||||
OrganizationID: prod.OrganizationID,
|
OrganizationID: prod.OrganizationID,
|
||||||
@@ -106,10 +138,13 @@ func ProductModelResponseToResponse(prod *models.ProductResponse) *contract.Prod
|
|||||||
Name: prod.Name,
|
Name: prod.Name,
|
||||||
Description: prod.Description,
|
Description: prod.Description,
|
||||||
Price: prod.Price,
|
Price: prod.Price,
|
||||||
|
OutletPrice: prod.OutletPrice,
|
||||||
|
OutletPrices: outletPriceResponses,
|
||||||
Cost: prod.Cost,
|
Cost: prod.Cost,
|
||||||
BusinessType: string(prod.BusinessType),
|
BusinessType: string(prod.BusinessType),
|
||||||
ImageURL: prod.ImageURL,
|
ImageURL: prod.ImageURL,
|
||||||
PrinterType: prod.PrinterType,
|
PrinterType: prod.PrinterType,
|
||||||
|
PrintToChecker: prod.PrintToChecker,
|
||||||
Metadata: prod.Metadata,
|
Metadata: prod.Metadata,
|
||||||
IsActive: prod.IsActive,
|
IsActive: prod.IsActive,
|
||||||
CreatedAt: prod.CreatedAt,
|
CreatedAt: prod.CreatedAt,
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
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, ""
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS product_outlet_prices;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
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);
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
-- Remove outlet_id column from categories table
|
||||||
|
DROP INDEX IF EXISTS idx_categories_outlet_id;
|
||||||
|
|
||||||
|
ALTER TABLE categories
|
||||||
|
DROP COLUMN IF EXISTS outlet_id;
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
-- 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);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE product_outlet_prices DROP COLUMN IF EXISTS print_to_checker;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE product_outlet_prices ADD COLUMN print_to_checker BOOLEAN NOT NULL DEFAULT TRUE;
|
||||||
Reference in New Issue
Block a user