Compare commits

..

No commits in common. "f6b42709d75c7aaa42bcaa4e170d0304d8f11e23" and "dc5a823508f7136efbbea76a76a6f972b5eb6fd7" have entirely different histories.

8 changed files with 1 additions and 39 deletions

View File

@ -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"`
@ -60,7 +58,6 @@ 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"`
@ -92,7 +89,6 @@ 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

@ -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"`
@ -28,7 +27,6 @@ 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

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

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

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

@ -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,
@ -102,7 +100,6 @@ 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

@ -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;

View File

@ -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;