Implement FCM

Barcode generation with Boombuler
Add self-order/orders/:sessionId
2026-05-09 14:18:36 +07:00 · 2026-05-09 01:01:25 +07:00 · 2026-05-09 00:12:00 +07:00 · 2026-05-08 23:56:06 +07:00 · 2026-05-08 23:18:52 +07:00 · 2026-05-08 18:41:14 +07:00
65 changed files with 1359 additions and 2829 deletions
@@ -7,5 +7,4 @@ config/env/*

 vendor

-# Firebase service account credentials
-infra/firebase-service-account.json
+*firebase-adminsdk*.json
@@ -12,13 +12,18 @@ func main() {
 	cfg := config.LoadConfig()
 	logger.Setup(cfg.LogLevel(), cfg.LogFormat())

-	db, err := db.NewPostgres(cfg.Database)
+	pg, err := db.NewPostgres(cfg.Database)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	redisClient, err := db.NewRedisClient(cfg.Redis)
 	if err != nil {
 		log.Fatal(err)
 	}

 	logger.NonContext.Info("helloworld")
-	application := app.NewApp(db)
+	application := app.NewApp(pg, redisClient)

 	if err := application.Initialize(cfg); err != nil {
 		log.Fatalf("Failed to initialize application: %v", err)
@@ -26,11 +26,12 @@ var (
 type Config struct {
 	Server   Server   `mapstructure:"server"`
 	Database Database `mapstructure:"postgresql"`
+	Redis    Redis    `mapstructure:"redis"`
 	Jwt      Jwt      `mapstructure:"jwt"`
 	Log      Log      `mapstructure:"log"`
 	S3Config S3Config `mapstructure:"s3"`
 	Fonnte   Fonnte   `mapstructure:"fonnte"`
-	FCM      FCM      `mapstructure:"fcm"`
+	Firebase Firebase `mapstructure:"firebase"`
 }

 var (
@@ -96,6 +97,6 @@ func (c *Config) GetFonnte() *Fonnte {
 	return &c.Fonnte
 }

-func (c *Config) GetFCM() *FCM {
-	return &c.FCM
+func (c *Config) GetFirebase() *Firebase {
+	return &c.Firebase
 }
@@ -1,14 +0,0 @@
-package config
-
-type FCM struct {
-	CredentialsFile string `mapstructure:"credentials_file"`
-	ProjectID       string `mapstructure:"project_id"`
-}
-
-func (f *FCM) GetCredentialsFile() string {
-	return f.CredentialsFile
-}
-
-func (f *FCM) GetProjectID() string {
-	return f.ProjectID
-}
@@ -0,0 +1,9 @@
+package config
+
+type Firebase struct {
+	CredentialsFile string `mapstructure:"credentials_file"`
+}
+
+func (f *Firebase) GetCredentialsFile() string {
+	return f.CredentialsFile
+}
@@ -0,0 +1,55 @@
+package config
+
+import (
+	"fmt"
+	"time"
+)
+
+type Redis struct {
+	Host               string `mapstructure:"host"`
+	Port               int    `mapstructure:"port"`
+	Password           string `mapstructure:"password"`
+	DB                 int    `mapstructure:"db"`
+	DialTimeout        string `mapstructure:"dial_timeout"`
+	ReadTimeout        string `mapstructure:"read_timeout"`
+	WriteTimeout       string `mapstructure:"write_timeout"`
+	PoolSize           int    `mapstructure:"pool_size"`
+	MinIdleConnections int    `mapstructure:"min_idle_connections"`
+}
+
+func (r Redis) Addr() string {
+	return fmt.Sprintf("%s:%d", r.Host, r.Port)
+}
+
+func (r Redis) ParseDialTimeout() time.Duration {
+	if r.DialTimeout == "" {
+		return 5 * time.Second
+	}
+	d, err := time.ParseDuration(r.DialTimeout)
+	if err != nil {
+		return 5 * time.Second
+	}
+	return d
+}
+
+func (r Redis) ParseReadTimeout() time.Duration {
+	if r.ReadTimeout == "" {
+		return 3 * time.Second
+	}
+	d, err := time.ParseDuration(r.ReadTimeout)
+	if err != nil {
+		return 3 * time.Second
+	}
+	return d
+}
+
+func (r Redis) ParseWriteTimeout() time.Duration {
+	if r.WriteTimeout == "" {
+		return 3 * time.Second
+	}
+	d, err := time.ParseDuration(r.WriteTimeout)
+	if err != nil {
+		return 3 * time.Second
+	}
+	return d
+}
@@ -1,6 +1,6 @@
 module apskel-pos-be

-go 1.23.0
+go 1.24

 require (
 	github.com/gin-gonic/gin v1.9.1
@@ -57,7 +57,7 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -86,7 +86,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
 	go.opentelemetry.io/otel/trace v1.35.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/net v0.42.0 // indirect
@@ -108,7 +108,9 @@ require (
 require (
 	firebase.google.com/go/v4 v4.19.0
 	github.com/aws/aws-sdk-go v1.55.7
+	github.com/boombuler/barcode v1.1.0
 	github.com/golang-jwt/jwt/v5 v5.2.3
+	github.com/redis/go-redis/v9 v9.19.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.21.0
@@ -78,6 +78,12 @@ github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE
 github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/boombuler/barcode v1.1.0 h1:ChaYjBR63fr4LFyGn8E8nt7dBSt3MiU3zMOZqFvVkHo=
+github.com/boombuler/barcode v1.1.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
@@ -255,8 +261,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
-github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -294,6 +300,8 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/redis/go-redis/v9 v9.19.0 h1:XPVaaPSnG6RhYf7p+rmSa9zZfeVAnWsH5h3lxthOm/k=
+github.com/redis/go-redis/v9 v9.19.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@@ -343,6 +351,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
 github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
+github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
+github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -370,8 +380,8 @@ go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstF
 go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
 go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
@@ -27,6 +27,17 @@ postgresql:
  connection-max-life-time-in-second: 600
  debug: false

+redis:
+  host: 127.0.0.1
+  port: 6379
+  password: "CmICdmnX1EZPhVBYzQPEGw==U"
+  db: 0
+  dial_timeout: 5s
+  read_timeout: 3s
+  write_timeout: 3s
+  pool_size: 10
+  min_idle_connections: 5
+
 s3:
  access_key_id: cf9a475e18bc7626cbdbf09709d82a64
  access_key_secret: 91f3321294d3e23035427a0ecb893ada
@@ -44,6 +55,5 @@ fonnte:
  token: "bADQrf9NTXfLZQCK2wGg"
  timeout: 30

-fcm:
-  credentials_file: "infra/firebase-service-account.json"
-  project_id: "your-firebase-project-id"
+firebase:
+  credentials_file: "apskel-pos-v2-firebase-adminsdk-fbsvc-ae00499526.json"
@@ -20,19 +20,22 @@ import (
 	"apskel-pos-be/internal/service"
 	"apskel-pos-be/internal/validator"

+	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
 )

 type App struct {
 	server      *http.Server
 	db          *gorm.DB
+	redisClient *redis.Client
 	router      *router.Router
 	shutdown    chan os.Signal
 }

-func NewApp(db *gorm.DB) *App {
+func NewApp(db *gorm.DB, redisClient *redis.Client) *App {
 	return &App{
 		db:          db,
+		redisClient: redisClient,
 		shutdown:    make(chan os.Signal, 1),
 	}
 }
@@ -44,6 +47,17 @@ func (a *App) Initialize(cfg *config.Config) error {
 	validators := a.initValidators()
 	middleware := a.initMiddleware(services, cfg)
 	healthHandler := handler.NewHealthHandler()
+	selfOrderHandler := handler.NewSelfOrderHandler(
+		services.orderService,
+		services.categoryService,
+		services.productService,
+		repos.tableRepo,
+		repos.outletRepo,
+		repos.userRepo,
+		repos.sessionRepo,
+		repos.orderRepo,
+		processors.fcmClient,
+	)

 	a.router = router.NewRouter(
 		cfg,
@@ -105,10 +119,7 @@ func (a *App) Initialize(cfg *config.Config) error {
 		services.customerPointsService,
 		services.spinGameService,
 		middleware.customerAuthMiddleware,
-		services.userDeviceService,
-		validators.userDeviceValidator,
-		services.notificationService,
-		validators.notificationValidator,
+		selfOrderHandler,
 	)

 	return nil
@@ -195,11 +206,8 @@ type repositories struct {
 	customerAuthRepo               repository.CustomerAuthRepository
 	customerPointsRepo             repository.CustomerPointsRepository
 	otpRepo                        repository.OtpRepository
+	sessionRepo                    repository.SessionRepository
 	txManager                      *repository.TxManager
-	userDeviceRepo                 *repository.UserDeviceRepositoryImpl
-	notificationRepo               *repository.NotificationRepositoryImpl
-	notificationReceiverRepo       *repository.NotificationReceiverRepositoryImpl
-	notificationDeliveryRepo       *repository.NotificationDeliveryRepositoryImpl
 }

 func (a *App) initRepositories() *repositories {
@@ -245,11 +253,8 @@ func (a *App) initRepositories() *repositories {
 		customerAuthRepo:               repository.NewCustomerAuthRepository(a.db),
 		customerPointsRepo:             repository.NewCustomerPointsRepository(a.db),
 		otpRepo:                        repository.NewOtpRepository(a.db),
+		sessionRepo:                    repository.NewSessionRepository(a.redisClient),
 		txManager:                      repository.NewTxManager(a.db),
-		userDeviceRepo:                 repository.NewUserDeviceRepositoryImpl(a.db),
-		notificationRepo:               repository.NewNotificationRepository(a.db),
-		notificationReceiverRepo:       repository.NewNotificationReceiverRepository(a.db),
-		notificationDeliveryRepo:       repository.NewNotificationDeliveryRepository(a.db),
 	}
 }

@@ -291,14 +296,14 @@ type processors struct {
 	customerPointsProcessor             *processor.CustomerPointsProcessor
 	otpProcessor                        processor.OtpProcessor
 	fileClient                          processor.FileClient
+	fcmClient                           client.FcmClient
 	inventoryMovementService            service.InventoryMovementService
-	userDeviceProcessor                 *processor.UserDeviceProcessorImpl
-	notificationProcessor               *processor.NotificationProcessorImpl
 }

 func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors {
 	fileClient := client.NewFileClient(cfg.S3Config)
 	fonnteClient := client.NewFonnteClient(cfg.GetFonnte())
+	fcmClient := client.NewFcmClient(cfg.GetFirebase())
 	otpProcessor := processor.NewOtpProcessor(fonnteClient, repos.otpRepo)
 	inventoryMovementService := service.NewInventoryMovementService(repos.inventoryMovementRepo, repos.ingredientRepo)

@@ -340,9 +345,8 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		customerPointsProcessor:             processor.NewCustomerPointsProcessor(repos.customerPointsRepo, repos.gameRepo),
 		otpProcessor:                        otpProcessor,
 		fileClient:                          fileClient,
+		fcmClient:                           fcmClient,
 		inventoryMovementService:            inventoryMovementService,
-		userDeviceProcessor:                 processor.NewUserDeviceProcessorImpl(repos.userDeviceRepo),
-		notificationProcessor:               buildNotificationProcessor(cfg, repos),
 	}
 }

@@ -379,13 +383,11 @@ type services struct {
 	customerAuthService               service.CustomerAuthService
 	customerPointsService             service.CustomerPointsService
 	spinGameService                   service.SpinGameService
-	userDeviceService                 service.UserDeviceService
-	notificationService               service.NotificationService
 }

 func (a *App) initServices(processors *processors, repos *repositories, cfg *config.Config) *services {
 	authConfig := cfg.Auth()
-	authService := service.NewAuthService(processors.userProcessor, processors.userDeviceProcessor, authConfig)
+	authService := service.NewAuthService(processors.userProcessor, authConfig)
 	organizationService := service.NewOrganizationService(processors.organizationProcessor)
 	outletService := service.NewOutletService(processors.outletProcessor)
 	outletSettingService := service.NewOutletSettingService(processors.outletSettingProcessor)
@@ -393,7 +395,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) // Will be updated after orderIngredientTransactionService is created
+	orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo) // 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)
@@ -416,11 +418,9 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	customerAuthService := service.NewCustomerAuthService(processors.customerAuthProcessor)
 	customerPointsService := service.NewCustomerPointsService(processors.customerPointsProcessor)
 	spinGameService := service.NewSpinGameService(processors.gamePlayProcessor, repos.txManager)
-	userDeviceService := service.NewUserDeviceService(processors.userDeviceProcessor)
-	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)
+	orderService = service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, orderIngredientTransactionService, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo)

 	return &services{
 		userService:                       service.NewUserService(processors.userProcessor),
@@ -455,8 +455,6 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		customerAuthService:               customerAuthService,
 		customerPointsService:             customerPointsService,
 		spinGameService:                   spinGameService,
-		userDeviceService:                 userDeviceService,
-		notificationService:               notificationService,
 	}
 }

@@ -496,8 +494,6 @@ type validators struct {
 	rewardValidator                     validator.RewardValidator
 	campaignValidator                   validator.CampaignValidator
 	customerAuthValidator               validator.CustomerAuthValidator
-	userDeviceValidator                 *validator.UserDeviceValidatorImpl
-	notificationValidator               *validator.NotificationValidatorImpl
 }

 func (a *App) initValidators() *validators {
@@ -525,30 +521,5 @@ func (a *App) initValidators() *validators {
 		rewardValidator:                     validator.NewRewardValidator(),
 		campaignValidator:                   validator.NewCampaignValidator(),
 		customerAuthValidator:               validator.NewCustomerAuthValidator(),
-		userDeviceValidator:                 validator.NewUserDeviceValidator(),
-		notificationValidator:               validator.NewNotificationValidator(),
 	}
 }
-
-// buildNotificationProcessor creates the notification processor with FCM integration.
-// If FCM is not configured, it returns a processor with a nil FCM client (FCM dispatch will be skipped).
-func buildNotificationProcessor(cfg *config.Config, repos *repositories) *processor.NotificationProcessorImpl {
-	var fcmClient client.FCMClient
-	if cfg.FCM.CredentialsFile != "" {
-		var err error
-		fcmClient, err = client.NewFCMClient(&cfg.FCM)
-		if err != nil {
-			// FCM init failure is non-fatal; notifications will still be persisted.
-			fcmClient = nil
-		}
-	}
-
-	return processor.NewNotificationProcessor(
-		repos.notificationRepo,
-		repos.notificationReceiverRepo,
-		repos.notificationDeliveryRepo,
-		repos.userDeviceRepo,
-		repos.userRepo,
-		fcmClient,
-	)
-}
@@ -3,140 +3,81 @@ package client
 import (
 	"context"
 	"fmt"
+	"log"
+
+	"apskel-pos-be/config"

 	firebase "firebase.google.com/go/v4"
 	"firebase.google.com/go/v4/messaging"
 	"google.golang.org/api/option"
 )

-type FCMConfig interface {
-	GetCredentialsFile() string
-	GetProjectID() string
-}
-
-type FCMClient interface {
-	SendNotification(ctx context.Context, token string, title string, body string, data map[string]string) error
-	SendMulticastNotification(ctx context.Context, tokens []string, title string, body string, data map[string]string) error
-	SendToTopic(ctx context.Context, topic string, title string, body string, data map[string]string) error
+type FcmClient interface {
+	SendMulticastNotification(ctx context.Context, tokens []string, title string, body string) error
 }

 type fcmClient struct {
-	messaging *messaging.Client
+	messagingClient *messaging.Client
 }

-func NewFCMClient(cfg FCMConfig) (FCMClient, error) {
-	ctx := context.Background()
+func NewFcmClient(cfg *config.Firebase) FcmClient {
+	if cfg == nil || cfg.GetCredentialsFile() == "" {
+		log.Println("FCM: credentials file not configured, FCM client is disabled")
+		return &fcmClient{messagingClient: nil}
+	}

 	opt := option.WithCredentialsFile(cfg.GetCredentialsFile())
-
-	app, err := firebase.NewApp(ctx, &firebase.Config{
-		ProjectID: cfg.GetProjectID(),
-	}, opt)
+	app, err := firebase.NewApp(context.Background(), nil, opt)
 	if err != nil {
-		return nil, fmt.Errorf("failed to initialize firebase app: %w", err)
+		log.Printf("FCM: failed to initialize Firebase app: %v", err)
+		return &fcmClient{messagingClient: nil}
 	}

-	msgClient, err := app.Messaging(ctx)
+	client, err := app.Messaging(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to initialize firebase messaging client: %w", err)
+		log.Printf("FCM: failed to create messaging client: %v", err)
+		return &fcmClient{messagingClient: nil}
 	}

-	return &fcmClient{
-		messaging: msgClient,
-	}, nil
+	log.Println("FCM: client initialized successfully")
+	return &fcmClient{messagingClient: client}
 }

-// SendNotification sends a push notification to a single device token.
-func (f *fcmClient) SendNotification(ctx context.Context, token string, title string, body string, data map[string]string) error {
-	message := &messaging.Message{
-		Token: token,
-		Notification: &messaging.Notification{
-			Title: title,
-			Body:  body,
-		},
-		Data: data,
-		Android: &messaging.AndroidConfig{
-			Priority: "high",
-		},
-		APNS: &messaging.APNSConfig{
-			Payload: &messaging.APNSPayload{
-				Aps: &messaging.Aps{
-					Sound: "default",
-				},
-			},
-		},
-	}
-
-	_, err := f.messaging.Send(ctx, message)
-	if err != nil {
-		return fmt.Errorf("failed to send FCM notification: %w", err)
-	}
-
+func (c *fcmClient) SendMulticastNotification(ctx context.Context, tokens []string, title string, body string) error {
+	if c.messagingClient == nil {
+		log.Println("FCM: client not initialized, skipping notification")
 		return nil
-}
+	}

-// SendMulticastNotification sends a push notification to multiple device tokens.
-func (f *fcmClient) SendMulticastNotification(ctx context.Context, tokens []string, title string, body string, data map[string]string) error {
 	if len(tokens) == 0 {
 		return nil
 	}

 	message := &messaging.MulticastMessage{
+		Notification: &messaging.Notification{
+			Title: title,
+			Body:  body,
+		},
 		Tokens: tokens,
-		Notification: &messaging.Notification{
-			Title: title,
-			Body:  body,
-		},
-		Data: data,
 		Android: &messaging.AndroidConfig{
 			Priority: "high",
 		},
-		APNS: &messaging.APNSConfig{
-			Payload: &messaging.APNSPayload{
-				Aps: &messaging.Aps{
-					Sound: "default",
-				},
-			},
-		},
 	}

-	batchResp, err := f.messaging.SendEachForMulticast(ctx, message)
+	response, err := c.messagingClient.SendMulticast(ctx, message)
 	if err != nil {
-		return fmt.Errorf("failed to send FCM multicast notification: %w", err)
+		return fmt.Errorf("FCM: failed to send multicast notification: %w", err)
 	}

-	if batchResp.FailureCount > 0 {
-		return fmt.Errorf("FCM multicast: %d/%d messages failed to send", batchResp.FailureCount, len(tokens))
+	if response.FailureCount > 0 {
+		log.Printf("FCM: %d tokens failed out of %d", response.FailureCount, len(tokens))
+		for i, resp := range response.Responses {
+			if !resp.Success {
+				log.Printf("FCM: token[%d] failed: %v", i, resp.Error)
 			}
-
-	return nil
-}
-
-// SendToTopic sends a push notification to all devices subscribed to a topic.
-func (f *fcmClient) SendToTopic(ctx context.Context, topic string, title string, body string, data map[string]string) error {
-	message := &messaging.Message{
-		Topic: topic,
-		Notification: &messaging.Notification{
-			Title: title,
-			Body:  body,
-		},
-		Data: data,
-		Android: &messaging.AndroidConfig{
-			Priority: "high",
-		},
-		APNS: &messaging.APNSConfig{
-			Payload: &messaging.APNSPayload{
-				Aps: &messaging.Aps{
-					Sound: "default",
-				},
-			},
-		},
 		}
-
-	_, err := f.messaging.Send(ctx, message)
-	if err != nil {
-		return fmt.Errorf("failed to send FCM topic notification: %w", err)
 	}

+	log.Printf("FCM: sent %d/%d notifications successfully", response.SuccessCount, len(tokens))
 	return nil
 }
@@ -56,9 +56,6 @@ const (
 	CampaignRuleEntity    = "campaign_rule"
 	CustomerEntity        = "customer"
 	SpinGameHandlerEntity = "spin_game_handler"
-	UserDeviceServiceEntity   = "user_device_service"
-	NotificationServiceEntity = "notification_service"
-	NotificationHandlerEntity = "notification_handler"
 )

 var HttpErrorMap = map[string]int{
@@ -1,92 +0,0 @@
-package contract
-
-import (
-	"time"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-)
-
-// ---- Request contracts ----
-
-type SendNotificationRequest struct {
-	Title          string                        `json:"title" validate:"required,min=1,max=255"`
-	Body           string                        `json:"body" validate:"required"`
-	Type           string                        `json:"type,omitempty" validate:"omitempty,max=100"`
-	Category       string                        `json:"category,omitempty" validate:"omitempty,max=100"`
-	Priority       entities.NotificationPriority `json:"priority,omitempty" validate:"omitempty,oneof=low normal high"`
-	ImageURL       string                        `json:"image_url,omitempty" validate:"omitempty,max=512"`
-	ActionURL      string                        `json:"action_url,omitempty" validate:"omitempty,max=512"`
-	NotifiableType string                        `json:"notifiable_type,omitempty" validate:"omitempty,max=100"`
-	NotifiableID   *uuid.UUID                    `json:"notifiable_id,omitempty"`
-	Data           map[string]interface{}        `json:"data,omitempty"`
-	ReceiverIDs    []uuid.UUID                   `json:"receiver_ids" validate:"required,min=1"`
-	ScheduledAt    *time.Time                    `json:"scheduled_at,omitempty"`
-	ExpiredAt      *time.Time                    `json:"expired_at,omitempty"`
-}
-
-type BroadcastNotificationRequest struct {
-	Title          string                        `json:"title" validate:"required,min=1,max=255"`
-	Body           string                        `json:"body" validate:"required"`
-	Type           string                        `json:"type,omitempty" validate:"omitempty,max=100"`
-	Category       string                        `json:"category,omitempty" validate:"omitempty,max=100"`
-	Priority       entities.NotificationPriority `json:"priority,omitempty" validate:"omitempty,oneof=low normal high"`
-	ImageURL       string                        `json:"image_url,omitempty" validate:"omitempty,max=512"`
-	ActionURL      string                        `json:"action_url,omitempty" validate:"omitempty,max=512"`
-	NotifiableType string                        `json:"notifiable_type,omitempty" validate:"omitempty,max=100"`
-	NotifiableID   *uuid.UUID                    `json:"notifiable_id,omitempty"`
-	Data           map[string]interface{}        `json:"data,omitempty"`
-	ScheduledAt    *time.Time                    `json:"scheduled_at,omitempty"`
-	ExpiredAt      *time.Time                    `json:"expired_at,omitempty"`
-}
-
-type ListNotificationsRequest struct {
-	Page   int   `form:"page" validate:"min=1"`
-	Limit  int   `form:"limit" validate:"min=1,max=100"`
-	IsRead *bool `form:"is_read"`
-}
-
-// ---- Response contracts ----
-
-type NotificationResponse struct {
-	ID             uuid.UUID                     `json:"id"`
-	Title          string                        `json:"title"`
-	Body           string                        `json:"body"`
-	Type           string                        `json:"type"`
-	Category       string                        `json:"category"`
-	Priority       entities.NotificationPriority `json:"priority"`
-	ImageURL       string                        `json:"image_url"`
-	ActionURL      string                        `json:"action_url"`
-	NotifiableType string                        `json:"notifiable_type"`
-	NotifiableID   *uuid.UUID                    `json:"notifiable_id"`
-	Data           map[string]interface{}        `json:"data"`
-	ScheduledAt    *time.Time                    `json:"scheduled_at"`
-	SentAt         *time.Time                    `json:"sent_at"`
-	ExpiredAt      *time.Time                    `json:"expired_at"`
-	CreatedBy      *uuid.UUID                    `json:"created_by"`
-	CreatedAt      time.Time                     `json:"created_at"`
-	UpdatedAt      time.Time                     `json:"updated_at"`
-}
-
-type NotificationReceiverResponse struct {
-	ID             uuid.UUID             `json:"id"`
-	NotificationID uuid.UUID             `json:"notification_id"`
-	UserID         uuid.UUID             `json:"user_id"`
-	IsRead         bool                  `json:"is_read"`
-	ReadAt         *time.Time            `json:"read_at"`
-	IsDeleted      bool                  `json:"is_deleted"`
-	DeletedAt      *time.Time            `json:"deleted_at"`
-	CreatedAt      time.Time             `json:"created_at"`
-	UpdatedAt      time.Time             `json:"updated_at"`
-	Notification   *NotificationResponse `json:"notification,omitempty"`
-}
-
-type ListNotificationsResponse struct {
-	Notifications []*NotificationReceiverResponse `json:"notifications"`
-	TotalCount    int64                           `json:"total_count"`
-	UnreadCount   int64                           `json:"unread_count"`
-	Page          int                             `json:"page"`
-	Limit         int                             `json:"limit"`
-	TotalPages    int                             `json:"total_pages"`
-}
@@ -0,0 +1,112 @@
+package contract
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type SelfOrderTableTokenResponse struct {
+	SessionID      string `json:"session_id"`
+	TableID        string `json:"table_id"`
+	OrganizationID string `json:"organization_id"`
+	OutletID       string `json:"outlet_id"`
+	TableName      string `json:"table_name"`
+	OutletName     string `json:"outlet_name"`
+	Status         string `json:"status"`
+}
+
+type SelfOrderMenuRequest struct {
+	SessionID string `form:"session_id" validate:"required"`
+}
+
+type SelfOrderMenuResponse struct {
+	OutletName string                  `json:"outlet_name"`
+	TableName  string                  `json:"table_name"`
+	Categories []SelfOrderMenuCategory `json:"categories"`
+}
+
+type SelfOrderMenuCategory struct {
+	ID          uuid.UUID           `json:"id"`
+	Name        string              `json:"name"`
+	Description *string             `json:"description,omitempty"`
+	Order       int                 `json:"order"`
+	Products    []SelfOrderMenuItem `json:"products"`
+}
+
+type SelfOrderMenuItem struct {
+	ID          uuid.UUID              `json:"id"`
+	Name        string                 `json:"name"`
+	Description *string                `json:"description,omitempty"`
+	Price       float64                `json:"price"`
+	ImageURL    *string                `json:"image_url,omitempty"`
+	Variants    []SelfOrderMenuVariant `json:"variants,omitempty"`
+}
+
+type SelfOrderMenuVariant struct {
+	ID            uuid.UUID `json:"id"`
+	Name          string    `json:"name"`
+	PriceModifier float64   `json:"price_modifier"`
+}
+
+type SelfOrderCreateOrderRequest struct {
+	SessionID  string                     `json:"session_id" validate:"required"`
+	OrderItems []SelfOrderCreateOrderItem `json:"order_items" validate:"required,min=1,dive"`
+}
+
+type SelfOrderCreateOrderItem struct {
+	ProductID        uuid.UUID  `json:"product_id" validate:"required"`
+	ProductVariantID *uuid.UUID `json:"product_variant_id,omitempty"`
+	Quantity         int        `json:"quantity" validate:"required,min=1"`
+	Notes            *string    `json:"notes,omitempty"`
+}
+
+type SelfOrderListCategoriesRequest struct {
+	OrganizationID string `form:"organisasi_id" validate:"required"`
+	OutletID       string `form:"outlet_id" validate:"required"`
+}
+
+type SelfOrderCategoryItem struct {
+	ID          uuid.UUID `json:"id"`
+	Name        string    `json:"name"`
+	Description *string   `json:"description,omitempty"`
+	Order       int       `json:"order"`
+}
+
+type SelfOrderListCategoriesResponse struct {
+	Categories []SelfOrderCategoryItem `json:"categories"`
+}
+
+type SelfOrderListOrdersResponse struct {
+	Orders []SelfOrderOrderItem `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"`
+}
@@ -37,13 +37,7 @@ type UpdateUserOutletRequest struct {
 type LoginRequest struct {
 	Email    string  `json:"email" validate:"required,email"`
 	Password string  `json:"password" validate:"required"`
-	DeviceID   string `json:"device_id,omitempty"`
-	DeviceName string `json:"device_name,omitempty"`
-	DeviceType string `json:"device_type,omitempty"`
-	Platform   string `json:"platform,omitempty"`
-	FCMToken   string `json:"fcm_token,omitempty"`
-	AppVersion string `json:"app_version,omitempty"`
-	OsVersion  string `json:"os_version,omitempty"`
+	FcmToken *string `json:"fcm_token,omitempty"`
 }

 type LoginResponse struct {
@@ -1,59 +0,0 @@
-package contract
-
-import (
-	"time"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-)
-
-type RegisterUserDeviceRequest struct {
-	DeviceID   string                  `json:"device_id" validate:"required,min=1,max=255"`
-	DeviceName string                  `json:"device_name,omitempty" validate:"omitempty,max=255"`
-	DeviceType entities.DeviceType     `json:"device_type,omitempty" validate:"omitempty,oneof=mobile tablet desktop"`
-	Platform   entities.DevicePlatform `json:"platform,omitempty" validate:"omitempty,oneof=android ios web"`
-	FCMToken   string                  `json:"fcm_token,omitempty" validate:"omitempty,max=512"`
-	AppVersion string                  `json:"app_version,omitempty" validate:"omitempty,max=50"`
-	OsVersion  string                  `json:"os_version,omitempty" validate:"omitempty,max=50"`
-}
-
-type UpdateUserDeviceRequest struct {
-	DeviceName string                  `json:"device_name,omitempty" validate:"omitempty,max=255"`
-	DeviceType entities.DeviceType     `json:"device_type,omitempty" validate:"omitempty,oneof=mobile tablet desktop"`
-	Platform   entities.DevicePlatform `json:"platform,omitempty" validate:"omitempty,oneof=android ios web"`
-	FCMToken   string                  `json:"fcm_token,omitempty" validate:"omitempty,max=512"`
-	AppVersion string                  `json:"app_version,omitempty" validate:"omitempty,max=50"`
-	OsVersion  string                  `json:"os_version,omitempty" validate:"omitempty,max=50"`
-}
-
-type UserDeviceResponse struct {
-	ID           uuid.UUID               `json:"id"`
-	UserID       uuid.UUID               `json:"user_id"`
-	DeviceID     string                  `json:"device_id"`
-	DeviceName   string                  `json:"device_name"`
-	DeviceType   entities.DeviceType     `json:"device_type"`
-	Platform     entities.DevicePlatform `json:"platform"`
-	FCMToken     string                  `json:"fcm_token"`
-	AppVersion   string                  `json:"app_version"`
-	OsVersion    string                  `json:"os_version"`
-	IPAddress    string                  `json:"ip_address"`
-	LastActiveAt *time.Time              `json:"last_active_at"`
-	CreatedAt    time.Time               `json:"created_at"`
-	UpdatedAt    time.Time               `json:"updated_at"`
-}
-
-type ListUserDevicesRequest struct {
-	Page     int    `json:"page" validate:"min=1"`
-	Limit    int    `json:"limit" validate:"min=1,max=100"`
-	UserID   string `json:"user_id,omitempty"`
-	Platform string `json:"platform,omitempty"`
-}
-
-type ListUserDevicesResponse struct {
-	Devices    []UserDeviceResponse `json:"devices"`
-	TotalCount int                  `json:"total_count"`
-	Page       int                  `json:"page"`
-	Limit      int                  `json:"limit"`
-	TotalPages int                  `json:"total_pages"`
-}
@@ -0,0 +1,30 @@
+package db
+
+import (
+	"apskel-pos-be/config"
+	"fmt"
+
+	"github.com/redis/go-redis/v9"
+)
+
+func NewRedisClient(c config.Redis) (*redis.Client, error) {
+	opts := &redis.Options{
+		Addr:         c.Addr(),
+		Password:     c.Password,
+		DB:           c.DB,
+		DialTimeout:  c.ParseDialTimeout(),
+		ReadTimeout:  c.ParseReadTimeout(),
+		WriteTimeout: c.ParseWriteTimeout(),
+	}
+	if c.PoolSize > 0 {
+		opts.PoolSize = c.PoolSize
+	}
+	if c.MinIdleConnections > 0 {
+		opts.MinIdleConns = c.MinIdleConnections
+	}
+
+	client := redis.NewClient(opts)
+
+	fmt.Println("Successfully connected to Redis")
+	return client, nil
+}
@@ -36,7 +36,6 @@ func GetAllEntities() []interface{} {
 		&CampaignRule{},
 		&OtpSession{},
 		// Analytics entities are not database tables, they are query results
-		&UserDevice{},
 	}
 }

@@ -1,150 +0,0 @@
-package entities
-
-import (
-	"database/sql/driver"
-	"encoding/json"
-	"errors"
-	"time"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type NotificationPriority string
-type NotificationDeliveryStatus string
-type NotificationChannel string
-type NotificationProvider string
-
-const (
-	NotificationPriorityLow    NotificationPriority = "low"
-	NotificationPriorityNormal NotificationPriority = "normal"
-	NotificationPriorityHigh   NotificationPriority = "high"
-
-	NotificationDeliveryStatusPending   NotificationDeliveryStatus = "pending"
-	NotificationDeliveryStatusSent      NotificationDeliveryStatus = "sent"
-	NotificationDeliveryStatusDelivered NotificationDeliveryStatus = "delivered"
-	NotificationDeliveryStatusFailed    NotificationDeliveryStatus = "failed"
-
-	NotificationChannelPush      NotificationChannel = "push"
-	NotificationChannelWebsocket NotificationChannel = "websocket"
-	NotificationChannelEmail     NotificationChannel = "email"
-
-	NotificationProviderFirebase NotificationProvider = "firebase"
-)
-
-// NotificationData is a JSON-serializable map for extra notification payload.
-type NotificationData map[string]interface{}
-
-func (d NotificationData) Value() (driver.Value, error) {
-	if d == nil {
-		return nil, nil
-	}
-	return json.Marshal(d)
-}
-
-func (d *NotificationData) Scan(value interface{}) error {
-	if value == nil {
-		*d = nil
-		return nil
-	}
-	bytes, ok := value.([]byte)
-	if !ok {
-		return errors.New("type assertion to []byte failed")
-	}
-	return json.Unmarshal(bytes, d)
-}
-
-// Notification is the master notification record.
-type Notification struct {
-	ID             uuid.UUID            `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	Title          string               `gorm:"not null;size:255" json:"title"`
-	Body           string               `gorm:"type:text" json:"body"`
-	Type           string               `gorm:"size:100" json:"type"`
-	Category       string               `gorm:"size:100" json:"category"`
-	Priority       NotificationPriority `gorm:"size:50;default:'normal'" json:"priority"`
-	ImageURL       string               `gorm:"size:512" json:"image_url"`
-	ActionURL      string               `gorm:"size:512" json:"action_url"`
-	NotifiableType string               `gorm:"size:100" json:"notifiable_type"`
-	NotifiableID   *uuid.UUID           `gorm:"type:uuid" json:"notifiable_id"`
-	Data           NotificationData     `gorm:"type:jsonb" json:"data"`
-	ScheduledAt    *time.Time           `gorm:"type:timestamptz" json:"scheduled_at"`
-	SentAt         *time.Time           `gorm:"type:timestamptz" json:"sent_at"`
-	ExpiredAt      *time.Time           `gorm:"type:timestamptz" json:"expired_at"`
-	CreatedBy      *uuid.UUID           `gorm:"type:uuid" json:"created_by"`
-	CreatedAt      time.Time            `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt      time.Time            `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Creator   *User                   `gorm:"foreignKey:CreatedBy" json:"creator,omitempty"`
-	Receivers []*NotificationReceiver `gorm:"foreignKey:NotificationID" json:"receivers,omitempty"`
-}
-
-func (n *Notification) BeforeCreate(tx *gorm.DB) error {
-	if n.ID == uuid.Nil {
-		n.ID = uuid.New()
-	}
-	return nil
-}
-
-func (Notification) TableName() string {
-	return "notifications"
-}
-
-// NotificationReceiver links a notification to a specific user.
-type NotificationReceiver struct {
-	ID             uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	NotificationID uuid.UUID  `gorm:"type:uuid;not null;index" json:"notification_id"`
-	UserID         uuid.UUID  `gorm:"type:uuid;not null;index" json:"user_id"`
-	IsRead         bool       `gorm:"default:false" json:"is_read"`
-	ReadAt         *time.Time `gorm:"type:timestamptz" json:"read_at"`
-	IsDeleted      bool       `gorm:"default:false" json:"is_deleted"`
-	DeletedAt      *time.Time `gorm:"type:timestamptz" json:"deleted_at"`
-	CreatedAt      time.Time  `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Notification *Notification           `gorm:"foreignKey:NotificationID" json:"notification,omitempty"`
-	User         *User                   `gorm:"foreignKey:UserID" json:"user,omitempty"`
-	Deliveries   []*NotificationDelivery `gorm:"foreignKey:NotificationReceiverID" json:"deliveries,omitempty"`
-}
-
-func (n *NotificationReceiver) BeforeCreate(tx *gorm.DB) error {
-	if n.ID == uuid.Nil {
-		n.ID = uuid.New()
-	}
-	return nil
-}
-
-func (NotificationReceiver) TableName() string {
-	return "notification_receivers"
-}
-
-// NotificationDelivery tracks per-device delivery attempts.
-type NotificationDelivery struct {
-	ID                     uuid.UUID                  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	NotificationReceiverID uuid.UUID                  `gorm:"type:uuid;not null;index" json:"notification_receiver_id"`
-	UserDeviceID           uuid.UUID                  `gorm:"type:uuid;not null;index" json:"user_device_id"`
-	Channel                NotificationChannel        `gorm:"size:50;default:'push'" json:"channel"`
-	DeliveryStatus         NotificationDeliveryStatus `gorm:"size:50;default:'pending'" json:"delivery_status"`
-	Provider               NotificationProvider       `gorm:"size:50" json:"provider"`
-	ProviderMessageID      string                     `gorm:"size:255" json:"provider_message_id"`
-	SentAt                 *time.Time                 `gorm:"type:timestamptz" json:"sent_at"`
-	DeliveredAt            *time.Time                 `gorm:"type:timestamptz" json:"delivered_at"`
-	FailedAt               *time.Time                 `gorm:"type:timestamptz" json:"failed_at"`
-	FailureReason          string                     `gorm:"type:text" json:"failure_reason"`
-	RetryCount             int                        `gorm:"default:0" json:"retry_count"`
-	CreatedAt              time.Time                  `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt              time.Time                  `gorm:"autoUpdateTime" json:"updated_at"`
-
-	NotificationReceiver *NotificationReceiver `gorm:"foreignKey:NotificationReceiverID" json:"notification_receiver,omitempty"`
-	UserDevice           *UserDevice           `gorm:"foreignKey:UserDeviceID" json:"user_device,omitempty"`
-}
-
-func (n *NotificationDelivery) BeforeCreate(tx *gorm.DB) error {
-	if n.ID == uuid.Nil {
-		n.ID = uuid.New()
-	}
-	return nil
-}
-
-func (NotificationDelivery) TableName() string {
-	return "notification_deliveries"
-}
@@ -1,6 +1,7 @@
 package entities

 import (
+	"apskel-pos-be/internal/pkg/tabletoken"
 	"time"

 	"github.com/google/uuid"
@@ -12,6 +13,7 @@ type Table struct {
 	OrganizationID uuid.UUID  `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
 	OutletID       uuid.UUID  `gorm:"type:uuid;not null;index" json:"outlet_id" validate:"required"`
 	TableName      string     `gorm:"not null;size:100" json:"table_name" validate:"required"`
+	Token          string     `gorm:"uniqueIndex;not null;size:255" json:"token"`
 	StartTime      *time.Time `gorm:"" json:"start_time"`
 	Status         string     `gorm:"default:'available';size:50" json:"status"`
 	OrderID        *uuid.UUID `gorm:"type:uuid;index" json:"order_id"`
@@ -33,6 +35,9 @@ func (t *Table) BeforeCreate(tx *gorm.DB) error {
 	if t.ID == uuid.Nil {
 		t.ID = uuid.New()
 	}
+	if t.Token == "" {
+		t.Token = tabletoken.Encode(t.ID, t.OrganizationID, t.OutletID)
+	}
 	return nil
 }

@@ -49,6 +49,7 @@ type User struct {
 	Role           UserRole     `gorm:"not null;size:50" json:"role" validate:"required,oneof=admin manager cashier waiter"`
 	Permissions    Permissions  `gorm:"type:jsonb;default:'{}'" json:"permissions"`
 	IsActive       bool         `gorm:"default:true" json:"is_active"`
+	FcmToken       *string      `gorm:"size:512" json:"fcm_token,omitempty"`
 	CreatedAt      time.Time    `gorm:"autoCreateTime" json:"created_at"`
 	UpdatedAt      time.Time    `gorm:"autoUpdateTime" json:"updated_at"`
 	Organization   Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
@@ -1,50 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type DeviceType string
-type DevicePlatform string
-
-const (
-	DeviceTypeMobile  DeviceType = "mobile"
-	DeviceTypeTablet  DeviceType = "tablet"
-	DeviceTypeDesktop DeviceType = "desktop"
-
-	DevicePlatformAndroid DevicePlatform = "android"
-	DevicePlatformIOS     DevicePlatform = "ios"
-	DevicePlatformWeb     DevicePlatform = "web"
-)
-
-type UserDevice struct {
-	ID           uuid.UUID      `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	UserID       uuid.UUID      `gorm:"type:uuid;not null;index" json:"user_id"`
-	DeviceID     string         `gorm:"not null;size:255;index" json:"device_id"`
-	DeviceName   string         `gorm:"size:255" json:"device_name"`
-	DeviceType   DeviceType     `gorm:"size:50" json:"device_type"`
-	Platform     DevicePlatform `gorm:"size:50" json:"platform"`
-	FCMToken     string         `gorm:"size:512" json:"fcm_token"`
-	AppVersion   string         `gorm:"size:50" json:"app_version"`
-	OsVersion    string         `gorm:"size:50" json:"os_version"`
-	IPAddress    string         `gorm:"size:45" json:"ip_address"`
-	LastActiveAt *time.Time     `gorm:"type:timestamptz" json:"last_active_at"`
-	CreatedAt    time.Time      `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt    time.Time      `gorm:"autoUpdateTime" json:"updated_at"`
-
-	User User `gorm:"foreignKey:UserID" json:"user,omitempty"`
-}
-
-func (u *UserDevice) BeforeCreate(tx *gorm.DB) error {
-	if u.ID == uuid.Nil {
-		u.ID = uuid.New()
-	}
-	return nil
-}
-
-func (UserDevice) TableName() string {
-	return "user_devices"
-}
@@ -1,190 +0,0 @@
-package handler
-
-import (
-	"apskel-pos-be/internal/appcontext"
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/logger"
-	"apskel-pos-be/internal/service"
-	"apskel-pos-be/internal/util"
-	"apskel-pos-be/internal/validator"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-type NotificationHandler struct {
-	notificationService   service.NotificationService
-	notificationValidator validator.NotificationValidator
-}
-
-func NewNotificationHandler(
-	notificationService service.NotificationService,
-	notificationValidator validator.NotificationValidator,
-) *NotificationHandler {
-	return &NotificationHandler{
-		notificationService:   notificationService,
-		notificationValidator: notificationValidator,
-	}
-}
-
-// Send godoc
-// POST /api/v1/notifications/send
-// Sends a notification to specific users.
-func (h *NotificationHandler) Send(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.SendNotificationRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::Send -> request binding failed")
-		validationErr := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::Send")
-		return
-	}
-
-	if validationErr, errCode := h.notificationValidator.ValidateSendRequest(&req); validationErr != nil {
-		respErr := contract.NewResponseError(errCode, constants.RequestEntity, validationErr.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{respErr}), "NotificationHandler::Send")
-		return
-	}
-
-	resp := h.notificationService.Send(ctx, &req, contextInfo.UserID)
-	if resp.HasErrors() {
-		logger.FromContext(ctx).WithError(resp.GetErrors()[0]).Error("NotificationHandler::Send -> service error")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::Send")
-}
-
-// Broadcast godoc
-// POST /api/v1/notifications/broadcast
-// Sends a notification to all active users in the caller's organization.
-func (h *NotificationHandler) Broadcast(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.BroadcastNotificationRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::Broadcast -> request binding failed")
-		validationErr := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::Broadcast")
-		return
-	}
-
-	if validationErr, errCode := h.notificationValidator.ValidateBroadcastRequest(&req); validationErr != nil {
-		respErr := contract.NewResponseError(errCode, constants.RequestEntity, validationErr.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{respErr}), "NotificationHandler::Broadcast")
-		return
-	}
-
-	resp := h.notificationService.Broadcast(ctx, &req, contextInfo.OrganizationID, contextInfo.UserID)
-	if resp.HasErrors() {
-		logger.FromContext(ctx).WithError(resp.GetErrors()[0]).Error("NotificationHandler::Broadcast -> service error")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::Broadcast")
-}
-
-// List godoc
-// GET /api/v1/notifications
-// Returns paginated notifications for the authenticated user.
-func (h *NotificationHandler) List(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	req := contract.ListNotificationsRequest{
-		Page:  1,
-		Limit: 20,
-	}
-
-	if err := c.ShouldBindQuery(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::List -> query binding failed")
-		validationErr := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::List")
-		return
-	}
-
-	if validationErr, errCode := h.notificationValidator.ValidateListRequest(&req); validationErr != nil {
-		respErr := contract.NewResponseError(errCode, constants.RequestEntity, validationErr.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{respErr}), "NotificationHandler::List")
-		return
-	}
-
-	resp := h.notificationService.ListForUser(ctx, &req, contextInfo.UserID)
-	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::List")
-}
-
-// GetByID godoc
-// GET /api/v1/notifications/:id
-func (h *NotificationHandler) GetByID(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	idStr := c.Param("id")
-	id, err := uuid.Parse(idStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::GetByID -> invalid notification ID")
-		validationErr := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid notification ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::GetByID")
-		return
-	}
-
-	resp := h.notificationService.GetByID(ctx, id)
-	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::GetByID")
-}
-
-// MarkAsRead godoc
-// PUT /api/v1/notifications/:id/read
-func (h *NotificationHandler) MarkAsRead(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	idStr := c.Param("id")
-	receiverID, err := uuid.Parse(idStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::MarkAsRead -> invalid receiver ID")
-		validationErr := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid notification receiver ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::MarkAsRead")
-		return
-	}
-
-	resp := h.notificationService.MarkAsRead(ctx, receiverID, contextInfo.UserID)
-	if resp.HasErrors() {
-		logger.FromContext(ctx).WithError(resp.GetErrors()[0]).Error("NotificationHandler::MarkAsRead -> service error")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::MarkAsRead")
-}
-
-// MarkAllAsRead godoc
-// PUT /api/v1/notifications/read-all
-func (h *NotificationHandler) MarkAllAsRead(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	resp := h.notificationService.MarkAllAsRead(ctx, contextInfo.UserID)
-	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::MarkAllAsRead")
-}
-
-// Delete godoc
-// DELETE /api/v1/notifications/:id
-func (h *NotificationHandler) Delete(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	idStr := c.Param("id")
-	receiverID, err := uuid.Parse(idStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::Delete -> invalid receiver ID")
-		validationErr := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid notification receiver ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::Delete")
-		return
-	}
-
-	resp := h.notificationService.DeleteForUser(ctx, receiverID, contextInfo.UserID)
-	if resp.HasErrors() {
-		logger.FromContext(ctx).WithError(resp.GetErrors()[0]).Error("NotificationHandler::Delete -> service error")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::Delete")
-}
@@ -0,0 +1,613 @@
+package handler
+
+import (
+	"apskel-pos-be/internal/client"
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/logger"
+	"apskel-pos-be/internal/models"
+	"apskel-pos-be/internal/pkg/tabletoken"
+	"apskel-pos-be/internal/processor"
+	"apskel-pos-be/internal/repository"
+	"apskel-pos-be/internal/service"
+	"apskel-pos-be/internal/transformer"
+	"apskel-pos-be/internal/util"
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type SelfOrderHandler struct {
+	orderService    service.OrderService
+	categoryService service.CategoryService
+	productService  service.ProductService
+	tableRepo       repository.TableRepositoryInterface
+	outletRepo      processor.OutletRepository
+	userRepo        processor.UserRepository
+	sessionRepo     repository.SessionRepository
+	orderRepo       repository.OrderRepository
+	fcmClient       client.FcmClient
+}
+
+func NewSelfOrderHandler(
+	orderService service.OrderService,
+	categoryService service.CategoryService,
+	productService service.ProductService,
+	tableRepo repository.TableRepositoryInterface,
+	outletRepo processor.OutletRepository,
+	userRepo processor.UserRepository,
+	sessionRepo repository.SessionRepository,
+	orderRepo repository.OrderRepository,
+	fcmClient client.FcmClient,
+) *SelfOrderHandler {
+	return &SelfOrderHandler{
+		orderService:    orderService,
+		categoryService: categoryService,
+		productService:  productService,
+		tableRepo:       tableRepo,
+		outletRepo:      outletRepo,
+		userRepo:        userRepo,
+		sessionRepo:     sessionRepo,
+		orderRepo:       orderRepo,
+		fcmClient:       fcmClient,
+	}
+}
+
+func (h *SelfOrderHandler) ValidateToken(c *gin.Context) {
+	ctx := c.Request.Context()
+	token := c.Param("token")
+
+	if token == "" {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "token is required"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	tableID, orgID, outletID, err := tabletoken.Decode(token)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> invalid token")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid table token"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	table, err := h.tableRepo.GetByID(ctx, tableID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> table not found")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "table not found"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	if !table.IsActive {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.TableEntity, "table is not active"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	if table.OrganizationID != orgID || table.OutletID != outletID {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.TableEntity, "token does not match table"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	outlet, err := h.outletRepo.GetByID(ctx, table.OutletID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> outlet not found")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.OrderServiceEntity, "outlet not found"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	existingSession, err := h.sessionRepo.GetActiveByTableID(ctx, table.ID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> failed to check session")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to check session"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	var sessionStatus string
+	var sessionID string
+
+	if existingSession != nil {
+		sessionStatus = "joined_session"
+		sessionID = existingSession.ID
+	} else {
+		session := &models.SelfOrderSession{
+			TableID:        table.ID,
+			OrganizationID: table.OrganizationID,
+			OutletID:       table.OutletID,
+		}
+		if err := h.sessionRepo.Create(ctx, session); err != nil {
+			logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> failed to create session")
+			util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+				contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to create session"),
+			}), "SelfOrderHandler::ValidateToken")
+			return
+		}
+		sessionStatus = "new_session"
+		sessionID = session.ID
+	}
+
+	resp := &contract.SelfOrderTableTokenResponse{
+		SessionID:      sessionID,
+		TableID:        table.ID.String(),
+		OrganizationID: table.OrganizationID.String(),
+		OutletID:       table.OutletID.String(),
+		TableName:      table.TableName,
+		OutletName:     outlet.Name,
+		Status:         sessionStatus,
+	}
+
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(resp), "SelfOrderHandler::ValidateToken")
+}
+
+func (h *SelfOrderHandler) GetMenu(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req contract.SelfOrderMenuRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetMenu -> query binding failed")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	session, table, outlet, err := h.resolveSession(ctx, req.SessionID)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+	if session == nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found or expired"),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	isActive := true
+	catResp := h.categoryService.ListCategories(ctx, &contract.ListCategoriesRequest{
+		OrganizationID: &table.OrganizationID,
+		Page:           1,
+		Limit:          100,
+	})
+	if catResp.HasErrors() {
+		logger.FromContext(ctx).WithError(catResp.GetErrors()[0]).Error("SelfOrderHandler::GetMenu -> failed to list categories")
+		util.HandleResponse(c.Writer, c.Request, catResp, "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	prodResp := h.productService.ListProducts(ctx, &contract.ListProductsRequest{
+		OrganizationID: &table.OrganizationID,
+		IsActive:       &isActive,
+		Page:           1,
+		Limit:          1000,
+	})
+	if prodResp.HasErrors() {
+		logger.FromContext(ctx).WithError(prodResp.GetErrors()[0]).Error("SelfOrderHandler::GetMenu -> failed to list products")
+		util.HandleResponse(c.Writer, c.Request, prodResp, "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	catList, ok := catResp.Data.(*contract.ListCategoriesResponse)
+	if !ok {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.CategoryServiceEntity, "unexpected categories response type"),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	prodList, ok := prodResp.Data.(*contract.ListProductsResponse)
+	if !ok {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductServiceEntity, "unexpected products response type"),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	menu := h.buildMenuResponse(outlet, table, catList.Categories, prodList.Products)
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(menu), "SelfOrderHandler::GetMenu")
+}
+
+func (h *SelfOrderHandler) buildMenuResponse(
+	outlet *entities.Outlet,
+	table *entities.Table,
+	categories []contract.CategoryResponse,
+	products []contract.ProductResponse,
+) *contract.SelfOrderMenuResponse {
+	productMap := make(map[uuid.UUID][]contract.ProductResponse)
+	for _, p := range products {
+		productMap[p.CategoryID] = append(productMap[p.CategoryID], p)
+	}
+
+	menuCategories := make([]contract.SelfOrderMenuCategory, 0, len(categories))
+	for _, cat := range categories {
+		menuItems := make([]contract.SelfOrderMenuItem, 0)
+		if prods, ok := productMap[cat.ID]; ok {
+			for _, p := range prods {
+				item := contract.SelfOrderMenuItem{
+					ID:          p.ID,
+					Name:        p.Name,
+					Description: p.Description,
+					Price:       p.Price,
+					ImageURL:    p.ImageURL,
+				}
+				for _, v := range p.Variants {
+					item.Variants = append(item.Variants, contract.SelfOrderMenuVariant{
+						ID:            v.ID,
+						Name:          v.Name,
+						PriceModifier: v.PriceModifier,
+					})
+				}
+				menuItems = append(menuItems, item)
+			}
+		}
+		menuCategories = append(menuCategories, contract.SelfOrderMenuCategory{
+			ID:          cat.ID,
+			Name:        cat.Name,
+			Description: cat.Description,
+			Order:       cat.Order,
+			Products:    menuItems,
+		})
+	}
+
+	return &contract.SelfOrderMenuResponse{
+		OutletName: outlet.Name,
+		TableName:  table.TableName,
+		Categories: menuCategories,
+	}
+}
+
+func (h *SelfOrderHandler) CreateOrder(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req contract.SelfOrderCreateOrderRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> request binding failed")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	if err := h.validateCreateOrderRequest(&req); err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	session, table, _, err := h.resolveSession(ctx, req.SessionID)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+	if session == nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found or expired"),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	if !table.IsActive || !table.IsAvailable() {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.TableEntity, "table is not available for ordering"),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	userID, err := h.resolveOrgUser(ctx, table.OrganizationID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> failed to resolve org user")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to create self-order"),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	orderItems := make([]models.CreateOrderItemRequest, 0, len(req.OrderItems))
+	for _, item := range req.OrderItems {
+		orderItems = append(orderItems, models.CreateOrderItemRequest{
+			ProductID:        item.ProductID,
+			ProductVariantID: item.ProductVariantID,
+			Quantity:         item.Quantity,
+			Notes:            item.Notes,
+		})
+	}
+
+	metadata := make(map[string]interface{})
+	metadata["self_order"] = true
+	metadata["session_id"] = session.ID
+
+	tableID := table.ID
+	modelReq := &models.CreateOrderRequest{
+		OutletID:    table.OutletID,
+		UserID:      userID,
+		TableID:     &tableID,
+		TableNumber: &table.TableName,
+		OrderType:   constants.OrderTypeDineIn,
+		OrderItems:  orderItems,
+		Metadata:    metadata,
+	}
+
+	response, err := h.orderService.CreateOrder(ctx, modelReq, table.OrganizationID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> failed to create order")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, err.Error()),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	go h.sendNewOrderNotification(context.Background(), table.OrganizationID, table.TableName, len(req.OrderItems))
+
+	contractResp := transformer.OrderModelToContract(response)
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "SelfOrderHandler::CreateOrder")
+}
+
+func (h *SelfOrderHandler) sendNewOrderNotification(ctx context.Context, organizationID uuid.UUID, tableName string, itemCount int) {
+	users, err := h.userRepo.GetUsersWithFcmTokenByOrganization(ctx, organizationID)
+	if err != nil {
+		log.Printf("SelfOrderHandler::sendNewOrderNotification -> failed to get users with FCM token: %v", err)
+		return
+	}
+
+	tokens := make([]string, 0, len(users))
+	for _, u := range users {
+		if u.FcmToken != nil && *u.FcmToken != "" {
+			tokens = append(tokens, *u.FcmToken)
+		}
+	}
+
+	if len(tokens) == 0 {
+		return
+	}
+
+	title := "Order Baru"
+	body := fmt.Sprintf("Order baru dari Meja %s — %d item", tableName, itemCount)
+
+	if err := h.fcmClient.SendMulticastNotification(ctx, tokens, title, body); err != nil {
+		log.Printf("SelfOrderHandler::sendNewOrderNotification -> failed to send FCM notification: %v", err)
+	}
+}
+
+func (h *SelfOrderHandler) GetOrdersBySession(c *gin.Context) {
+	ctx := c.Request.Context()
+	sessionID := c.Param("sessionId")
+
+	if sessionID == "" {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "session_id is required"),
+		}), "SelfOrderHandler::GetOrdersBySession")
+		return
+	}
+
+	session, err := h.sessionRepo.GetByID(ctx, sessionID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetOrdersBySession -> failed to get session")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found"),
+		}), "SelfOrderHandler::GetOrdersBySession")
+		return
+	}
+	if session == nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found"),
+		}), "SelfOrderHandler::GetOrdersBySession")
+		return
+	}
+
+	orders, err := h.orderRepo.ListBySessionID(ctx, sessionID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetOrdersBySession -> failed to list orders")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to list orders"),
+		}), "SelfOrderHandler::GetOrdersBySession")
+		return
+	}
+
+	resp := &contract.SelfOrderListOrdersResponse{
+		Orders: make([]contract.SelfOrderOrderItem, 0, len(orders)),
+	}
+	for _, o := range orders {
+		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)
+	}
+
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(resp), "SelfOrderHandler::GetOrdersBySession")
+}
+
+func (h *SelfOrderHandler) validateCreateOrderRequest(req *contract.SelfOrderCreateOrderRequest) error {
+	if req.SessionID == "" {
+		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 {
+		if item.ProductID == uuid.Nil {
+			return fmt.Errorf("product_id is required for item %d", i+1)
+		}
+		if item.Quantity <= 0 {
+			return fmt.Errorf("quantity must be greater than zero for item %d", i+1)
+		}
+	}
+	return nil
+}
+
+func (h *SelfOrderHandler) ListCategories(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req contract.SelfOrderListCategoriesRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ListCategories -> query binding failed")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	if req.OrganizationID == "" {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "organisasi_id is required"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	if req.OutletID == "" {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "outlet_id is required"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	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"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	outletID, err := uuid.Parse(req.OutletID)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid outlet_id format"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	outlet, err := h.outletRepo.GetByID(ctx, outletID)
+	if err != nil || outlet == nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "outlet not found"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	if outlet.OrganizationID != orgID {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "outlet does not belong to the specified organization"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	catResp := h.categoryService.ListCategories(ctx, &contract.ListCategoriesRequest{
+		OrganizationID: &orgID,
+		Page:           1,
+		Limit:          100,
+	})
+	if catResp.HasErrors() {
+		logger.FromContext(ctx).WithError(catResp.GetErrors()[0]).Error("SelfOrderHandler::ListCategories -> failed to list categories")
+		util.HandleResponse(c.Writer, c.Request, catResp, "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	catList, ok := catResp.Data.(*contract.ListCategoriesResponse)
+	if !ok {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.CategoryServiceEntity, "unexpected categories response type"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	items := make([]contract.SelfOrderCategoryItem, 0, len(catList.Categories))
+	for _, cat := range catList.Categories {
+		items = append(items, contract.SelfOrderCategoryItem{
+			ID:          cat.ID,
+			Name:        cat.Name,
+			Description: cat.Description,
+			Order:       cat.Order,
+		})
+	}
+
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(&contract.SelfOrderListCategoriesResponse{
+		Categories: items,
+	}), "SelfOrderHandler::ListCategories")
+}
+
+func (h *SelfOrderHandler) resolveSession(ctx context.Context, sessionID string) (*models.SelfOrderSession, *entities.Table, *entities.Outlet, error) {
+	session, err := h.sessionRepo.GetByID(ctx, sessionID)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("failed to get session: %w", err)
+	}
+	if session == nil {
+		return nil, nil, nil, nil
+	}
+	if session.Status != "active" {
+		return nil, nil, nil, fmt.Errorf("session is no longer active")
+	}
+
+	table, err := h.tableRepo.GetByID(ctx, session.TableID)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("table not found for session")
+	}
+
+	outlet, err := h.outletRepo.GetByID(ctx, table.OutletID)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("outlet not found for session")
+	}
+
+	return session, table, outlet, nil
+}
+
+func (h *SelfOrderHandler) resolveOrgUser(ctx context.Context, organizationID uuid.UUID) (uuid.UUID, error) {
+	users, err := h.userRepo.GetByOrganizationID(ctx, organizationID)
+	if err != nil {
+		return uuid.Nil, fmt.Errorf("failed to get users for organization: %w", err)
+	}
+	if len(users) == 0 {
+		return uuid.Nil, fmt.Errorf("no users found for organization")
+	}
+	return users[0].ID, nil
+}
@@ -5,8 +5,11 @@ import (
 	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/contract"
 	"apskel-pos-be/internal/logger"
+	"apskel-pos-be/internal/pkg/qrcode"
 	"apskel-pos-be/internal/util"
 	"apskel-pos-be/internal/validator"
+	"fmt"
+	"net/http"
 	"strconv"

 	"github.com/gin-gonic/gin"
@@ -16,12 +19,14 @@ import (
 type TableHandler struct {
 	tableService   TableService
 	tableValidator *validator.TableValidator
+	baseURL        string
 }

-func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator) *TableHandler {
+func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator, baseURL string) *TableHandler {
 	return &TableHandler{
 		tableService:   tableService,
 		tableValidator: tableValidator,
+		baseURL:        baseURL,
 	}
 }

@@ -286,3 +291,45 @@ func (h *TableHandler) GetOccupiedTables(c *gin.Context) {

 	util.HandleResponse(c.Writer, c.Request, response, "TableHandler::GetOccupiedTables")
 }
+
+func (h *TableHandler) GenerateQRCode(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	id := c.Param("id")
+	tableID, err := uuid.Parse(id)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> Invalid table ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid table ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode")
+		return
+	}
+
+	token, err := h.tableService.GetTableToken(ctx, tableID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> table not found")
+		validationResponseError := contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "Table not found")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode")
+		return
+	}
+
+	selfOrderURL := fmt.Sprintf("%s/api/v1/self-order/table/%s", h.baseURL, token)
+
+	size := 256
+	if sizeStr := c.Query("size"); sizeStr != "" {
+		if s, err := strconv.Atoi(sizeStr); err == nil && s > 0 && s <= 1024 {
+			size = s
+		}
+	}
+
+	pngBytes, err := qrcode.GeneratePNG(selfOrderURL, 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")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode")
+		return
+	}
+
+	c.Header("Content-Type", "image/png")
+	c.Header("Content-Disposition", fmt.Sprintf("inline; filename=\"table-%s-qr.png\"", tableID))
+	c.Data(http.StatusOK, "image/png", pngBytes)
+}
@@ -17,4 +17,5 @@ type TableService interface {
 	ReleaseTable(ctx context.Context, tableID uuid.UUID, req *contract.ReleaseTableRequest) *contract.Response
 	GetAvailableTables(ctx context.Context, outletID uuid.UUID) *contract.Response
 	GetOccupiedTables(ctx context.Context, outletID uuid.UUID) *contract.Response
+	GetTableToken(ctx context.Context, tableID uuid.UUID) (string, error)
 }
@@ -1,215 +0,0 @@
-package handler
-
-import (
-	"strconv"
-
-	"apskel-pos-be/internal/appcontext"
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/logger"
-	"apskel-pos-be/internal/service"
-	"apskel-pos-be/internal/util"
-	"apskel-pos-be/internal/validator"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-type UserDeviceHandler struct {
-	userDeviceService   service.UserDeviceService
-	userDeviceValidator validator.UserDeviceValidator
-}
-
-func NewUserDeviceHandler(
-	userDeviceService service.UserDeviceService,
-	userDeviceValidator validator.UserDeviceValidator,
-) *UserDeviceHandler {
-	return &UserDeviceHandler{
-		userDeviceService:   userDeviceService,
-		userDeviceValidator: userDeviceValidator,
-	}
-}
-
-func (h *UserDeviceHandler) RegisterDevice(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.RegisterUserDeviceRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::RegisterDevice -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::RegisterDevice")
-		return
-	}
-
-	validationError, validationErrorCode := h.userDeviceValidator.ValidateRegisterDeviceRequest(&req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::RegisterDevice")
-		return
-	}
-
-	deviceResponse := h.userDeviceService.RegisterDevice(ctx, contextInfo.UserID, &req)
-	if deviceResponse.HasErrors() {
-		errorResp := deviceResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::RegisterDevice -> Failed to register device from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::RegisterDevice")
-}
-
-func (h *UserDeviceHandler) UpdateDevice(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	deviceIDStr := c.Param("id")
-	deviceID, err := uuid.Parse(deviceIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::UpdateDevice -> Invalid device ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid device ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::UpdateDevice")
-		return
-	}
-
-	var req contract.UpdateUserDeviceRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::UpdateDevice -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "Invalid request body")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::UpdateDevice")
-		return
-	}
-
-	validationError, validationErrorCode := h.userDeviceValidator.ValidateUpdateDeviceRequest(&req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::UpdateDevice")
-		return
-	}
-
-	deviceResponse := h.userDeviceService.UpdateDevice(ctx, deviceID, &req)
-	if deviceResponse.HasErrors() {
-		errorResp := deviceResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::UpdateDevice -> Failed to update device from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::UpdateDevice")
-}
-
-func (h *UserDeviceHandler) DeleteDevice(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	deviceIDStr := c.Param("id")
-	deviceID, err := uuid.Parse(deviceIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::DeleteDevice -> Invalid device ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid device ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::DeleteDevice")
-		return
-	}
-
-	deviceResponse := h.userDeviceService.DeleteDevice(ctx, deviceID)
-	if deviceResponse.HasErrors() {
-		errorResp := deviceResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::DeleteDevice -> Failed to delete device from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::DeleteDevice")
-}
-
-func (h *UserDeviceHandler) GetDevice(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	deviceIDStr := c.Param("id")
-	deviceID, err := uuid.Parse(deviceIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::GetDevice -> Invalid device ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid device ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::GetDevice")
-		return
-	}
-
-	deviceResponse := h.userDeviceService.GetDeviceByID(ctx, deviceID)
-	if deviceResponse.HasErrors() {
-		errorResp := deviceResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::GetDevice -> Failed to get device from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::GetDevice")
-}
-
-func (h *UserDeviceHandler) GetMyDevices(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	deviceResponse := h.userDeviceService.GetDevicesByUserID(ctx, contextInfo.UserID)
-	if deviceResponse.HasErrors() {
-		errorResp := deviceResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::GetMyDevices -> Failed to get devices from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::GetMyDevices")
-}
-
-func (h *UserDeviceHandler) GetDevicesByUser(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	userIDStr := c.Param("user_id")
-	userID, err := uuid.Parse(userIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::GetDevicesByUser -> Invalid user ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid user ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::GetDevicesByUser")
-		return
-	}
-
-	deviceResponse := h.userDeviceService.GetDevicesByUserID(ctx, userID)
-	if deviceResponse.HasErrors() {
-		errorResp := deviceResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::GetDevicesByUser -> Failed to get devices from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::GetDevicesByUser")
-}
-
-func (h *UserDeviceHandler) ListDevices(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	req := &contract.ListUserDevicesRequest{
-		Page:  1,
-		Limit: 10,
-	}
-
-	if pageStr := c.Query("page"); pageStr != "" {
-		if page, err := strconv.Atoi(pageStr); err == nil {
-			req.Page = page
-		}
-	}
-
-	if limitStr := c.Query("limit"); limitStr != "" {
-		if limit, err := strconv.Atoi(limitStr); err == nil {
-			req.Limit = limit
-		}
-	}
-
-	if userID := c.Query("user_id"); userID != "" {
-		req.UserID = userID
-	}
-
-	if platform := c.Query("platform"); platform != "" {
-		req.Platform = platform
-	}
-
-	validationError, validationErrorCode := h.userDeviceValidator.ValidateListDevicesRequest(req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::ListDevices")
-		return
-	}
-
-	deviceResponse := h.userDeviceService.ListDevices(ctx, req)
-	if deviceResponse.HasErrors() {
-		errorResp := deviceResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::ListDevices -> Failed to list devices from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::ListDevices")
-}
@@ -1,85 +0,0 @@
-package mappers
-
-import (
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/models"
-)
-
-func NotificationEntityToResponse(e *entities.Notification) *models.NotificationResponse {
-	if e == nil {
-		return nil
-	}
-	return &models.NotificationResponse{
-		ID:             e.ID,
-		Title:          e.Title,
-		Body:           e.Body,
-		Type:           e.Type,
-		Category:       e.Category,
-		Priority:       e.Priority,
-		ImageURL:       e.ImageURL,
-		ActionURL:      e.ActionURL,
-		NotifiableType: e.NotifiableType,
-		NotifiableID:   e.NotifiableID,
-		Data:           e.Data,
-		ScheduledAt:    e.ScheduledAt,
-		SentAt:         e.SentAt,
-		ExpiredAt:      e.ExpiredAt,
-		CreatedBy:      e.CreatedBy,
-		CreatedAt:      e.CreatedAt,
-		UpdatedAt:      e.UpdatedAt,
-	}
-}
-
-func NotificationReceiverEntityToResponse(e *entities.NotificationReceiver) *models.NotificationReceiverResponse {
-	if e == nil {
-		return nil
-	}
-	resp := &models.NotificationReceiverResponse{
-		ID:             e.ID,
-		NotificationID: e.NotificationID,
-		UserID:         e.UserID,
-		IsRead:         e.IsRead,
-		ReadAt:         e.ReadAt,
-		IsDeleted:      e.IsDeleted,
-		DeletedAt:      e.DeletedAt,
-		CreatedAt:      e.CreatedAt,
-		UpdatedAt:      e.UpdatedAt,
-	}
-	if e.Notification != nil {
-		resp.Notification = NotificationEntityToResponse(e.Notification)
-	}
-	return resp
-}
-
-func NotificationReceiverEntitiesToResponses(entities []*entities.NotificationReceiver) []*models.NotificationReceiverResponse {
-	if entities == nil {
-		return nil
-	}
-	responses := make([]*models.NotificationReceiverResponse, len(entities))
-	for i, e := range entities {
-		responses[i] = NotificationReceiverEntityToResponse(e)
-	}
-	return responses
-}
-
-func NotificationDeliveryEntityToResponse(e *entities.NotificationDelivery) *models.NotificationDeliveryResponse {
-	if e == nil {
-		return nil
-	}
-	return &models.NotificationDeliveryResponse{
-		ID:                     e.ID,
-		NotificationReceiverID: e.NotificationReceiverID,
-		UserDeviceID:           e.UserDeviceID,
-		Channel:                e.Channel,
-		DeliveryStatus:         e.DeliveryStatus,
-		Provider:               e.Provider,
-		ProviderMessageID:      e.ProviderMessageID,
-		SentAt:                 e.SentAt,
-		DeliveredAt:            e.DeliveredAt,
-		FailedAt:               e.FailedAt,
-		FailureReason:          e.FailureReason,
-		RetryCount:             e.RetryCount,
-		CreatedAt:              e.CreatedAt,
-		UpdatedAt:              e.UpdatedAt,
-	}
-}
@@ -1,62 +0,0 @@
-package mappers
-
-import (
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/models"
-)
-
-func UserDeviceEntityToModel(entity *entities.UserDevice) *models.UserDevice {
-	if entity == nil {
-		return nil
-	}
-
-	return &models.UserDevice{
-		ID:           entity.ID,
-		UserID:       entity.UserID,
-		DeviceID:     entity.DeviceID,
-		DeviceName:   entity.DeviceName,
-		DeviceType:   entity.DeviceType,
-		Platform:     entity.Platform,
-		FCMToken:     entity.FCMToken,
-		AppVersion:   entity.AppVersion,
-		OsVersion:    entity.OsVersion,
-		IPAddress:    entity.IPAddress,
-		LastActiveAt: entity.LastActiveAt,
-		CreatedAt:    entity.CreatedAt,
-		UpdatedAt:    entity.UpdatedAt,
-	}
-}
-
-func UserDeviceEntityToResponse(entity *entities.UserDevice) *models.UserDeviceResponse {
-	if entity == nil {
-		return nil
-	}
-
-	return &models.UserDeviceResponse{
-		ID:           entity.ID,
-		UserID:       entity.UserID,
-		DeviceID:     entity.DeviceID,
-		DeviceName:   entity.DeviceName,
-		DeviceType:   entity.DeviceType,
-		Platform:     entity.Platform,
-		FCMToken:     entity.FCMToken,
-		AppVersion:   entity.AppVersion,
-		OsVersion:    entity.OsVersion,
-		IPAddress:    entity.IPAddress,
-		LastActiveAt: entity.LastActiveAt,
-		CreatedAt:    entity.CreatedAt,
-		UpdatedAt:    entity.UpdatedAt,
-	}
-}
-
-func UserDeviceEntitiesToResponses(entities []*entities.UserDevice) []*models.UserDeviceResponse {
-	if entities == nil {
-		return nil
-	}
-
-	responses := make([]*models.UserDeviceResponse, len(entities))
-	for i, entity := range entities {
-		responses[i] = UserDeviceEntityToResponse(entity)
-	}
-	return responses
-}
@@ -1,118 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-)
-
-// ---- Request models ----
-
-type SendNotificationRequest struct {
-	Title          string                        `json:"title"`
-	Body           string                        `json:"body"`
-	Type           string                        `json:"type"`
-	Category       string                        `json:"category"`
-	Priority       entities.NotificationPriority `json:"priority"`
-	ImageURL       string                        `json:"image_url"`
-	ActionURL      string                        `json:"action_url"`
-	NotifiableType string                        `json:"notifiable_type"`
-	NotifiableID   *uuid.UUID                    `json:"notifiable_id"`
-	Data           map[string]interface{}        `json:"data"`
-	ReceiverIDs    []uuid.UUID                   `json:"receiver_ids"`
-	ScheduledAt    *time.Time                    `json:"scheduled_at"`
-	ExpiredAt      *time.Time                    `json:"expired_at"`
-	CreatedBy      *uuid.UUID                    `json:"created_by"`
-}
-
-type BroadcastNotificationRequest struct {
-	Title          string                        `json:"title"`
-	Body           string                        `json:"body"`
-	Type           string                        `json:"type"`
-	Category       string                        `json:"category"`
-	Priority       entities.NotificationPriority `json:"priority"`
-	ImageURL       string                        `json:"image_url"`
-	ActionURL      string                        `json:"action_url"`
-	NotifiableType string                        `json:"notifiable_type"`
-	NotifiableID   *uuid.UUID                    `json:"notifiable_id"`
-	Data           map[string]interface{}        `json:"data"`
-	OrganizationID uuid.UUID                     `json:"organization_id"`
-	ScheduledAt    *time.Time                    `json:"scheduled_at"`
-	ExpiredAt      *time.Time                    `json:"expired_at"`
-	CreatedBy      *uuid.UUID                    `json:"created_by"`
-}
-
-type MarkNotificationReadRequest struct {
-	NotificationReceiverID uuid.UUID `json:"notification_receiver_id"`
-	UserID                 uuid.UUID `json:"user_id"`
-}
-
-type ListNotificationsRequest struct {
-	Page   int       `json:"page"`
-	Limit  int       `json:"limit"`
-	UserID uuid.UUID `json:"user_id"`
-	IsRead *bool     `json:"is_read"`
-}
-
-// ---- Response models ----
-
-type NotificationResponse struct {
-	ID             uuid.UUID                     `json:"id"`
-	Title          string                        `json:"title"`
-	Body           string                        `json:"body"`
-	Type           string                        `json:"type"`
-	Category       string                        `json:"category"`
-	Priority       entities.NotificationPriority `json:"priority"`
-	ImageURL       string                        `json:"image_url"`
-	ActionURL      string                        `json:"action_url"`
-	NotifiableType string                        `json:"notifiable_type"`
-	NotifiableID   *uuid.UUID                    `json:"notifiable_id"`
-	Data           map[string]interface{}        `json:"data"`
-	ScheduledAt    *time.Time                    `json:"scheduled_at"`
-	SentAt         *time.Time                    `json:"sent_at"`
-	ExpiredAt      *time.Time                    `json:"expired_at"`
-	CreatedBy      *uuid.UUID                    `json:"created_by"`
-	CreatedAt      time.Time                     `json:"created_at"`
-	UpdatedAt      time.Time                     `json:"updated_at"`
-}
-
-type NotificationReceiverResponse struct {
-	ID             uuid.UUID             `json:"id"`
-	NotificationID uuid.UUID             `json:"notification_id"`
-	UserID         uuid.UUID             `json:"user_id"`
-	IsRead         bool                  `json:"is_read"`
-	ReadAt         *time.Time            `json:"read_at"`
-	IsDeleted      bool                  `json:"is_deleted"`
-	DeletedAt      *time.Time            `json:"deleted_at"`
-	CreatedAt      time.Time             `json:"created_at"`
-	UpdatedAt      time.Time             `json:"updated_at"`
-	Notification   *NotificationResponse `json:"notification,omitempty"`
-}
-
-type NotificationDeliveryResponse struct {
-	ID                     uuid.UUID                           `json:"id"`
-	NotificationReceiverID uuid.UUID                           `json:"notification_receiver_id"`
-	UserDeviceID           uuid.UUID                           `json:"user_device_id"`
-	Channel                entities.NotificationChannel        `json:"channel"`
-	DeliveryStatus         entities.NotificationDeliveryStatus `json:"delivery_status"`
-	Provider               entities.NotificationProvider       `json:"provider"`
-	ProviderMessageID      string                              `json:"provider_message_id"`
-	SentAt                 *time.Time                          `json:"sent_at"`
-	DeliveredAt            *time.Time                          `json:"delivered_at"`
-	FailedAt               *time.Time                          `json:"failed_at"`
-	FailureReason          string                              `json:"failure_reason"`
-	RetryCount             int                                 `json:"retry_count"`
-	CreatedAt              time.Time                           `json:"created_at"`
-	UpdatedAt              time.Time                           `json:"updated_at"`
-}
-
-type ListNotificationsResponse struct {
-	Notifications []*NotificationReceiverResponse `json:"notifications"`
-	TotalCount    int                             `json:"total_count"`
-	UnreadCount   int                             `json:"unread_count"`
-	Page          int                             `json:"page"`
-	Limit         int                             `json:"limit"`
-	TotalPages    int                             `json:"total_pages"`
-}
@@ -0,0 +1,18 @@
+package models
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type SelfOrderSession struct {
+	ID             string     `json:"id"`
+	TableID        uuid.UUID  `json:"table_id"`
+	OrganizationID uuid.UUID  `json:"organization_id"`
+	OutletID       uuid.UUID  `json:"outlet_id"`
+	Status         string     `json:"status"`
+	CustomerName   string     `json:"customer_name"`
+	CreatedAt      time.Time  `json:"created_at"`
+	ClosedAt       *time.Time `json:"closed_at,omitempty"`
+}
@@ -1,77 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-)
-
-type UserDevice struct {
-	ID           uuid.UUID               `json:"id"`
-	UserID       uuid.UUID               `json:"user_id"`
-	DeviceID     string                  `json:"device_id"`
-	DeviceName   string                  `json:"device_name"`
-	DeviceType   entities.DeviceType     `json:"device_type"`
-	Platform     entities.DevicePlatform `json:"platform"`
-	FCMToken     string                  `json:"fcm_token"`
-	AppVersion   string                  `json:"app_version"`
-	OsVersion    string                  `json:"os_version"`
-	IPAddress    string                  `json:"ip_address"`
-	LastActiveAt *time.Time              `json:"last_active_at"`
-	CreatedAt    time.Time               `json:"created_at"`
-	UpdatedAt    time.Time               `json:"updated_at"`
-}
-
-type UserDeviceResponse struct {
-	ID           uuid.UUID               `json:"id"`
-	UserID       uuid.UUID               `json:"user_id"`
-	DeviceID     string                  `json:"device_id"`
-	DeviceName   string                  `json:"device_name"`
-	DeviceType   entities.DeviceType     `json:"device_type"`
-	Platform     entities.DevicePlatform `json:"platform"`
-	FCMToken     string                  `json:"fcm_token"`
-	AppVersion   string                  `json:"app_version"`
-	OsVersion    string                  `json:"os_version"`
-	IPAddress    string                  `json:"ip_address"`
-	LastActiveAt *time.Time              `json:"last_active_at"`
-	CreatedAt    time.Time               `json:"created_at"`
-	UpdatedAt    time.Time               `json:"updated_at"`
-}
-
-type RegisterUserDeviceRequest struct {
-	UserID     uuid.UUID               `json:"user_id"`
-	DeviceID   string                  `json:"device_id"`
-	DeviceName string                  `json:"device_name"`
-	DeviceType entities.DeviceType     `json:"device_type"`
-	Platform   entities.DevicePlatform `json:"platform"`
-	FCMToken   string                  `json:"fcm_token"`
-	AppVersion string                  `json:"app_version"`
-	OsVersion  string                  `json:"os_version"`
-	IPAddress  string                  `json:"ip_address"`
-}
-
-type UpdateUserDeviceRequest struct {
-	DeviceName string                  `json:"device_name"`
-	DeviceType entities.DeviceType     `json:"device_type"`
-	Platform   entities.DevicePlatform `json:"platform"`
-	FCMToken   string                  `json:"fcm_token"`
-	AppVersion string                  `json:"app_version"`
-	OsVersion  string                  `json:"os_version"`
-}
-
-type ListUserDevicesRequest struct {
-	Page     int    `json:"page"`
-	Limit    int    `json:"limit"`
-	UserID   string `json:"user_id,omitempty"`
-	Platform string `json:"platform,omitempty"`
-}
-
-type ListUserDevicesResponse struct {
-	Devices    []*UserDeviceResponse `json:"devices"`
-	TotalCount int                   `json:"total_count"`
-	Page       int                   `json:"page"`
-	Limit      int                   `json:"limit"`
-	TotalPages int                   `json:"total_pages"`
-}
@@ -0,0 +1,32 @@
+package qrcode
+
+import (
+	"bytes"
+	"image/png"
+
+	"github.com/boombuler/barcode"
+	"github.com/boombuler/barcode/qr"
+)
+
+func GeneratePNG(content string, size int) ([]byte, error) {
+	if size <= 0 {
+		size = 256
+	}
+
+	qrCode, err := qr.Encode(content, qr.M, qr.Auto)
+	if err != nil {
+		return nil, err
+	}
+
+	qrCode, err = barcode.Scale(qrCode, size, size)
+	if err != nil {
+		return nil, err
+	}
+
+	var buf bytes.Buffer
+	if err := png.Encode(&buf, qrCode); err != nil {
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
+}
@@ -0,0 +1,43 @@
+package tabletoken
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+
+	"github.com/google/uuid"
+)
+
+type TableTokenPayload struct {
+	TableID        uuid.UUID `json:"table_id"`
+	OrganizationID uuid.UUID `json:"organization_id"`
+	OutletID       uuid.UUID `json:"outlet_id"`
+}
+
+func Encode(tableID, organizationID, outletID uuid.UUID) string {
+	payload := TableTokenPayload{
+		TableID:        tableID,
+		OrganizationID: organizationID,
+		OutletID:       outletID,
+	}
+	jsonBytes, _ := json.Marshal(payload)
+	return base64.URLEncoding.EncodeToString(jsonBytes)
+}
+
+func Decode(token string) (tableID, organizationID, outletID uuid.UUID, err error) {
+	jsonBytes, err := base64.URLEncoding.DecodeString(token)
+	if err != nil {
+		return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("invalid token encoding: %w", err)
+	}
+
+	var payload TableTokenPayload
+	if err := json.Unmarshal(jsonBytes, &payload); err != nil {
+		return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("invalid token format: %w", err)
+	}
+
+	if payload.TableID == uuid.Nil || payload.OrganizationID == uuid.Nil || payload.OutletID == uuid.Nil {
+		return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("token missing required fields")
+	}
+
+	return payload.TableID, payload.OrganizationID, payload.OutletID, nil
+}
@@ -1,338 +0,0 @@
-package processor
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"apskel-pos-be/internal/client"
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/mappers"
-	"apskel-pos-be/internal/models"
-
-	"github.com/google/uuid"
-)
-
-// NotificationRepository is the interface the processor depends on.
-type NotificationRepository interface {
-	Create(ctx context.Context, notification *entities.Notification) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.Notification, error)
-	Update(ctx context.Context, notification *entities.Notification) error
-	Delete(ctx context.Context, id uuid.UUID) error
-	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Notification, int64, error)
-}
-
-// NotificationReceiverRepository is the interface the processor depends on.
-type NotificationReceiverRepository interface {
-	Create(ctx context.Context, receiver *entities.NotificationReceiver) error
-	BulkCreate(ctx context.Context, receivers []*entities.NotificationReceiver) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationReceiver, error)
-	GetByNotificationAndUser(ctx context.Context, notificationID, userID uuid.UUID) (*entities.NotificationReceiver, error)
-	Update(ctx context.Context, receiver *entities.NotificationReceiver) error
-	ListByUserID(ctx context.Context, userID uuid.UUID, isRead *bool, limit, offset int) ([]*entities.NotificationReceiver, int64, error)
-	CountUnreadByUserID(ctx context.Context, userID uuid.UUID) (int64, error)
-	SoftDeleteByID(ctx context.Context, id uuid.UUID) error
-}
-
-// NotificationDeliveryRepository is the interface the processor depends on.
-type NotificationDeliveryRepository interface {
-	Create(ctx context.Context, delivery *entities.NotificationDelivery) error
-	BulkCreate(ctx context.Context, deliveries []*entities.NotificationDelivery) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationDelivery, error)
-	Update(ctx context.Context, delivery *entities.NotificationDelivery) error
-	ListByReceiverID(ctx context.Context, receiverID uuid.UUID) ([]*entities.NotificationDelivery, error)
-}
-
-// NotificationUserRepository is a minimal interface to fetch user devices.
-type NotificationUserDeviceRepository interface {
-	GetByUserID(ctx context.Context, userID uuid.UUID) ([]*entities.UserDevice, error)
-}
-
-// NotificationUserRepository is a minimal interface to fetch users by org.
-type NotificationUserRepository interface {
-	GetActiveUsers(ctx context.Context, organizationID uuid.UUID) ([]*entities.User, error)
-}
-
-// NotificationProcessor defines the business logic interface.
-type NotificationProcessor interface {
-	Send(ctx context.Context, req *models.SendNotificationRequest) (*models.NotificationResponse, error)
-	Broadcast(ctx context.Context, req *models.BroadcastNotificationRequest) (*models.NotificationResponse, error)
-	MarkAsRead(ctx context.Context, receiverID, userID uuid.UUID) (*models.NotificationReceiverResponse, error)
-	MarkAllAsRead(ctx context.Context, userID uuid.UUID) error
-	DeleteForUser(ctx context.Context, receiverID, userID uuid.UUID) error
-	ListForUser(ctx context.Context, req *models.ListNotificationsRequest) ([]*models.NotificationReceiverResponse, int64, int64, error)
-	GetByID(ctx context.Context, id uuid.UUID) (*models.NotificationResponse, error)
-}
-
-type NotificationProcessorImpl struct {
-	notificationRepo NotificationRepository
-	receiverRepo     NotificationReceiverRepository
-	deliveryRepo     NotificationDeliveryRepository
-	userDeviceRepo   NotificationUserDeviceRepository
-	userRepo         NotificationUserRepository
-	fcmClient        client.FCMClient
-}
-
-func NewNotificationProcessor(
-	notificationRepo NotificationRepository,
-	receiverRepo NotificationReceiverRepository,
-	deliveryRepo NotificationDeliveryRepository,
-	userDeviceRepo NotificationUserDeviceRepository,
-	userRepo NotificationUserRepository,
-	fcmClient client.FCMClient,
-) *NotificationProcessorImpl {
-	return &NotificationProcessorImpl{
-		notificationRepo: notificationRepo,
-		receiverRepo:     receiverRepo,
-		deliveryRepo:     deliveryRepo,
-		userDeviceRepo:   userDeviceRepo,
-		userRepo:         userRepo,
-		fcmClient:        fcmClient,
-	}
-}
-
-// Send creates a notification and dispatches it to the given receiver user IDs via FCM.
-func (p *NotificationProcessorImpl) Send(ctx context.Context, req *models.SendNotificationRequest) (*models.NotificationResponse, error) {
-	if len(req.ReceiverIDs) == 0 {
-		return nil, fmt.Errorf("at least one receiver_id is required")
-	}
-
-	notification := &entities.Notification{
-		Title:          req.Title,
-		Body:           req.Body,
-		Type:           req.Type,
-		Category:       req.Category,
-		Priority:       req.Priority,
-		ImageURL:       req.ImageURL,
-		ActionURL:      req.ActionURL,
-		NotifiableType: req.NotifiableType,
-		NotifiableID:   req.NotifiableID,
-		Data:           req.Data,
-		ScheduledAt:    req.ScheduledAt,
-		ExpiredAt:      req.ExpiredAt,
-		CreatedBy:      req.CreatedBy,
-	}
-
-	if err := p.notificationRepo.Create(ctx, notification); err != nil {
-		return nil, fmt.Errorf("failed to create notification: %w", err)
-	}
-
-	// Create receiver records and dispatch FCM per user.
-	for _, userID := range req.ReceiverIDs {
-		receiver := &entities.NotificationReceiver{
-			NotificationID: notification.ID,
-			UserID:         userID,
-		}
-		if err := p.receiverRepo.Create(ctx, receiver); err != nil {
-			// Log but continue for other receivers.
-			continue
-		}
-
-		p.dispatchFCMToUser(ctx, receiver, notification)
-	}
-
-	// Mark notification as sent.
-	now := time.Now()
-	notification.SentAt = &now
-	_ = p.notificationRepo.Update(ctx, notification)
-
-	return mappers.NotificationEntityToResponse(notification), nil
-}
-
-// Broadcast sends a notification to all active users in an organization.
-func (p *NotificationProcessorImpl) Broadcast(ctx context.Context, req *models.BroadcastNotificationRequest) (*models.NotificationResponse, error) {
-	users, err := p.userRepo.GetActiveUsers(ctx, req.OrganizationID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch organization users: %w", err)
-	}
-
-	notification := &entities.Notification{
-		Title:          req.Title,
-		Body:           req.Body,
-		Type:           req.Type,
-		Category:       req.Category,
-		Priority:       req.Priority,
-		ImageURL:       req.ImageURL,
-		ActionURL:      req.ActionURL,
-		NotifiableType: req.NotifiableType,
-		NotifiableID:   req.NotifiableID,
-		Data:           req.Data,
-		ScheduledAt:    req.ScheduledAt,
-		ExpiredAt:      req.ExpiredAt,
-		CreatedBy:      req.CreatedBy,
-	}
-
-	if err := p.notificationRepo.Create(ctx, notification); err != nil {
-		return nil, fmt.Errorf("failed to create notification: %w", err)
-	}
-
-	// Build receiver records in bulk.
-	receivers := make([]*entities.NotificationReceiver, 0, len(users))
-	for _, u := range users {
-		receivers = append(receivers, &entities.NotificationReceiver{
-			NotificationID: notification.ID,
-			UserID:         u.ID,
-		})
-	}
-
-	if err := p.receiverRepo.BulkCreate(ctx, receivers); err != nil {
-		return nil, fmt.Errorf("failed to create notification receivers: %w", err)
-	}
-
-	// Dispatch FCM for each receiver.
-	for _, receiver := range receivers {
-		p.dispatchFCMToUser(ctx, receiver, notification)
-	}
-
-	now := time.Now()
-	notification.SentAt = &now
-	_ = p.notificationRepo.Update(ctx, notification)
-
-	return mappers.NotificationEntityToResponse(notification), nil
-}
-
-// MarkAsRead marks a single notification receiver record as read.
-func (p *NotificationProcessorImpl) MarkAsRead(ctx context.Context, receiverID, userID uuid.UUID) (*models.NotificationReceiverResponse, error) {
-	receiver, err := p.receiverRepo.GetByID(ctx, receiverID)
-	if err != nil {
-		return nil, fmt.Errorf("notification not found: %w", err)
-	}
-
-	if receiver.UserID != userID {
-		return nil, fmt.Errorf("unauthorized: notification does not belong to user")
-	}
-
-	if !receiver.IsRead {
-		now := time.Now()
-		receiver.IsRead = true
-		receiver.ReadAt = &now
-		if err := p.receiverRepo.Update(ctx, receiver); err != nil {
-			return nil, fmt.Errorf("failed to mark notification as read: %w", err)
-		}
-	}
-
-	return mappers.NotificationReceiverEntityToResponse(receiver), nil
-}
-
-// MarkAllAsRead marks all unread notifications for a user as read.
-func (p *NotificationProcessorImpl) MarkAllAsRead(ctx context.Context, userID uuid.UUID) error {
-	isRead := false
-	receivers, _, err := p.receiverRepo.ListByUserID(ctx, userID, &isRead, 1000, 0)
-	if err != nil {
-		return fmt.Errorf("failed to fetch unread notifications: %w", err)
-	}
-
-	now := time.Now()
-	for _, r := range receivers {
-		r.IsRead = true
-		r.ReadAt = &now
-		_ = p.receiverRepo.Update(ctx, r)
-	}
-
-	return nil
-}
-
-// DeleteForUser soft-deletes a notification receiver record for a user.
-func (p *NotificationProcessorImpl) DeleteForUser(ctx context.Context, receiverID, userID uuid.UUID) error {
-	receiver, err := p.receiverRepo.GetByID(ctx, receiverID)
-	if err != nil {
-		return fmt.Errorf("notification not found: %w", err)
-	}
-
-	if receiver.UserID != userID {
-		return fmt.Errorf("unauthorized: notification does not belong to user")
-	}
-
-	return p.receiverRepo.SoftDeleteByID(ctx, receiverID)
-}
-
-// ListForUser returns paginated notifications for a user.
-// Returns: receivers, total, unreadCount, error
-func (p *NotificationProcessorImpl) ListForUser(ctx context.Context, req *models.ListNotificationsRequest) ([]*models.NotificationReceiverResponse, int64, int64, error) {
-	offset := (req.Page - 1) * req.Limit
-
-	receivers, total, err := p.receiverRepo.ListByUserID(ctx, req.UserID, req.IsRead, req.Limit, offset)
-	if err != nil {
-		return nil, 0, 0, fmt.Errorf("failed to list notifications: %w", err)
-	}
-
-	unreadCount, err := p.receiverRepo.CountUnreadByUserID(ctx, req.UserID)
-	if err != nil {
-		unreadCount = 0
-	}
-
-	responses := mappers.NotificationReceiverEntitiesToResponses(receivers)
-	return responses, total, unreadCount, nil
-}
-
-// GetByID returns a single notification by its ID.
-func (p *NotificationProcessorImpl) GetByID(ctx context.Context, id uuid.UUID) (*models.NotificationResponse, error) {
-	notification, err := p.notificationRepo.GetByID(ctx, id)
-	if err != nil {
-		return nil, fmt.Errorf("notification not found: %w", err)
-	}
-	return mappers.NotificationEntityToResponse(notification), nil
-}
-
-// dispatchFCMToUser fetches all FCM tokens for a user and sends the push notification.
-func (p *NotificationProcessorImpl) dispatchFCMToUser(ctx context.Context, receiver *entities.NotificationReceiver, notification *entities.Notification) {
-	if p.fcmClient == nil {
-		return
-	}
-
-	devices, err := p.userDeviceRepo.GetByUserID(ctx, receiver.UserID)
-	if err != nil || len(devices) == 0 {
-		return
-	}
-
-	// Build FCM data payload.
-	data := map[string]string{
-		"notification_id":          notification.ID.String(),
-		"notification_receiver_id": receiver.ID.String(),
-		"type":                     notification.Type,
-		"category":                 notification.Category,
-		"action_url":               notification.ActionURL,
-	}
-
-	// Collect valid FCM tokens and create delivery records.
-	tokens := make([]string, 0, len(devices))
-	deliveries := make([]*entities.NotificationDelivery, 0, len(devices))
-
-	for _, device := range devices {
-		if device.FCMToken == "" {
-			continue
-		}
-		tokens = append(tokens, device.FCMToken)
-		deliveries = append(deliveries, &entities.NotificationDelivery{
-			NotificationReceiverID: receiver.ID,
-			UserDeviceID:           device.ID,
-			Channel:                entities.NotificationChannelPush,
-			DeliveryStatus:         entities.NotificationDeliveryStatusPending,
-			Provider:               entities.NotificationProviderFirebase,
-		})
-	}
-
-	if len(tokens) == 0 {
-		return
-	}
-
-	// Persist delivery records before sending.
-	_ = p.deliveryRepo.BulkCreate(ctx, deliveries)
-
-	// Send via FCM multicast.
-	now := time.Now()
-	sendErr := p.fcmClient.SendMulticastNotification(ctx, tokens, notification.Title, notification.Body, data)
-
-	// Update delivery status.
-	for _, delivery := range deliveries {
-		if sendErr != nil {
-			delivery.DeliveryStatus = entities.NotificationDeliveryStatusFailed
-			delivery.FailedAt = &now
-			delivery.FailureReason = sendErr.Error()
-		} else {
-			delivery.DeliveryStatus = entities.NotificationDeliveryStatusSent
-			delivery.SentAt = &now
-		}
-		_ = p.deliveryRepo.Update(ctx, delivery)
-	}
-}
@@ -207,6 +207,14 @@ func (p *TableProcessor) GetOccupiedTables(ctx context.Context, outletID uuid.UU
 	return responses, nil
 }

+func (p *TableProcessor) GetTokenByID(ctx context.Context, id uuid.UUID) (string, error) {
+	table, err := p.tableRepo.GetByID(ctx, id)
+	if err != nil {
+		return "", err
+	}
+	return table.Token, nil
+}
+
 func (p *TableProcessor) mapTableToResponse(table *entities.Table) *models.TableResponse {
 	response := &models.TableResponse{
 		ID:             table.ID,
@@ -1,165 +0,0 @@
-package processor
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/mappers"
-	"apskel-pos-be/internal/models"
-
-	"github.com/google/uuid"
-)
-
-type UserDeviceRepository interface {
-	Create(ctx context.Context, device *entities.UserDevice) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.UserDevice, error)
-	GetByDeviceID(ctx context.Context, deviceID string, userID uuid.UUID) (*entities.UserDevice, error)
-	GetByUserID(ctx context.Context, userID uuid.UUID) ([]*entities.UserDevice, error)
-	Update(ctx context.Context, device *entities.UserDevice) error
-	Delete(ctx context.Context, id uuid.UUID) error
-	DeleteByUserID(ctx context.Context, userID uuid.UUID) error
-	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.UserDevice, int64, error)
-}
-
-type UserDeviceProcessor interface {
-	RegisterDevice(ctx context.Context, req *models.RegisterUserDeviceRequest) (*models.UserDeviceResponse, error)
-	UpdateDevice(ctx context.Context, id uuid.UUID, req *models.UpdateUserDeviceRequest) (*models.UserDeviceResponse, error)
-	DeleteDevice(ctx context.Context, id uuid.UUID) error
-	GetDeviceByID(ctx context.Context, id uuid.UUID) (*models.UserDeviceResponse, error)
-	GetDevicesByUserID(ctx context.Context, userID uuid.UUID) ([]*models.UserDeviceResponse, error)
-	ListDevices(ctx context.Context, filters map[string]interface{}, page, limit int) ([]*models.UserDeviceResponse, int, error)
-}
-
-type UserDeviceProcessorImpl struct {
-	userDeviceRepo UserDeviceRepository
-}
-
-func NewUserDeviceProcessorImpl(userDeviceRepo UserDeviceRepository) *UserDeviceProcessorImpl {
-	return &UserDeviceProcessorImpl{
-		userDeviceRepo: userDeviceRepo,
-	}
-}
-
-func (p *UserDeviceProcessorImpl) RegisterDevice(ctx context.Context, req *models.RegisterUserDeviceRequest) (*models.UserDeviceResponse, error) {
-	// Upsert: if device already registered for this user, update it
-	existing, err := p.userDeviceRepo.GetByDeviceID(ctx, req.DeviceID, req.UserID)
-	if err == nil && existing != nil {
-		existing.DeviceName = req.DeviceName
-		existing.DeviceType = req.DeviceType
-		existing.Platform = req.Platform
-		existing.FCMToken = req.FCMToken
-		existing.AppVersion = req.AppVersion
-		existing.OsVersion = req.OsVersion
-		existing.IPAddress = req.IPAddress
-		now := time.Now()
-		existing.LastActiveAt = &now
-
-		if err := p.userDeviceRepo.Update(ctx, existing); err != nil {
-			return nil, fmt.Errorf("failed to update device: %w", err)
-		}
-
-		return mappers.UserDeviceEntityToResponse(existing), nil
-	}
-
-	deviceEntity := &entities.UserDevice{
-		UserID:     req.UserID,
-		DeviceID:   req.DeviceID,
-		DeviceName: req.DeviceName,
-		DeviceType: req.DeviceType,
-		Platform:   req.Platform,
-		FCMToken:   req.FCMToken,
-		AppVersion: req.AppVersion,
-		OsVersion:  req.OsVersion,
-		IPAddress:  req.IPAddress,
-	}
-
-	now := time.Now()
-	deviceEntity.LastActiveAt = &now
-
-	if err := p.userDeviceRepo.Create(ctx, deviceEntity); err != nil {
-		return nil, fmt.Errorf("failed to register device: %w", err)
-	}
-
-	return mappers.UserDeviceEntityToResponse(deviceEntity), nil
-}
-
-func (p *UserDeviceProcessorImpl) UpdateDevice(ctx context.Context, id uuid.UUID, req *models.UpdateUserDeviceRequest) (*models.UserDeviceResponse, error) {
-	deviceEntity, err := p.userDeviceRepo.GetByID(ctx, id)
-	if err != nil {
-		return nil, fmt.Errorf("device not found: %w", err)
-	}
-
-	if req.DeviceName != "" {
-		deviceEntity.DeviceName = req.DeviceName
-	}
-	if req.DeviceType != "" {
-		deviceEntity.DeviceType = req.DeviceType
-	}
-	if req.Platform != "" {
-		deviceEntity.Platform = req.Platform
-	}
-	if req.FCMToken != "" {
-		deviceEntity.FCMToken = req.FCMToken
-	}
-	if req.AppVersion != "" {
-		deviceEntity.AppVersion = req.AppVersion
-	}
-	if req.OsVersion != "" {
-		deviceEntity.OsVersion = req.OsVersion
-	}
-
-	now := time.Now()
-	deviceEntity.LastActiveAt = &now
-
-	if err := p.userDeviceRepo.Update(ctx, deviceEntity); err != nil {
-		return nil, fmt.Errorf("failed to update device: %w", err)
-	}
-
-	return mappers.UserDeviceEntityToResponse(deviceEntity), nil
-}
-
-func (p *UserDeviceProcessorImpl) DeleteDevice(ctx context.Context, id uuid.UUID) error {
-	_, err := p.userDeviceRepo.GetByID(ctx, id)
-	if err != nil {
-		return fmt.Errorf("device not found: %w", err)
-	}
-
-	if err := p.userDeviceRepo.Delete(ctx, id); err != nil {
-		return fmt.Errorf("failed to delete device: %w", err)
-	}
-
-	return nil
-}
-
-func (p *UserDeviceProcessorImpl) GetDeviceByID(ctx context.Context, id uuid.UUID) (*models.UserDeviceResponse, error) {
-	deviceEntity, err := p.userDeviceRepo.GetByID(ctx, id)
-	if err != nil {
-		return nil, fmt.Errorf("device not found: %w", err)
-	}
-
-	return mappers.UserDeviceEntityToResponse(deviceEntity), nil
-}
-
-func (p *UserDeviceProcessorImpl) GetDevicesByUserID(ctx context.Context, userID uuid.UUID) ([]*models.UserDeviceResponse, error) {
-	deviceEntities, err := p.userDeviceRepo.GetByUserID(ctx, userID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get devices: %w", err)
-	}
-
-	return mappers.UserDeviceEntitiesToResponses(deviceEntities), nil
-}
-
-func (p *UserDeviceProcessorImpl) ListDevices(ctx context.Context, filters map[string]interface{}, page, limit int) ([]*models.UserDeviceResponse, int, error) {
-	offset := (page - 1) * limit
-	deviceEntities, total, err := p.userDeviceRepo.List(ctx, filters, limit, offset)
-	if err != nil {
-		return nil, 0, fmt.Errorf("failed to list devices: %w", err)
-	}
-
-	deviceResponses := mappers.UserDeviceEntitiesToResponses(deviceEntities)
-	totalPages := int((total + int64(limit) - 1) / int64(limit))
-
-	return deviceResponses, totalPages, nil
-}
@@ -253,3 +253,17 @@ func (p *UserProcessorImpl) UpdateUserOutlet(ctx context.Context, userID uuid.UU

 	return mappers.UserEntityToResponse(existingUser), nil
 }
+
+func (p *UserProcessorImpl) UpdateFcmToken(ctx context.Context, userID uuid.UUID, fcmToken string) error {
+	_, err := p.userRepo.GetByID(ctx, userID)
+	if err != nil {
+		return fmt.Errorf("user not found: %w", err)
+	}
+
+	err = p.userRepo.UpdateFcmToken(ctx, userID, fcmToken)
+	if err != nil {
+		return fmt.Errorf("failed to update FCM token: %w", err)
+	}
+
+	return nil
+}
@@ -19,4 +19,6 @@ type UserRepository interface {
 	UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error
 	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.User, int64, error)
 	Count(ctx context.Context, filters map[string]interface{}) (int64, error)
+	UpdateFcmToken(ctx context.Context, id uuid.UUID, fcmToken string) error
+	GetUsersWithFcmTokenByOrganization(ctx context.Context, organizationID uuid.UUID) ([]*entities.User, error)
 }
@@ -1,59 +0,0 @@
-package repository
-
-import (
-	"context"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type NotificationDeliveryRepository interface {
-	Create(ctx context.Context, delivery *entities.NotificationDelivery) error
-	BulkCreate(ctx context.Context, deliveries []*entities.NotificationDelivery) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationDelivery, error)
-	Update(ctx context.Context, delivery *entities.NotificationDelivery) error
-	ListByReceiverID(ctx context.Context, receiverID uuid.UUID) ([]*entities.NotificationDelivery, error)
-}
-
-type NotificationDeliveryRepositoryImpl struct {
-	db *gorm.DB
-}
-
-func NewNotificationDeliveryRepository(db *gorm.DB) *NotificationDeliveryRepositoryImpl {
-	return &NotificationDeliveryRepositoryImpl{db: db}
-}
-
-func (r *NotificationDeliveryRepositoryImpl) Create(ctx context.Context, delivery *entities.NotificationDelivery) error {
-	return r.db.WithContext(ctx).Create(delivery).Error
-}
-
-func (r *NotificationDeliveryRepositoryImpl) BulkCreate(ctx context.Context, deliveries []*entities.NotificationDelivery) error {
-	if len(deliveries) == 0 {
-		return nil
-	}
-	return r.db.WithContext(ctx).Create(&deliveries).Error
-}
-
-func (r *NotificationDeliveryRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationDelivery, error) {
-	var delivery entities.NotificationDelivery
-	err := r.db.WithContext(ctx).First(&delivery, "id = ?", id).Error
-	if err != nil {
-		return nil, err
-	}
-	return &delivery, nil
-}
-
-func (r *NotificationDeliveryRepositoryImpl) Update(ctx context.Context, delivery *entities.NotificationDelivery) error {
-	return r.db.WithContext(ctx).Save(delivery).Error
-}
-
-func (r *NotificationDeliveryRepositoryImpl) ListByReceiverID(ctx context.Context, receiverID uuid.UUID) ([]*entities.NotificationDelivery, error) {
-	var deliveries []*entities.NotificationDelivery
-	err := r.db.WithContext(ctx).
-		Where("notification_receiver_id = ?", receiverID).
-		Order("created_at DESC").
-		Find(&deliveries).Error
-	return deliveries, err
-}
@@ -1,108 +0,0 @@
-package repository
-
-import (
-	"context"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type NotificationReceiverRepository interface {
-	Create(ctx context.Context, receiver *entities.NotificationReceiver) error
-	BulkCreate(ctx context.Context, receivers []*entities.NotificationReceiver) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationReceiver, error)
-	GetByNotificationAndUser(ctx context.Context, notificationID, userID uuid.UUID) (*entities.NotificationReceiver, error)
-	Update(ctx context.Context, receiver *entities.NotificationReceiver) error
-	ListByUserID(ctx context.Context, userID uuid.UUID, isRead *bool, limit, offset int) ([]*entities.NotificationReceiver, int64, error)
-	CountUnreadByUserID(ctx context.Context, userID uuid.UUID) (int64, error)
-	SoftDeleteByID(ctx context.Context, id uuid.UUID) error
-}
-
-type NotificationReceiverRepositoryImpl struct {
-	db *gorm.DB
-}
-
-func NewNotificationReceiverRepository(db *gorm.DB) *NotificationReceiverRepositoryImpl {
-	return &NotificationReceiverRepositoryImpl{db: db}
-}
-
-func (r *NotificationReceiverRepositoryImpl) Create(ctx context.Context, receiver *entities.NotificationReceiver) error {
-	return r.db.WithContext(ctx).Create(receiver).Error
-}
-
-func (r *NotificationReceiverRepositoryImpl) BulkCreate(ctx context.Context, receivers []*entities.NotificationReceiver) error {
-	if len(receivers) == 0 {
-		return nil
-	}
-	return r.db.WithContext(ctx).Create(&receivers).Error
-}
-
-func (r *NotificationReceiverRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationReceiver, error) {
-	var receiver entities.NotificationReceiver
-	err := r.db.WithContext(ctx).
-		Preload("Notification").
-		First(&receiver, "id = ? AND is_deleted = false", id).Error
-	if err != nil {
-		return nil, err
-	}
-	return &receiver, nil
-}
-
-func (r *NotificationReceiverRepositoryImpl) GetByNotificationAndUser(ctx context.Context, notificationID, userID uuid.UUID) (*entities.NotificationReceiver, error) {
-	var receiver entities.NotificationReceiver
-	err := r.db.WithContext(ctx).
-		Where("notification_id = ? AND user_id = ? AND is_deleted = false", notificationID, userID).
-		First(&receiver).Error
-	if err != nil {
-		return nil, err
-	}
-	return &receiver, nil
-}
-
-func (r *NotificationReceiverRepositoryImpl) Update(ctx context.Context, receiver *entities.NotificationReceiver) error {
-	return r.db.WithContext(ctx).Save(receiver).Error
-}
-
-func (r *NotificationReceiverRepositoryImpl) ListByUserID(ctx context.Context, userID uuid.UUID, isRead *bool, limit, offset int) ([]*entities.NotificationReceiver, int64, error) {
-	var receivers []*entities.NotificationReceiver
-	var total int64
-
-	query := r.db.WithContext(ctx).
-		Model(&entities.NotificationReceiver{}).
-		Where("user_id = ? AND is_deleted = false", userID)
-
-	if isRead != nil {
-		query = query.Where("is_read = ?", *isRead)
-	}
-
-	if err := query.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	err := query.
-		Preload("Notification").
-		Order("created_at DESC").
-		Limit(limit).
-		Offset(offset).
-		Find(&receivers).Error
-
-	return receivers, total, err
-}
-
-func (r *NotificationReceiverRepositoryImpl) CountUnreadByUserID(ctx context.Context, userID uuid.UUID) (int64, error) {
-	var count int64
-	err := r.db.WithContext(ctx).
-		Model(&entities.NotificationReceiver{}).
-		Where("user_id = ? AND is_read = false AND is_deleted = false", userID).
-		Count(&count).Error
-	return count, err
-}
-
-func (r *NotificationReceiverRepositoryImpl) SoftDeleteByID(ctx context.Context, id uuid.UUID) error {
-	return r.db.WithContext(ctx).
-		Model(&entities.NotificationReceiver{}).
-		Where("id = ?", id).
-		Updates(map[string]interface{}{"is_deleted": true}).Error
-}
@@ -1,64 +0,0 @@
-package repository
-
-import (
-	"context"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type NotificationRepository interface {
-	Create(ctx context.Context, notification *entities.Notification) error
-	GetByID(ctx context.Context, id uuid.UUID) (*entities.Notification, error)
-	Update(ctx context.Context, notification *entities.Notification) error
-	Delete(ctx context.Context, id uuid.UUID) error
-	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Notification, int64, error)
-}
-
-type NotificationRepositoryImpl struct {
-	db *gorm.DB
-}
-
-func NewNotificationRepository(db *gorm.DB) *NotificationRepositoryImpl {
-	return &NotificationRepositoryImpl{db: db}
-}
-
-func (r *NotificationRepositoryImpl) Create(ctx context.Context, notification *entities.Notification) error {
-	return r.db.WithContext(ctx).Create(notification).Error
-}
-
-func (r *NotificationRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Notification, error) {
-	var notification entities.Notification
-	err := r.db.WithContext(ctx).First(&notification, "id = ?", id).Error
-	if err != nil {
-		return nil, err
-	}
-	return &notification, nil
-}
-
-func (r *NotificationRepositoryImpl) Update(ctx context.Context, notification *entities.Notification) error {
-	return r.db.WithContext(ctx).Save(notification).Error
-}
-
-func (r *NotificationRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
-	return r.db.WithContext(ctx).Delete(&entities.Notification{}, "id = ?", id).Error
-}
-
-func (r *NotificationRepositoryImpl) List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Notification, int64, error) {
-	var notifications []*entities.Notification
-	var total int64
-
-	query := r.db.WithContext(ctx).Model(&entities.Notification{})
-	for key, value := range filters {
-		query = query.Where(key+" = ?", value)
-	}
-
-	if err := query.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	err := query.Order("created_at DESC").Limit(limit).Offset(offset).Find(&notifications).Error
-	return notifications, total, err
-}
@@ -18,6 +18,7 @@ type OrderRepository interface {
 	Update(ctx context.Context, order *entities.Order) error
 	Delete(ctx context.Context, id uuid.UUID) error
 	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Order, int64, error)
+	ListBySessionID(ctx context.Context, sessionID string) ([]*entities.Order, error)
 	GetByOrderNumber(ctx context.Context, orderNumber string) (*entities.Order, error)
 	ExistsByOrderNumber(ctx context.Context, orderNumber string) (bool, error)
 	VoidOrder(ctx context.Context, id uuid.UUID, reason string, voidedBy uuid.UUID) error
@@ -130,6 +131,24 @@ func (r *OrderRepositoryImpl) List(ctx context.Context, filters map[string]inter
 	return orders, total, err
 }

+func (r *OrderRepositoryImpl) ListBySessionID(ctx context.Context, sessionID string) ([]*entities.Order, error) {
+	var orders []*entities.Order
+	err := r.db.WithContext(ctx).Model(&entities.Order{}).
+		Preload("Organization").
+		Preload("Outlet").
+		Preload("User").
+		Preload("OrderItems").
+		Preload("OrderItems.Product").
+		Preload("OrderItems.ProductVariant").
+		Preload("Payments").
+		Preload("Payments.PaymentMethod").
+		Preload("Payments.PaymentOrderItems").
+		Where("metadata->>'session_id' = ?", sessionID).
+		Order("created_at ASC").
+		Find(&orders).Error
+	return orders, err
+}
+
 func (r *OrderRepositoryImpl) GetByOrderNumber(ctx context.Context, orderNumber string) (*entities.Order, error) {
 	var order entities.Order
 	err := r.db.WithContext(ctx).First(&order, "order_number = ?", orderNumber).Error
@@ -0,0 +1,141 @@
+package repository
+
+import (
+	"apskel-pos-be/internal/models"
+	"context"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/redis/go-redis/v9"
+)
+
+const (
+	sessionKeyPrefix      = "self_order:session:"
+	tableSessionKeyPrefix = "self_order:table_session:"
+	sessionTTL            = 24 * time.Hour
+	sessionStatusActive   = "active"
+	sessionStatusClosed   = "closed"
+)
+
+type SessionRepository interface {
+	Create(ctx context.Context, session *models.SelfOrderSession) error
+	GetByID(ctx context.Context, sessionID string) (*models.SelfOrderSession, error)
+	GetActiveByTableID(ctx context.Context, tableID uuid.UUID) (*models.SelfOrderSession, error)
+	Close(ctx context.Context, sessionID string) error
+	CloseByTableID(ctx context.Context, tableID uuid.UUID) error
+}
+
+type sessionRepository struct {
+	client *redis.Client
+}
+
+func NewSessionRepository(client *redis.Client) SessionRepository {
+	return &sessionRepository{client: client}
+}
+
+func (r *sessionRepository) Create(ctx context.Context, session *models.SelfOrderSession) error {
+	if session.ID == "" {
+		session.ID = uuid.New().String()
+	}
+	session.Status = sessionStatusActive
+	session.CreatedAt = time.Now()
+
+	data, err := json.Marshal(session)
+	if err != nil {
+		return fmt.Errorf("failed to marshal session: %w", err)
+	}
+
+	sessionKey := sessionKeyPrefix + session.ID
+	tableSessionKey := tableSessionKeyPrefix + session.TableID.String()
+
+	pipe := r.client.Pipeline()
+	pipe.Set(ctx, sessionKey, data, sessionTTL)
+	pipe.Set(ctx, tableSessionKey, session.ID, sessionTTL)
+
+	if _, err := pipe.Exec(ctx); err != nil {
+		return fmt.Errorf("failed to store session in redis: %w", err)
+	}
+
+	return nil
+}
+
+func (r *sessionRepository) GetByID(ctx context.Context, sessionID string) (*models.SelfOrderSession, error) {
+	data, err := r.client.Get(ctx, sessionKeyPrefix+sessionID).Bytes()
+	if err != nil {
+		if err == redis.Nil {
+			return nil, nil
+		}
+		return nil, fmt.Errorf("failed to get session: %w", err)
+	}
+
+	var session models.SelfOrderSession
+	if err := json.Unmarshal(data, &session); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal session: %w", err)
+	}
+
+	return &session, nil
+}
+
+func (r *sessionRepository) GetActiveByTableID(ctx context.Context, tableID uuid.UUID) (*models.SelfOrderSession, error) {
+	sessionID, err := r.client.Get(ctx, tableSessionKeyPrefix+tableID.String()).Result()
+	if err != nil {
+		if err == redis.Nil {
+			return nil, nil
+		}
+		return nil, fmt.Errorf("failed to get session for table: %w", err)
+	}
+
+	session, err := r.GetByID(ctx, sessionID)
+	if err != nil {
+		return nil, err
+	}
+
+	if session != nil && session.Status != sessionStatusActive {
+		return nil, nil
+	}
+
+	return session, nil
+}
+
+func (r *sessionRepository) Close(ctx context.Context, sessionID string) error {
+	session, err := r.GetByID(ctx, sessionID)
+	if err != nil {
+		return err
+	}
+	if session == nil {
+		return fmt.Errorf("session not found")
+	}
+
+	now := time.Now()
+	session.Status = sessionStatusClosed
+	session.ClosedAt = &now
+
+	data, err := json.Marshal(session)
+	if err != nil {
+		return fmt.Errorf("failed to marshal session: %w", err)
+	}
+
+	pipe := r.client.Pipeline()
+	pipe.Set(ctx, sessionKeyPrefix+session.ID, data, sessionTTL)
+	pipe.Del(ctx, tableSessionKeyPrefix+session.TableID.String())
+
+	if _, err := pipe.Exec(ctx); err != nil {
+		return fmt.Errorf("failed to close session: %w", err)
+	}
+
+	return nil
+}
+
+func (r *sessionRepository) CloseByTableID(ctx context.Context, tableID uuid.UUID) error {
+	session, err := r.GetActiveByTableID(ctx, tableID)
+	if err != nil {
+		return err
+	}
+	if session == nil {
+		return nil
+	}
+
+	return r.Close(ctx, session.ID)
+}
@@ -36,6 +36,20 @@ func (r *TableRepository) GetByID(ctx context.Context, id uuid.UUID) (*entities.
 	return &table, nil
 }

+func (r *TableRepository) GetByToken(ctx context.Context, token string) (*entities.Table, error) {
+	var table entities.Table
+	err := r.db.WithContext(ctx).
+		Preload("Organization").
+		Preload("Outlet").
+		Preload("Order").
+		Where("token = ?", token).
+		First(&table).Error
+	if err != nil {
+		return nil, err
+	}
+	return &table, nil
+}
+
 func (r *TableRepository) GetByOutletID(ctx context.Context, outletID uuid.UUID) ([]entities.Table, error) {
 	var tables []entities.Table
 	err := r.db.WithContext(ctx).
@@ -13,6 +13,7 @@ import (
 type TableRepositoryInterface interface {
 	Create(ctx context.Context, table *entities.Table) error
 	GetByID(ctx context.Context, id uuid.UUID) (*entities.Table, error)
+	GetByToken(ctx context.Context, token string) (*entities.Table, error)
 	GetByOutletID(ctx context.Context, outletID uuid.UUID) ([]entities.Table, error)
 	GetByOrganizationID(ctx context.Context, organizationID uuid.UUID) ([]entities.Table, error)
 	Update(ctx context.Context, table *entities.Table) error
@@ -1,94 +0,0 @@
-package repository
-
-import (
-	"context"
-	"strings"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type UserDeviceRepositoryImpl struct {
-	db *gorm.DB
-}
-
-func NewUserDeviceRepositoryImpl(db *gorm.DB) *UserDeviceRepositoryImpl {
-	return &UserDeviceRepositoryImpl{
-		db: db,
-	}
-}
-
-func (r *UserDeviceRepositoryImpl) Create(ctx context.Context, device *entities.UserDevice) error {
-	return r.db.WithContext(ctx).Create(device).Error
-}
-
-func (r *UserDeviceRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.UserDevice, error) {
-	var device entities.UserDevice
-	err := r.db.WithContext(ctx).First(&device, "id = ?", id).Error
-	if err != nil {
-		return nil, err
-	}
-	return &device, nil
-}
-
-func (r *UserDeviceRepositoryImpl) GetByDeviceID(ctx context.Context, deviceID string, userID uuid.UUID) (*entities.UserDevice, error) {
-	var device entities.UserDevice
-	err := r.db.WithContext(ctx).Where("device_id = ? AND user_id = ?", deviceID, userID).First(&device).Error
-	if err != nil {
-		return nil, err
-	}
-	return &device, nil
-}
-
-func (r *UserDeviceRepositoryImpl) GetByUserID(ctx context.Context, userID uuid.UUID) ([]*entities.UserDevice, error) {
-	var devices []*entities.UserDevice
-	err := r.db.WithContext(ctx).Where("user_id = ?", userID).Order("created_at DESC").Find(&devices).Error
-	return devices, err
-}
-
-func (r *UserDeviceRepositoryImpl) Update(ctx context.Context, device *entities.UserDevice) error {
-	return r.db.WithContext(ctx).Save(device).Error
-}
-
-func (r *UserDeviceRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
-	return r.db.WithContext(ctx).Delete(&entities.UserDevice{}, "id = ?", id).Error
-}
-
-func (r *UserDeviceRepositoryImpl) DeleteByUserID(ctx context.Context, userID uuid.UUID) error {
-	return r.db.WithContext(ctx).Delete(&entities.UserDevice{}, "user_id = ?", userID).Error
-}
-
-func (r *UserDeviceRepositoryImpl) List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.UserDevice, int64, error) {
-	var devices []*entities.UserDevice
-	var total int64
-
-	query := r.db.WithContext(ctx).Model(&entities.UserDevice{})
-
-	for key, value := range filters {
-		switch key {
-		case "user_id":
-			query = query.Where("user_id = ?", value)
-		case "platform":
-			if platform, ok := value.(string); ok && platform != "" {
-				query = query.Where("platform = ?", platform)
-			}
-		case "search":
-			if searchStr, ok := value.(string); ok && searchStr != "" {
-				searchPattern := "%" + strings.ToLower(searchStr) + "%"
-				query = query.Where("LOWER(device_name) LIKE ? OR LOWER(device_id) LIKE ?",
-					searchPattern, searchPattern)
-			}
-		default:
-			query = query.Where(key+" = ?", value)
-		}
-	}
-
-	if err := query.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	err := query.Order("created_at DESC").Limit(limit).Offset(offset).Find(&devices).Error
-	return devices, total, err
-}
@@ -110,3 +110,17 @@ func (r *UserRepositoryImpl) Count(ctx context.Context, filters map[string]inter
 	err := query.Count(&count).Error
 	return count, err
 }
+
+func (r *UserRepositoryImpl) UpdateFcmToken(ctx context.Context, id uuid.UUID, fcmToken string) error {
+	return r.db.WithContext(ctx).Model(&entities.User{}).
+		Where("id = ?", id).
+		Update("fcm_token", fcmToken).Error
+}
+
+func (r *UserRepositoryImpl) GetUsersWithFcmTokenByOrganization(ctx context.Context, organizationID uuid.UUID) ([]*entities.User, error) {
+	var users []*entities.User
+	err := r.db.WithContext(ctx).
+		Where("organization_id = ? AND is_active = ? AND fcm_token IS NOT NULL AND fcm_token != ''", organizationID, true).
+		Find(&users).Error
+	return users, err
+}
@@ -46,13 +46,12 @@ type Router struct {
 	customerAuthHandler               *handler.CustomerAuthHandler
 	customerPointsHandler             *handler.CustomerPointsHandler
 	spinGameHandler                   *handler.SpinGameHandler
-	userDeviceHandler                 *handler.UserDeviceHandler
-	notificationHandler               *handler.NotificationHandler
+	selfOrderHandler                  *handler.SelfOrderHandler
 	authMiddleware                    *middleware.AuthMiddleware
 	customerAuthMiddleware            *middleware.CustomerAuthMiddleware
 }

-func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, userDeviceService service.UserDeviceService, userDeviceValidator validator.UserDeviceValidator, notificationService service.NotificationService, notificationValidator validator.NotificationValidator) *Router {
+func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, selfOrderHandler *handler.SelfOrderHandler) *Router {

 	return &Router{
 		config:                            cfg,
@@ -71,7 +70,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),
+		tableHandler:                      handler.NewTableHandler(tableService, tableValidator, cfg.Server.BaseUrl),
 		unitHandler:                       handler.NewUnitHandler(unitService),
 		ingredientHandler:                 handler.NewIngredientHandler(ingredientService),
 		productRecipeHandler:              handler.NewProductRecipeHandler(productRecipeService),
@@ -91,8 +90,7 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
 		authMiddleware:                    authMiddleware,
 		customerAuthMiddleware:            customerAuthMiddleware,
 		productVariantHandler:             handler.NewProductVariantHandler(productVariantService, productVariantValidator),
-		userDeviceHandler:                 handler.NewUserDeviceHandler(userDeviceService, userDeviceValidator),
-		notificationHandler:               handler.NewNotificationHandler(notificationService, notificationValidator),
+		selfOrderHandler:                  selfOrderHandler,
 	}
 }

@@ -149,6 +147,15 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			customer.POST("/spin", r.spinGameHandler.PlaySpinGame)
 		}

+		selfOrder := v1.Group("/self-order")
+		{
+			selfOrder.GET("/table/:token", r.selfOrderHandler.ValidateToken)
+			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)
+		}
+
 		organizations := v1.Group("/organizations")
 		{
 			organizations.POST("", r.organizationHandler.CreateOrganization)
@@ -316,6 +323,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				tables.DELETE("/:id", r.tableHandler.Delete)
 				tables.POST("/:id/occupy", r.tableHandler.OccupyTable)
 				tables.POST("/:id/release", r.tableHandler.ReleaseTable)
+				tables.GET("/:id/qr", r.tableHandler.GenerateQRCode)
 			}

 			ingredients := protected.Group("/ingredients")
@@ -563,42 +571,6 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				// Reports
 				outlets.GET("/:outlet_id/reports/daily-transaction.pdf", r.reportHandler.GetDailyTransactionReportPDF)
 			}
-
-			// User device routes - accessible by authenticated users for their own devices
-			userDevices := protected.Group("/user-devices")
-			{
-				userDevices.POST("/register", r.userDeviceHandler.RegisterDevice)
-				userDevices.GET("/me", r.userDeviceHandler.GetMyDevices)
-				userDevices.GET("/:id", r.userDeviceHandler.GetDevice)
-				userDevices.PUT("/:id", r.userDeviceHandler.UpdateDevice)
-				userDevices.DELETE("/:id", r.userDeviceHandler.DeleteDevice)
-			}
-
-			// Admin-only user device routes
-			adminUserDevices := protected.Group("/user-devices")
-			adminUserDevices.Use(r.authMiddleware.RequireAdminOrManager())
-			{
-				adminUserDevices.GET("", r.userDeviceHandler.ListDevices)
-				adminUserDevices.GET("/user/:user_id", r.userDeviceHandler.GetDevicesByUser)
-			}
-
-			// Notification routes - authenticated users manage their own notifications
-			notifications := protected.Group("/notifications")
-			{
-				notifications.GET("", r.notificationHandler.List)
-				notifications.GET("/:id", r.notificationHandler.GetByID)
-				notifications.PUT("/:id/read", r.notificationHandler.MarkAsRead)
-				notifications.PUT("/read-all", r.notificationHandler.MarkAllAsRead)
-				notifications.DELETE("/:id", r.notificationHandler.Delete)
-			}
-
-			// Admin notification routes - send and broadcast
-			adminNotifications := protected.Group("/notifications")
-			adminNotifications.Use(r.authMiddleware.RequireAdminOrManager())
-			{
-				adminNotifications.POST("/send", r.notificationHandler.Send)
-				adminNotifications.POST("/broadcast", r.notificationHandler.Broadcast)
-			}
 		}
 	}
 }
@@ -4,13 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log"
 	"time"

 	"apskel-pos-be/config"
 	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
-	"apskel-pos-be/internal/processor"
 	"apskel-pos-be/internal/transformer"

 	"github.com/golang-jwt/jwt/v5"
@@ -27,7 +26,6 @@ type AuthService interface {

 type AuthServiceImpl struct {
 	userProcessor   UserProcessor
-	userDeviceProcessor processor.UserDeviceProcessor
 	jwtSecret       string
 	refreshSecret   string
 	tokenTTL        time.Duration
@@ -42,10 +40,9 @@ type Claims struct {
 	jwt.RegisteredClaims
 }

-func NewAuthService(userProcessor UserProcessor, userDeviceProcessor processor.UserDeviceProcessor, authConfig *config.AuthConfig) AuthService {
+func NewAuthService(userProcessor UserProcessor, authConfig *config.AuthConfig) AuthService {
 	return &AuthServiceImpl{
 		userProcessor:   userProcessor,
-		userDeviceProcessor: userDeviceProcessor,
 		jwtSecret:       authConfig.AccessTokenSecret(),
 		refreshSecret:   authConfig.RefreshTokenSecret(),
 		tokenTTL:        authConfig.AccessTokenTTL(),
@@ -85,24 +82,7 @@ func (s *AuthServiceImpl) Login(ctx context.Context, req *contract.LoginRequest)
 		return nil, fmt.Errorf("failed to generate refresh token: %w", err)
 	}

-	// Register or update device info if provided
-	if req.DeviceID != "" && s.userDeviceProcessor != nil {
-		deviceReq := &models.RegisterUserDeviceRequest{
-			UserID:     userResponse.ID,
-			DeviceID:   req.DeviceID,
-			DeviceName: req.DeviceName,
-			DeviceType: entities.DeviceType(req.DeviceType),
-			Platform:   entities.DevicePlatform(req.Platform),
-			FCMToken:   req.FCMToken,
-			AppVersion: req.AppVersion,
-			OsVersion:  req.OsVersion,
-		}
-		// Non-blocking: log error but don't fail login
-		if _, err := s.userDeviceProcessor.RegisterDevice(ctx, deviceReq); err != nil {
-			// Log but don't fail the login
-			_ = err
-		}
-	}
+	go s.saveFcmToken(context.Background(), userResponse.ID, req.FcmToken)

 	return &contract.LoginResponse{
 		Token:            token,
@@ -113,6 +93,14 @@ func (s *AuthServiceImpl) Login(ctx context.Context, req *contract.LoginRequest)
 	}, nil
 }

+func (s *AuthServiceImpl) saveFcmToken(ctx context.Context, userID uuid.UUID, fcmToken *string) {
+	if fcmToken != nil && *fcmToken != "" {
+		if err := s.userProcessor.UpdateFcmToken(ctx, userID, *fcmToken); err != nil {
+			log.Printf("failed to save FCM token for user %s: %v", userID, err)
+		}
+	}
+}
+
 func (s *AuthServiceImpl) ValidateToken(tokenString string) (*contract.UserResponse, error) {
 	claims, err := s.parseToken(tokenString)
 	if err != nil {
@@ -1,154 +0,0 @@
-package service
-
-import (
-	"context"
-	"math"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/models"
-	"apskel-pos-be/internal/processor"
-	"apskel-pos-be/internal/transformer"
-
-	"github.com/google/uuid"
-)
-
-type NotificationService interface {
-	Send(ctx context.Context, req *contract.SendNotificationRequest, createdBy uuid.UUID) *contract.Response
-	Broadcast(ctx context.Context, req *contract.BroadcastNotificationRequest, organizationID, createdBy uuid.UUID) *contract.Response
-	MarkAsRead(ctx context.Context, receiverID, userID uuid.UUID) *contract.Response
-	MarkAllAsRead(ctx context.Context, userID uuid.UUID) *contract.Response
-	DeleteForUser(ctx context.Context, receiverID, userID uuid.UUID) *contract.Response
-	ListForUser(ctx context.Context, req *contract.ListNotificationsRequest, userID uuid.UUID) *contract.Response
-	GetByID(ctx context.Context, id uuid.UUID) *contract.Response
-}
-
-type NotificationServiceImpl struct {
-	notificationProcessor processor.NotificationProcessor
-}
-
-func NewNotificationService(notificationProcessor processor.NotificationProcessor) *NotificationServiceImpl {
-	return &NotificationServiceImpl{
-		notificationProcessor: notificationProcessor,
-	}
-}
-
-func (s *NotificationServiceImpl) Send(ctx context.Context, req *contract.SendNotificationRequest, createdBy uuid.UUID) *contract.Response {
-	modelReq := &models.SendNotificationRequest{
-		Title:          req.Title,
-		Body:           req.Body,
-		Type:           req.Type,
-		Category:       req.Category,
-		Priority:       req.Priority,
-		ImageURL:       req.ImageURL,
-		ActionURL:      req.ActionURL,
-		NotifiableType: req.NotifiableType,
-		NotifiableID:   req.NotifiableID,
-		Data:           req.Data,
-		ReceiverIDs:    req.ReceiverIDs,
-		ScheduledAt:    req.ScheduledAt,
-		ExpiredAt:      req.ExpiredAt,
-		CreatedBy:      &createdBy,
-	}
-
-	resp, err := s.notificationProcessor.Send(ctx, modelReq)
-	if err != nil {
-		errResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.NotificationServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errResp})
-	}
-
-	return contract.BuildSuccessResponse(transformer.NotificationModelResponseToContract(resp))
-}
-
-func (s *NotificationServiceImpl) Broadcast(ctx context.Context, req *contract.BroadcastNotificationRequest, organizationID, createdBy uuid.UUID) *contract.Response {
-	modelReq := &models.BroadcastNotificationRequest{
-		Title:          req.Title,
-		Body:           req.Body,
-		Type:           req.Type,
-		Category:       req.Category,
-		Priority:       req.Priority,
-		ImageURL:       req.ImageURL,
-		ActionURL:      req.ActionURL,
-		NotifiableType: req.NotifiableType,
-		NotifiableID:   req.NotifiableID,
-		Data:           req.Data,
-		OrganizationID: organizationID,
-		ScheduledAt:    req.ScheduledAt,
-		ExpiredAt:      req.ExpiredAt,
-		CreatedBy:      &createdBy,
-	}
-
-	resp, err := s.notificationProcessor.Broadcast(ctx, modelReq)
-	if err != nil {
-		errResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.NotificationServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errResp})
-	}
-
-	return contract.BuildSuccessResponse(transformer.NotificationModelResponseToContract(resp))
-}
-
-func (s *NotificationServiceImpl) MarkAsRead(ctx context.Context, receiverID, userID uuid.UUID) *contract.Response {
-	resp, err := s.notificationProcessor.MarkAsRead(ctx, receiverID, userID)
-	if err != nil {
-		errResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.NotificationServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errResp})
-	}
-
-	return contract.BuildSuccessResponse(transformer.NotificationReceiverModelResponseToContract(resp))
-}
-
-func (s *NotificationServiceImpl) MarkAllAsRead(ctx context.Context, userID uuid.UUID) *contract.Response {
-	if err := s.notificationProcessor.MarkAllAsRead(ctx, userID); err != nil {
-		errResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.NotificationServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errResp})
-	}
-
-	return contract.BuildSuccessResponse(map[string]interface{}{"message": "All notifications marked as read"})
-}
-
-func (s *NotificationServiceImpl) DeleteForUser(ctx context.Context, receiverID, userID uuid.UUID) *contract.Response {
-	if err := s.notificationProcessor.DeleteForUser(ctx, receiverID, userID); err != nil {
-		errResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.NotificationServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errResp})
-	}
-
-	return contract.BuildSuccessResponse(map[string]interface{}{"message": "Notification deleted"})
-}
-
-func (s *NotificationServiceImpl) ListForUser(ctx context.Context, req *contract.ListNotificationsRequest, userID uuid.UUID) *contract.Response {
-	modelReq := &models.ListNotificationsRequest{
-		Page:   req.Page,
-		Limit:  req.Limit,
-		UserID: userID,
-		IsRead: req.IsRead,
-	}
-
-	receivers, total, unreadCount, err := s.notificationProcessor.ListForUser(ctx, modelReq)
-	if err != nil {
-		errResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.NotificationServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errResp})
-	}
-
-	totalPages := int(math.Ceil(float64(total) / float64(req.Limit)))
-
-	response := contract.ListNotificationsResponse{
-		Notifications: transformer.NotificationReceiverModelResponsesToContracts(receivers),
-		TotalCount:    total,
-		UnreadCount:   unreadCount,
-		Page:          req.Page,
-		Limit:         req.Limit,
-		TotalPages:    totalPages,
-	}
-
-	return contract.BuildSuccessResponse(response)
-}
-
-func (s *NotificationServiceImpl) GetByID(ctx context.Context, id uuid.UUID) *contract.Response {
-	resp, err := s.notificationProcessor.GetByID(ctx, id)
-	if err != nil {
-		errResp := contract.NewResponseError(constants.NotFoundErrorCode, constants.NotificationServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errResp})
-	}
-
-	return contract.BuildSuccessResponse(transformer.NotificationModelResponseToContract(resp))
-}
@@ -37,9 +37,10 @@ type OrderServiceImpl struct {
 	orderIngredientTransactionProcessor processor.OrderIngredientTransactionProcessor
 	productRecipeRepo                   repository.ProductRecipeRepository
 	txManager                           *repository.TxManager
+	sessionRepo                         repository.SessionRepository
 }

-func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repository.TableRepositoryInterface, orderIngredientTransactionService *OrderIngredientTransactionService, orderIngredientTransactionProcessor processor.OrderIngredientTransactionProcessor, productRecipeRepo repository.ProductRecipeRepository, txManager *repository.TxManager) *OrderServiceImpl {
+func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repository.TableRepositoryInterface, orderIngredientTransactionService *OrderIngredientTransactionService, orderIngredientTransactionProcessor processor.OrderIngredientTransactionProcessor, productRecipeRepo repository.ProductRecipeRepository, txManager *repository.TxManager, sessionRepo repository.SessionRepository) *OrderServiceImpl {
 	return &OrderServiceImpl{
 		orderProcessor:                      orderProcessor,
 		tableRepo:                           tableRepo,
@@ -47,6 +48,7 @@ func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repo
 		orderIngredientTransactionProcessor: orderIngredientTransactionProcessor,
 		productRecipeRepo:                   productRecipeRepo,
 		txManager:                           txManager,
+		sessionRepo:                         sessionRepo,
 	}
 }

@@ -621,6 +623,12 @@ func (s *OrderServiceImpl) handleTableReleaseOnPayment(ctx context.Context, orde
 			if err := s.tableRepo.ReleaseTable(ctx, table.ID, order.TotalAmount); err != nil {
 				return fmt.Errorf("failed to release table: %w", err)
 			}
+
+			if s.sessionRepo != nil {
+				if err := s.sessionRepo.CloseByTableID(ctx, table.ID); err != nil {
+					fmt.Printf("Warning: failed to close self-order session for table %s: %v\n", table.ID, err)
+				}
+			}
 		}
 	}

@@ -152,3 +152,7 @@ func (s *TableServiceImpl) GetOccupiedTables(ctx context.Context, outletID uuid.

 	return contract.BuildSuccessResponse(responses)
 }
+
+func (s *TableServiceImpl) GetTableToken(ctx context.Context, tableID uuid.UUID) (string, error) {
+	return s.tableProcessor.GetTokenByID(ctx, tableID)
+}
@@ -1,122 +0,0 @@
-package service
-
-import (
-	"context"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/processor"
-	"apskel-pos-be/internal/transformer"
-
-	"github.com/google/uuid"
-)
-
-type UserDeviceService interface {
-	RegisterDevice(ctx context.Context, userID uuid.UUID, req *contract.RegisterUserDeviceRequest) *contract.Response
-	UpdateDevice(ctx context.Context, id uuid.UUID, req *contract.UpdateUserDeviceRequest) *contract.Response
-	DeleteDevice(ctx context.Context, id uuid.UUID) *contract.Response
-	GetDeviceByID(ctx context.Context, id uuid.UUID) *contract.Response
-	GetDevicesByUserID(ctx context.Context, userID uuid.UUID) *contract.Response
-	ListDevices(ctx context.Context, req *contract.ListUserDevicesRequest) *contract.Response
-}
-
-type UserDeviceServiceImpl struct {
-	userDeviceProcessor processor.UserDeviceProcessor
-}
-
-func NewUserDeviceService(userDeviceProcessor processor.UserDeviceProcessor) *UserDeviceServiceImpl {
-	return &UserDeviceServiceImpl{
-		userDeviceProcessor: userDeviceProcessor,
-	}
-}
-
-func (s *UserDeviceServiceImpl) RegisterDevice(ctx context.Context, userID uuid.UUID, req *contract.RegisterUserDeviceRequest) *contract.Response {
-	modelReq := transformer.RegisterUserDeviceRequestToModel(req)
-	modelReq.UserID = userID
-
-	deviceResponse, err := s.userDeviceProcessor.RegisterDevice(ctx, modelReq)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.UserDeviceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponse := transformer.UserDeviceModelResponseToResponse(deviceResponse)
-	return contract.BuildSuccessResponse(contractResponse)
-}
-
-func (s *UserDeviceServiceImpl) UpdateDevice(ctx context.Context, id uuid.UUID, req *contract.UpdateUserDeviceRequest) *contract.Response {
-	modelReq := transformer.UpdateUserDeviceRequestToModel(req)
-
-	deviceResponse, err := s.userDeviceProcessor.UpdateDevice(ctx, id, modelReq)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.UserDeviceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponse := transformer.UserDeviceModelResponseToResponse(deviceResponse)
-	return contract.BuildSuccessResponse(contractResponse)
-}
-
-func (s *UserDeviceServiceImpl) DeleteDevice(ctx context.Context, id uuid.UUID) *contract.Response {
-	err := s.userDeviceProcessor.DeleteDevice(ctx, id)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.UserDeviceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	return contract.BuildSuccessResponse(map[string]interface{}{
-		"message": "Device deleted successfully",
-	})
-}
-
-func (s *UserDeviceServiceImpl) GetDeviceByID(ctx context.Context, id uuid.UUID) *contract.Response {
-	deviceResponse, err := s.userDeviceProcessor.GetDeviceByID(ctx, id)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.NotFoundErrorCode, constants.UserDeviceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponse := transformer.UserDeviceModelResponseToResponse(deviceResponse)
-	return contract.BuildSuccessResponse(contractResponse)
-}
-
-func (s *UserDeviceServiceImpl) GetDevicesByUserID(ctx context.Context, userID uuid.UUID) *contract.Response {
-	deviceResponses, err := s.userDeviceProcessor.GetDevicesByUserID(ctx, userID)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.UserDeviceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponses := transformer.UserDeviceModelResponsesToResponses(deviceResponses)
-	return contract.BuildSuccessResponse(contractResponses)
-}
-
-func (s *UserDeviceServiceImpl) ListDevices(ctx context.Context, req *contract.ListUserDevicesRequest) *contract.Response {
-	modelReq := transformer.ListUserDevicesRequestToModel(req)
-
-	filters := make(map[string]interface{})
-	if modelReq.UserID != "" {
-		filters["user_id"] = modelReq.UserID
-	}
-	if modelReq.Platform != "" {
-		filters["platform"] = modelReq.Platform
-	}
-
-	devices, totalPages, err := s.userDeviceProcessor.ListDevices(ctx, filters, modelReq.Page, modelReq.Limit)
-	if err != nil {
-		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.UserDeviceServiceEntity, err.Error())
-		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
-	}
-
-	contractResponses := transformer.UserDeviceModelResponsesToResponses(devices)
-
-	response := contract.ListUserDevicesResponse{
-		Devices:    contractResponses,
-		TotalCount: len(contractResponses),
-		Page:       modelReq.Page,
-		Limit:      modelReq.Limit,
-		TotalPages: totalPages,
-	}
-
-	return contract.BuildSuccessResponse(response)
-}
@@ -20,4 +20,5 @@ type UserProcessor interface {
 	ActivateUser(ctx context.Context, userID uuid.UUID) error
 	DeactivateUser(ctx context.Context, userID uuid.UUID) error
 	UpdateUserOutlet(ctx context.Context, userID uuid.UUID, req *models.UpdateUserOutletRequest) (*models.UserResponse, error)
+	UpdateFcmToken(ctx context.Context, userID uuid.UUID, fcmToken string) error
 }
@@ -1,63 +0,0 @@
-package transformer
-
-import (
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/models"
-)
-
-func NotificationModelResponseToContract(m *models.NotificationResponse) *contract.NotificationResponse {
-	if m == nil {
-		return nil
-	}
-	return &contract.NotificationResponse{
-		ID:             m.ID,
-		Title:          m.Title,
-		Body:           m.Body,
-		Type:           m.Type,
-		Category:       m.Category,
-		Priority:       m.Priority,
-		ImageURL:       m.ImageURL,
-		ActionURL:      m.ActionURL,
-		NotifiableType: m.NotifiableType,
-		NotifiableID:   m.NotifiableID,
-		Data:           m.Data,
-		ScheduledAt:    m.ScheduledAt,
-		SentAt:         m.SentAt,
-		ExpiredAt:      m.ExpiredAt,
-		CreatedBy:      m.CreatedBy,
-		CreatedAt:      m.CreatedAt,
-		UpdatedAt:      m.UpdatedAt,
-	}
-}
-
-func NotificationReceiverModelResponseToContract(m *models.NotificationReceiverResponse) *contract.NotificationReceiverResponse {
-	if m == nil {
-		return nil
-	}
-	resp := &contract.NotificationReceiverResponse{
-		ID:             m.ID,
-		NotificationID: m.NotificationID,
-		UserID:         m.UserID,
-		IsRead:         m.IsRead,
-		ReadAt:         m.ReadAt,
-		IsDeleted:      m.IsDeleted,
-		DeletedAt:      m.DeletedAt,
-		CreatedAt:      m.CreatedAt,
-		UpdatedAt:      m.UpdatedAt,
-	}
-	if m.Notification != nil {
-		resp.Notification = NotificationModelResponseToContract(m.Notification)
-	}
-	return resp
-}
-
-func NotificationReceiverModelResponsesToContracts(ms []*models.NotificationReceiverResponse) []*contract.NotificationReceiverResponse {
-	if ms == nil {
-		return nil
-	}
-	result := make([]*contract.NotificationReceiverResponse, len(ms))
-	for i, m := range ms {
-		result[i] = NotificationReceiverModelResponseToContract(m)
-	}
-	return result
-}
@@ -1,74 +0,0 @@
-package transformer
-
-import (
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/models"
-)
-
-func RegisterUserDeviceRequestToModel(req *contract.RegisterUserDeviceRequest) *models.RegisterUserDeviceRequest {
-	return &models.RegisterUserDeviceRequest{
-		DeviceID:   req.DeviceID,
-		DeviceName: req.DeviceName,
-		DeviceType: req.DeviceType,
-		Platform:   req.Platform,
-		FCMToken:   req.FCMToken,
-		AppVersion: req.AppVersion,
-		OsVersion:  req.OsVersion,
-	}
-}
-
-func UpdateUserDeviceRequestToModel(req *contract.UpdateUserDeviceRequest) *models.UpdateUserDeviceRequest {
-	return &models.UpdateUserDeviceRequest{
-		DeviceName: req.DeviceName,
-		DeviceType: req.DeviceType,
-		Platform:   req.Platform,
-		FCMToken:   req.FCMToken,
-		AppVersion: req.AppVersion,
-		OsVersion:  req.OsVersion,
-	}
-}
-
-func ListUserDevicesRequestToModel(req *contract.ListUserDevicesRequest) *models.ListUserDevicesRequest {
-	return &models.ListUserDevicesRequest{
-		Page:     req.Page,
-		Limit:    req.Limit,
-		UserID:   req.UserID,
-		Platform: req.Platform,
-	}
-}
-
-func UserDeviceModelResponseToResponse(device *models.UserDeviceResponse) *contract.UserDeviceResponse {
-	if device == nil {
-		return nil
-	}
-	return &contract.UserDeviceResponse{
-		ID:           device.ID,
-		UserID:       device.UserID,
-		DeviceID:     device.DeviceID,
-		DeviceName:   device.DeviceName,
-		DeviceType:   device.DeviceType,
-		Platform:     device.Platform,
-		FCMToken:     device.FCMToken,
-		AppVersion:   device.AppVersion,
-		OsVersion:    device.OsVersion,
-		IPAddress:    device.IPAddress,
-		LastActiveAt: device.LastActiveAt,
-		CreatedAt:    device.CreatedAt,
-		UpdatedAt:    device.UpdatedAt,
-	}
-}
-
-func UserDeviceModelResponsesToResponses(devices []*models.UserDeviceResponse) []contract.UserDeviceResponse {
-	if devices == nil {
-		return nil
-	}
-
-	responses := make([]contract.UserDeviceResponse, len(devices))
-	for i, device := range devices {
-		response := UserDeviceModelResponseToResponse(device)
-		if response != nil {
-			responses[i] = *response
-		}
-	}
-	return responses
-}
@@ -1,53 +0,0 @@
-package validator
-
-import (
-	"fmt"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-)
-
-type NotificationValidator interface {
-	ValidateSendRequest(req *contract.SendNotificationRequest) (error, string)
-	ValidateBroadcastRequest(req *contract.BroadcastNotificationRequest) (error, string)
-	ValidateListRequest(req *contract.ListNotificationsRequest) (error, string)
-}
-
-type NotificationValidatorImpl struct{}
-
-func NewNotificationValidator() *NotificationValidatorImpl {
-	return &NotificationValidatorImpl{}
-}
-
-func (v *NotificationValidatorImpl) ValidateSendRequest(req *contract.SendNotificationRequest) (error, string) {
-	if req.Title == "" {
-		return fmt.Errorf("title is required"), constants.MissingFieldErrorCode
-	}
-	if req.Body == "" {
-		return fmt.Errorf("body is required"), constants.MissingFieldErrorCode
-	}
-	if len(req.ReceiverIDs) == 0 {
-		return fmt.Errorf("at least one receiver_id is required"), constants.MissingFieldErrorCode
-	}
-	return nil, ""
-}
-
-func (v *NotificationValidatorImpl) ValidateBroadcastRequest(req *contract.BroadcastNotificationRequest) (error, string) {
-	if req.Title == "" {
-		return fmt.Errorf("title is required"), constants.MissingFieldErrorCode
-	}
-	if req.Body == "" {
-		return fmt.Errorf("body is required"), constants.MissingFieldErrorCode
-	}
-	return nil, ""
-}
-
-func (v *NotificationValidatorImpl) ValidateListRequest(req *contract.ListNotificationsRequest) (error, string) {
-	if req.Page < 1 {
-		return fmt.Errorf("page must be greater than 0"), constants.ValidationErrorCode
-	}
-	if req.Limit < 1 || req.Limit > 100 {
-		return fmt.Errorf("limit must be between 1 and 100"), constants.ValidationErrorCode
-	}
-	return nil, ""
-}
@@ -1,126 +0,0 @@
-package validator
-
-import (
-	"errors"
-	"strings"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/entities"
-)
-
-type UserDeviceValidator interface {
-	ValidateRegisterDeviceRequest(req *contract.RegisterUserDeviceRequest) (error, string)
-	ValidateUpdateDeviceRequest(req *contract.UpdateUserDeviceRequest) (error, string)
-	ValidateListDevicesRequest(req *contract.ListUserDevicesRequest) (error, string)
-}
-
-type UserDeviceValidatorImpl struct{}
-
-func NewUserDeviceValidator() *UserDeviceValidatorImpl {
-	return &UserDeviceValidatorImpl{}
-}
-
-var validDeviceTypes = map[entities.DeviceType]bool{
-	entities.DeviceTypeMobile:  true,
-	entities.DeviceTypeTablet:  true,
-	entities.DeviceTypeDesktop: true,
-}
-
-var validPlatforms = map[entities.DevicePlatform]bool{
-	entities.DevicePlatformAndroid: true,
-	entities.DevicePlatformIOS:     true,
-	entities.DevicePlatformWeb:     true,
-}
-
-func (v *UserDeviceValidatorImpl) ValidateRegisterDeviceRequest(req *contract.RegisterUserDeviceRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if strings.TrimSpace(req.DeviceID) == "" {
-		return errors.New("device_id is required"), constants.MissingFieldErrorCode
-	}
-
-	if len(req.DeviceID) > 255 {
-		return errors.New("device_id must be at most 255 characters"), constants.MalformedFieldErrorCode
-	}
-
-	if req.DeviceName != "" && len(req.DeviceName) > 255 {
-		return errors.New("device_name must be at most 255 characters"), constants.MalformedFieldErrorCode
-	}
-
-	if req.DeviceType != "" && !validDeviceTypes[req.DeviceType] {
-		return errors.New("device_type must be one of: mobile, tablet, desktop"), constants.MalformedFieldErrorCode
-	}
-
-	if req.Platform != "" && !validPlatforms[req.Platform] {
-		return errors.New("platform must be one of: android, ios, web"), constants.MalformedFieldErrorCode
-	}
-
-	if req.FCMToken != "" && len(req.FCMToken) > 512 {
-		return errors.New("fcm_token must be at most 512 characters"), constants.MalformedFieldErrorCode
-	}
-
-	if req.AppVersion != "" && len(req.AppVersion) > 50 {
-		return errors.New("app_version must be at most 50 characters"), constants.MalformedFieldErrorCode
-	}
-
-	if req.OsVersion != "" && len(req.OsVersion) > 50 {
-		return errors.New("os_version must be at most 50 characters"), constants.MalformedFieldErrorCode
-	}
-
-	return nil, ""
-}
-
-func (v *UserDeviceValidatorImpl) ValidateUpdateDeviceRequest(req *contract.UpdateUserDeviceRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.DeviceName != "" && len(req.DeviceName) > 255 {
-		return errors.New("device_name must be at most 255 characters"), constants.MalformedFieldErrorCode
-	}
-
-	if req.DeviceType != "" && !validDeviceTypes[req.DeviceType] {
-		return errors.New("device_type must be one of: mobile, tablet, desktop"), constants.MalformedFieldErrorCode
-	}
-
-	if req.Platform != "" && !validPlatforms[req.Platform] {
-		return errors.New("platform must be one of: android, ios, web"), constants.MalformedFieldErrorCode
-	}
-
-	if req.FCMToken != "" && len(req.FCMToken) > 512 {
-		return errors.New("fcm_token must be at most 512 characters"), constants.MalformedFieldErrorCode
-	}
-
-	if req.AppVersion != "" && len(req.AppVersion) > 50 {
-		return errors.New("app_version must be at most 50 characters"), constants.MalformedFieldErrorCode
-	}
-
-	if req.OsVersion != "" && len(req.OsVersion) > 50 {
-		return errors.New("os_version must be at most 50 characters"), constants.MalformedFieldErrorCode
-	}
-
-	return nil, ""
-}
-
-func (v *UserDeviceValidatorImpl) ValidateListDevicesRequest(req *contract.ListUserDevicesRequest) (error, string) {
-	if req == nil {
-		return errors.New("request body is required"), constants.MissingFieldErrorCode
-	}
-
-	if req.Page < 1 {
-		return errors.New("page must be at least 1"), constants.MalformedFieldErrorCode
-	}
-
-	if req.Limit < 1 || req.Limit > 100 {
-		return errors.New("limit must be between 1 and 100"), constants.MalformedFieldErrorCode
-	}
-
-	if req.Platform != "" && !validPlatforms[entities.DevicePlatform(req.Platform)] {
-		return errors.New("platform must be one of: android, ios, web"), constants.MalformedFieldErrorCode
-	}
-
-	return nil, ""
-}
@@ -0,0 +1 @@
+ALTER TABLE tables DROP COLUMN IF EXISTS token;
@@ -0,0 +1 @@
+ALTER TABLE tables ADD COLUMN token VARCHAR(255) UNIQUE NOT NULL DEFAULT gen_random_uuid()::text;
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS user_devices;
@@ -1,22 +0,0 @@
-- User devices table
-CREATE TABLE user_devices (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    device_id VARCHAR(255) NOT NULL,
-    device_name VARCHAR(255),
-    device_type VARCHAR(50) CHECK (device_type IN ('mobile', 'tablet', 'desktop')),
-    platform VARCHAR(50) CHECK (platform IN ('android', 'ios', 'web')),
-    fcm_token VARCHAR(512),
-    app_version VARCHAR(50),
-    os_version VARCHAR(50),
-    ip_address VARCHAR(45),
-    last_active_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_user_devices_user_id ON user_devices(user_id);
-CREATE INDEX idx_user_devices_device_id ON user_devices(device_id);
-CREATE INDEX idx_user_devices_fcm_token ON user_devices(fcm_token);
-CREATE UNIQUE INDEX idx_user_devices_user_device ON user_devices(user_id, device_id);
@@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN fcm_token;
@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN fcm_token VARCHAR(512) NULL;
Author	SHA1	Message	Date
ryan	15805a4853	Implement FCM	2026-05-09 14:18:36 +07:00
ryan	07b186c986	Barcode generation with Boombuler	2026-05-09 01:01:25 +07:00
ryan	4cc563f6f1	Add self-order/orders/:sessionId	2026-05-09 00:12:00 +07:00
ryan	e7c4681102	Add outlet_id to self-order/categories	2026-05-08 23:56:06 +07:00
ryan	f957b07d23	Change self-order/menu from POST to GET	2026-05-08 23:18:52 +07:00
ryan	3c103b7692	Token and session implementation with Redis	2026-05-08 18:41:14 +07:00
ryan	fe57aab3b4	Fix categories with table	2026-05-08 14:19:40 +07:00
ryan	3721fb3cd7	List categories for self-order	2026-05-06 11:56:11 +07:00
ryan	2d6df8e4c6	Self Order - BE	2026-05-05 21:07:03 +07:00
				`@@ -0,0 +1 @@`
				`ALTER TABLE tables DROP COLUMN IF EXISTS token;`
				`@@ -0,0 +1 @@`
				`ALTER TABLE tables ADD COLUMN token VARCHAR(255) UNIQUE NOT NULL DEFAULT gen_random_uuid()::text;`
				`@@ -0,0 +1 @@`
				`ALTER TABLE users ADD COLUMN fcm_token VARCHAR(512) NULL;`