Compare commits

...

5 Commits

19 changed files with 97 additions and 27 deletions

View File

@ -8,6 +8,7 @@ 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"`
@ -16,6 +17,7 @@ type CreateCategoryRequest struct {
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"`
@ -24,6 +26,7 @@ type UpdateCategoryRequest struct {
type ListCategoriesRequest struct { type ListCategoriesRequest struct {
OrganizationID *uuid.UUID `json:"organization_id,omitempty"` OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
BusinessType string `json:"business_type,omitempty"` BusinessType string `json:"business_type,omitempty"`
Search string `json:"search,omitempty"` Search string `json:"search,omitempty"`
Page int `json:"page" validate:"required,min=1"` Page int `json:"page" validate:"required,min=1"`
@ -34,6 +37,7 @@ 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"`

View File

@ -7,6 +7,7 @@ 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"`
@ -25,6 +26,7 @@ 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,6 +60,7 @@ 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"`
@ -89,6 +92,7 @@ type ProductVariantResponse struct {
type ListProductsRequest struct { type ListProductsRequest struct {
OrganizationID *uuid.UUID `json:"organization_id,omitempty"` OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
OutletID *uuid.UUID `json:"outlet_id,omitempty"`
CategoryID *uuid.UUID `json:"category_id,omitempty"` CategoryID *uuid.UUID `json:"category_id,omitempty"`
BusinessType string `json:"business_type,omitempty"` BusinessType string `json:"business_type,omitempty"`
IsActive *bool `json:"is_active,omitempty"` IsActive *bool `json:"is_active,omitempty"`

View File

@ -33,6 +33,7 @@ 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"`
@ -42,6 +43,7 @@ type Category struct {
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"`
} }

View File

@ -10,6 +10,7 @@ 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,6 +28,7 @@ type Product struct {
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"`

View File

@ -170,6 +170,12 @@ 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

View File

@ -172,6 +172,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 categoryIDStr := c.Query("category_id"); categoryIDStr != "" { if categoryIDStr := c.Query("category_id"); categoryIDStr != "" {
if categoryID, err := uuid.Parse(categoryIDStr); err == nil { if categoryID, err := uuid.Parse(categoryIDStr); err == nil {
req.CategoryID = &categoryID req.CategoryID = &categoryID

View File

@ -9,6 +9,7 @@ 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
@ -20,6 +21,7 @@ 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"`
@ -27,6 +29,7 @@ type CreateCategoryRequest struct {
} }
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"`
@ -37,6 +40,7 @@ type UpdateCategoryRequest struct {
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

View File

@ -10,6 +10,7 @@ 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
@ -40,6 +41,7 @@ type ProductVariant struct {
type CreateProductRequest struct { type CreateProductRequest struct {
OrganizationID uuid.UUID `validate:"required"` OrganizationID uuid.UUID `validate:"required"`
OutletID *uuid.UUID `validate:"omitempty"`
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"`
@ -60,6 +62,7 @@ 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"`
@ -94,6 +97,7 @@ 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

View File

@ -55,6 +55,7 @@ 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 {
@ -86,6 +87,9 @@ 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 {

View File

@ -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).First(&category, "id = ?", id).Error err := r.db.WithContext(ctx).Preload("Outlet").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").First(&category, "id = ?", id).Error err := r.db.WithContext(ctx).Preload("Products").Preload("Outlet").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.Order("\"order\" ASC").Limit(limit).Offset(offset).Find(&categories).Error err := query.Preload("Outlet").Order("\"order\" ASC").Limit(limit).Offset(offset).Find(&categories).Error
return categories, total, err return categories, total, err
} }

View File

@ -88,6 +88,9 @@ 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
} }

View File

@ -85,6 +85,9 @@ func (s *ProductServiceImpl) ListProducts(ctx context.Context, req *contract.Lis
if req.OrganizationID != nil { if req.OrganizationID != nil {
filters["organization_id"] = *req.OrganizationID filters["organization_id"] = *req.OrganizationID
} }
if req.OutletID != nil {
filters["outlet_id"] = *req.OutletID
}
if req.CategoryID != nil { if req.CategoryID != nil {
filters["category_id"] = *req.CategoryID filters["category_id"] = *req.CategoryID
} }

View File

@ -9,6 +9,7 @@ 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,
@ -18,6 +19,7 @@ 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,
@ -34,6 +36,7 @@ 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

View File

@ -39,6 +39,7 @@ 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,
@ -60,6 +61,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,
@ -100,6 +102,7 @@ func ProductModelResponseToResponse(prod *models.ProductResponse) *contract.Prod
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,

View File

@ -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 { if req.Name == nil && req.Description == nil && req.BusinessType == nil && req.Metadata == nil && req.OutletID == nil {
return errors.New("at least one field must be provided for update"), constants.MissingFieldErrorCode return errors.New("at least one field must be provided for update"), constants.MissingFieldErrorCode
} }

View File

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

View File

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

View File

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

View File

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