Compare commits
No commits in common. "f7399fd0e7676920bcc942e70ed2c10eca829492" and "66a8126da0315bc98727b50d69cc159ecfba8dc5" have entirely different histories.
f7399fd0e7
...
66a8126da0
@ -98,8 +98,6 @@ type OrderItemResponse struct {
|
|||||||
ProductName string `json:"product_name"`
|
ProductName string `json:"product_name"`
|
||||||
ProductVariantID *uuid.UUID `json:"product_variant_id"`
|
ProductVariantID *uuid.UUID `json:"product_variant_id"`
|
||||||
ProductVariantName *string `json:"product_variant_name,omitempty"`
|
ProductVariantName *string `json:"product_variant_name,omitempty"`
|
||||||
CategoryID *uuid.UUID `json:"category_id,omitempty"`
|
|
||||||
CategoryName *string `json:"category_name,omitempty"`
|
|
||||||
Quantity int `json:"quantity"`
|
Quantity int `json:"quantity"`
|
||||||
UnitPrice float64 `json:"unit_price"`
|
UnitPrice float64 `json:"unit_price"`
|
||||||
TotalPrice float64 `json:"total_price"`
|
TotalPrice float64 `json:"total_price"`
|
||||||
@ -110,7 +108,6 @@ type OrderItemResponse struct {
|
|||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
PrinterType string `json:"printer_type"`
|
PrinterType string `json:"printer_type"`
|
||||||
PrintToChecker bool `json:"print_to_checker"`
|
|
||||||
PaidQuantity int `json:"paid_quantity"`
|
PaidQuantity int `json:"paid_quantity"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,6 @@ type CreateProductRequest struct {
|
|||||||
BusinessType *string `json:"business_type,omitempty"`
|
BusinessType *string `json:"business_type,omitempty"`
|
||||||
ImageURL *string `json:"image_url,omitempty" validate:"omitempty,max=500"`
|
ImageURL *string `json:"image_url,omitempty" validate:"omitempty,max=500"`
|
||||||
PrinterType *string `json:"printer_type,omitempty" validate:"omitempty,max=50"`
|
PrinterType *string `json:"printer_type,omitempty" validate:"omitempty,max=50"`
|
||||||
PrintToChecker *bool `json:"print_to_checker,omitempty"`
|
|
||||||
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
||||||
IsActive *bool `json:"is_active,omitempty"`
|
IsActive *bool `json:"is_active,omitempty"`
|
||||||
Variants []CreateProductVariantRequest `json:"variants,omitempty"`
|
Variants []CreateProductVariantRequest `json:"variants,omitempty"`
|
||||||
@ -37,7 +36,6 @@ type UpdateProductRequest struct {
|
|||||||
BusinessType *string `json:"business_type,omitempty"`
|
BusinessType *string `json:"business_type,omitempty"`
|
||||||
ImageURL *string `json:"image_url,omitempty" validate:"omitempty,max=500"`
|
ImageURL *string `json:"image_url,omitempty" validate:"omitempty,max=500"`
|
||||||
PrinterType *string `json:"printer_type,omitempty" validate:"omitempty,max=50"`
|
PrinterType *string `json:"printer_type,omitempty" validate:"omitempty,max=50"`
|
||||||
PrintToChecker *bool `json:"print_to_checker,omitempty"`
|
|
||||||
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
||||||
IsActive *bool `json:"is_active,omitempty"`
|
IsActive *bool `json:"is_active,omitempty"`
|
||||||
ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
|
ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
|
||||||
@ -73,7 +71,6 @@ type ProductResponse struct {
|
|||||||
BusinessType string `json:"business_type"`
|
BusinessType string `json:"business_type"`
|
||||||
ImageURL *string `json:"image_url"`
|
ImageURL *string `json:"image_url"`
|
||||||
PrinterType string `json:"printer_type"`
|
PrinterType string `json:"printer_type"`
|
||||||
PrintToChecker bool `json:"print_to_checker"`
|
|
||||||
Metadata map[string]interface{} `json:"metadata"`
|
Metadata map[string]interface{} `json:"metadata"`
|
||||||
IsActive bool `json:"is_active"`
|
IsActive bool `json:"is_active"`
|
||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
|||||||
@ -10,12 +10,10 @@ type CreateProductOutletPriceRequest struct {
|
|||||||
ProductID uuid.UUID `json:"product_id" validate:"required"`
|
ProductID uuid.UUID `json:"product_id" validate:"required"`
|
||||||
OutletID uuid.UUID `json:"outlet_id" validate:"required"`
|
OutletID uuid.UUID `json:"outlet_id" validate:"required"`
|
||||||
Price float64 `json:"price" validate:"required,min=0"`
|
Price float64 `json:"price" validate:"required,min=0"`
|
||||||
PrintToChecker bool `json:"print_to_checker"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateProductOutletPriceRequest struct {
|
type UpdateProductOutletPriceRequest struct {
|
||||||
Price float64 `json:"price" validate:"required,min=0"`
|
Price float64 `json:"price" validate:"required,min=0"`
|
||||||
PrintToChecker *bool `json:"print_to_checker"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductOutletPriceResponse struct {
|
type ProductOutletPriceResponse struct {
|
||||||
@ -24,7 +22,6 @@ type ProductOutletPriceResponse struct {
|
|||||||
OutletID uuid.UUID `json:"outlet_id"`
|
OutletID uuid.UUID `json:"outlet_id"`
|
||||||
OutletName string `json:"outlet_name,omitempty"`
|
OutletName string `json:"outlet_name,omitempty"`
|
||||||
Price float64 `json:"price"`
|
Price float64 `json:"price"`
|
||||||
PrintToChecker bool `json:"print_to_checker"`
|
|
||||||
CreatedAt time.Time `json:"created_at,omitempty"`
|
CreatedAt time.Time `json:"created_at,omitempty"`
|
||||||
UpdatedAt time.Time `json:"updated_at,omitempty"`
|
UpdatedAt time.Time `json:"updated_at,omitempty"`
|
||||||
}
|
}
|
||||||
@ -42,5 +39,4 @@ type BulkCreateProductOutletPriceRequest struct {
|
|||||||
type CreateProductOutletPricePerOutletRequest struct {
|
type CreateProductOutletPricePerOutletRequest struct {
|
||||||
OutletID uuid.UUID `json:"outlet_id" validate:"required"`
|
OutletID uuid.UUID `json:"outlet_id" validate:"required"`
|
||||||
Price float64 `json:"price" validate:"required,min=0"`
|
Price float64 `json:"price" validate:"required,min=0"`
|
||||||
PrintToChecker bool `json:"print_to_checker"`
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,6 @@ type Product struct {
|
|||||||
ProductRecipes []ProductRecipe `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
|
ProductRecipes []ProductRecipe `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
|
||||||
Inventory []Inventory `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
|
Inventory []Inventory `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
|
||||||
OrderItems []OrderItem `gorm:"foreignKey:ProductID" json:"order_items,omitempty"`
|
OrderItems []OrderItem `gorm:"foreignKey:ProductID" json:"order_items,omitempty"`
|
||||||
ProductOutletPrices []ProductOutletPrice `gorm:"foreignKey:ProductID" json:"product_outlet_prices,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Product) BeforeCreate(tx *gorm.DB) error {
|
func (p *Product) BeforeCreate(tx *gorm.DB) error {
|
||||||
|
|||||||
@ -12,7 +12,6 @@ type ProductOutletPrice struct {
|
|||||||
ProductID uuid.UUID `gorm:"type:uuid;not null;index" json:"product_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"`
|
OutletID uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
|
||||||
Price float64 `gorm:"type:decimal(10,2);not null" json:"price"`
|
Price float64 `gorm:"type:decimal(10,2);not null" json:"price"`
|
||||||
PrintToChecker bool `gorm:"not null;default:true" json:"print_to_checker"`
|
|
||||||
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
||||||
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
||||||
|
|
||||||
|
|||||||
@ -82,7 +82,7 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for i, item := range order.OrderItems {
|
for i, item := range order.OrderItems {
|
||||||
resp := OrderItemEntityToResponse(&item, order.OutletID)
|
resp := OrderItemEntityToResponse(&item)
|
||||||
if resp != nil {
|
if resp != nil {
|
||||||
resp.PaidQuantity = paidQtyByOrderItem[item.ID]
|
resp.PaidQuantity = paidQtyByOrderItem[item.ID]
|
||||||
response.OrderItems[i] = *resp
|
response.OrderItems[i] = *resp
|
||||||
@ -101,20 +101,11 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
|
|||||||
return response
|
return response
|
||||||
}
|
}
|
||||||
|
|
||||||
func OrderItemEntityToResponse(item *entities.OrderItem, outletID uuid.UUID) *models.OrderItemResponse {
|
func OrderItemEntityToResponse(item *entities.OrderItem) *models.OrderItemResponse {
|
||||||
if item == nil {
|
if item == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Resolve print_to_checker from preloaded outlet prices
|
|
||||||
printToChecker := true // default
|
|
||||||
for _, op := range item.Product.ProductOutletPrices {
|
|
||||||
if op.OutletID == outletID {
|
|
||||||
printToChecker = op.PrintToChecker
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
response := &models.OrderItemResponse{
|
response := &models.OrderItemResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
OrderID: item.OrderID,
|
OrderID: item.OrderID,
|
||||||
@ -139,19 +130,10 @@ func OrderItemEntityToResponse(item *entities.OrderItem, outletID uuid.UUID) *mo
|
|||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
PrinterType: item.Product.PrinterType,
|
PrinterType: item.Product.PrinterType,
|
||||||
PrintToChecker: printToChecker,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if item.Product.ID != uuid.Nil {
|
if item.Product.ID != uuid.Nil {
|
||||||
response.ProductName = item.Product.Name
|
response.ProductName = item.Product.Name
|
||||||
if item.Product.CategoryID != uuid.Nil {
|
|
||||||
categoryID := item.Product.CategoryID
|
|
||||||
response.CategoryID = &categoryID
|
|
||||||
}
|
|
||||||
if item.Product.Category.ID != uuid.Nil {
|
|
||||||
categoryName := item.Product.Category.Name
|
|
||||||
response.CategoryName = &categoryName
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if item.ProductVariant != nil {
|
if item.ProductVariant != nil {
|
||||||
@ -334,14 +316,14 @@ func OrderEntitiesToResponses(orders []*entities.Order) []models.OrderResponse {
|
|||||||
return responses
|
return responses
|
||||||
}
|
}
|
||||||
|
|
||||||
func OrderItemEntitiesToResponses(items []*entities.OrderItem, outletID uuid.UUID) []models.OrderItemResponse {
|
func OrderItemEntitiesToResponses(items []*entities.OrderItem) []models.OrderItemResponse {
|
||||||
if items == nil {
|
if items == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
responses := make([]models.OrderItemResponse, len(items))
|
responses := make([]models.OrderItemResponse, len(items))
|
||||||
for i, item := range items {
|
for i, item := range items {
|
||||||
response := OrderItemEntityToResponse(item, outletID)
|
response := OrderItemEntityToResponse(item)
|
||||||
if response != nil {
|
if response != nil {
|
||||||
responses[i] = *response
|
responses[i] = *response
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,7 +45,7 @@ func TestOrderItemEntityToResponse_WithProductNames(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
result := OrderItemEntityToResponse(orderItem, uuid.Nil)
|
result := OrderItemEntityToResponse(orderItem)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
assert.NotNil(t, result)
|
assert.NotNil(t, result)
|
||||||
@ -89,7 +89,7 @@ func TestOrderItemEntityToResponse_WithoutProductVariant(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
result := OrderItemEntityToResponse(orderItem, uuid.Nil)
|
result := OrderItemEntityToResponse(orderItem)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
assert.NotNil(t, result)
|
assert.NotNil(t, result)
|
||||||
@ -129,7 +129,7 @@ func TestOrderItemEntityToResponse_WithoutProductPreload(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
result := OrderItemEntityToResponse(orderItem, uuid.Nil)
|
result := OrderItemEntityToResponse(orderItem)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
assert.NotNil(t, result)
|
assert.NotNil(t, result)
|
||||||
|
|||||||
@ -15,7 +15,6 @@ func ProductOutletPriceEntityToModel(entity *entities.ProductOutletPrice) *model
|
|||||||
ProductID: entity.ProductID,
|
ProductID: entity.ProductID,
|
||||||
OutletID: entity.OutletID,
|
OutletID: entity.OutletID,
|
||||||
Price: entity.Price,
|
Price: entity.Price,
|
||||||
PrintToChecker: entity.PrintToChecker,
|
|
||||||
CreatedAt: entity.CreatedAt,
|
CreatedAt: entity.CreatedAt,
|
||||||
UpdatedAt: entity.UpdatedAt,
|
UpdatedAt: entity.UpdatedAt,
|
||||||
}
|
}
|
||||||
@ -31,7 +30,6 @@ func ProductOutletPriceModelToEntity(model *models.ProductOutletPrice) *entities
|
|||||||
ProductID: model.ProductID,
|
ProductID: model.ProductID,
|
||||||
OutletID: model.OutletID,
|
OutletID: model.OutletID,
|
||||||
Price: model.Price,
|
Price: model.Price,
|
||||||
PrintToChecker: model.PrintToChecker,
|
|
||||||
CreatedAt: model.CreatedAt,
|
CreatedAt: model.CreatedAt,
|
||||||
UpdatedAt: model.UpdatedAt,
|
UpdatedAt: model.UpdatedAt,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -188,8 +188,6 @@ type OrderItemResponse struct {
|
|||||||
ProductName string
|
ProductName string
|
||||||
ProductVariantID *uuid.UUID
|
ProductVariantID *uuid.UUID
|
||||||
ProductVariantName *string
|
ProductVariantName *string
|
||||||
CategoryID *uuid.UUID
|
|
||||||
CategoryName *string
|
|
||||||
Quantity int
|
Quantity int
|
||||||
UnitPrice float64
|
UnitPrice float64
|
||||||
TotalPrice float64
|
TotalPrice float64
|
||||||
@ -209,7 +207,6 @@ type OrderItemResponse struct {
|
|||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
PrinterType string
|
PrinterType string
|
||||||
PrintToChecker bool
|
|
||||||
PaidQuantity int
|
PaidQuantity int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -50,7 +50,6 @@ type CreateProductRequest struct {
|
|||||||
BusinessType constants.BusinessType `validate:"required"`
|
BusinessType constants.BusinessType `validate:"required"`
|
||||||
ImageURL *string `validate:"omitempty,max=500"`
|
ImageURL *string `validate:"omitempty,max=500"`
|
||||||
PrinterType *string `validate:"omitempty,max=50"`
|
PrinterType *string `validate:"omitempty,max=50"`
|
||||||
PrintToChecker *bool `validate:"omitempty"`
|
|
||||||
UnitID *uuid.UUID `validate:"omitempty"`
|
UnitID *uuid.UUID `validate:"omitempty"`
|
||||||
HasIngredients bool `validate:"omitempty"`
|
HasIngredients bool `validate:"omitempty"`
|
||||||
Metadata map[string]interface{}
|
Metadata map[string]interface{}
|
||||||
@ -71,7 +70,6 @@ type UpdateProductRequest struct {
|
|||||||
Cost *float64 `validate:"omitempty,min=0"`
|
Cost *float64 `validate:"omitempty,min=0"`
|
||||||
ImageURL *string `validate:"omitempty,max=500"`
|
ImageURL *string `validate:"omitempty,max=500"`
|
||||||
PrinterType *string `validate:"omitempty,max=50"`
|
PrinterType *string `validate:"omitempty,max=50"`
|
||||||
PrintToChecker *bool `validate:"omitempty"`
|
|
||||||
UnitID *uuid.UUID `validate:"omitempty"`
|
UnitID *uuid.UUID `validate:"omitempty"`
|
||||||
HasIngredients *bool `validate:"omitempty"`
|
HasIngredients *bool `validate:"omitempty"`
|
||||||
Metadata map[string]interface{}
|
Metadata map[string]interface{}
|
||||||
@ -110,7 +108,6 @@ type ProductResponse struct {
|
|||||||
BusinessType constants.BusinessType
|
BusinessType constants.BusinessType
|
||||||
ImageURL *string
|
ImageURL *string
|
||||||
PrinterType string
|
PrinterType string
|
||||||
PrintToChecker bool
|
|
||||||
UnitID *uuid.UUID
|
UnitID *uuid.UUID
|
||||||
HasIngredients bool
|
HasIngredients bool
|
||||||
Metadata map[string]interface{}
|
Metadata map[string]interface{}
|
||||||
@ -124,7 +121,6 @@ type OutletPrice struct {
|
|||||||
OutletID uuid.UUID
|
OutletID uuid.UUID
|
||||||
OutletName string
|
OutletName string
|
||||||
Price float64
|
Price float64
|
||||||
PrintToChecker bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductVariantResponse struct {
|
type ProductVariantResponse struct {
|
||||||
|
|||||||
@ -11,7 +11,6 @@ type ProductOutletPrice struct {
|
|||||||
ProductID uuid.UUID
|
ProductID uuid.UUID
|
||||||
OutletID uuid.UUID
|
OutletID uuid.UUID
|
||||||
Price float64
|
Price float64
|
||||||
PrintToChecker bool
|
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
}
|
}
|
||||||
@ -20,12 +19,10 @@ type CreateProductOutletPriceRequest struct {
|
|||||||
ProductID uuid.UUID `validate:"required"`
|
ProductID uuid.UUID `validate:"required"`
|
||||||
OutletID uuid.UUID `validate:"required"`
|
OutletID uuid.UUID `validate:"required"`
|
||||||
Price float64 `validate:"required,min=0"`
|
Price float64 `validate:"required,min=0"`
|
||||||
PrintToChecker bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateProductOutletPriceRequest struct {
|
type UpdateProductOutletPriceRequest struct {
|
||||||
Price *float64 `validate:"required,min=0"`
|
Price *float64 `validate:"required,min=0"`
|
||||||
PrintToChecker *bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductOutletPriceResponse struct {
|
type ProductOutletPriceResponse struct {
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package processor
|
package processor
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"apskel-pos-be/internal/constants"
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@ -387,10 +388,31 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
|
|||||||
return nil, fmt.Errorf("failed to create order item: %w", err)
|
return nil, fmt.Errorf("failed to create order item: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
itemResponse := mappers.OrderItemEntityToResponse(orderItem, order.OutletID)
|
itemResponse := models.OrderItemResponse{
|
||||||
if itemResponse != nil {
|
ID: orderItem.ID,
|
||||||
addedItemResponses = append(addedItemResponses, *itemResponse)
|
OrderID: orderItem.OrderID,
|
||||||
|
ProductID: orderItem.ProductID,
|
||||||
|
ProductVariantID: orderItem.ProductVariantID,
|
||||||
|
Quantity: orderItem.Quantity,
|
||||||
|
UnitPrice: orderItem.UnitPrice,
|
||||||
|
TotalPrice: orderItem.TotalPrice,
|
||||||
|
UnitCost: orderItem.UnitCost,
|
||||||
|
TotalCost: orderItem.TotalCost,
|
||||||
|
RefundAmount: orderItem.RefundAmount,
|
||||||
|
RefundQuantity: orderItem.RefundQuantity,
|
||||||
|
IsPartiallyRefunded: orderItem.IsPartiallyRefunded,
|
||||||
|
IsFullyRefunded: orderItem.IsFullyRefunded,
|
||||||
|
RefundReason: orderItem.RefundReason,
|
||||||
|
RefundedAt: orderItem.RefundedAt,
|
||||||
|
RefundedBy: orderItem.RefundedBy,
|
||||||
|
Modifiers: []map[string]interface{}(orderItem.Modifiers),
|
||||||
|
Notes: orderItem.Notes,
|
||||||
|
Metadata: map[string]interface{}(orderItem.Metadata),
|
||||||
|
Status: constants.OrderItemStatus(orderItem.Status),
|
||||||
|
CreatedAt: orderItem.CreatedAt,
|
||||||
|
UpdatedAt: orderItem.UpdatedAt,
|
||||||
}
|
}
|
||||||
|
addedItemResponses = append(addedItemResponses, itemResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
orderWithRelations, err := p.orderRepo.GetWithRelations(ctx, orderID)
|
orderWithRelations, err := p.orderRepo.GetWithRelations(ctx, orderID)
|
||||||
|
|||||||
@ -49,7 +49,6 @@ func (p *ProductOutletPriceProcessorImpl) Upsert(ctx context.Context, req *model
|
|||||||
ProductID: req.ProductID,
|
ProductID: req.ProductID,
|
||||||
OutletID: req.OutletID,
|
OutletID: req.OutletID,
|
||||||
Price: req.Price,
|
Price: req.Price,
|
||||||
PrintToChecker: req.PrintToChecker,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := p.repo.Upsert(ctx, entity); err != nil {
|
if err := p.repo.Upsert(ctx, entity); err != nil {
|
||||||
|
|||||||
@ -5,7 +5,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"apskel-pos-be/internal/entities"
|
"apskel-pos-be/internal/entities"
|
||||||
"apskel-pos-be/internal/logger"
|
|
||||||
"apskel-pos-be/internal/mappers"
|
"apskel-pos-be/internal/mappers"
|
||||||
"apskel-pos-be/internal/models"
|
"apskel-pos-be/internal/models"
|
||||||
"apskel-pos-be/internal/repository"
|
"apskel-pos-be/internal/repository"
|
||||||
@ -126,15 +125,10 @@ func (p *ProductProcessorImpl) CreateProduct(ctx context.Context, req *models.Cr
|
|||||||
|
|
||||||
// Upsert outlet-specific price if outlet context is present
|
// Upsert outlet-specific price if outlet context is present
|
||||||
if req.OutletID != uuid.Nil {
|
if req.OutletID != uuid.Nil {
|
||||||
printToChecker := true // default
|
|
||||||
if req.PrintToChecker != nil {
|
|
||||||
printToChecker = *req.PrintToChecker
|
|
||||||
}
|
|
||||||
outletPriceEntity := &entities.ProductOutletPrice{
|
outletPriceEntity := &entities.ProductOutletPrice{
|
||||||
ProductID: productEntity.ID,
|
ProductID: productEntity.ID,
|
||||||
OutletID: req.OutletID,
|
OutletID: req.OutletID,
|
||||||
Price: req.Price,
|
Price: req.Price,
|
||||||
PrintToChecker: printToChecker,
|
|
||||||
}
|
}
|
||||||
if err := p.outletPriceRepo.Upsert(ctx, outletPriceEntity); err != nil {
|
if err := p.outletPriceRepo.Upsert(ctx, outletPriceEntity); err != nil {
|
||||||
return nil, fmt.Errorf("failed to assign outlet price: %w", err)
|
return nil, fmt.Errorf("failed to assign outlet price: %w", err)
|
||||||
@ -202,39 +196,16 @@ func (p *ProductProcessorImpl) UpdateProduct(ctx context.Context, id uuid.UUID,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Upsert outlet-specific price if outlet context is present and price or print_to_checker is provided
|
// Upsert outlet-specific price if outlet context is present
|
||||||
if req.OutletID != uuid.Nil && (req.Price != nil || req.PrintToChecker != nil) {
|
if req.OutletID != uuid.Nil && req.Price != nil {
|
||||||
// Fetch existing outlet price to use as fallback for fields not provided
|
|
||||||
existing, _ := p.outletPriceRepo.GetByProductAndOutlet(ctx, id, req.OutletID)
|
|
||||||
|
|
||||||
price := float64(0)
|
|
||||||
if existing != nil {
|
|
||||||
price = existing.Price
|
|
||||||
}
|
|
||||||
if req.Price != nil {
|
|
||||||
price = *req.Price
|
|
||||||
}
|
|
||||||
|
|
||||||
printToChecker := true // default
|
|
||||||
if existing != nil {
|
|
||||||
printToChecker = existing.PrintToChecker
|
|
||||||
}
|
|
||||||
if req.PrintToChecker != nil {
|
|
||||||
printToChecker = *req.PrintToChecker
|
|
||||||
}
|
|
||||||
|
|
||||||
outletPriceEntity := &entities.ProductOutletPrice{
|
outletPriceEntity := &entities.ProductOutletPrice{
|
||||||
ProductID: id,
|
ProductID: id,
|
||||||
OutletID: req.OutletID,
|
OutletID: req.OutletID,
|
||||||
Price: price,
|
Price: *req.Price,
|
||||||
PrintToChecker: printToChecker,
|
|
||||||
}
|
}
|
||||||
logger.FromContext(ctx).Infof("ProductProcessor::UpdateProduct -> upserting outlet price: productID=%s outletID=%s price=%f printToChecker=%v", id, req.OutletID, price, printToChecker)
|
|
||||||
if err := p.outletPriceRepo.Upsert(ctx, outletPriceEntity); err != nil {
|
if err := p.outletPriceRepo.Upsert(ctx, outletPriceEntity); err != nil {
|
||||||
return nil, fmt.Errorf("failed to assign outlet price: %w", err)
|
return nil, fmt.Errorf("failed to assign outlet price: %w", err)
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
logger.FromContext(ctx).Infof("ProductProcessor::UpdateProduct -> skipping outlet price upsert: outletID=%s price=%v printToChecker=%v", req.OutletID, req.Price, req.PrintToChecker)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
productWithCategory, err := p.productRepo.GetWithCategory(ctx, id)
|
productWithCategory, err := p.productRepo.GetWithCategory(ctx, id)
|
||||||
@ -285,7 +256,6 @@ func (p *ProductProcessorImpl) GetProductByID(ctx context.Context, id uuid.UUID,
|
|||||||
outletPrice, err := p.outletPriceRepo.GetByProductAndOutlet(ctx, id, outletID)
|
outletPrice, err := p.outletPriceRepo.GetByProductAndOutlet(ctx, id, outletID)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
response.OutletPrice = &outletPrice.Price
|
response.OutletPrice = &outletPrice.Price
|
||||||
response.PrintToChecker = outletPrice.PrintToChecker
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// No outlet context — return all outlet prices for this product
|
// No outlet context — return all outlet prices for this product
|
||||||
@ -297,7 +267,6 @@ func (p *ProductProcessorImpl) GetProductByID(ctx context.Context, id uuid.UUID,
|
|||||||
OutletID: op.OutletID,
|
OutletID: op.OutletID,
|
||||||
OutletName: op.Outlet.Name,
|
OutletName: op.Outlet.Name,
|
||||||
Price: op.Price,
|
Price: op.Price,
|
||||||
PrintToChecker: op.PrintToChecker,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
response.OutletPrices = prices
|
response.OutletPrices = prices
|
||||||
@ -334,37 +303,12 @@ func (p *ProductProcessorImpl) ListProducts(ctx context.Context, filters map[str
|
|||||||
}
|
}
|
||||||
|
|
||||||
responses := make([]models.ProductResponse, len(productEntities))
|
responses := make([]models.ProductResponse, len(productEntities))
|
||||||
if outletID != uuid.Nil && len(productEntities) > 0 {
|
|
||||||
// Bulk-fetch outlet prices to populate OutletPrice and PrintToChecker per product
|
|
||||||
productIDs := make([]uuid.UUID, len(productEntities))
|
|
||||||
for i, e := range productEntities {
|
|
||||||
productIDs[i] = e.ID
|
|
||||||
}
|
|
||||||
outletPrices, opErr := p.outletPriceRepo.GetByProductsAndOutlet(ctx, productIDs, outletID)
|
|
||||||
priceMap := make(map[uuid.UUID]*entities.ProductOutletPrice)
|
|
||||||
if opErr == nil {
|
|
||||||
for _, op := range outletPrices {
|
|
||||||
priceMap[op.ProductID] = op
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for i, entity := range productEntities {
|
|
||||||
response := mappers.ProductEntityToResponse(entity)
|
|
||||||
if response != nil {
|
|
||||||
if op, ok := priceMap[entity.ID]; ok {
|
|
||||||
response.OutletPrice = &op.Price
|
|
||||||
response.PrintToChecker = op.PrintToChecker
|
|
||||||
}
|
|
||||||
responses[i] = *response
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for i, entity := range productEntities {
|
for i, entity := range productEntities {
|
||||||
response := mappers.ProductEntityToResponse(entity)
|
response := mappers.ProductEntityToResponse(entity)
|
||||||
if response != nil {
|
if response != nil {
|
||||||
responses[i] = *response
|
responses[i] = *response
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return responses, int(total), nil
|
return responses, int(total), nil
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,8 +60,6 @@ func (r *OrderRepositoryImpl) GetWithRelations(ctx context.Context, id uuid.UUID
|
|||||||
Preload("User").
|
Preload("User").
|
||||||
Preload("OrderItems").
|
Preload("OrderItems").
|
||||||
Preload("OrderItems.Product").
|
Preload("OrderItems.Product").
|
||||||
Preload("OrderItems.Product.Category").
|
|
||||||
Preload("OrderItems.Product.ProductOutletPrices").
|
|
||||||
Preload("OrderItems.ProductVariant").
|
Preload("OrderItems.ProductVariant").
|
||||||
Preload("Payments").
|
Preload("Payments").
|
||||||
Preload("Payments.PaymentMethod").
|
Preload("Payments.PaymentMethod").
|
||||||
@ -141,8 +139,6 @@ func (r *OrderRepositoryImpl) List(ctx context.Context, filters map[string]inter
|
|||||||
Preload("User").
|
Preload("User").
|
||||||
Preload("OrderItems").
|
Preload("OrderItems").
|
||||||
Preload("OrderItems.Product").
|
Preload("OrderItems.Product").
|
||||||
Preload("OrderItems.Product.Category").
|
|
||||||
Preload("OrderItems.Product.ProductOutletPrices").
|
|
||||||
Preload("OrderItems.ProductVariant").
|
Preload("OrderItems.ProductVariant").
|
||||||
Preload("Payments").
|
Preload("Payments").
|
||||||
Preload("Payments.PaymentMethod").
|
Preload("Payments.PaymentMethod").
|
||||||
@ -159,8 +155,6 @@ func (r *OrderRepositoryImpl) ListBySessionID(ctx context.Context, sessionID str
|
|||||||
Preload("User").
|
Preload("User").
|
||||||
Preload("OrderItems").
|
Preload("OrderItems").
|
||||||
Preload("OrderItems.Product").
|
Preload("OrderItems.Product").
|
||||||
Preload("OrderItems.Product.Category").
|
|
||||||
Preload("OrderItems.Product.ProductOutletPrices").
|
|
||||||
Preload("OrderItems.ProductVariant").
|
Preload("OrderItems.ProductVariant").
|
||||||
Preload("Payments").
|
Preload("Payments").
|
||||||
Preload("Payments.PaymentMethod").
|
Preload("Payments.PaymentMethod").
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import (
|
|||||||
|
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
|
"gorm.io/gorm/clause"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ProductOutletPriceRepository interface {
|
type ProductOutletPriceRepository interface {
|
||||||
@ -52,18 +53,10 @@ func (r *ProductOutletPriceRepositoryImpl) GetByOutlet(ctx context.Context, outl
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *ProductOutletPriceRepositoryImpl) Upsert(ctx context.Context, price *entities.ProductOutletPrice) error {
|
func (r *ProductOutletPriceRepositoryImpl) Upsert(ctx context.Context, price *entities.ProductOutletPrice) error {
|
||||||
if price.ID == uuid.Nil {
|
return r.db.WithContext(ctx).Clauses(clause.OnConflict{
|
||||||
price.ID = uuid.New()
|
Columns: []clause.Column{{Name: "product_id"}, {Name: "outlet_id"}},
|
||||||
}
|
DoUpdates: clause.AssignmentColumns([]string{"price", "updated_at"}),
|
||||||
return r.db.WithContext(ctx).Exec(`
|
}).Create(price).Error
|
||||||
INSERT INTO product_outlet_prices (id, product_id, outlet_id, price, print_to_checker, created_at, updated_at)
|
|
||||||
VALUES (?, ?, ?, ?, ?, NOW(), NOW())
|
|
||||||
ON CONFLICT (product_id, outlet_id)
|
|
||||||
DO UPDATE SET
|
|
||||||
price = EXCLUDED.price,
|
|
||||||
print_to_checker = EXCLUDED.print_to_checker,
|
|
||||||
updated_at = NOW()
|
|
||||||
`, price.ID, price.ProductID, price.OutletID, price.Price, price.PrintToChecker).Error
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *ProductOutletPriceRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
|
func (r *ProductOutletPriceRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
|
||||||
|
|||||||
@ -108,7 +108,6 @@ func (s *ProductOutletPriceServiceImpl) BulkUpsert(ctx context.Context, req *con
|
|||||||
ProductID: req.ProductID,
|
ProductID: req.ProductID,
|
||||||
OutletID: p.OutletID,
|
OutletID: p.OutletID,
|
||||||
Price: p.Price,
|
Price: p.Price,
|
||||||
PrintToChecker: p.PrintToChecker,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -100,8 +100,6 @@ func OrderModelToContract(resp *models.OrderResponse) *contract.OrderResponse {
|
|||||||
ProductName: item.ProductName,
|
ProductName: item.ProductName,
|
||||||
ProductVariantID: item.ProductVariantID,
|
ProductVariantID: item.ProductVariantID,
|
||||||
ProductVariantName: item.ProductVariantName,
|
ProductVariantName: item.ProductVariantName,
|
||||||
CategoryID: item.CategoryID,
|
|
||||||
CategoryName: item.CategoryName,
|
|
||||||
Quantity: item.Quantity,
|
Quantity: item.Quantity,
|
||||||
UnitPrice: item.UnitPrice,
|
UnitPrice: item.UnitPrice,
|
||||||
TotalPrice: item.TotalPrice,
|
TotalPrice: item.TotalPrice,
|
||||||
@ -112,7 +110,6 @@ func OrderModelToContract(resp *models.OrderResponse) *contract.OrderResponse {
|
|||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
PrinterType: item.PrinterType,
|
PrinterType: item.PrinterType,
|
||||||
PrintToChecker: item.PrintToChecker,
|
|
||||||
PaidQuantity: item.PaidQuantity,
|
PaidQuantity: item.PaidQuantity,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -171,8 +168,6 @@ func AddToOrderModelToContract(resp *models.AddToOrderResponse) *contract.AddToO
|
|||||||
ProductName: item.ProductName,
|
ProductName: item.ProductName,
|
||||||
ProductVariantID: item.ProductVariantID,
|
ProductVariantID: item.ProductVariantID,
|
||||||
ProductVariantName: item.ProductVariantName,
|
ProductVariantName: item.ProductVariantName,
|
||||||
CategoryID: item.CategoryID,
|
|
||||||
CategoryName: item.CategoryName,
|
|
||||||
Quantity: item.Quantity,
|
Quantity: item.Quantity,
|
||||||
UnitPrice: item.UnitPrice,
|
UnitPrice: item.UnitPrice,
|
||||||
TotalPrice: item.TotalPrice,
|
TotalPrice: item.TotalPrice,
|
||||||
@ -182,7 +177,6 @@ func AddToOrderModelToContract(resp *models.AddToOrderResponse) *contract.AddToO
|
|||||||
Status: string(item.Status),
|
Status: string(item.Status),
|
||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
PrintToChecker: item.PrintToChecker,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return &contract.AddToOrderResponse{
|
return &contract.AddToOrderResponse{
|
||||||
|
|||||||
@ -14,7 +14,6 @@ func CreateProductOutletPriceRequestToModel(req *contract.CreateProductOutletPri
|
|||||||
ProductID: req.ProductID,
|
ProductID: req.ProductID,
|
||||||
OutletID: req.OutletID,
|
OutletID: req.OutletID,
|
||||||
Price: req.Price,
|
Price: req.Price,
|
||||||
PrintToChecker: req.PrintToChecker,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -25,7 +24,6 @@ func UpdateProductOutletPriceRequestToModel(req *contract.UpdateProductOutletPri
|
|||||||
|
|
||||||
return &models.UpdateProductOutletPriceRequest{
|
return &models.UpdateProductOutletPriceRequest{
|
||||||
Price: &req.Price,
|
Price: &req.Price,
|
||||||
PrintToChecker: req.PrintToChecker,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,7 +37,6 @@ func ProductOutletPriceModelToResponse(m *models.ProductOutletPrice) *contract.P
|
|||||||
ProductID: m.ProductID,
|
ProductID: m.ProductID,
|
||||||
OutletID: m.OutletID,
|
OutletID: m.OutletID,
|
||||||
Price: m.Price,
|
Price: m.Price,
|
||||||
PrintToChecker: m.PrintToChecker,
|
|
||||||
CreatedAt: m.CreatedAt,
|
CreatedAt: m.CreatedAt,
|
||||||
UpdatedAt: m.UpdatedAt,
|
UpdatedAt: m.UpdatedAt,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -57,7 +57,6 @@ func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Cr
|
|||||||
BusinessType: businessType,
|
BusinessType: businessType,
|
||||||
ImageURL: req.ImageURL,
|
ImageURL: req.ImageURL,
|
||||||
PrinterType: req.PrinterType,
|
PrinterType: req.PrinterType,
|
||||||
PrintToChecker: req.PrintToChecker,
|
|
||||||
Metadata: metadata,
|
Metadata: metadata,
|
||||||
Variants: variants,
|
Variants: variants,
|
||||||
}
|
}
|
||||||
@ -85,7 +84,6 @@ func UpdateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Up
|
|||||||
Cost: req.Cost,
|
Cost: req.Cost,
|
||||||
ImageURL: req.ImageURL,
|
ImageURL: req.ImageURL,
|
||||||
PrinterType: req.PrinterType,
|
PrinterType: req.PrinterType,
|
||||||
PrintToChecker: req.PrintToChecker,
|
|
||||||
Metadata: metadata,
|
Metadata: metadata,
|
||||||
IsActive: req.IsActive,
|
IsActive: req.IsActive,
|
||||||
}
|
}
|
||||||
@ -124,7 +122,6 @@ func ProductModelResponseToResponse(prod *models.ProductResponse) *contract.Prod
|
|||||||
OutletID: op.OutletID,
|
OutletID: op.OutletID,
|
||||||
OutletName: op.OutletName,
|
OutletName: op.OutletName,
|
||||||
Price: op.Price,
|
Price: op.Price,
|
||||||
PrintToChecker: op.PrintToChecker,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -144,7 +141,6 @@ func ProductModelResponseToResponse(prod *models.ProductResponse) *contract.Prod
|
|||||||
BusinessType: string(prod.BusinessType),
|
BusinessType: string(prod.BusinessType),
|
||||||
ImageURL: prod.ImageURL,
|
ImageURL: prod.ImageURL,
|
||||||
PrinterType: prod.PrinterType,
|
PrinterType: prod.PrinterType,
|
||||||
PrintToChecker: prod.PrintToChecker,
|
|
||||||
Metadata: prod.Metadata,
|
Metadata: prod.Metadata,
|
||||||
IsActive: prod.IsActive,
|
IsActive: prod.IsActive,
|
||||||
CreatedAt: prod.CreatedAt,
|
CreatedAt: prod.CreatedAt,
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
ALTER TABLE product_outlet_prices DROP COLUMN IF EXISTS print_to_checker;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
ALTER TABLE product_outlet_prices ADD COLUMN print_to_checker BOOLEAN NOT NULL DEFAULT TRUE;
|
|
||||||
Loading…
x
Reference in New Issue
Block a user