Compare commits
13 Commits
feature/ou
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d735c20cb | |||
|
|
cb8a830345 | ||
| 9c143a43aa | |||
|
|
222cadd8df | ||
| cad4e6c816 | |||
|
|
50d633ee3a | ||
|
|
21fa21d089 | ||
| 5f379faf17 | |||
| 3b62504798 | |||
| 4130cb66df | |||
| 30dff17272 | |||
|
|
f8c732f0ff | ||
| e92c487815 |
@ -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 ./
|
||||||
|
|||||||
@ -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(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -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{
|
||||||
|
|||||||
@ -8,25 +8,22 @@ import (
|
|||||||
|
|
||||||
type CreateCategoryRequest struct {
|
type CreateCategoryRequest struct {
|
||||||
Name string `json:"name" validate:"required,min=1,max=255"`
|
Name string `json:"name" validate:"required,min=1,max=255"`
|
||||||
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
|
||||||
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"`
|
Order *int `json:"order,omitempty"`
|
||||||
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateCategoryRequest struct {
|
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"`
|
||||||
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
|
||||||
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"`
|
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"`
|
||||||
@ -37,11 +34,10 @@ 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,omitempty"`
|
|
||||||
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"`
|
||||||
|
|||||||
@ -7,7 +7,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type CreateProductRequest struct {
|
type CreateProductRequest struct {
|
||||||
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
|
||||||
CategoryID uuid.UUID `json:"category_id" validate:"required"`
|
CategoryID uuid.UUID `json:"category_id" validate:"required"`
|
||||||
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"`
|
||||||
@ -26,7 +25,6 @@ type CreateProductRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type UpdateProductRequest struct {
|
type UpdateProductRequest struct {
|
||||||
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
|
|
||||||
CategoryID *uuid.UUID `json:"category_id,omitempty"`
|
CategoryID *uuid.UUID `json:"category_id,omitempty"`
|
||||||
SKU *string `json:"sku,omitempty"`
|
SKU *string `json:"sku,omitempty"`
|
||||||
Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
|
Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
|
||||||
@ -58,25 +56,26 @@ 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"`
|
||||||
OutletID *uuid.UUID `json:"outlet_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"`
|
OutletPrice *float64 `json:"outlet_price,omitempty"`
|
||||||
Cost float64 `json:"cost"`
|
OutletPrices []ProductOutletPriceResponse `json:"outlet_prices,omitempty"`
|
||||||
BusinessType string `json:"business_type"`
|
Cost float64 `json:"cost"`
|
||||||
ImageURL *string `json:"image_url"`
|
BusinessType string `json:"business_type"`
|
||||||
PrinterType string `json:"printer_type"`
|
ImageURL *string `json:"image_url"`
|
||||||
Metadata map[string]interface{} `json:"metadata"`
|
PrinterType string `json:"printer_type"`
|
||||||
IsActive bool `json:"is_active"`
|
Metadata map[string]interface{} `json:"metadata"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
IsActive bool `json:"is_active"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
Category *CategoryResponse `json:"category,omitempty"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
Variants []ProductVariantResponse `json:"variants,omitempty"`
|
Category *CategoryResponse `json:"category,omitempty"`
|
||||||
|
Variants []ProductVariantResponse `json:"variants,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductVariantResponse struct {
|
type ProductVariantResponse struct {
|
||||||
|
|||||||
42
internal/contract/product_outlet_price_contract.go
Normal file
42
internal/contract/product_outlet_price_contract.go
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
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"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type UpdateProductOutletPriceRequest struct {
|
||||||
|
Price float64 `json:"price" validate:"required,min=0"`
|
||||||
|
}
|
||||||
|
|
||||||
|
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"`
|
||||||
|
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"`
|
||||||
|
}
|
||||||
@ -31,19 +31,17 @@ 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"`
|
||||||
OutletID *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id,omitempty"`
|
Name string `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
|
||||||
Name string `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
|
Description *string `gorm:"type:text" json:"description"`
|
||||||
Description *string `gorm:"type:text" json:"description"`
|
Order int `gorm:"default:0" json:"order"`
|
||||||
Order int `gorm:"default:0" json:"order"`
|
BusinessType string `gorm:"size:50;default:'restaurant'" json:"business_type"`
|
||||||
BusinessType string `gorm:"size:50;default:'restaurant'" json:"business_type"`
|
Metadata Metadata `gorm:"type:jsonb;default:'{}'" json:"metadata"`
|
||||||
Metadata Metadata `gorm:"type:jsonb;default:'{}'" json:"metadata"`
|
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"`
|
||||||
Outlet Outlet `gorm:"foreignKey:OutletID" json:"outlet,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{},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,6 @@ import (
|
|||||||
type Product struct {
|
type Product 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"`
|
||||||
OutletID *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id"`
|
|
||||||
CategoryID uuid.UUID `gorm:"type:uuid;not null;index" json:"category_id" validate:"required"`
|
CategoryID uuid.UUID `gorm:"type:uuid;not null;index" json:"category_id" validate:"required"`
|
||||||
SKU *string `gorm:"size:100;index" json:"sku"`
|
SKU *string `gorm:"size:100;index" json:"sku"`
|
||||||
Name string `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
|
Name string `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
|
||||||
@ -27,14 +26,13 @@ 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"`
|
||||||
Outlet *Outlet `gorm:"foreignKey:OutletID" json:"outlet,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"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Product) BeforeCreate(tx *gorm.DB) error {
|
func (p *Product) BeforeCreate(tx *gorm.DB) error {
|
||||||
|
|||||||
31
internal/entities/product_outlet_price.go
Normal file
31
internal/entities/product_outlet_price.go
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
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"`
|
||||||
|
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"
|
||||||
|
}
|
||||||
@ -170,12 +170,6 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
|
|||||||
req.BusinessType = businessType
|
req.BusinessType = businessType
|
||||||
}
|
}
|
||||||
|
|
||||||
if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
|
|
||||||
if outletID, err := uuid.Parse(outletIDStr); err == nil {
|
|
||||||
req.OutletID = &outletID
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if organizationIDStr := c.Query("organization_id"); organizationIDStr != "" {
|
if organizationIDStr := c.Query("organization_id"); organizationIDStr != "" {
|
||||||
if organizationID, err := uuid.Parse(organizationIDStr); err == nil {
|
if organizationID, err := uuid.Parse(organizationIDStr); err == nil {
|
||||||
req.OrganizationID = &organizationID
|
req.OrganizationID = &organizationID
|
||||||
|
|||||||
@ -137,6 +137,9 @@ 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")
|
||||||
|
|||||||
@ -117,6 +117,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 +128,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")
|
||||||
@ -172,10 +173,89 @@ func (h *ProductHandler) ListProducts(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if categoryIDStr := c.Query("category_id"); categoryIDStr != "" {
|
||||||
|
if categoryID, err := uuid.Parse(categoryIDStr); err == nil {
|
||||||
|
req.CategoryID = &categoryID
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if isActiveStr := c.Query("is_active"); isActiveStr != "" {
|
||||||
|
if isActive, err := strconv.ParseBool(isActiveStr); err == nil {
|
||||||
|
req.IsActive = &isActive
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
|
if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
|
||||||
if outletID, err := uuid.Parse(outletIDStr); err == nil {
|
if outletID, err := uuid.Parse(outletIDStr); err == nil {
|
||||||
req.OutletID = &outletID
|
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 categoryIDStr := c.Query("category_id"); categoryIDStr != "" {
|
||||||
@ -190,6 +270,12 @@ 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
135
internal/handler/product_outlet_price_handler.go
Normal file
135
internal/handler/product_outlet_price_handler.go
Normal file
@ -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
|
||||||
|
|||||||
@ -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,
|
||||||
|
|||||||
48
internal/mappers/product_outlet_price_mapper.go
Normal file
48
internal/mappers/product_outlet_price_mapper.go
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
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,
|
||||||
|
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,
|
||||||
|
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()
|
||||||
|
|||||||
@ -9,11 +9,10 @@ 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
|
||||||
@ -21,30 +20,27 @@ type Category struct {
|
|||||||
|
|
||||||
type CreateCategoryRequest struct {
|
type CreateCategoryRequest struct {
|
||||||
OrganizationID uuid.UUID `validate:"required"`
|
OrganizationID uuid.UUID `validate:"required"`
|
||||||
OutletID *uuid.UUID
|
Name string `validate:"required,min=1,max=255"`
|
||||||
Name string `validate:"required,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:"min=0"`
|
||||||
Order int `validate:"min=0"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateCategoryRequest struct {
|
type UpdateCategoryRequest struct {
|
||||||
OutletID *uuid.UUID `validate:"omitempty,required"`
|
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"`
|
||||||
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
|
||||||
|
|||||||
@ -10,7 +10,6 @@ import (
|
|||||||
type Product struct {
|
type Product struct {
|
||||||
ID uuid.UUID
|
ID uuid.UUID
|
||||||
OrganizationID uuid.UUID
|
OrganizationID uuid.UUID
|
||||||
OutletID *uuid.UUID
|
|
||||||
CategoryID uuid.UUID
|
CategoryID uuid.UUID
|
||||||
SKU *string
|
SKU *string
|
||||||
Name string
|
Name string
|
||||||
@ -41,7 +40,6 @@ type ProductVariant struct {
|
|||||||
|
|
||||||
type CreateProductRequest struct {
|
type CreateProductRequest struct {
|
||||||
OrganizationID uuid.UUID `validate:"required"`
|
OrganizationID uuid.UUID `validate:"required"`
|
||||||
OutletID *uuid.UUID `validate:"omitempty"`
|
|
||||||
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"`
|
||||||
@ -62,7 +60,6 @@ type CreateProductRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type UpdateProductRequest struct {
|
type UpdateProductRequest struct {
|
||||||
OutletID *uuid.UUID `validate:"omitempty"`
|
|
||||||
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"`
|
||||||
@ -97,13 +94,14 @@ type UpdateProductVariantRequest struct {
|
|||||||
type ProductResponse struct {
|
type ProductResponse struct {
|
||||||
ID uuid.UUID
|
ID uuid.UUID
|
||||||
OrganizationID uuid.UUID
|
OrganizationID uuid.UUID
|
||||||
OutletID *uuid.UUID
|
|
||||||
CategoryID uuid.UUID
|
CategoryID uuid.UUID
|
||||||
CategoryName string
|
CategoryName string
|
||||||
SKU *string
|
SKU *string
|
||||||
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
|
||||||
@ -117,6 +115,12 @@ type ProductResponse struct {
|
|||||||
Variants []ProductVariantResponse
|
Variants []ProductVariantResponse
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type OutletPrice struct {
|
||||||
|
OutletID uuid.UUID
|
||||||
|
OutletName string
|
||||||
|
Price float64
|
||||||
|
}
|
||||||
|
|
||||||
type ProductVariantResponse struct {
|
type ProductVariantResponse struct {
|
||||||
ID uuid.UUID
|
ID uuid.UUID
|
||||||
ProductID uuid.UUID
|
ProductID uuid.UUID
|
||||||
|
|||||||
35
internal/models/product_outlet_price.go
Normal file
35
internal/models/product_outlet_price.go
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ProductOutletPrice struct {
|
||||||
|
ID uuid.UUID
|
||||||
|
ProductID uuid.UUID
|
||||||
|
OutletID uuid.UUID
|
||||||
|
Price float64
|
||||||
|
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"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type UpdateProductOutletPriceRequest struct {
|
||||||
|
Price *float64 `validate:"required,min=0"`
|
||||||
|
}
|
||||||
|
|
||||||
|
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"`
|
||||||
|
}
|
||||||
@ -55,7 +55,6 @@ func (p *CategoryProcessorImpl) CreateCategory(ctx context.Context, req *models.
|
|||||||
|
|
||||||
// Map request to entity
|
// Map request to entity
|
||||||
categoryEntity := mappers.CreateCategoryRequestToEntity(req)
|
categoryEntity := mappers.CreateCategoryRequestToEntity(req)
|
||||||
categoryEntity.OutletID = req.OutletID
|
|
||||||
|
|
||||||
// Create category
|
// Create category
|
||||||
if err := p.categoryRepo.Create(ctx, categoryEntity); err != nil {
|
if err := p.categoryRepo.Create(ctx, categoryEntity); err != nil {
|
||||||
@ -87,9 +86,6 @@ func (p *CategoryProcessorImpl) UpdateCategory(ctx context.Context, id uuid.UUID
|
|||||||
|
|
||||||
// Apply updates to entity
|
// Apply updates to entity
|
||||||
mappers.UpdateCategoryEntityFromRequest(existingCategory, req)
|
mappers.UpdateCategoryEntityFromRequest(existingCategory, req)
|
||||||
if req.OutletID != nil {
|
|
||||||
existingCategory.OutletID = req.OutletID
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update category
|
// Update category
|
||||||
if err := p.categoryRepo.Update(ctx, existingCategory); err != nil {
|
if err := p.categoryRepo.Update(ctx, existingCategory); err != nil {
|
||||||
|
|||||||
@ -108,6 +108,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 +127,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 +146,7 @@ func NewOrderProcessorImpl(
|
|||||||
productRecipeRepo: productRecipeRepo,
|
productRecipeRepo: productRecipeRepo,
|
||||||
ingredientRepo: ingredientRepo,
|
ingredientRepo: ingredientRepo,
|
||||||
inventoryMovementService: inventoryMovementService,
|
inventoryMovementService: inventoryMovementService,
|
||||||
|
productOutletPriceRepo: productOutletPriceRepo,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -170,6 +173,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 +302,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)
|
||||||
|
|||||||
121
internal/processor/product_outlet_price_processor.go
Normal file
121
internal/processor/product_outlet_price_processor.go
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
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,
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
@ -16,8 +16,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,6 +33,7 @@ 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)
|
||||||
@ -47,15 +49,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,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -214,19 +218,79 @@ 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
|
||||||
|
}
|
||||||
|
} 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,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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))
|
||||||
|
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)
|
||||||
|
|||||||
@ -25,7 +25,7 @@ func (r *CategoryRepositoryImpl) Create(ctx context.Context, category *entities.
|
|||||||
|
|
||||||
func (r *CategoryRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Category, error) {
|
func (r *CategoryRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Category, error) {
|
||||||
var category entities.Category
|
var category entities.Category
|
||||||
err := r.db.WithContext(ctx).Preload("Outlet").First(&category, "id = ?", id).Error
|
err := r.db.WithContext(ctx).First(&category, "id = ?", id).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -34,7 +34,7 @@ func (r *CategoryRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*en
|
|||||||
|
|
||||||
func (r *CategoryRepositoryImpl) GetWithProducts(ctx context.Context, id uuid.UUID) (*entities.Category, error) {
|
func (r *CategoryRepositoryImpl) GetWithProducts(ctx context.Context, id uuid.UUID) (*entities.Category, error) {
|
||||||
var category entities.Category
|
var category entities.Category
|
||||||
err := r.db.WithContext(ctx).Preload("Products").Preload("Outlet").First(&category, "id = ?", id).Error
|
err := r.db.WithContext(ctx).Preload("Products").First(&category, "id = ?", id).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -81,7 +81,7 @@ func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]in
|
|||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
err := query.Preload("Outlet").Order("\"order\" ASC").Limit(limit).Offset(offset).Find(&categories).Error
|
err := query.Order("\"order\" ASC").Limit(limit).Offset(offset).Find(&categories).Error
|
||||||
return categories, total, err
|
return categories, total, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
85
internal/repository/product_outlet_price_repository.go
Normal file
85
internal/repository/product_outlet_price_repository.go
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
package repository
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"apskel-pos-be/internal/entities"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"gorm.io/gorm/clause"
|
||||||
|
)
|
||||||
|
|
||||||
|
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 {
|
||||||
|
return r.db.WithContext(ctx).Clauses(clause.OnConflict{
|
||||||
|
Columns: []clause.Column{{Name: "product_id"}, {Name: "outlet_id"}},
|
||||||
|
DoUpdates: clause.AssignmentColumns([]string{"price", "updated_at"}),
|
||||||
|
}).Create(price).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
|
||||||
|
}
|
||||||
@ -189,3 +189,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
|
||||||
|
}
|
||||||
|
|||||||
@ -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)
|
||||||
|
|||||||
@ -88,9 +88,6 @@ func (s *CategoryServiceImpl) ListCategories(ctx context.Context, req *contract.
|
|||||||
if req.BusinessType != "" {
|
if req.BusinessType != "" {
|
||||||
filters["business_type"] = req.BusinessType
|
filters["business_type"] = req.BusinessType
|
||||||
}
|
}
|
||||||
if req.OutletID != nil {
|
|
||||||
filters["outlet_id"] = *req.OutletID
|
|
||||||
}
|
|
||||||
if req.Search != "" {
|
if req.Search != "" {
|
||||||
filters["search"] = req.Search
|
filters["search"] = req.Search
|
||||||
}
|
}
|
||||||
|
|||||||
125
internal/service/product_outlet_price_service.go
Normal file
125
internal/service/product_outlet_price_service.go
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
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,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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),
|
||||||
|
})
|
||||||
|
}
|
||||||
@ -16,8 +16,9 @@ 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, 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 {
|
||||||
@ -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})
|
||||||
@ -132,3 +133,57 @@ func (s *ProductServiceImpl) ListProducts(ctx context.Context, req *contract.Lis
|
|||||||
|
|
||||||
return contract.BuildSuccessResponse(listResponse)
|
return contract.BuildSuccessResponse(listResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *ProductServiceImpl) ListProductsAll(ctx context.Context, req *contract.ListProductsRequest) *contract.Response {
|
||||||
|
// Build filters
|
||||||
|
filters := make(map[string]interface{})
|
||||||
|
if req.OrganizationID != nil {
|
||||||
|
filters["organization_id"] = *req.OrganizationID
|
||||||
|
}
|
||||||
|
if req.OutletID != nil {
|
||||||
|
filters["outlet_id"] = *req.OutletID
|
||||||
|
}
|
||||||
|
if req.CategoryID != nil {
|
||||||
|
filters["category_id"] = *req.CategoryID
|
||||||
|
}
|
||||||
|
if req.BusinessType != "" {
|
||||||
|
filters["business_type"] = req.BusinessType
|
||||||
|
}
|
||||||
|
if req.IsActive != nil {
|
||||||
|
filters["is_active"] = *req.IsActive
|
||||||
|
}
|
||||||
|
if req.Search != "" {
|
||||||
|
filters["search"] = req.Search
|
||||||
|
}
|
||||||
|
if req.MinPrice != nil {
|
||||||
|
filters["price_min"] = *req.MinPrice
|
||||||
|
}
|
||||||
|
if req.MaxPrice != nil {
|
||||||
|
filters["price_max"] = *req.MaxPrice
|
||||||
|
}
|
||||||
|
|
||||||
|
products, totalCount, err := s.productProcessor.ListProducts(ctx, filters, req.Page, req.Limit)
|
||||||
|
if err != nil {
|
||||||
|
errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductServiceEntity, err.Error())
|
||||||
|
return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to contract responses
|
||||||
|
contractResponses := transformer.ProductsToResponses(products)
|
||||||
|
|
||||||
|
// Calculate total pages
|
||||||
|
totalPages := totalCount / req.Limit
|
||||||
|
if totalCount%req.Limit > 0 {
|
||||||
|
totalPages++
|
||||||
|
}
|
||||||
|
|
||||||
|
listResponse := &contract.ListProductsResponse{
|
||||||
|
Products: contractResponses,
|
||||||
|
TotalCount: totalCount,
|
||||||
|
Page: req.Page,
|
||||||
|
Limit: req.Limit,
|
||||||
|
TotalPages: totalPages,
|
||||||
|
}
|
||||||
|
|
||||||
|
return contract.BuildSuccessResponse(listResponse)
|
||||||
|
}
|
||||||
|
|||||||
@ -9,7 +9,6 @@ import (
|
|||||||
func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateCategoryRequest) *models.CreateCategoryRequest {
|
func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateCategoryRequest) *models.CreateCategoryRequest {
|
||||||
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,
|
||||||
@ -19,7 +18,6 @@ func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.C
|
|||||||
|
|
||||||
func UpdateCategoryRequestToModel(req *contract.UpdateCategoryRequest) *models.UpdateCategoryRequest {
|
func UpdateCategoryRequestToModel(req *contract.UpdateCategoryRequest) *models.UpdateCategoryRequest {
|
||||||
return &models.UpdateCategoryRequest{
|
return &models.UpdateCategoryRequest{
|
||||||
OutletID: req.OutletID,
|
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Description: req.Description,
|
Description: req.Description,
|
||||||
ImageURL: nil,
|
ImageURL: nil,
|
||||||
@ -36,7 +34,6 @@ 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", // Default business type
|
||||||
|
|||||||
55
internal/transformer/product_outlet_price_transformer.go
Normal file
55
internal/transformer/product_outlet_price_transformer.go
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
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,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpdateProductOutletPriceRequestToModel(req *contract.UpdateProductOutletPriceRequest) *models.UpdateProductOutletPriceRequest {
|
||||||
|
if req == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return &models.UpdateProductOutletPriceRequest{
|
||||||
|
Price: &req.Price,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
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
|
||||||
|
}
|
||||||
@ -39,7 +39,6 @@ func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Cr
|
|||||||
|
|
||||||
return &models.CreateProductRequest{
|
return &models.CreateProductRequest{
|
||||||
OrganizationID: apctx.OrganizationID,
|
OrganizationID: apctx.OrganizationID,
|
||||||
OutletID: req.OutletID,
|
|
||||||
CategoryID: req.CategoryID,
|
CategoryID: req.CategoryID,
|
||||||
SKU: req.SKU,
|
SKU: req.SKU,
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
@ -61,8 +60,7 @@ func UpdateProductRequestToModel(req *contract.UpdateProductRequest) *models.Upd
|
|||||||
}
|
}
|
||||||
|
|
||||||
return &models.UpdateProductRequest{
|
return &models.UpdateProductRequest{
|
||||||
OutletID: req.OutletID,
|
CategoryID: req.CategoryID,
|
||||||
CategoryID: req.CategoryID,
|
|
||||||
SKU: req.SKU,
|
SKU: req.SKU,
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Description: req.Description,
|
Description: req.Description,
|
||||||
@ -99,16 +97,30 @@ 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,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return &contract.ProductResponse{
|
return &contract.ProductResponse{
|
||||||
ID: prod.ID,
|
ID: prod.ID,
|
||||||
OrganizationID: prod.OrganizationID,
|
OrganizationID: prod.OrganizationID,
|
||||||
OutletID: prod.OutletID,
|
|
||||||
CategoryID: prod.CategoryID,
|
CategoryID: prod.CategoryID,
|
||||||
CategoryName: prod.CategoryName,
|
CategoryName: prod.CategoryName,
|
||||||
SKU: prod.SKU,
|
SKU: prod.SKU,
|
||||||
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,
|
||||||
|
|||||||
@ -59,7 +59,7 @@ func (v *CategoryValidatorImpl) ValidateUpdateCategoryRequest(req *contract.Upda
|
|||||||
}
|
}
|
||||||
|
|
||||||
// At least one field should be provided for update
|
// At least one field should be provided for update
|
||||||
if req.Name == nil && req.Description == nil && req.BusinessType == nil && req.Metadata == nil && req.OutletID == nil {
|
if req.Name == nil && req.Description == nil && req.BusinessType == nil && req.Metadata == nil {
|
||||||
return errors.New("at least one field must be provided for update"), constants.MissingFieldErrorCode
|
return errors.New("at least one field must be provided for update"), constants.MissingFieldErrorCode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
80
internal/validator/product_outlet_price_validator.go
Normal file
80
internal/validator/product_outlet_price_validator.go
Normal file
@ -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, ""
|
||||||
|
}
|
||||||
@ -1,3 +0,0 @@
|
|||||||
DROP INDEX IF EXISTS idx_categories_outlet_id;
|
|
||||||
ALTER TABLE categories DROP CONSTRAINT IF EXISTS fk_categories_outlet;
|
|
||||||
ALTER TABLE categories DROP COLUMN IF EXISTS outlet_id;
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
ALTER TABLE categories ADD COLUMN outlet_id UUID;
|
|
||||||
ALTER TABLE categories ADD CONSTRAINT fk_categories_outlet FOREIGN KEY (outlet_id) REFERENCES outlets(id) ON DELETE SET NULL;
|
|
||||||
CREATE INDEX idx_categories_outlet_id ON categories(outlet_id);
|
|
||||||
@ -0,0 +1 @@
|
|||||||
|
DROP TABLE IF EXISTS product_outlet_prices;
|
||||||
12
migrations/000068_create_product_outlet_prices_table.up.sql
Normal file
12
migrations/000068_create_product_outlet_prices_table.up.sql
Normal file
@ -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);
|
||||||
@ -1,8 +0,0 @@
|
|||||||
-- Remove foreign key constraint
|
|
||||||
ALTER TABLE products DROP CONSTRAINT IF EXISTS fk_products_outlet;
|
|
||||||
|
|
||||||
-- Remove index
|
|
||||||
DROP INDEX IF EXISTS idx_products_outlet_id;
|
|
||||||
|
|
||||||
-- Remove outlet_id column
|
|
||||||
ALTER TABLE products DROP COLUMN IF EXISTS outlet_id;
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
-- Add nullable outlet_id column to products table
|
|
||||||
ALTER TABLE products ADD COLUMN outlet_id UUID;
|
|
||||||
|
|
||||||
-- Create index on outlet_id for faster queries
|
|
||||||
CREATE INDEX idx_products_outlet_id ON products (outlet_id);
|
|
||||||
|
|
||||||
-- Add foreign key constraint
|
|
||||||
ALTER TABLE products ADD CONSTRAINT fk_products_outlet FOREIGN KEY (outlet_id) REFERENCES outlets(id) ON DELETE SET NULL;
|
|
||||||
Loading…
x
Reference in New Issue
Block a user