add product migrations

This reverts commit 7ba776555e.

config/server.go

@@ -1,7 +1,8 @@
 package config
 
 type Server struct {
-	Port     string `mapstructure:"port"`
+	Port         string `mapstructure:"port"`
-	BaseUrl  string `mapstructure:"common-url"`
+	BaseUrl      string `mapstructure:"common-url"`
-	LocalUrl string `mapstructure:"local-url"`
+	LocalUrl     string `mapstructure:"local-url"`
+	SelfOrderUrl string `mapstructure:"self-order-url"`
 }

infra/development.yaml

@@ -1,6 +1,7 @@
 server:
   base-url:
   local-url:
+  self-order-url: http://localhost:5173
   port: 4000
 
 jwt:
@@ -57,4 +58,4 @@ fonnte:
 
 fcm:
   credentials_file: "infra/firebase-service-account.json"
-  project_id: "your-firebase-project-id"
+  project_id: "apskel-pos-v2"

internal/app/app.go

@@ -25,11 +25,12 @@ import (
 )
 
 type App struct {
-	server      *http.Server
+	server         *http.Server
-	db          *gorm.DB
+	db             *gorm.DB
-	redisClient *redis.Client
+	redisClient    *redis.Client
-	router      *router.Router
+	router         *router.Router
-	shutdown    chan os.Signal
+	shutdown       chan os.Signal
+	omsetScheduler *service.OmsetMilestoneScheduler
 }
 
 func NewApp(db *gorm.DB, redisClient *redis.Client) *App {
@@ -43,6 +44,14 @@ func NewApp(db *gorm.DB, redisClient *redis.Client) *App {
 func (a *App) Initialize(cfg *config.Config) error {
 	repos := a.initRepositories()
 	processors := a.initProcessors(cfg, repos)
+
+	// Initialize omset milestone scheduler
+	a.omsetScheduler = service.NewOmsetMilestoneScheduler(
+		repos.organizationRepo,
+		repos.userRepo,
+		processors.notificationProcessor,
+	)
+
 	services := a.initServices(processors, repos, cfg)
 	validators := a.initValidators()
 	middleware := a.initMiddleware(services, cfg)
@@ -129,6 +138,11 @@ func (a *App) Initialize(cfg *config.Config) error {
 }
 
 func (a *App) Start(port string) error {
+	// Start the omset milestone scheduler (checks every hour)
+	if a.omsetScheduler != nil {
+		a.omsetScheduler.Start(1 * time.Hour)
+	}
+
 	engine := a.router.Init()
 
 	a.server = &http.Server{
@@ -164,6 +178,9 @@ func (a *App) Start(port string) error {
 }
 
 func (a *App) Shutdown() {
+	if a.omsetScheduler != nil {
+		a.omsetScheduler.Stop()
+	}
 	close(a.shutdown)
 }
 
@@ -409,7 +426,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	productService := service.NewProductService(processors.productProcessor)
 	productVariantService := service.NewProductVariantService(processors.productVariantProcessor)
 	inventoryService := service.NewInventoryService(processors.inventoryProcessor)
-	orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo) // Will be updated after orderIngredientTransactionService is created
+	orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo, processors.notificationProcessor, repos.userRepo) // Will be updated after orderIngredientTransactionService is created
 	paymentMethodService := service.NewPaymentMethodService(processors.paymentMethodProcessor)
 	fileService := service.NewFileServiceImpl(processors.fileProcessor)
 	var customerService service.CustomerService = service.NewCustomerService(processors.customerProcessor)
@@ -436,7 +453,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	notificationService := service.NewNotificationService(processors.notificationProcessor)
 
 	// Update order service with order ingredient transaction service
-	orderService = service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, orderIngredientTransactionService, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo)
+	orderService = service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, orderIngredientTransactionService, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo, processors.notificationProcessor, repos.userRepo)
 
 	return &services{
 		userService:                       service.NewUserService(processors.userProcessor),

internal/constants/user.go

@@ -7,6 +7,7 @@ const (
 	RoleManager UserRole = "manager"
 	RoleCashier UserRole = "cashier"
 	RoleWaiter  UserRole = "waiter"
+	RoleOwner   UserRole = "owner"
 )
 
 func GetAllUserRoles() []UserRole {
@@ -15,6 +16,7 @@ func GetAllUserRoles() []UserRole {
 		RoleManager,
 		RoleCashier,
 		RoleWaiter,
+		RoleOwner,
 	}
 }
 

internal/contract/analytics_contract.go

@@ -7,11 +7,11 @@ import (
 )
 
 type PaymentMethodAnalyticsRequest struct {
-	OrganizationID uuid.UUID  `form:"organization_id"`
+	OrganizationID uuid.UUID `form:"organization_id"`
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string   `form:"outlet_id,omitempty"`
-	DateFrom       string     `form:"date_from" validate:"required"`
+	DateFrom       string    `form:"date_from" validate:"required"`
-	DateTo         string     `form:"date_to" validate:"required"`
+	DateTo         string    `form:"date_to" validate:"required"`
-	GroupBy        string     `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
+	GroupBy        string    `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
 // PaymentMethodAnalyticsResponse represents the response for payment method analytics
@@ -45,10 +45,10 @@ type PaymentMethodAnalyticsData struct {
 
 type SalesAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string `form:"outlet_id,omitempty"`
-	DateFrom       string     `form:"date_from" validate:"required"`
+	DateFrom       string  `form:"date_from" validate:"required"`
-	DateTo         string     `form:"date_to" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
-	GroupBy        string     `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
+	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
 type SalesAnalyticsResponse struct {
@@ -86,10 +86,10 @@ type SalesAnalyticsData struct {
 // ProductAnalyticsRequest represents the request for product analytics
 type ProductAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string `form:"outlet_id,omitempty"`
-	DateFrom       string     `form:"date_from" validate:"required"`
+	DateFrom       string  `form:"date_from" validate:"required"`
-	DateTo         string     `form:"date_to" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
-	Limit          int        `form:"limit,default=1000" validate:"min=1,max=1000"`
+	Limit          int     `form:"limit,default=1000" validate:"min=1,max=1000"`
 }
 
 // ProductAnalyticsResponse represents the response for product analytics
@@ -123,9 +123,9 @@ type ProductAnalyticsData struct {
 // ProductAnalyticsPerCategoryRequest represents the request for product analytics per category
 type ProductAnalyticsPerCategoryRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string `form:"outlet_id,omitempty"`
-	DateFrom       string     `form:"date_from" validate:"required"`
+	DateFrom       string  `form:"date_from" validate:"required"`
-	DateTo         string     `form:"date_to" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
 }
 
 // ProductAnalyticsPerCategoryResponse represents the response for product analytics per category
@@ -152,9 +152,9 @@ type ProductAnalyticsPerCategoryData struct {
 // DashboardAnalyticsRequest represents the request for dashboard analytics
 type DashboardAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string `form:"outlet_id,omitempty"`
-	DateFrom       string     `form:"date_from" validate:"required"`
+	DateFrom       string  `form:"date_from" validate:"required"`
-	DateTo         string     `form:"date_to" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
 }
 
 // DashboardAnalyticsResponse represents the response for dashboard analytics
@@ -182,10 +182,10 @@ type DashboardOverview struct {
 // ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string `form:"outlet_id,omitempty"`
-	DateFrom       string     `form:"date_from" validate:"required"`
+	DateFrom       string  `form:"date_from" validate:"required"`
-	DateTo         string     `form:"date_to" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
-	GroupBy        string     `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
+	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
 // ProfitLossAnalyticsResponse represents the response for profit and loss analytics

internal/contract/category_contract.go

@@ -8,22 +8,25 @@ import (
 
 type CreateCategoryRequest struct {
 	Name         string                 `json:"name" validate:"required,min=1,max=255"`
+	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
-	Order 		 *int                	`json:"order,omitempty"`
+	Order        *int                   `json:"order,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 }
 
 type UpdateCategoryRequest struct {
 	Name         *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
+	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
-	Order 		 *int                	`json:"order,omitempty"`
+	Order        *int                   `json:"order,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 }
 
 type ListCategoriesRequest struct {
 	OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
+	OutletID       *uuid.UUID `json:"outlet_id,omitempty"`
 	BusinessType   string     `json:"business_type,omitempty"`
 	Search         string     `json:"search,omitempty"`
 	Page           int        `json:"page" validate:"required,min=1"`
@@ -34,10 +37,11 @@ type ListCategoriesRequest struct {
 type CategoryResponse struct {
 	ID             uuid.UUID              `json:"id"`
 	OrganizationID uuid.UUID              `json:"organization_id"`
+	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
 	Name           string                 `json:"name"`
 	Description    *string                `json:"description"`
 	BusinessType   string                 `json:"business_type"`
-	Order 		   int                	  `json:"order"`
+	Order          int                    `json:"order"`
 	Metadata       map[string]interface{} `json:"metadata"`
 	CreatedAt      time.Time              `json:"created_at"`
 	UpdatedAt      time.Time              `json:"updated_at"`

internal/contract/product_contract.go

@@ -7,6 +7,7 @@ import (
 )
 
 type CreateProductRequest struct {
+	OutletID        *uuid.UUID                    `json:"outlet_id,omitempty"`
 	CategoryID      uuid.UUID                     `json:"category_id" validate:"required"`
 	SKU             *string                       `json:"sku,omitempty"`
 	Name            string                        `json:"name" validate:"required,min=1,max=255"`
@@ -25,6 +26,7 @@ type CreateProductRequest struct {
 }
 
 type UpdateProductRequest struct {
+	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	CategoryID   *uuid.UUID             `json:"category_id,omitempty"`
 	SKU          *string                `json:"sku,omitempty"`
 	Name         *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
@@ -58,6 +60,7 @@ type UpdateProductVariantRequest struct {
 type ProductResponse struct {
 	ID             uuid.UUID                `json:"id"`
 	OrganizationID uuid.UUID                `json:"organization_id"`
+	OutletID       *uuid.UUID               `json:"outlet_id"`
 	CategoryID     uuid.UUID                `json:"category_id"`
 	CategoryName   string                   `json:"category_name"`
 	SKU            *string                  `json:"sku"`
@@ -89,6 +92,7 @@ type ProductVariantResponse struct {
 
 type ListProductsRequest struct {
 	OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
+	OutletID       *uuid.UUID `json:"outlet_id,omitempty"`
 	CategoryID     *uuid.UUID `json:"category_id,omitempty"`
 	BusinessType   string     `json:"business_type,omitempty"`
 	IsActive       *bool      `json:"is_active,omitempty"`

internal/contract/self_order_contract.go

@@ -1,8 +1,6 @@
 package contract
 
 import (
-	"time"
-
 	"github.com/google/uuid"
 )
 
@@ -50,8 +48,10 @@ type SelfOrderMenuVariant struct {
 }
 
 type SelfOrderCreateOrderRequest struct {
-	SessionID  string                     `json:"session_id" validate:"required"`
+	SessionID    string                     `json:"session_id" validate:"required"`
-	OrderItems []SelfOrderCreateOrderItem `json:"order_items" validate:"required,min=1,dive"`
+	CustomerName string                     `json:"customer_name" validate:"required"`
+	OrderType    string                     `json:"order_type" validate:"required,oneof=dine_in takeaway delivery"`
+	OrderItems   []SelfOrderCreateOrderItem `json:"order_items" validate:"required,min=1,dive"`
 }
 
 type SelfOrderCreateOrderItem struct {
@@ -62,7 +62,7 @@ type SelfOrderCreateOrderItem struct {
 }
 
 type SelfOrderListCategoriesRequest struct {
-	OrganizationID string `form:"organisasi_id" validate:"required"`
+	OrganizationID string `form:"organization_id" validate:"required"`
 	OutletID       string `form:"outlet_id" validate:"required"`
 }
 
@@ -78,35 +78,5 @@ type SelfOrderListCategoriesResponse struct {
 }
 
 type SelfOrderListOrdersResponse struct {
-	Orders []SelfOrderOrderItem `json:"orders"`
+	Orders []OrderResponse `json:"orders"`
-}
-
-type SelfOrderOrderItem struct {
-	ID              uuid.UUID                `json:"id"`
-	OrderNumber     string                   `json:"order_number"`
-	TableNumber     *string                  `json:"table_number,omitempty"`
-	OrderType       string                   `json:"order_type"`
-	Status          string                   `json:"status"`
-	Subtotal        float64                  `json:"subtotal"`
-	TaxAmount       float64                  `json:"tax_amount"`
-	DiscountAmount  float64                  `json:"discount_amount"`
-	TotalAmount     float64                  `json:"total_amount"`
-	RemainingAmount float64                  `json:"remaining_amount"`
-	PaymentStatus   string                   `json:"payment_status"`
-	IsVoid          bool                     `json:"is_void"`
-	IsRefund        bool                     `json:"is_refund"`
-	Items           []SelfOrderOrderLineItem `json:"items,omitempty"`
-	CreatedAt       time.Time                `json:"created_at"`
-}
-
-type SelfOrderOrderLineItem struct {
-	ProductID         uuid.UUID  `json:"product_id"`
-	ProductName       string     `json:"product_name"`
-	ProductVariantID  *uuid.UUID `json:"product_variant_id,omitempty"`
-	ProductVariantNam *string    `json:"product_variant_name,omitempty"`
-	Quantity          int        `json:"quantity"`
-	UnitPrice         float64    `json:"unit_price"`
-	TotalPrice        float64    `json:"total_price"`
-	Notes             *string    `json:"notes,omitempty"`
-	Status            string     `json:"status"`
 }

internal/entities/category.go

@@ -31,17 +31,19 @@ func (m *Metadata) Scan(value interface{}) error {
 }
 
 type Category struct {
-	ID             uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ID             uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
+	OrganizationID uuid.UUID  `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
-	Name           string    `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
+	OutletID       *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id,omitempty"`
-	Description    *string   `gorm:"type:text" json:"description"`
+	Name           string     `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
-	Order    	   int  	 `gorm:"default:0" json:"order"`
+	Description    *string    `gorm:"type:text" json:"description"`
-	BusinessType   string    `gorm:"size:50;default:'restaurant'" json:"business_type"`
+	Order          int        `gorm:"default:0" json:"order"`
-	Metadata       Metadata  `gorm:"type:jsonb;default:'{}'" json:"metadata"`
+	BusinessType   string     `gorm:"size:50;default:'restaurant'" json:"business_type"`
-	CreatedAt      time.Time `gorm:"autoCreateTime" json:"created_at"`
+	Metadata       Metadata   `gorm:"type:jsonb;default:'{}'" json:"metadata"`
-	UpdatedAt      time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+	CreatedAt      time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet       Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
 	Products     []Product    `gorm:"foreignKey:CategoryID" json:"products,omitempty"`
 }
 

internal/entities/entities.go

@@ -37,6 +37,10 @@ func GetAllEntities() []interface{} {
 		&OtpSession{},
 		// Analytics entities are not database tables, they are query results
 		&UserDevice{},
+		// Notification entities
+		&Notification{},
+		&NotificationReceiver{},
+		&NotificationDelivery{},
 	}
 }
 

internal/entities/product.go

@@ -10,6 +10,7 @@ import (
 type Product struct {
 	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"`
+	OutletID       *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id"`
 	CategoryID     uuid.UUID  `gorm:"type:uuid;not null;index" json:"category_id" validate:"required"`
 	SKU            *string    `gorm:"size:100;index" json:"sku"`
 	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"`
 
 	Organization       Organization        `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet             *Outlet             `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
 	Category           Category            `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
 	Unit               *Unit               `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
 	ProductVariants    []ProductVariant    `gorm:"foreignKey:ProductID" json:"variants,omitempty"`

internal/handler/analytics_handler.go

@@ -8,6 +8,7 @@ import (
 	"apskel-pos-be/internal/util"
 
 	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 )
 
 type AnalyticsHandler struct {
@@ -25,6 +26,17 @@ func NewAnalyticsHandler(
 	}
 }
 
+func (h *AnalyticsHandler) resolveOutletID(c *gin.Context, contextOutletID uuid.UUID) *string {
+	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
+		return &outletIDStr
+	}
+	if contextOutletID != uuid.Nil {
+		s := contextOutletID.String()
+		return &s
+	}
+	return nil
+}
+
 func (h *AnalyticsHandler) GetPaymentMethodAnalytics(c *gin.Context) {
 	ctx := c.Request.Context()
 	contextInfo := appcontext.FromGinContext(ctx)
@@ -36,7 +48,7 @@ func (h *AnalyticsHandler) GetPaymentMethodAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.PaymentMethodAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetPaymentMethodAnalytics(ctx, modelReq)
@@ -60,7 +72,7 @@ func (h *AnalyticsHandler) GetSalesAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.SalesAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetSalesAnalytics(ctx, modelReq)
@@ -84,7 +96,7 @@ func (h *AnalyticsHandler) GetProductAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.ProductAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetProductAnalytics(ctx, modelReq)
@@ -108,7 +120,7 @@ func (h *AnalyticsHandler) GetProductAnalyticsPerCategory(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.ProductAnalyticsPerCategoryContractToModel(&req)
 
 	response, err := h.analyticsService.GetProductAnalyticsPerCategory(ctx, modelReq)
@@ -132,7 +144,7 @@ func (h *AnalyticsHandler) GetDashboardAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.DashboardAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetDashboardAnalytics(ctx, modelReq)
@@ -156,6 +168,7 @@ func (h *AnalyticsHandler) GetProfitLossAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq, err := transformer.ProfitLossAnalyticsContractToModel(&req)
 	if err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetProfitLossAnalytics", err.Error())}), "AnalyticsHandler::GetProfitLossAnalytics")

internal/handler/category_handler.go

@@ -170,6 +170,12 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
 		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 organizationID, err := uuid.Parse(organizationIDStr); err == nil {
 			req.OrganizationID = &organizationID

internal/handler/product_handler.go

@@ -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 categoryID, err := uuid.Parse(categoryIDStr); err == nil {
 			req.CategoryID = &categoryID

internal/handler/report_handler.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 )
 
 type ReportHandler struct {
@@ -19,11 +20,26 @@ func NewReportHandler(reportService service.ReportService, userService UserServi
 	return &ReportHandler{reportService: reportService, userService: userService}
 }
 
+func (h *ReportHandler) resolveOutletID(c *gin.Context, contextOutletID uuid.UUID) string {
+	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
+		if _, err := uuid.Parse(outletIDStr); err == nil {
+			return outletIDStr
+		}
+	}
+	if pathOutletID := c.Param("outlet_id"); pathOutletID != "" {
+		return pathOutletID
+	}
+	if contextOutletID != uuid.Nil {
+		return contextOutletID.String()
+	}
+	return ""
+}
+
 func (h *ReportHandler) GetDailyTransactionReportPDF(c *gin.Context) {
 	ctx := c.Request.Context()
 	ci := appcontext.FromGinContext(ctx)
 
-	outletID := c.Param("outlet_id")
+	outletID := h.resolveOutletID(c, ci.OutletID)
 	var dayPtr *time.Time
 	if d := c.Query("date"); d != "" {
 		if t, err := time.Parse("2006-01-02", d); err == nil {

internal/handler/self_order_handler.go

@@ -5,6 +5,7 @@ import (
 	"apskel-pos-be/internal/contract"
 	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/logger"
+	"apskel-pos-be/internal/mappers"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/pkg/tabletoken"
 	"apskel-pos-be/internal/processor"
@@ -330,6 +331,7 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) {
 	metadata := make(map[string]interface{})
 	metadata["self_order"] = true
 	metadata["session_id"] = session.ID
+	metadata["customer_name"] = req.CustomerName
 
 	tableID := table.ID
 	modelReq := &models.CreateOrderRequest{
@@ -337,7 +339,7 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) {
 		UserID:      userID,
 		TableID:     &tableID,
 		TableNumber: &table.TableName,
-		OrderType:   constants.OrderTypeDineIn,
+		OrderType:   constants.OrderType(req.OrderType),
 		OrderItems:  orderItems,
 		Metadata:    metadata,
 	}
@@ -357,7 +359,7 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) {
 
 func (h *SelfOrderHandler) GetOrdersBySession(c *gin.Context) {
 	ctx := c.Request.Context()
-	sessionID := c.Param("sessionId")
+	sessionID := c.Param("session_id")
 
 	if sessionID == "" {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
@@ -390,47 +392,15 @@ func (h *SelfOrderHandler) GetOrdersBySession(c *gin.Context) {
 		return
 	}
 
-	resp := &contract.SelfOrderListOrdersResponse{
+	modelOrders := mappers.OrderEntitiesToResponses(orders)
-		Orders: make([]contract.SelfOrderOrderItem, 0, len(orders)),
+	contractOrders := make([]contract.OrderResponse, len(modelOrders))
-	}
+	for i := range modelOrders {
-	for _, o := range orders {
+		contractOrders[i] = *transformer.OrderModelToContract(&modelOrders[i])
-		item := contract.SelfOrderOrderItem{
-			ID:              o.ID,
-			OrderNumber:     o.OrderNumber,
-			TableNumber:     o.TableNumber,
-			OrderType:       string(o.OrderType),
-			Status:          string(o.Status),
-			Subtotal:        o.Subtotal,
-			TaxAmount:       o.TaxAmount,
-			DiscountAmount:  o.DiscountAmount,
-			TotalAmount:     o.TotalAmount,
-			RemainingAmount: o.RemainingAmount,
-			PaymentStatus:   string(o.PaymentStatus),
-			IsVoid:          o.IsVoid,
-			IsRefund:        o.IsRefund,
-			CreatedAt:       o.CreatedAt,
-		}
-		for _, oi := range o.OrderItems {
-			lineItem := contract.SelfOrderOrderLineItem{
-				ProductID:        oi.ProductID,
-				Quantity:         oi.Quantity,
-				UnitPrice:        oi.UnitPrice,
-				TotalPrice:       oi.TotalPrice,
-				Notes:            oi.Notes,
-				Status:           string(oi.Status),
-				ProductVariantID: oi.ProductVariantID,
-			}
-			if oi.Product.ID != uuid.Nil {
-				lineItem.ProductName = oi.Product.Name
-			}
-			if oi.ProductVariant != nil {
-				lineItem.ProductVariantNam = &oi.ProductVariant.Name
-			}
-			item.Items = append(item.Items, lineItem)
-		}
-		resp.Orders = append(resp.Orders, item)
 	}
 
+	resp := &contract.SelfOrderListOrdersResponse{
+		Orders: contractOrders,
+	}
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(resp), "SelfOrderHandler::GetOrdersBySession")
 }
 
@@ -439,6 +409,7 @@ func (h *SelfOrderHandler) validateCreateOrderRequest(req *contract.SelfOrderCre
 		return fmt.Errorf("session_id is required")
 	}
 	if len(req.OrderItems) == 0 {
+
 		return fmt.Errorf("at least one order item is required")
 	}
 	for i, item := range req.OrderItems {
@@ -466,7 +437,7 @@ func (h *SelfOrderHandler) ListCategories(c *gin.Context) {
 
 	if req.OrganizationID == "" {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
-			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "organisasi_id is required"),
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "organization_id is required"),
 		}), "SelfOrderHandler::ListCategories")
 		return
 	}
@@ -481,7 +452,7 @@ func (h *SelfOrderHandler) ListCategories(c *gin.Context) {
 	orgID, err := uuid.Parse(req.OrganizationID)
 	if err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
-			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid organisasi_id format"),
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid organization_id format"),
 		}), "SelfOrderHandler::ListCategories")
 		return
 	}

internal/handler/table_handler.go

@@ -19,14 +19,14 @@ import (
 type TableHandler struct {
 	tableService   TableService
 	tableValidator *validator.TableValidator
-	baseURL        string
+	selfOrderURL   string
 }
 
-func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator, baseURL string) *TableHandler {
+func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator, selfOrderURL string) *TableHandler {
 	return &TableHandler{
 		tableService:   tableService,
 		tableValidator: tableValidator,
-		baseURL:        baseURL,
+		selfOrderURL:   selfOrderURL,
 	}
 }
 
@@ -312,7 +312,7 @@ func (h *TableHandler) GenerateQRCode(c *gin.Context) {
 		return
 	}
 
-	selfOrderURL := fmt.Sprintf("%s/api/v1/self-order/table/%s", h.baseURL, token)
+	selfOrderURLResult := fmt.Sprintf("%s/menu?token=%s", h.selfOrderURL, token)
 
 	size := 256
 	if sizeStr := c.Query("size"); sizeStr != "" {
@@ -321,7 +321,7 @@ func (h *TableHandler) GenerateQRCode(c *gin.Context) {
 		}
 	}
 
-	pngBytes, err := qrcode.GeneratePNG(selfOrderURL, size)
+	pngBytes, err := qrcode.GeneratePNG(selfOrderURLResult, size)
 	if err != nil {
 		logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> QR generation failed")
 		validationResponseError := contract.NewResponseError(constants.InternalServerErrorCode, constants.TableEntity, "Failed to generate QR code")

internal/models/category.go

@@ -9,10 +9,11 @@ import (
 type Category struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	Name           string
 	Description    *string
 	ImageURL       *string
-	Order      	   int
+	Order          int
 	IsActive       bool
 	CreatedAt      time.Time
 	UpdatedAt      time.Time
@@ -20,27 +21,30 @@ type Category struct {
 
 type CreateCategoryRequest struct {
 	OrganizationID uuid.UUID `validate:"required"`
-	Name           string    `validate:"required,min=1,max=255"`
+	OutletID       *uuid.UUID
-	Description    *string   `validate:"omitempty,max=1000"`
+	Name           string  `validate:"required,min=1,max=255"`
-	ImageURL       *string   `validate:"omitempty,url"`
+	Description    *string `validate:"omitempty,max=1000"`
-	Order      	   int       `validate:"min=0"`
+	ImageURL       *string `validate:"omitempty,url"`
+	Order          int     `validate:"min=0"`
 }
 
 type UpdateCategoryRequest struct {
-	Name        *string `validate:"omitempty,min=1,max=255"`
+	OutletID    *uuid.UUID `validate:"omitempty,required"`
-	Description *string `validate:"omitempty,max=1000"`
+	Name        *string    `validate:"omitempty,min=1,max=255"`
-	ImageURL    *string `validate:"omitempty,url"`
+	Description *string    `validate:"omitempty,max=1000"`
-	Order       *int    `validate:"omitempty,min=0"`
+	ImageURL    *string    `validate:"omitempty,url"`
+	Order       *int       `validate:"omitempty,min=0"`
 	IsActive    *bool
 }
 
 type CategoryResponse struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	Name           string
 	Description    *string
 	ImageURL       *string
-	Order      int
+	Order          int
 	IsActive       bool
 	CreatedAt      time.Time
 	UpdatedAt      time.Time

internal/models/product.go

@@ -10,6 +10,7 @@ import (
 type Product struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	CategoryID     uuid.UUID
 	SKU            *string
 	Name           string
@@ -40,6 +41,7 @@ type ProductVariant struct {
 
 type CreateProductRequest struct {
 	OrganizationID uuid.UUID              `validate:"required"`
+	OutletID       *uuid.UUID             `validate:"omitempty"`
 	CategoryID     uuid.UUID              `validate:"required"`
 	SKU            *string                `validate:"omitempty,max=100"`
 	Name           string                 `validate:"required,min=1,max=255"`
@@ -60,6 +62,7 @@ type CreateProductRequest struct {
 }
 
 type UpdateProductRequest struct {
+	OutletID       *uuid.UUID `validate:"omitempty"`
 	CategoryID     *uuid.UUID `validate:"omitempty"`
 	SKU            *string    `validate:"omitempty,max=100"`
 	Name           *string    `validate:"omitempty,min=1,max=255"`
@@ -94,6 +97,7 @@ type UpdateProductVariantRequest struct {
 type ProductResponse struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	CategoryID     uuid.UUID
 	CategoryName   string
 	SKU            *string

internal/processor/category_processor.go

@@ -55,6 +55,7 @@ func (p *CategoryProcessorImpl) CreateCategory(ctx context.Context, req *models.
 
 	// Map request to entity
 	categoryEntity := mappers.CreateCategoryRequestToEntity(req)
+	categoryEntity.OutletID = req.OutletID
 
 	// Create category
 	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
 	mappers.UpdateCategoryEntityFromRequest(existingCategory, req)
+	if req.OutletID != nil {
+		existingCategory.OutletID = req.OutletID
+	}
 
 	// Update category
 	if err := p.categoryRepo.Update(ctx, existingCategory); err != nil {

internal/processor/table_processor.go

@@ -4,6 +4,7 @@ import (
 	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
+	"apskel-pos-be/internal/pkg/tabletoken"
 	"apskel-pos-be/internal/repository"
 	"context"
 	"errors"
@@ -212,6 +213,15 @@ func (p *TableProcessor) GetTokenByID(ctx context.Context, id uuid.UUID) (string
 	if err != nil {
 		return "", err
 	}
+
+	if _, _, _, err := tabletoken.Decode(table.Token); err != nil {
+		newToken := tabletoken.Encode(table.ID, table.OrganizationID, table.OutletID)
+		if updateErr := p.tableRepo.UpdateToken(ctx, table.ID, newToken); updateErr != nil {
+			return "", updateErr
+		}
+		return newToken, nil
+	}
+
 	return table.Token, nil
 }
 

internal/repository/analytics_repository.go

@@ -29,6 +29,13 @@ func NewAnalyticsRepositoryImpl(db *gorm.DB) *AnalyticsRepositoryImpl {
 	}
 }
 
+func (r *AnalyticsRepositoryImpl) resolveOutletID(query *gorm.DB, outletID *uuid.UUID, column string) *gorm.DB {
+	if outletID != nil {
+		return query.Where(column+" = ?", *outletID)
+	}
+	return query
+}
+
 func (r *AnalyticsRepositoryImpl) GetPaymentMethodAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.PaymentMethodAnalytics, error) {
 	var results []*entities.PaymentMethodAnalytics
 
@@ -50,9 +57,7 @@ func (r *AnalyticsRepositoryImpl) GetPaymentMethodAnalytics(ctx context.Context,
 		Where("p.status = ?", entities.PaymentTransactionStatusCompleted).
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
+	query = r.resolveOutletID(query, outletID, "o.outlet_id")
-		query = query.Where("o.outlet_id = ?", *outletID)
-	}
 
 	err := query.
 		Group("pm.id, pm.name, pm.type").
@@ -180,9 +185,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
 		Where("oi.status != ?", entities.OrderItemStatusCancelled).
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
+	query = r.resolveOutletID(query, outletID, "o.outlet_id")
-		query = query.Where("o.outlet_id = ?", *outletID)
-	}
 
 	err := query.
 		Group("p.id, p.name, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
@@ -235,9 +238,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalyticsPerCategory(ctx context.Con
 		Where("oi.status != ?", entities.OrderItemStatusCancelled).
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
+	query = r.resolveOutletID(query, outletID, "o.outlet_id")
-		query = query.Where("o.outlet_id = ?", *outletID)
-	}
 
 	err := query.
 		Group("c.id, c.name").
@@ -267,9 +268,7 @@ func (r *AnalyticsRepositoryImpl) GetDashboardOverview(ctx context.Context, orga
 		Where("o.organization_id = ?", organizationID).
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
+	query = r.resolveOutletID(query, outletID, "o.outlet_id")
-		query = query.Where("o.outlet_id = ?", *outletID)
-	}
 
 	err := query.Scan(&result).Error
 	if err != nil {
@@ -320,9 +319,7 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Where("o.is_void = false AND o.is_refund = false").
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
+	summaryQuery = r.resolveOutletID(summaryQuery, outletID, "o.outlet_id")
-		summaryQuery = summaryQuery.Where("o.outlet_id = ?", *outletID)
-	}
 
 	err := summaryQuery.Scan(&summary).Error
 	if err != nil {
@@ -374,9 +371,7 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Group(timeFormat).
 		Order(timeFormat)
 
-	if outletID != nil {
+	dataQuery = r.resolveOutletID(dataQuery, outletID, "o.outlet_id")
-		dataQuery = dataQuery.Where("o.outlet_id = ?", *outletID)
-	}
 
 	err = dataQuery.Scan(&data).Error
 	if err != nil {
@@ -419,9 +414,7 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Order("p.name ASC").
 		Limit(1000)
 
-	if outletID != nil {
+	productQuery = r.resolveOutletID(productQuery, outletID, "o.outlet_id")
-		productQuery = productQuery.Where("o.outlet_id = ?", *outletID)
-	}
 
 	err = productQuery.Scan(&productData).Error
 	if err != nil {

internal/repository/category_repository.go

@@ -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) {
 	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 {
 		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) {
 	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 {
 		return nil, err
 	}
@@ -81,7 +81,7 @@ func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]in
 		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
 }
 

internal/repository/inventory_repository.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/google/uuid"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 type InventoryRepository interface {
@@ -278,7 +279,12 @@ func (r *InventoryRepositoryImpl) UpdateReorderLevel(ctx context.Context, id uui
 }
 
 func (r *InventoryRepositoryImpl) BulkCreate(ctx context.Context, inventoryItems []*entities.Inventory) error {
-	return r.db.WithContext(ctx).CreateInBatches(inventoryItems, 100).Error
+	return r.db.WithContext(ctx).
+		Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "outlet_id"}, {Name: "product_id"}},
+			DoNothing: true,
+		}).
+		CreateInBatches(inventoryItems, 100).Error
 }
 
 func (r *InventoryRepositoryImpl) BulkUpdate(ctx context.Context, inventoryItems []*entities.Inventory) error {
@@ -301,21 +307,25 @@ func (r *InventoryRepositoryImpl) BulkAdjustQuantity(ctx context.Context, adjust
 	return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		for productID, delta := range adjustments {
 			var inventory entities.Inventory
-			if err := tx.Where("product_id = ? AND outlet_id = ?", productID, outletID).First(&inventory).Error; err != nil {
+			err := tx.Set("gorm:query_option", "FOR UPDATE").
-				if errors.Is(err, gorm.ErrRecordNotFound) {
+				Where("product_id = ? AND outlet_id = ?", productID, outletID).
-					// Inventory doesn't exist, create it with initial quantity
+				First(&inventory).Error
-					inventory = entities.Inventory{
+			if err != nil {
-						ProductID:    productID,
+				if !errors.Is(err, gorm.ErrRecordNotFound) {
-						OutletID:     outletID,
-						Quantity:     0,
-						ReorderLevel: 0,
-					}
-					if err := tx.Create(&inventory).Error; err != nil {
-						return fmt.Errorf("failed to create inventory record for product %s: %w", productID, err)
-					}
-				} else {
 					return err
 				}
+				// Use FirstOrCreate to handle race conditions — avoids duplicate key
+				// if another transaction already inserted this row concurrently.
+				inventory = entities.Inventory{
+					ProductID:    productID,
+					OutletID:     outletID,
+					Quantity:     0,
+					ReorderLevel: 0,
+				}
+				if err := tx.Where(entities.Inventory{ProductID: productID, OutletID: outletID}).
+					FirstOrCreate(&inventory).Error; err != nil {
+					return fmt.Errorf("failed to create inventory record for product %s: %w", productID, err)
+				}
 			}
 
 			inventory.UpdateQuantity(delta)

internal/repository/organization_repository.go

@@ -99,3 +99,14 @@ func (r *OrganizationRepositoryImpl) GetByEmail(ctx context.Context, email strin
 	}
 	return &org, nil
 }
+
+// GetTotalOmset returns the total revenue from completed orders for an organization.
+func (r *OrganizationRepositoryImpl) GetTotalOmset(ctx context.Context, organizationID uuid.UUID) (float64, error) {
+	var total float64
+	err := r.db.WithContext(ctx).
+		Table("orders").
+		Where("organization_id = ? AND payment_status = ?", organizationID, "completed").
+		Select("COALESCE(SUM(total_amount), 0)").
+		Scan(&total).Error
+	return total, err
+}

internal/repository/table_repository.go

@@ -171,6 +171,13 @@ func (r *TableRepository) ReleaseTable(ctx context.Context, tableID uuid.UUID, p
 		}).Error
 }
 
+func (r *TableRepository) UpdateToken(ctx context.Context, tableID uuid.UUID, token string) error {
+	return r.db.WithContext(ctx).
+		Model(&entities.Table{}).
+		Where("id = ?", tableID).
+		Update("token", token).Error
+}
+
 func (r *TableRepository) GetByOrderID(ctx context.Context, orderID uuid.UUID) (*entities.Table, error) {
 	var table entities.Table
 	err := r.db.WithContext(ctx).

internal/repository/table_repository_interface.go

@@ -24,4 +24,5 @@ type TableRepositoryInterface interface {
 	OccupyTable(ctx context.Context, tableID, orderID uuid.UUID, startTime *time.Time) error
 	ReleaseTable(ctx context.Context, tableID uuid.UUID, paymentAmount float64) error
 	GetByOrderID(ctx context.Context, orderID uuid.UUID) (*entities.Table, error)
+	UpdateToken(ctx context.Context, tableID uuid.UUID, token string) error
 }

internal/repository/user_repository.go

@@ -61,6 +61,17 @@ func (r *UserRepositoryImpl) GetActiveUsers(ctx context.Context, organizationID
 	return users, err
 }
 
+func (r *UserRepositoryImpl) GetActiveByOutletID(ctx context.Context, organizationID, outletID uuid.UUID) ([]*entities.User, error) {
+	var users []*entities.User
+	err := r.db.WithContext(ctx).
+		Where(
+			"organization_id = ? AND is_active = ? AND (outlet_id = ? OR role IN ?)",
+			organizationID, true, outletID, []string{"admin", "manager"},
+		).
+		Find(&users).Error
+	return users, err
+}
+
 func (r *UserRepositoryImpl) Update(ctx context.Context, user *entities.User) error {
 	return r.db.WithContext(ctx).Save(user).Error
 }

internal/router/router.go

@@ -72,7 +72,7 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
 		paymentMethodHandler:              handler.NewPaymentMethodHandler(paymentMethodService, paymentMethodValidator),
 		analyticsHandler:                  handler.NewAnalyticsHandler(analyticsService, transformer.NewTransformer()),
 		reportHandler:                     handler.NewReportHandler(reportService, userService),
-		tableHandler:                      handler.NewTableHandler(tableService, tableValidator, cfg.Server.BaseUrl),
+		tableHandler:                      handler.NewTableHandler(tableService, tableValidator, cfg.Server.SelfOrderUrl),
 		unitHandler:                       handler.NewUnitHandler(unitService),
 		ingredientHandler:                 handler.NewIngredientHandler(ingredientService),
 		productRecipeHandler:              handler.NewProductRecipeHandler(productRecipeService),
@@ -157,7 +157,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			selfOrder.GET("/categories", r.selfOrderHandler.ListCategories)
 			selfOrder.GET("/menu", r.selfOrderHandler.GetMenu)
 			selfOrder.POST("/orders", r.selfOrderHandler.CreateOrder)
-			selfOrder.GET("/orders/:sessionId", r.selfOrderHandler.GetOrdersBySession)
+			selfOrder.GET("/orders/:session_id", r.selfOrderHandler.GetOrdersBySession)
 		}
 
 		organizations := v1.Group("/organizations")

internal/service/category_service.go

@@ -88,6 +88,9 @@ func (s *CategoryServiceImpl) ListCategories(ctx context.Context, req *contract.
 	if req.BusinessType != "" {
 		filters["business_type"] = req.BusinessType
 	}
+	if req.OutletID != nil {
+		filters["outlet_id"] = *req.OutletID
+	}
 	if req.Search != "" {
 		filters["search"] = req.Search
 	}

internal/service/omset_milestone_scheduler.go

@@ -0,0 +1,171 @@
+package service
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"sync"
+	"time"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+	"apskel-pos-be/internal/processor"
+	"apskel-pos-be/internal/repository"
+
+	"github.com/google/uuid"
+)
+
+const (
+	defaultCheckInterval = 1 * time.Hour
+	OmsetMillionRupiah   = 1_000_000.0
+)
+
+// OmsetMilestoneScheduler periodically checks each organization's total omset
+// and sends a notification to owner/admin users when a milestone is reached.
+//
+// NOTE: Milestone tracking is in-memory; notifications may re-trigger after a restart.
+// For persistent tracking, persist the notified state in the database.
+type OmsetMilestoneScheduler struct {
+	orgRepo          *repository.OrganizationRepositoryImpl
+	userRepo         *repository.UserRepositoryImpl
+	notificationProc processor.NotificationProcessor
+
+	mu       sync.Mutex
+	notified map[string]bool // "orgID:milestone" -> already notified
+	stopCh   chan struct{}
+}
+
+func NewOmsetMilestoneScheduler(
+	orgRepo *repository.OrganizationRepositoryImpl,
+	userRepo *repository.UserRepositoryImpl,
+	notificationProc processor.NotificationProcessor,
+) *OmsetMilestoneScheduler {
+	return &OmsetMilestoneScheduler{
+		orgRepo:          orgRepo,
+		userRepo:         userRepo,
+		notificationProc: notificationProc,
+		notified:         make(map[string]bool),
+		stopCh:           make(chan struct{}),
+	}
+}
+
+// Start begins the periodic milestone check in a background goroutine.
+func (s *OmsetMilestoneScheduler) Start(interval time.Duration) {
+	if interval <= 0 {
+		interval = defaultCheckInterval
+	}
+
+	go func() {
+		// Perform an initial check immediately.
+		s.checkAllOrganizations()
+
+		ticker := time.NewTicker(interval)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-ticker.C:
+				s.checkAllOrganizations()
+			case <-s.stopCh:
+				log.Println("Omset milestone scheduler stopped")
+				return
+			}
+		}
+	}()
+
+	log.Println("Omset milestone scheduler started")
+}
+
+// Stop signals the scheduler to stop.
+func (s *OmsetMilestoneScheduler) Stop() {
+	close(s.stopCh)
+}
+
+func (s *OmsetMilestoneScheduler) checkAllOrganizations() {
+	ctx := context.Background()
+
+	orgs, _, err := s.orgRepo.List(ctx, nil, 1000, 0)
+	if err != nil {
+		log.Printf("OmsetMilestoneScheduler: failed to list organizations: %v", err)
+		return
+	}
+
+	for _, org := range orgs {
+		s.checkOrganization(ctx, org)
+	}
+}
+
+func (s *OmsetMilestoneScheduler) checkOrganization(ctx context.Context, org *entities.Organization) {
+	totalOmset, err := s.orgRepo.GetTotalOmset(ctx, org.ID)
+	if err != nil {
+		log.Printf("OmsetMilestoneScheduler: failed to get total omset for org %s: %v", org.ID, err)
+		return
+	}
+
+	milestones := []float64{OmsetMillionRupiah}
+
+	for _, milestone := range milestones {
+		if totalOmset < milestone {
+			continue
+		}
+
+		key := fmt.Sprintf("%s:%.0f", org.ID.String(), milestone)
+
+		s.mu.Lock()
+		if s.notified[key] {
+			s.mu.Unlock()
+			continue
+		}
+		s.notified[key] = true
+		s.mu.Unlock()
+
+		s.sendMilestoneNotification(ctx, org, totalOmset, milestone)
+	}
+}
+
+func (s *OmsetMilestoneScheduler) sendMilestoneNotification(ctx context.Context, org *entities.Organization, totalOmset float64, milestone float64) {
+	users, err := s.userRepo.GetByOrganizationID(ctx, org.ID)
+	if err != nil {
+		log.Printf("OmsetMilestoneScheduler: failed to get users for org %s: %v", org.ID, err)
+		return
+	}
+
+	// Notify owner and admin users.
+	var receiverIDs []uuid.UUID
+	for _, user := range users {
+		roleStr := string(user.Role)
+		if roleStr == string(constants.RoleOwner) || roleStr == string(constants.RoleAdmin) {
+			receiverIDs = append(receiverIDs, user.ID)
+		}
+	}
+
+	if len(receiverIDs) == 0 {
+		return
+	}
+
+	orgID := org.ID
+	title := "🎉 Selamat! Omset Telah Mencapai 1 Juta Rupiah"
+	body := fmt.Sprintf("Organisasi %s telah mencapai omset Rp %.0f. Terus tingkatkan prestasinya!", org.Name, totalOmset)
+
+	notifReq := &models.SendNotificationRequest{
+		Title:          title,
+		Body:           body,
+		Type:           "milestone",
+		Category:       "omset_milestone",
+		NotifiableType: "organization",
+		NotifiableID:   &orgID,
+		ReceiverIDs:    receiverIDs,
+		Data: map[string]interface{}{
+			"organization_id": org.ID.String(),
+			"total_omset":     totalOmset,
+			"milestone":       milestone,
+		},
+	}
+
+	if _, err := s.notificationProc.Send(ctx, notifReq); err != nil {
+		log.Printf("OmsetMilestoneScheduler: failed to send notification for org %s: %v", org.ID, err)
+	} else {
+		log.Printf("OmsetMilestoneScheduler: sent milestone notification to org %s (omset: %.0f)", org.ID, totalOmset)
+	}
+}

internal/service/order_service.go

@@ -16,6 +16,11 @@ import (
 	"github.com/google/uuid"
 )
 
+// orderUserRepository is a minimal interface to fetch users by organization for notification purposes.
+type orderUserRepository interface {
+	GetActiveByOutletID(ctx context.Context, organizationID, outletID uuid.UUID) ([]*entities.User, error)
+}
+
 type OrderService interface {
 	CreateOrder(ctx context.Context, req *models.CreateOrderRequest, organizationID uuid.UUID) (*models.OrderResponse, error)
 	AddToOrder(ctx context.Context, orderID uuid.UUID, req *models.AddToOrderRequest) (*models.AddToOrderResponse, error)
@@ -38,9 +43,11 @@ type OrderServiceImpl struct {
 	productRecipeRepo                   repository.ProductRecipeRepository
 	txManager                           *repository.TxManager
 	sessionRepo                         repository.SessionRepository
+	notificationProcessor               processor.NotificationProcessor
+	userRepo                            orderUserRepository
 }
 
-func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repository.TableRepositoryInterface, orderIngredientTransactionService *OrderIngredientTransactionService, orderIngredientTransactionProcessor processor.OrderIngredientTransactionProcessor, productRecipeRepo repository.ProductRecipeRepository, txManager *repository.TxManager, sessionRepo repository.SessionRepository) *OrderServiceImpl {
+func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repository.TableRepositoryInterface, orderIngredientTransactionService *OrderIngredientTransactionService, orderIngredientTransactionProcessor processor.OrderIngredientTransactionProcessor, productRecipeRepo repository.ProductRecipeRepository, txManager *repository.TxManager, sessionRepo repository.SessionRepository, notificationProcessor processor.NotificationProcessor, userRepo orderUserRepository) *OrderServiceImpl {
 	return &OrderServiceImpl{
 		orderProcessor:                      orderProcessor,
 		tableRepo:                           tableRepo,
@@ -49,6 +56,8 @@ func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repo
 		productRecipeRepo:                   productRecipeRepo,
 		txManager:                           txManager,
 		sessionRepo:                         sessionRepo,
+		notificationProcessor:               notificationProcessor,
+		userRepo:                            userRepo,
 	}
 }
 
@@ -104,10 +113,73 @@ func (s *OrderServiceImpl) CreateOrder(ctx context.Context, req *models.CreateOr
 		return nil, err
 	}
 
+	// Send notification to all org users if this is a self-order
+	if isSelfOrder(req.Metadata) {
+		go s.sendSelfOrderNotification(context.Background(), response, organizationID)
+	}
+
 	return response, nil
 }
 
-// createIngredientTransactions creates ingredient transactions for order items efficiently
+// isSelfOrder checks if the order metadata indicates a self-order.
+func isSelfOrder(metadata map[string]interface{}) bool {
+	if metadata == nil {
+		return false
+	}
+	v, ok := metadata["self_order"]
+	if !ok {
+		return false
+	}
+	b, ok := v.(bool)
+	return ok && b
+}
+
+// sendSelfOrderNotification sends a new-order notification to all active users
+// that can access the outlet where the self-order was placed.
+func (s *OrderServiceImpl) sendSelfOrderNotification(ctx context.Context, order *models.OrderResponse, organizationID uuid.UUID) {
+	if s.notificationProcessor == nil || s.userRepo == nil {
+		return
+	}
+
+	users, err := s.userRepo.GetActiveByOutletID(ctx, organizationID, order.OutletID)
+	if err != nil || len(users) == 0 {
+		return
+	}
+
+	receiverIDs := make([]uuid.UUID, 0, len(users))
+	for _, u := range users {
+		receiverIDs = append(receiverIDs, u.ID)
+	}
+
+	tableName := ""
+	if order.TableNumber != nil {
+		tableName = *order.TableNumber
+	}
+
+	title := "Pesanan Baru Masuk"
+	body := fmt.Sprintf("Ada pesanan baru dari meja %s", tableName)
+	if tableName == "" {
+		body = "Ada pesanan baru masuk"
+	}
+
+	orderID := order.ID
+	notifReq := &models.SendNotificationRequest{
+		Title:          title,
+		Body:           body,
+		Type:           "order",
+		Category:       "self_order",
+		NotifiableType: "order",
+		NotifiableID:   &orderID,
+		ReceiverIDs:    receiverIDs,
+		Data: map[string]interface{}{
+			"order_id":     order.ID.String(),
+			"order_number": order.OrderNumber,
+			"table_name":   tableName,
+		},
+	}
+
+	_, _ = s.notificationProcessor.Send(ctx, notifReq)
+}
 func (s *OrderServiceImpl) createIngredientTransactions(ctx context.Context, orderID uuid.UUID, orderItems []models.OrderItemResponse) ([]*contract.CreateOrderIngredientTransactionRequest, error) {
 	appCtx := appcontext.FromGinContext(ctx)
 	organizationID := appCtx.OrganizationID

internal/service/product_service.go

@@ -85,6 +85,9 @@ func (s *ProductServiceImpl) ListProducts(ctx context.Context, req *contract.Lis
 	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
 	}

internal/transformer/analytics_transformer.go

@@ -6,8 +6,22 @@ import (
 	"apskel-pos-be/internal/util"
 	"fmt"
 	"time"
+
+	"github.com/google/uuid"
 )
 
+// parseOutletID converts a *string outlet ID to *uuid.UUID, returning nil for invalid/empty values.
+func parseOutletID(s *string) *uuid.UUID {
+	if s == nil {
+		return nil
+	}
+	id, err := uuid.Parse(*s)
+	if err != nil {
+		return nil
+	}
+	return &id
+}
+
 // PaymentMethodAnalyticsContractToModel converts contract request to model
 func PaymentMethodAnalyticsContractToModel(req *contract.PaymentMethodAnalyticsRequest) *models.PaymentMethodAnalyticsRequest {
 	var dateFrom, dateTo time.Time
@@ -23,7 +37,7 @@ func PaymentMethodAnalyticsContractToModel(req *contract.PaymentMethodAnalyticsR
 
 	return &models.PaymentMethodAnalyticsRequest{
 		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
+		OutletID:       parseOutletID(req.OutletID),
 		DateFrom:       dateFrom,
 		DateTo:         dateTo,
 		GroupBy:        req.GroupBy,
@@ -79,7 +93,7 @@ func SalesAnalyticsContractToModel(req *contract.SalesAnalyticsRequest) *models.
 
 	return &models.SalesAnalyticsRequest{
 		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
+		OutletID:       parseOutletID(req.OutletID),
 		DateFrom:       dateFrom,
 		DateTo:         dateTo,
 		GroupBy:        req.GroupBy,
@@ -139,7 +153,7 @@ func ProductAnalyticsContractToModel(req *contract.ProductAnalyticsRequest) *mod
 
 	return &models.ProductAnalyticsRequest{
 		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
+		OutletID:       parseOutletID(req.OutletID),
 		DateFrom:       dateFrom,
 		DateTo:         dateTo,
 		Limit:          req.Limit,
@@ -199,7 +213,7 @@ func ProductAnalyticsPerCategoryContractToModel(req *contract.ProductAnalyticsPe
 
 	return &models.ProductAnalyticsPerCategoryRequest{
 		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
+		OutletID:       parseOutletID(req.OutletID),
 		DateFrom:       dateFrom,
 		DateTo:         dateTo,
 	}
@@ -251,7 +265,7 @@ func DashboardAnalyticsContractToModel(req *contract.DashboardAnalyticsRequest)
 
 	return &models.DashboardAnalyticsRequest{
 		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
+		OutletID:       parseOutletID(req.OutletID),
 		DateFrom:       dateFrom,
 		DateTo:         dateTo,
 	}
@@ -346,7 +360,7 @@ func ProfitLossAnalyticsContractToModel(req *contract.ProfitLossAnalyticsRequest
 
 	return &models.ProfitLossAnalyticsRequest{
 		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
+		OutletID:       parseOutletID(req.OutletID),
 		DateFrom:       *dateFrom,
 		DateTo:         *dateTo,
 		GroupBy:        req.GroupBy,

internal/transformer/category_transformer.go

@@ -9,6 +9,7 @@ import (
 func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.CreateCategoryRequest) *models.CreateCategoryRequest {
 	return &models.CreateCategoryRequest{
 		OrganizationID: apctx.OrganizationID,
+		OutletID:       req.OutletID,
 		Name:           req.Name,
 		Description:    req.Description,
 		ImageURL:       nil,
@@ -18,6 +19,7 @@ func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.C
 
 func UpdateCategoryRequestToModel(req *contract.UpdateCategoryRequest) *models.UpdateCategoryRequest {
 	return &models.UpdateCategoryRequest{
+		OutletID:    req.OutletID,
 		Name:        req.Name,
 		Description: req.Description,
 		ImageURL:    nil,
@@ -34,6 +36,7 @@ func CategoryModelResponseToResponse(cat *models.CategoryResponse) *contract.Cat
 	return &contract.CategoryResponse{
 		ID:             cat.ID,
 		OrganizationID: cat.OrganizationID,
+		OutletID:       cat.OutletID,
 		Name:           cat.Name,
 		Description:    cat.Description,
 		BusinessType:   "restaurant", // Default business type

internal/transformer/product_transformer.go

@@ -39,6 +39,7 @@ func CreateProductRequestToModel(apctx *appcontext.ContextInfo, req *contract.Cr
 
 	return &models.CreateProductRequest{
 		OrganizationID: apctx.OrganizationID,
+		OutletID:       req.OutletID,
 		CategoryID:     req.CategoryID,
 		SKU:            req.SKU,
 		Name:           req.Name,
@@ -60,7 +61,8 @@ func UpdateProductRequestToModel(req *contract.UpdateProductRequest) *models.Upd
 	}
 
 	return &models.UpdateProductRequest{
-		CategoryID:  req.CategoryID,
+		OutletID:     req.OutletID,
+		CategoryID:   req.CategoryID,
 		SKU:         req.SKU,
 		Name:        req.Name,
 		Description: req.Description,
@@ -100,6 +102,7 @@ func ProductModelResponseToResponse(prod *models.ProductResponse) *contract.Prod
 	return &contract.ProductResponse{
 		ID:             prod.ID,
 		OrganizationID: prod.OrganizationID,
+		OutletID:       prod.OutletID,
 		CategoryID:     prod.CategoryID,
 		CategoryName:   prod.CategoryName,
 		SKU:            prod.SKU,

internal/validator/category_validator.go

@@ -59,7 +59,7 @@ func (v *CategoryValidatorImpl) ValidateUpdateCategoryRequest(req *contract.Upda
 	}
 
 	// 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
 	}
 

migrations/000065_create_notifications_table.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS notifications;

migrations/000065_create_notifications_table.up.sql

@@ -0,0 +1,28 @@
+-- Notifications table (master notification record)
+CREATE TABLE notifications (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    title VARCHAR(255) NOT NULL,
+    body TEXT,
+    type VARCHAR(100),
+    category VARCHAR(100),
+    priority VARCHAR(50) NOT NULL DEFAULT 'normal' CHECK (priority IN ('low', 'normal', 'high')),
+    image_url VARCHAR(512),
+    action_url VARCHAR(512),
+    notifiable_type VARCHAR(100),
+    notifiable_id UUID,
+    data JSONB,
+    scheduled_at TIMESTAMP WITH TIME ZONE,
+    sent_at TIMESTAMP WITH TIME ZONE,
+    expired_at TIMESTAMP WITH TIME ZONE,
+    created_by UUID REFERENCES users(id) ON DELETE SET NULL,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+);
+
+-- Indexes
+CREATE INDEX idx_notifications_created_by ON notifications(created_by);
+CREATE INDEX idx_notifications_type ON notifications(type);
+CREATE INDEX idx_notifications_category ON notifications(category);
+CREATE INDEX idx_notifications_notifiable ON notifications(notifiable_type, notifiable_id);
+CREATE INDEX idx_notifications_scheduled_at ON notifications(scheduled_at);
+CREATE INDEX idx_notifications_sent_at ON notifications(sent_at);

migrations/000066_create_notification_receivers_table.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS notification_receivers;

migrations/000066_create_notification_receivers_table.up.sql

@@ -0,0 +1,18 @@
+-- Notification receivers table (links a notification to a specific user)
+CREATE TABLE notification_receivers (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    notification_id UUID NOT NULL REFERENCES notifications(id) ON DELETE CASCADE,
+    user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    is_read BOOLEAN NOT NULL DEFAULT FALSE,
+    read_at TIMESTAMP WITH TIME ZONE,
+    is_deleted BOOLEAN NOT NULL DEFAULT FALSE,
+    deleted_at TIMESTAMP WITH TIME ZONE,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+);
+
+-- Indexes
+CREATE INDEX idx_notification_receivers_notification_id ON notification_receivers(notification_id);
+CREATE INDEX idx_notification_receivers_user_id ON notification_receivers(user_id);
+CREATE INDEX idx_notification_receivers_user_unread ON notification_receivers(user_id, is_read) WHERE is_deleted = FALSE;
+CREATE UNIQUE INDEX idx_notification_receivers_unique ON notification_receivers(notification_id, user_id);

migrations/000067_create_notification_deliveries_table.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS notification_deliveries;

migrations/000067_create_notification_deliveries_table.up.sql

@@ -0,0 +1,23 @@
+-- Notification deliveries table (tracks per-device delivery attempts)
+CREATE TABLE notification_deliveries (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    notification_receiver_id UUID NOT NULL REFERENCES notification_receivers(id) ON DELETE CASCADE,
+    user_device_id UUID NOT NULL REFERENCES user_devices(id) ON DELETE CASCADE,
+    channel VARCHAR(50) NOT NULL DEFAULT 'push' CHECK (channel IN ('push', 'websocket', 'email')),
+    delivery_status VARCHAR(50) NOT NULL DEFAULT 'pending' CHECK (delivery_status IN ('pending', 'sent', 'delivered', 'failed')),
+    provider VARCHAR(50) CHECK (provider IN ('firebase', 'onesignal')),
+    provider_message_id VARCHAR(255),
+    sent_at TIMESTAMP WITH TIME ZONE,
+    delivered_at TIMESTAMP WITH TIME ZONE,
+    failed_at TIMESTAMP WITH TIME ZONE,
+    failure_reason TEXT,
+    retry_count INT NOT NULL DEFAULT 0,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+);
+
+-- Indexes
+CREATE INDEX idx_notification_deliveries_receiver_id ON notification_deliveries(notification_receiver_id);
+CREATE INDEX idx_notification_deliveries_device_id ON notification_deliveries(user_device_id);
+CREATE INDEX idx_notification_deliveries_status ON notification_deliveries(delivery_status);
+CREATE INDEX idx_notification_deliveries_provider ON notification_deliveries(provider);

migrations/000068_add_outlet_id_to_categories.down.sql

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

migrations/000068_add_outlet_id_to_categories.up.sql

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

migrations/000069_add_outlet_id_to_products.down.sql

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

migrations/000069_add_outlet_id_to_products.up.sql

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