.gitignore

@@ -6,6 +6,3 @@ config/env/*
 !.env
 
 vendor
-
-# Firebase service account credentials
-infra/firebase-service-account.json

.vscode/settings.json

@@ -1 +0,0 @@
-{}

Dockerfile

@@ -1,5 +1,5 @@
 # 1) Build stage
-FROM golang:1.24-alpine AS build
+FROM golang:1.21-alpine AS build
 RUN apk --no-cache add ca-certificates tzdata git curl
 WORKDIR /src
 COPY go.mod go.sum ./

Makefile

@@ -83,12 +83,6 @@ migration-up:
 migration-down:
 	@migrate -database $(DB_URL) -path ./migrations down 1
 
-# Force migration to specific version
-
-.SILENT: migration-force
-migration-force:
-	@migrate -database $(DB_URL) -path ./migrations force $(version)
-
 .SILENT: seeder-create
 seeder-create:
 	@migrate create -ext sql -dir ./seeders -seq $(name)

cmd/server/main.go

@@ -12,18 +12,13 @@ func main() {
 	cfg := config.LoadConfig()
 	logger.Setup(cfg.LogLevel(), cfg.LogFormat())
 
-	pg, err := db.NewPostgres(cfg.Database)
+	db, 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(pg, redisClient)
+	application := app.NewApp(db)
 
 	if err := application.Initialize(cfg); err != nil {
 		log.Fatalf("Failed to initialize application: %v", err)

config/configs.go

@@ -26,12 +26,10 @@ 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"`
 }
 
 var (
@@ -96,7 +94,3 @@ func (c *Config) LogFormat() string {
 func (c *Config) GetFonnte() *Fonnte {
 	return &c.Fonnte
 }
-
-func (c *Config) GetFCM() *FCM {
-	return &c.FCM
-}

config/fcm.go

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

config/redis.go

@@ -1,55 +0,0 @@
-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
-}

config/server.go

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

go.mod

@@ -1,54 +1,28 @@
 module apskel-pos-be
 
-go 1.24
+go 1.21
 
 require (
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-playground/validator/v10 v10.17.0
-	github.com/google/uuid v1.6.0
+	github.com/google/uuid v1.1.2
 	github.com/lib/pq v1.2.0
 	github.com/spf13/viper v1.16.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	cel.dev/expr v0.23.1 // indirect
-	cloud.google.com/go v0.121.0 // indirect
-	cloud.google.com/go/auth v0.16.1 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
-	cloud.google.com/go/compute/metadata v0.6.0 // indirect
-	cloud.google.com/go/firestore v1.18.0 // indirect
-	cloud.google.com/go/iam v1.5.2 // indirect
-	cloud.google.com/go/longrunning v0.6.7 // indirect
-	cloud.google.com/go/monitoring v1.24.2 // indirect
-	cloud.google.com/go/storage v1.53.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
-	github.com/MicahParks/keyfunc v1.9.0 // indirect
 	github.com/bytedance/sonic v1.10.2 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
-	github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
-	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
@@ -57,7 +31,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.10 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // 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
@@ -65,57 +39,34 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
-	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/spf13/afero v1.10.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
-	github.com/zeebo/errs v1.4.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
-	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-	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.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
+	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
-	golang.org/x/time v0.11.0 // indirect
-	google.golang.org/appengine/v2 v2.0.6 // indirect
-	google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
-	google.golang.org/grpc v1.72.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
 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
+	github.com/stretchr/testify v1.8.4
 	go.uber.org/zap v1.21.0
-	golang.org/x/crypto v0.40.0
+	golang.org/x/crypto v0.28.0
-	google.golang.org/api v0.231.0
 	gorm.io/driver/postgres v1.5.0
 	gorm.io/gorm v1.30.0
 )

go.sum

@@ -1,5 +1,3 @@
-cel.dev/expr v0.23.1 h1:K4KOtPCJQjVggkARsjG9RWXP6O4R73aHeJMa/dmCQQg=
-cel.dev/expr v0.23.1/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -19,32 +17,14 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.121.0 h1:pgfwva8nGw7vivjZiRfrmglGWiCJBP+0OmDpenG/Fwg=
-cloud.google.com/go v0.121.0/go.mod h1:rS7Kytwheu/y9buoDmu5EIpMMCI4Mb8ND4aeN4Vwj7Q=
-cloud.google.com/go/auth v0.16.1 h1:XrXauHMd30LhQYVRHLGvJiYeczweKQXZxsTbV9TiguU=
-cloud.google.com/go/auth v0.16.1/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI=
-cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
-cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
-cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.18.0 h1:cuydCaLS7Vl2SatAeivXyhbhDEIR8BDmtn4egDhIn2s=
-cloud.google.com/go/firestore v1.18.0/go.mod h1:5ye0v48PhseZBdcl0qbl3uttu7FIEwEYVaWm0UIEOEU=
-cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=
-cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE=
-cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
-cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
-cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE=
-cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY=
-cloud.google.com/go/monitoring v1.24.2 h1:5OTsoJ1dXYIiMiuL+sYscLc9BumrL3CarVLL7dd7lHM=
-cloud.google.com/go/monitoring v1.24.2/go.mod h1:x7yzPWcgDRnPEv3sI+jJGBkwl5qINf+6qY4eq0I9B4U=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -55,42 +35,18 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.53.0 h1:gg0ERZwL17pJ+Cz3cD2qS60w1WMDnwcm5YPAIQBHUAw=
-cloud.google.com/go/storage v1.53.0/go.mod h1:7/eO2a/srr9ImZW9k5uufcNahT2+fPb8w5it1i5boaA=
-cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
-cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-firebase.google.com/go/v4 v4.19.0 h1:f5NMlC2YHFsncz00c2+ecBr+ZYlRMhKIhj1z8Iz0lD8=
-firebase.google.com/go/v4 v4.19.0/go.mod h1:P7UfBpzc8+Z3MckX79+zsWzKVfpGryr6HLbAe7gCWfs=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 h1:ErKg/3iS1AKcTkf3yixlZ54f9U1rljCkQyEXWUnIUxc=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0/go.mod h1:yAZHSGnqScoU556rBOVkwLze6WP5N+U11RHuWaGVxwY=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0/go.mod h1:BnBReJLvVYx2CS/UHOgVz2BXKXD9wsQPxZug20nZhd0=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0 h1:OqVGm6Ei3x5+yZmSJG1Mh2NwHvpVmZ08CB5qJhT9Nuk=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
-github.com/MicahParks/keyfunc v1.9.0 h1:lhKd5xrFHLNOWrDc4Tyb/Q1AJ4LCzQ48GVJyVIID3+o=
-github.com/MicahParks/keyfunc v1.9.0/go.mod h1:IdnCilugA0O/99dW+/MkvlyrsX8+L8+x95xuVNtM5jw=
 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=
 github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
@@ -105,8 +61,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv1aFbZMiM9vblcSArJRf2Irls=
-github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -116,17 +70,7 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
-github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
-github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A=
-github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw=
-github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
-github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
-github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
@@ -140,13 +84,6 @@ github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SU
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
-github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -157,9 +94,6 @@ github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ
 github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
-github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v5 v5.2.3 h1:kkGXqQOBSDDWRhWNXTFpqGSCMyh/PLnqUvMGJPDJDs0=
 github.com/golang-jwt/jwt/v5 v5.2.3/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -187,9 +121,6 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -201,16 +132,12 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc=
-github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
@@ -222,17 +149,10 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
-github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q=
-github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -261,8 +181,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.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
-github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 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=
@@ -295,21 +215,17 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 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=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
+github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
-github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
 github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
@@ -318,13 +234,10 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
 github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
-github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE=
-github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -334,9 +247,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
@@ -349,42 +261,17 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 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=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/detectors/gcp v1.35.0 h1:bGvFt68+KTiAKFlacHW6AhA56GF2rS0bdD3aJYEnmzA=
-go.opentelemetry.io/contrib/detectors/gcp v1.35.0/go.mod h1:qGWP8/+ILwMRIUf9uIVLloR1uo5ZYAslM4O6OqUi1DA=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 h1:x7wzEgXfnzJcHDwStJT+mxOz4etr2EcexjqhBvmoakw=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
-go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
-go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.35.0 h1:PB3Zrjs1sG1GBX51SXyTSoOTqcDglmsk7nT6tkKPb/k=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.35.0/go.mod h1:U2R3XyVPzn0WX7wOIypPuptulsMcPDPs/oiSVOMVnHY=
-go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
-go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
-go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
-go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
-go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
-go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
-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.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 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=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
 go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
@@ -402,8 +289,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -474,8 +361,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -485,8 +372,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
-golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -500,8 +385,6 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -545,8 +428,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -558,15 +441,12 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
-golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -639,8 +519,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.231.0 h1:LbUD5FUl0C4qwia2bjXhCMH65yz1MLPzA/0OYEsYY7Q=
-google.golang.org/api v0.231.0/go.mod h1:H52180fPI/QQlUc0F4xWfGZILdv09GCWKt2bcsn164A=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -648,8 +526,6 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine/v2 v2.0.6 h1:LvPZLGuchSBslPBp+LAhihBeGSiRh1myRoYK4NtuBIw=
-google.golang.org/appengine/v2 v2.0.6/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -686,12 +562,6 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78=
-google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:49MsLSx0oWMOZqcpB3uL8ZOkAh1+TndpJ8ONoCBWiZk=
-google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 h1:vPV0tzlsK6EzEDHNNH5sa7Hs9bd7iXR7B1tSiPepkV0=
-google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:pKLAc5OolXC3ViWGI62vvC0n10CpwAtRcTNCFwTKBEw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 h1:IqsN8hx+lWLqlN+Sc3DoMy/watjofWiU8sRFgQ8fhKM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -708,8 +578,6 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
-google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -720,10 +588,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

infra/development.yaml

@@ -1,7 +1,6 @@
 server:
   base-url:
   local-url:
-  self-order-url: http://localhost:5173
   port: 4000
 
 jwt:
@@ -28,17 +27,6 @@ postgresql:
   connection-max-life-time-in-second: 600
   debug: false
 
-redis:
-  host: 194.233.78.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
@@ -54,8 +42,4 @@ log:
 fonnte:
   api_url: "https://api.fonnte.com/send"
   token: "bADQrf9NTXfLZQCK2wGg"
-  timeout: 30
+  timeout: 30
-
-fcm:
-  credentials_file: "infra/firebase-service-account.json"
-  project_id: "apskel-pos-v2"

internal/app/app.go

@@ -20,54 +20,30 @@ 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
+	server   *http.Server
-	db             *gorm.DB
+	db       *gorm.DB
-	redisClient    *redis.Client
+	router   *router.Router
-	router         *router.Router
+	shutdown chan os.Signal
-	shutdown       chan os.Signal
-	omsetScheduler *service.OmsetMilestoneScheduler
 }
 
-func NewApp(db *gorm.DB, redisClient *redis.Client) *App {
+func NewApp(db *gorm.DB) *App {
 	return &App{
-		db:          db,
+		db:       db,
-		redisClient: redisClient,
+		shutdown: make(chan os.Signal, 1),
-		shutdown:    make(chan os.Signal, 1),
 	}
 }
 
 func (a *App) Initialize(cfg *config.Config) error {
 	repos := a.initRepositories()
 	processors := a.initProcessors(cfg, repos)
-
-	// Initialize omset milestone scheduler
-	a.omsetScheduler = service.NewOmsetMilestoneScheduler(
-		repos.organizationRepo,
-		repos.outletRepo,
-		repos.userRepo,
-		processors.notificationProcessor,
-	)
-
 	services := a.initServices(processors, repos, cfg)
 	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,
-		services.productOutletPriceService,
-	)
 
 	a.router = router.NewRouter(
 		cfg,
@@ -108,8 +84,6 @@ func (a *App) Initialize(cfg *config.Config) error {
 		validators.vendorValidator,
 		services.purchaseOrderService,
 		validators.purchaseOrderValidator,
-		services.purchaseCategoryService,
-		validators.purchaseCategoryValidator,
 		services.unitConverterService,
 		validators.unitConverterValidator,
 		services.chartOfAccountTypeService,
@@ -131,27 +105,12 @@ func (a *App) Initialize(cfg *config.Config) error {
 		services.customerPointsService,
 		services.spinGameService,
 		middleware.customerAuthMiddleware,
-		services.userDeviceService,
-		validators.userDeviceValidator,
-		services.notificationService,
-		validators.notificationValidator,
-		services.productOutletPriceService,
-		validators.productOutletPriceValidator,
-		selfOrderHandler,
-		services.expenseService,
-		validators.expenseValidator,
-		a.redisClient,
 	)
 
 	return nil
 }
 
 func (a *App) Start(port string) error {
-	// Start the omset milestone scheduler (checks every 5 minutes for daily omset milestones)
-	if a.omsetScheduler != nil {
-		a.omsetScheduler.Start(5 * time.Minute)
-	}
-
 	engine := a.router.Init()
 
 	a.server = &http.Server{
@@ -187,9 +146,6 @@ func (a *App) Start(port string) error {
 }
 
 func (a *App) Shutdown() {
-	if a.omsetScheduler != nil {
-		a.omsetScheduler.Stop()
-	}
 	close(a.shutdown)
 }
 
@@ -218,7 +174,6 @@ type repositories struct {
 	productRecipeRepo              *repository.ProductRecipeRepository
 	vendorRepo                     *repository.VendorRepositoryImpl
 	purchaseOrderRepo              *repository.PurchaseOrderRepositoryImpl
-	purchaseCategoryRepo           *repository.PurchaseCategoryRepositoryImpl
 	unitConverterRepo              *repository.IngredientUnitConverterRepositoryImpl
 	chartOfAccountTypeRepo         *repository.ChartOfAccountTypeRepositoryImpl
 	chartOfAccountRepo             *repository.ChartOfAccountRepositoryImpl
@@ -236,14 +191,7 @@ 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
-	productOutletPriceRepo         *repository.ProductOutletPriceRepositoryImpl
-	expenseRepo                    *repository.ExpenseRepositoryImpl
 }
 
 func (a *App) initRepositories() *repositories {
@@ -272,7 +220,6 @@ func (a *App) initRepositories() *repositories {
 		productRecipeRepo:              repository.NewProductRecipeRepository(a.db),
 		vendorRepo:                     repository.NewVendorRepositoryImpl(a.db),
 		purchaseOrderRepo:              repository.NewPurchaseOrderRepositoryImpl(a.db),
-		purchaseCategoryRepo:           repository.NewPurchaseCategoryRepositoryImpl(a.db),
 		unitConverterRepo:              repository.NewIngredientUnitConverterRepositoryImpl(a.db).(*repository.IngredientUnitConverterRepositoryImpl),
 		chartOfAccountTypeRepo:         repository.NewChartOfAccountTypeRepositoryImpl(a.db),
 		chartOfAccountRepo:             repository.NewChartOfAccountRepositoryImpl(a.db),
@@ -290,14 +237,7 @@ 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),
-		productOutletPriceRepo:         repository.NewProductOutletPriceRepositoryImpl(a.db),
-		expenseRepo:                    repository.NewExpenseRepositoryImpl(a.db),
 	}
 }
 
@@ -321,7 +261,6 @@ type processors struct {
 	productRecipeProcessor              *processor.ProductRecipeProcessorImpl
 	vendorProcessor                     *processor.VendorProcessorImpl
 	purchaseOrderProcessor              *processor.PurchaseOrderProcessorImpl
-	purchaseCategoryProcessor           *processor.PurchaseCategoryProcessorImpl
 	unitConverterProcessor              *processor.IngredientUnitConverterProcessorImpl
 	chartOfAccountTypeProcessor         *processor.ChartOfAccountTypeProcessorImpl
 	chartOfAccountProcessor             *processor.ChartOfAccountProcessorImpl
@@ -341,10 +280,6 @@ type processors struct {
 	otpProcessor                        processor.OtpProcessor
 	fileClient                          processor.FileClient
 	inventoryMovementService            service.InventoryMovementService
-	userDeviceProcessor                 *processor.UserDeviceProcessorImpl
-	notificationProcessor               *processor.NotificationProcessorImpl
-	productOutletPriceProcessor         processor.ProductOutletPriceProcessor
-	expenseProcessor                    *processor.ExpenseProcessorImpl
 }
 
 func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors {
@@ -359,21 +294,20 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		outletProcessor:                     processor.NewOutletProcessorImpl(repos.outletRepo),
 		outletSettingProcessor:              processor.NewOutletSettingProcessorImpl(repos.outletSettingRepo, repos.outletRepo),
 		categoryProcessor:                   processor.NewCategoryProcessorImpl(repos.categoryRepo),
-		productProcessor:                    processor.NewProductProcessorImpl(repos.productRepo, repos.categoryRepo, repos.productVariantRepo, repos.inventoryRepo, repos.outletRepo, repos.productOutletPriceRepo),
+		productProcessor:                    processor.NewProductProcessorImpl(repos.productRepo, repos.categoryRepo, repos.productVariantRepo, repos.inventoryRepo, repos.outletRepo),
 		productVariantProcessor:             processor.NewProductVariantProcessorImpl(repos.productVariantRepo, repos.productRepo),
 		inventoryProcessor:                  processor.NewInventoryProcessorImpl(repos.inventoryRepo, repos.productRepo, repos.outletRepo, repos.ingredientRepo, repos.inventoryMovementRepo),
-		orderProcessor:                      processor.NewOrderProcessorImpl(repos.orderRepo, repos.orderItemRepo, repos.paymentRepo, repos.paymentOrderItemRepo, repos.productRepo, repos.paymentMethodRepo, repos.inventoryRepo, repos.inventoryMovementRepo, repos.productVariantRepo, repos.outletRepo, repos.customerRepo, repos.txManager, repos.productRecipeRepo, repos.ingredientRepo, inventoryMovementService, repos.productOutletPriceRepo),
+		orderProcessor:                      processor.NewOrderProcessorImpl(repos.orderRepo, repos.orderItemRepo, repos.paymentRepo, repos.paymentOrderItemRepo, repos.productRepo, repos.paymentMethodRepo, repos.inventoryRepo, repos.inventoryMovementRepo, repos.productVariantRepo, repos.outletRepo, repos.customerRepo, repos.txManager, repos.productRecipeRepo, repos.ingredientRepo, inventoryMovementService),
 		paymentMethodProcessor:              processor.NewPaymentMethodProcessorImpl(repos.paymentMethodRepo),
 		fileProcessor:                       processor.NewFileProcessorImpl(repos.fileRepo, fileClient),
 		customerProcessor:                   processor.NewCustomerProcessor(repos.customerRepo),
-		analyticsProcessor:                  processor.NewAnalyticsProcessorImpl(repos.analyticsRepo, repos.expenseRepo),
+		analyticsProcessor:                  processor.NewAnalyticsProcessorImpl(repos.analyticsRepo),
 		tableProcessor:                      processor.NewTableProcessor(repos.tableRepo, repos.orderRepo),
 		unitProcessor:                       processor.NewUnitProcessor(repos.unitRepo),
 		ingredientProcessor:                 processor.NewIngredientProcessor(repos.ingredientRepo, repos.unitRepo, repos.ingredientCompositionRepo),
 		productRecipeProcessor:              processor.NewProductRecipeProcessor(repos.productRecipeRepo, repos.productRepo, repos.ingredientRepo),
 		vendorProcessor:                     processor.NewVendorProcessorImpl(repos.vendorRepo),
-		purchaseOrderProcessor:              processor.NewPurchaseOrderProcessorImpl(repos.purchaseOrderRepo, repos.vendorRepo, repos.ingredientRepo, repos.purchaseCategoryRepo, repos.unitRepo, repos.fileRepo, inventoryMovementService, repos.unitConverterRepo),
+		purchaseOrderProcessor:              processor.NewPurchaseOrderProcessorImpl(repos.purchaseOrderRepo, repos.vendorRepo, repos.ingredientRepo, repos.unitRepo, repos.fileRepo, inventoryMovementService, repos.unitConverterRepo),
-		purchaseCategoryProcessor:           processor.NewPurchaseCategoryProcessorImpl(repos.purchaseCategoryRepo),
 		unitConverterProcessor:              processor.NewIngredientUnitConverterProcessorImpl(repos.unitConverterRepo, repos.ingredientRepo, repos.unitRepo),
 		chartOfAccountTypeProcessor:         processor.NewChartOfAccountTypeProcessorImpl(repos.chartOfAccountTypeRepo),
 		chartOfAccountProcessor:             processor.NewChartOfAccountProcessorImpl(repos.chartOfAccountRepo, repos.chartOfAccountTypeRepo),
@@ -393,10 +327,6 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		otpProcessor:                        otpProcessor,
 		fileClient:                          fileClient,
 		inventoryMovementService:            inventoryMovementService,
-		userDeviceProcessor:                 processor.NewUserDeviceProcessorImpl(repos.userDeviceRepo),
-		notificationProcessor:               buildNotificationProcessor(cfg, repos),
-		productOutletPriceProcessor:         processor.NewProductOutletPriceProcessorImpl(repos.productOutletPriceRepo, repos.productRepo, repos.outletRepo),
-		expenseProcessor:                    processor.NewExpenseProcessorImpl(repos.expenseRepo, repos.purchaseCategoryRepo),
 	}
 }
 
@@ -422,7 +352,6 @@ type services struct {
 	productRecipeService              *service.ProductRecipeServiceImpl
 	vendorService                     *service.VendorServiceImpl
 	purchaseOrderService              *service.PurchaseOrderServiceImpl
-	purchaseCategoryService           service.PurchaseCategoryService
 	unitConverterService              *service.IngredientUnitConverterServiceImpl
 	chartOfAccountTypeService         service.ChartOfAccountTypeService
 	chartOfAccountService             service.ChartOfAccountService
@@ -434,15 +363,11 @@ type services struct {
 	customerAuthService               service.CustomerAuthService
 	customerPointsService             service.CustomerPointsService
 	spinGameService                   service.SpinGameService
-	userDeviceService                 service.UserDeviceService
-	notificationService               service.NotificationService
-	productOutletPriceService         service.ProductOutletPriceService
-	expenseService                    *service.ExpenseServiceImpl
 }
 
 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)
@@ -450,7 +375,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	productService := service.NewProductService(processors.productProcessor)
 	productVariantService := service.NewProductVariantService(processors.productVariantProcessor)
 	inventoryService := service.NewInventoryService(processors.inventoryProcessor)
-	orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo, processors.notificationProcessor, repos.userRepo) // Will be updated after orderIngredientTransactionService is created
+	orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager) // 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)
@@ -462,7 +387,6 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	productRecipeService := service.NewProductRecipeService(processors.productRecipeProcessor)
 	vendorService := service.NewVendorService(processors.vendorProcessor)
 	purchaseOrderService := service.NewPurchaseOrderService(processors.purchaseOrderProcessor)
-	purchaseCategoryService := service.NewPurchaseCategoryService(processors.purchaseCategoryProcessor)
 	unitConverterService := service.NewIngredientUnitConverterService(processors.unitConverterProcessor)
 	chartOfAccountTypeService := service.NewChartOfAccountTypeService(processors.chartOfAccountTypeProcessor)
 	chartOfAccountService := service.NewChartOfAccountService(processors.chartOfAccountProcessor)
@@ -474,11 +398,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, repos.sessionRepo, processors.notificationProcessor, repos.userRepo)
+	orderService = service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, orderIngredientTransactionService, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager)
 
 	return &services{
 		userService:                       service.NewUserService(processors.userProcessor),
@@ -502,7 +424,6 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		productRecipeService:              productRecipeService,
 		vendorService:                     vendorService,
 		purchaseOrderService:              purchaseOrderService,
-		purchaseCategoryService:           purchaseCategoryService,
 		unitConverterService:              unitConverterService,
 		chartOfAccountTypeService:         chartOfAccountTypeService,
 		chartOfAccountService:             chartOfAccountService,
@@ -514,10 +435,6 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		customerAuthService:               customerAuthService,
 		customerPointsService:             customerPointsService,
 		spinGameService:                   spinGameService,
-		userDeviceService:                 userDeviceService,
-		notificationService:               notificationService,
-		productOutletPriceService:         service.NewProductOutletPriceService(processors.productOutletPriceProcessor),
-		expenseService:                    service.NewExpenseService(processors.expenseProcessor),
 	}
 }
 
@@ -548,7 +465,6 @@ type validators struct {
 	tableValidator                      *validator.TableValidator
 	vendorValidator                     *validator.VendorValidatorImpl
 	purchaseOrderValidator              *validator.PurchaseOrderValidatorImpl
-	purchaseCategoryValidator           *validator.PurchaseCategoryValidatorImpl
 	unitConverterValidator              *validator.IngredientUnitConverterValidatorImpl
 	chartOfAccountTypeValidator         *validator.ChartOfAccountTypeValidatorImpl
 	chartOfAccountValidator             *validator.ChartOfAccountValidatorImpl
@@ -558,10 +474,6 @@ type validators struct {
 	rewardValidator                     validator.RewardValidator
 	campaignValidator                   validator.CampaignValidator
 	customerAuthValidator               validator.CustomerAuthValidator
-	userDeviceValidator                 *validator.UserDeviceValidatorImpl
-	notificationValidator               *validator.NotificationValidatorImpl
-	productOutletPriceValidator         *validator.ProductOutletPriceValidatorImpl
-	expenseValidator                    *validator.ExpenseValidatorImpl
 }
 
 func (a *App) initValidators() *validators {
@@ -580,7 +492,6 @@ func (a *App) initValidators() *validators {
 		tableValidator:                      validator.NewTableValidator(),
 		vendorValidator:                     validator.NewVendorValidator(),
 		purchaseOrderValidator:              validator.NewPurchaseOrderValidator(),
-		purchaseCategoryValidator:           validator.NewPurchaseCategoryValidator(),
 		unitConverterValidator:              validator.NewIngredientUnitConverterValidator().(*validator.IngredientUnitConverterValidatorImpl),
 		chartOfAccountTypeValidator:         validator.NewChartOfAccountTypeValidator().(*validator.ChartOfAccountTypeValidatorImpl),
 		chartOfAccountValidator:             validator.NewChartOfAccountValidator().(*validator.ChartOfAccountValidatorImpl),
@@ -590,32 +501,5 @@ func (a *App) initValidators() *validators {
 		rewardValidator:                     validator.NewRewardValidator(),
 		campaignValidator:                   validator.NewCampaignValidator(),
 		customerAuthValidator:               validator.NewCustomerAuthValidator(),
-		userDeviceValidator:                 validator.NewUserDeviceValidator(),
-		notificationValidator:               validator.NewNotificationValidator(),
-		productOutletPriceValidator:         validator.NewProductOutletPriceValidator(),
-		expenseValidator:                    validator.NewExpenseValidator(),
 	}
 }
-
-// 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,
-	)
-}

internal/client/fcm_client.go

@@ -1,142 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	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 struct {
-	messaging *messaging.Client
-}
-
-func NewFCMClient(cfg FCMConfig) (FCMClient, error) {
-	ctx := context.Background()
-
-	opt := option.WithCredentialsFile(cfg.GetCredentialsFile())
-
-	app, err := firebase.NewApp(ctx, &firebase.Config{
-		ProjectID: cfg.GetProjectID(),
-	}, opt)
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize firebase app: %w", err)
-	}
-
-	msgClient, err := app.Messaging(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize firebase messaging client: %w", err)
-	}
-
-	return &fcmClient{
-		messaging: msgClient,
-	}, nil
-}
-
-// 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)
-	}
-
-	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{
-		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)
-	if err != nil {
-		return fmt.Errorf("failed to send FCM multicast notification: %w", err)
-	}
-
-	if batchResp.FailureCount > 0 {
-		return fmt.Errorf("FCM multicast: %d/%d messages failed to send", batchResp.FailureCount, len(tokens))
-	}
-
-	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)
-	}
-
-	return nil
-}

internal/constants/error.go

@@ -40,28 +40,22 @@ const (
 	OutletServiceEntity                  = "outlet_service"
 	VendorServiceEntity                  = "vendor_service"
 	PurchaseOrderServiceEntity           = "purchase_order_service"
-	PurchaseCategoryServiceEntity        = "purchase_category_service"
 	IngredientUnitConverterServiceEntity = "ingredient_unit_converter_service"
 	IngredientCompositionServiceEntity   = "ingredient_composition_service"
 	TableEntity                          = "table"
 	// Gamification entities
-	CustomerPointsEntity            = "customer_points"
+	CustomerPointsEntity  = "customer_points"
-	CustomerTokensEntity            = "customer_tokens"
+	CustomerTokensEntity  = "customer_tokens"
-	TierEntity                      = "tier"
+	TierEntity            = "tier"
-	GameEntity                      = "game"
+	GameEntity            = "game"
-	GamePrizeEntity                 = "game_prize"
+	GamePrizeEntity       = "game_prize"
-	GamePlayEntity                  = "game_play"
+	GamePlayEntity        = "game_play"
-	OmsetTrackerEntity              = "omset_tracker"
+	OmsetTrackerEntity    = "omset_tracker"
-	RewardEntity                    = "reward"
+	RewardEntity          = "reward"
-	CampaignEntity                  = "campaign"
+	CampaignEntity        = "campaign"
-	CampaignRuleEntity              = "campaign_rule"
+	CampaignRuleEntity    = "campaign_rule"
-	CustomerEntity                  = "customer"
+	CustomerEntity        = "customer"
-	SpinGameHandlerEntity           = "spin_game_handler"
+	SpinGameHandlerEntity = "spin_game_handler"
-	UserDeviceServiceEntity         = "user_device_service"
-	NotificationServiceEntity       = "notification_service"
-	NotificationHandlerEntity       = "notification_handler"
-	ProductOutletPriceServiceEntity = "product_outlet_price_service"
-	ExpenseServiceEntity            = "expense_service"
 )
 
 var HttpErrorMap = map[string]int{

internal/constants/expense.go

@@ -1,28 +0,0 @@
-package constants
-
-type ExpenseStatus string
-
-const (
-	ExpenseStatusDraft    ExpenseStatus = "draft"
-	ExpenseStatusSent     ExpenseStatus = "sent"
-	ExpenseStatusApproved ExpenseStatus = "approved"
-	ExpenseStatusCancel   ExpenseStatus = "cancel"
-)
-
-func GetAllExpenseStatuses() []ExpenseStatus {
-	return []ExpenseStatus{
-		ExpenseStatusDraft,
-		ExpenseStatusSent,
-		ExpenseStatusApproved,
-		ExpenseStatusCancel,
-	}
-}
-
-func IsValidExpenseStatus(status ExpenseStatus) bool {
-	for _, validStatus := range GetAllExpenseStatuses() {
-		if status == validStatus {
-			return true
-		}
-	}
-	return false
-}

internal/constants/user.go

@@ -3,12 +3,10 @@ package constants
 type UserRole string
 
 const (
-	RoleAdmin      UserRole = "admin"
+	RoleAdmin   UserRole = "admin"
-	RoleManager    UserRole = "manager"
+	RoleManager UserRole = "manager"
-	RoleCashier    UserRole = "cashier"
+	RoleCashier UserRole = "cashier"
-	RoleWaiter     UserRole = "waiter"
+	RoleWaiter  UserRole = "waiter"
-	RoleOwner      UserRole = "owner"
-	RolePurchasing UserRole = "purchasing"
 )
 
 func GetAllUserRoles() []UserRole {
@@ -17,8 +15,6 @@ func GetAllUserRoles() []UserRole {
 		RoleManager,
 		RoleCashier,
 		RoleWaiter,
-		RoleOwner,
-		RolePurchasing,
 	}
 }
 

internal/contract/account_request.go

@@ -5,12 +5,12 @@ import (
 )
 
 type CreateAccountRequest struct {
-	ChartOfAccountID uuid.UUID `json:"chart_of_account_id" validate:"required"`
+	ChartOfAccountID uuid.UUID  `json:"chart_of_account_id" validate:"required"`
-	Name             string    `json:"name" validate:"required,min=1,max=255"`
+	Name             string     `json:"name" validate:"required,min=1,max=255"`
-	Number           string    `json:"number" validate:"required,min=1,max=50"`
+	Number           string     `json:"number" validate:"required,min=1,max=50"`
-	AccountType      string    `json:"account_type" validate:"required,oneof=cash wallet bank credit debit asset liability equity revenue expense"`
+	AccountType      string     `json:"account_type" validate:"required,oneof=cash wallet bank credit debit asset liability equity revenue expense"`
-	OpeningBalance   float64   `json:"opening_balance"`
+	OpeningBalance   float64    `json:"opening_balance"`
-	Description      *string   `json:"description"`
+	Description      *string    `json:"description"`
 }
 
 type UpdateAccountRequest struct {
@@ -24,21 +24,21 @@ type UpdateAccountRequest struct {
 }
 
 type AccountResponse struct {
-	ID               uuid.UUID               `json:"id"`
+	ID               uuid.UUID                 `json:"id"`
-	OrganizationID   uuid.UUID               `json:"organization_id"`
+	OrganizationID   uuid.UUID                 `json:"organization_id"`
-	OutletID         *uuid.UUID              `json:"outlet_id"`
+	OutletID         *uuid.UUID                `json:"outlet_id"`
-	ChartOfAccountID uuid.UUID               `json:"chart_of_account_id"`
+	ChartOfAccountID uuid.UUID                 `json:"chart_of_account_id"`
-	Name             string                  `json:"name"`
+	Name             string                    `json:"name"`
-	Number           string                  `json:"number"`
+	Number           string                    `json:"number"`
-	AccountType      string                  `json:"account_type"`
+	AccountType      string                    `json:"account_type"`
-	OpeningBalance   float64                 `json:"opening_balance"`
+	OpeningBalance   float64                   `json:"opening_balance"`
-	CurrentBalance   float64                 `json:"current_balance"`
+	CurrentBalance   float64                   `json:"current_balance"`
-	Description      *string                 `json:"description"`
+	Description      *string                   `json:"description"`
-	IsActive         bool                    `json:"is_active"`
+	IsActive         bool                      `json:"is_active"`
-	IsSystem         bool                    `json:"is_system"`
+	IsSystem         bool                      `json:"is_system"`
-	CreatedAt        string                  `json:"created_at"`
+	CreatedAt        string                    `json:"created_at"`
-	UpdatedAt        string                  `json:"updated_at"`
+	UpdatedAt        string                    `json:"updated_at"`
-	ChartOfAccount   *ChartOfAccountResponse `json:"chart_of_account,omitempty"`
+	ChartOfAccount   *ChartOfAccountResponse   `json:"chart_of_account,omitempty"`
 }
 
 type ListAccountsRequest struct {

internal/contract/analytics_contract.go

@@ -7,18 +7,17 @@ import (
 )
 
 type PaymentMethodAnalyticsRequest struct {
-	OrganizationID uuid.UUID `form:"organization_id"`
+	OrganizationID uuid.UUID  `form:"organization_id"`
-	OutletID       *string   `form:"outlet_id,omitempty"`
+	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
-	DateFrom       string    `form:"date_from" validate:"required"`
+	DateFrom       string     `form:"date_from" validate:"required"`
-	DateTo         string    `form:"date_to" validate:"required"`
+	DateTo         string     `form:"date_to" validate:"required"`
-	GroupBy        string    `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
+	GroupBy        string     `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
 // PaymentMethodAnalyticsResponse represents the response for payment method analytics
 type PaymentMethodAnalyticsResponse struct {
 	OrganizationID uuid.UUID                    `json:"organization_id"`
 	OutletID       *uuid.UUID                   `json:"outlet_id,omitempty"`
-	OutletName     *string                      `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                    `json:"date_from"`
 	DateTo         time.Time                    `json:"date_to"`
 	GroupBy        string                       `json:"group_by"`
@@ -46,16 +45,15 @@ type PaymentMethodAnalyticsData struct {
 
 type SalesAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
+	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
-	DateFrom       string  `form:"date_from" validate:"required"`
+	DateFrom       string     `form:"date_from" validate:"required"`
-	DateTo         string  `form:"date_to" validate:"required"`
+	DateTo         string     `form:"date_to" validate:"required"`
-	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
+	GroupBy        string     `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
 type SalesAnalyticsResponse struct {
 	OrganizationID uuid.UUID            `json:"organization_id"`
 	OutletID       *uuid.UUID           `json:"outlet_id,omitempty"`
-	OutletName     *string              `json:"outlet_name,omitempty"`
 	DateFrom       time.Time            `json:"date_from"`
 	DateTo         time.Time            `json:"date_to"`
 	GroupBy        string               `json:"group_by"`
@@ -85,85 +83,19 @@ type SalesAnalyticsData struct {
 	NetSales float64   `json:"net_sales"`
 }
 
-type PurchasingAnalyticsRequest struct {
-	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
-	DateFrom       string  `form:"date_from" validate:"required"`
-	DateTo         string  `form:"date_to" validate:"required"`
-	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
-}
-
-type PurchasingAnalyticsResponse struct {
-	OrganizationID uuid.UUID                  `json:"organization_id"`
-	OutletID       *uuid.UUID                 `json:"outlet_id,omitempty"`
-	OutletName     *string                    `json:"outlet_name,omitempty"`
-	DateFrom       time.Time                  `json:"date_from"`
-	DateTo         time.Time                  `json:"date_to"`
-	GroupBy        string                     `json:"group_by"`
-	Summary        PurchasingSummary          `json:"summary"`
-	Data           []PurchasingAnalyticsData  `json:"data"`
-	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
-	VendorData     []PurchasingVendorData     `json:"vendor_data"`
-}
-
-type PurchasingSummary struct {
-	TotalPurchases            float64 `json:"total_purchases"`
-	RawMaterialPurchases      float64 `json:"raw_material_purchases"`
-	ExpensePurchases          float64 `json:"expense_purchases"`
-	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
-	RawMaterialPurchaseOrders int64   `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64   `json:"expense_count"`
-	TotalQuantity             float64 `json:"total_quantity"`
-	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
-	TotalIngredients          int64   `json:"total_ingredients"`
-	TotalVendors              int64   `json:"total_vendors"`
-}
-
-type PurchasingAnalyticsData struct {
-	Date                      time.Time `json:"date"`
-	Purchases                 float64   `json:"purchases"`
-	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	ExpensePurchases          float64   `json:"expense_purchases"`
-	PurchaseOrders            int64     `json:"purchase_orders"`
-	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64     `json:"expense_count"`
-	Quantity                  float64   `json:"quantity"`
-	Ingredients               int64     `json:"ingredients"`
-	Vendors                   int64     `json:"vendors"`
-}
-
-type PurchasingIngredientData struct {
-	IngredientID       uuid.UUID `json:"ingredient_id"`
-	IngredientName     string    `json:"ingredient_name"`
-	Quantity           float64   `json:"quantity"`
-	TotalCost          float64   `json:"total_cost"`
-	AverageUnitCost    float64   `json:"average_unit_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-}
-
-type PurchasingVendorData struct {
-	VendorID           *uuid.UUID `json:"vendor_id"`
-	VendorName         string     `json:"vendor_name"`
-	TotalCost          float64    `json:"total_cost"`
-	PurchaseOrderCount int64      `json:"purchase_order_count"`
-	IngredientCount    int64      `json:"ingredient_count"`
-	Quantity           float64    `json:"quantity"`
-}
-
 // ProductAnalyticsRequest represents the request for product analytics
 type ProductAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
+	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
-	DateFrom       string  `form:"date_from" validate:"required"`
+	DateFrom       string     `form:"date_from" validate:"required"`
-	DateTo         string  `form:"date_to" validate:"required"`
+	DateTo         string     `form:"date_to" validate:"required"`
-	Limit          int     `form:"limit,default=1000" validate:"min=1,max=1000"`
+	Limit          int        `form:"limit,default=1000" validate:"min=1,max=1000"`
 }
 
 // ProductAnalyticsResponse represents the response for product analytics
 type ProductAnalyticsResponse struct {
 	OrganizationID uuid.UUID              `json:"organization_id"`
 	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
-	OutletName     *string                `json:"outlet_name,omitempty"`
 	DateFrom       time.Time              `json:"date_from"`
 	DateTo         time.Time              `json:"date_to"`
 	Data           []ProductAnalyticsData `json:"data"`
@@ -173,7 +105,6 @@ type ProductAnalyticsData struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
-	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -192,16 +123,15 @@ type ProductAnalyticsData struct {
 // ProductAnalyticsPerCategoryRequest represents the request for product analytics per category
 type ProductAnalyticsPerCategoryRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
+	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
-	DateFrom       string  `form:"date_from" validate:"required"`
+	DateFrom       string     `form:"date_from" validate:"required"`
-	DateTo         string  `form:"date_to" validate:"required"`
+	DateTo         string     `form:"date_to" validate:"required"`
 }
 
 // ProductAnalyticsPerCategoryResponse represents the response for product analytics per category
 type ProductAnalyticsPerCategoryResponse struct {
 	OrganizationID uuid.UUID                         `json:"organization_id"`
 	OutletID       *uuid.UUID                        `json:"outlet_id,omitempty"`
-	OutletName     *string                           `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                         `json:"date_from"`
 	DateTo         time.Time                         `json:"date_to"`
 	Data           []ProductAnalyticsPerCategoryData `json:"data"`
@@ -222,16 +152,15 @@ type ProductAnalyticsPerCategoryData struct {
 // DashboardAnalyticsRequest represents the request for dashboard analytics
 type DashboardAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
+	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
-	DateFrom       string  `form:"date_from" validate:"required"`
+	DateFrom       string     `form:"date_from" validate:"required"`
-	DateTo         string  `form:"date_to" validate:"required"`
+	DateTo         string     `form:"date_to" validate:"required"`
 }
 
 // DashboardAnalyticsResponse represents the response for dashboard analytics
 type DashboardAnalyticsResponse struct {
 	OrganizationID uuid.UUID                    `json:"organization_id"`
 	OutletID       *uuid.UUID                   `json:"outlet_id,omitempty"`
-	OutletName     *string                      `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                    `json:"date_from"`
 	DateTo         time.Time                    `json:"date_to"`
 	Overview       DashboardOverview            `json:"overview"`
@@ -242,58 +171,36 @@ type DashboardAnalyticsResponse struct {
 
 // DashboardOverview represents the overview data for dashboard
 type DashboardOverview struct {
-	TotalSales         float64 `json:"total_sales"`
+	TotalSales        float64 `json:"total_sales"`
-	TotalOrders        int64   `json:"total_orders"`
+	TotalOrders       int64   `json:"total_orders"`
-	AverageOrderValue  float64 `json:"average_order_value"`
+	AverageOrderValue float64 `json:"average_order_value"`
-	TotalCustomers     int64   `json:"total_customers"`
+	TotalCustomers    int64   `json:"total_customers"`
-	VoidedOrders       int64   `json:"voided_orders"`
+	VoidedOrders      int64   `json:"voided_orders"`
-	RefundedOrders     int64   `json:"refunded_orders"`
+	RefundedOrders    int64   `json:"refunded_orders"`
-	TotalItemSold      int64   `json:"total_item_sold"`
-	TotalLowStock      int64   `json:"total_low_stock"`
-	TotalProductActive int64   `json:"total_product_active"`
 }
 
+// ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
+	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
-	DateFrom       string  `form:"date_from" validate:"required"`
+	DateFrom       string     `form:"date_from" validate:"required"`
-	DateTo         string  `form:"date_to" validate:"required"`
+	DateTo         string     `form:"date_to" validate:"required"`
-	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
+	GroupBy        string     `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
+// ProfitLossAnalyticsResponse represents the response for profit and loss analytics
 type ProfitLossAnalyticsResponse struct {
-	OrganizationID           uuid.UUID                `json:"organization_id"`
+	OrganizationID uuid.UUID           `json:"organization_id"`
-	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
+	OutletID       *uuid.UUID          `json:"outlet_id,omitempty"`
-	OutletName               *string                  `json:"outlet_name,omitempty"`
+	DateFrom       time.Time           `json:"date_from"`
-	DateFrom                 time.Time                `json:"date_from"`
+	DateTo         time.Time           `json:"date_to"`
-	DateTo                   time.Time                `json:"date_to"`
+	GroupBy        string              `json:"group_by"`
-	GroupBy                  string                   `json:"group_by"`
+	Summary        ProfitLossSummary   `json:"summary"`
-	Summary                  ProfitLossSummary        `json:"summary"`
+	Data           []ProfitLossData    `json:"data"`
-	Data                     []ProfitLossData         `json:"data"`
+	ProductData    []ProductProfitData `json:"product_data"`
-	ProductData              []ProductProfitData      `json:"product_data"`
-	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
-	Purchasing               ProfitLossPurchasing     `json:"purchasing"`
-	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
-	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
-}
-
-type ProfitLossPurchasing struct {
-	TodayTotal       float64                    `json:"today_total"`
-	MtdTotal         float64                    `json:"mtd_total"`
-	TodayRawMaterial float64                    `json:"today_raw_material"`
-	MtdRawMaterial   float64                    `json:"mtd_raw_material"`
-	TodayExpense     float64                    `json:"today_expense"`
-	MtdExpense       float64                    `json:"mtd_expense"`
-	Items            []ProfitLossPurchasingItem `json:"items"`
-}
-
-type ProfitLossPurchasingItem struct {
-	Date     time.Time `json:"date"`
-	Item     string    `json:"item"`
-	Quantity float64   `json:"quantity"`
-	Nominal  float64   `json:"nominal"`
 }
 
+// ProfitLossSummary represents the summary of profit and loss analytics
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -308,6 +215,7 @@ type ProfitLossSummary struct {
 	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
+// ProfitLossData represents individual profit and loss data point by time period
 type ProfitLossData struct {
 	Date              time.Time `json:"date"`
 	Revenue           float64   `json:"revenue"`
@@ -321,6 +229,7 @@ type ProfitLossData struct {
 	Orders            int64     `json:"orders"`
 }
 
+// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
 	ProductID         uuid.UUID `json:"product_id"`
 	ProductName       string    `json:"product_name"`
@@ -335,139 +244,3 @@ type ProductProfitData struct {
 	AverageCost       float64   `json:"average_cost"`
 	ProfitPerUnit     float64   `json:"profit_per_unit"`
 }
-
-type ProfitLossSummaryRow struct {
-	ID           string                 `json:"id"`
-	Label        string                 `json:"label"`
-	IsBold       bool                   `json:"is_bold"`
-	TodayNominal float64                `json:"today_nominal"`
-	TodayPct     float64                `json:"today_pct"`
-	MtdNominal   float64                `json:"mtd_nominal"`
-	MtdPct       float64                `json:"mtd_pct"`
-	SubItems     []ProfitLossSummaryRow `json:"sub_items,omitempty"`
-}
-
-type OperationalExpenseItem struct {
-	Item    string  `json:"item"`
-	Nominal float64 `json:"nominal"`
-}
-
-type ExclusiveSummaryPeriodRequest struct {
-	OrganizationID                uuid.UUID
-	OutletID                      *string `form:"outlet_id,omitempty"`
-	DateFrom                      string  `form:"date_from" validate:"required"`
-	DateTo                        string  `form:"date_to" validate:"required"`
-	ExcludeGajiStaffFromReimburse bool    `form:"exclude_gaji_staff_from_reimburse"`
-}
-
-type ExclusiveSummaryMonthlyRequest struct {
-	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
-	Month          string  `form:"month" validate:"required"`
-}
-
-type ExclusiveSummaryMTDRequest struct {
-	OrganizationID                uuid.UUID
-	OutletID                      *string `form:"outlet_id,omitempty"`
-	DateTo                        string  `form:"date_to" validate:"required"`
-	ExcludeGajiStaffFromReimburse bool    `form:"exclude_gaji_staff_from_reimburse"`
-}
-
-type ExclusiveSummaryPeriodResponse struct {
-	OrganizationID              uuid.UUID                           `json:"organization_id"`
-	OutletID                    *uuid.UUID                          `json:"outlet_id,omitempty"`
-	OutletName                  *string                             `json:"outlet_name,omitempty"`
-	Period                      ExclusiveSummaryPeriodRange         `json:"period"`
-	Summary                     ExclusiveSummaryPeriodSummary       `json:"summary"`
-	Reimburse                   ExclusiveSummaryReimburse           `json:"reimburse"`
-	HPPBreakdown                []ExclusiveSummaryCategoryBreakdown `json:"hpp_breakdown"`
-	OperationalExpenseBreakdown []ExclusiveSummaryCategoryBreakdown `json:"operational_expense_breakdown"`
-	DailySummary                []ExclusiveSummaryDailySummary      `json:"daily_summary"`
-	DailyTransactions           []ExclusiveSummaryDailyTransaction  `json:"daily_transactions"`
-}
-
-type ExclusiveSummaryPeriodRange struct {
-	DateFrom time.Time `json:"date_from"`
-	DateTo   time.Time `json:"date_to"`
-}
-
-type ExclusiveSummaryPeriodSummary struct {
-	Sales                    float64 `json:"sales"`
-	HPP                      float64 `json:"hpp"`
-	GrossProfit              float64 `json:"gross_profit"`
-	SalaryTotal              float64 `json:"salary_total"`
-	SalaryDW                 float64 `json:"salary_dw"`
-	SalaryStaff              float64 `json:"salary_staff"`
-	SalaryOther              float64 `json:"salary_other"`
-	OtherOperationalExpenses float64 `json:"other_operational_expenses"`
-	OperationalExpensesTotal float64 `json:"operational_expenses_total"`
-	TotalCost                float64 `json:"total_cost"`
-	NetProfit                float64 `json:"net_profit"`
-}
-
-type ExclusiveSummaryReimburse struct {
-	TotalCost           float64 `json:"total_cost"`
-	ExcludedSalaryStaff float64 `json:"excluded_salary_staff"`
-	TotalReimburse      float64 `json:"total_reimburse"`
-}
-
-type ExclusiveSummaryCategoryBreakdown struct {
-	CategoryCode string  `json:"category_code"`
-	CategoryName string  `json:"category_name"`
-	Amount       float64 `json:"amount"`
-	Percentage   float64 `json:"percentage"`
-}
-
-type ExclusiveSummaryDailySummary struct {
-	Date             time.Time `json:"date"`
-	TransactionCount int64     `json:"transaction_count"`
-	TotalCost        float64   `json:"total_cost"`
-}
-
-type ExclusiveSummaryDailyTransaction struct {
-	Date         time.Time `json:"date"`
-	CategoryCode string    `json:"category_code"`
-	CategoryName string    `json:"category_name"`
-	Description  string    `json:"description"`
-	Amount       float64   `json:"amount"`
-	Source       string    `json:"source"`
-}
-
-type ExclusiveSummaryMonthlyResponse struct {
-	OrganizationID uuid.UUID                       `json:"organization_id"`
-	OutletID       *uuid.UUID                      `json:"outlet_id,omitempty"`
-	OutletName     *string                         `json:"outlet_name,omitempty"`
-	Month          string                          `json:"month"`
-	Summary        ExclusiveSummaryMonthlySummary  `json:"summary"`
-	Periods        []ExclusiveSummaryMonthlyPeriod `json:"periods"`
-	BankBalance    []ExclusiveSummaryBankBalance   `json:"bank_balance"`
-}
-
-type ExclusiveSummaryMonthlySummary struct {
-	TotalSales               float64 `json:"total_sales"`
-	HPP                      float64 `json:"hpp"`
-	GrossProfit              float64 `json:"gross_profit"`
-	OperationalExpensesTotal float64 `json:"operational_expenses_total"`
-	TotalCost                float64 `json:"total_cost"`
-	NetProfit                float64 `json:"net_profit"`
-	NetProfitMargin          float64 `json:"net_profit_margin"`
-}
-
-type ExclusiveSummaryMonthlyPeriod struct {
-	Label       string    `json:"label"`
-	DateFrom    time.Time `json:"date_from"`
-	DateTo      time.Time `json:"date_to"`
-	Sales       float64   `json:"sales"`
-	HPP         float64   `json:"hpp"`
-	GrossProfit float64   `json:"gross_profit"`
-	GrossMargin float64   `json:"gross_margin"`
-}
-
-type ExclusiveSummaryBankBalance struct {
-	Bank             string   `json:"bank"`
-	OpeningBalance   *float64 `json:"opening_balance"`
-	IncomingMutation *float64 `json:"incoming_mutation"`
-	OutgoingMutation *float64 `json:"outgoing_mutation"`
-	ClosingBalance   *float64 `json:"closing_balance"`
-	Notes            *string  `json:"notes"`
-}

internal/contract/category_contract.go

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

internal/contract/expense_contract.go

@@ -1,161 +0,0 @@
-package contract
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type CreateExpenseRequest struct {
-	Receiver        string                     `json:"receiver" validate:"required"`
-	TransactionDate string                     `json:"transaction_date" validate:"required"`
-	CodeNumber      string                     `json:"code_number" validate:"required"`
-	OutletID        string                     `json:"outlet_id" validate:"required"`
-	Status          *string                    `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
-	Description     *string                    `json:"description,omitempty"`
-	Tax             float64                    `json:"tax"`
-	Total           float64                    `json:"total" validate:"required"`
-	Items           []CreateExpenseItemRequest `json:"items" validate:"required"`
-}
-
-type CreateExpenseItemRequest struct {
-	ChartOfAccountID   string  `json:"chart_of_account_id" validate:"required"`
-	PurchaseCategoryID string  `json:"purchase_category_id" validate:"required"`
-	Item               string  `json:"item" validate:"required"`
-	Description        *string `json:"description,omitempty"`
-	Amount             float64 `json:"amount" validate:"required"`
-}
-
-type UpdateExpenseRequest struct {
-	Receiver        *string                    `json:"receiver,omitempty"`
-	TransactionDate *string                    `json:"transaction_date,omitempty"`
-	CodeNumber      *string                    `json:"code_number,omitempty"`
-	OutletID        *string                    `json:"outlet_id,omitempty"`
-	Status          *string                    `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
-	Description     *string                    `json:"description,omitempty"`
-	Tax             *float64                   `json:"tax,omitempty"`
-	Total           *float64                   `json:"total,omitempty"`
-	Reserved1       *string                    `json:"reserved1,omitempty"`
-	Items           []UpdateExpenseItemRequest `json:"items,omitempty"`
-}
-
-type UpdateExpenseItemRequest struct {
-	ChartOfAccountID   *string  `json:"chart_of_account_id,omitempty"`
-	PurchaseCategoryID *string  `json:"purchase_category_id,omitempty"`
-	Item               *string  `json:"item,omitempty"`
-	Description        *string  `json:"description,omitempty"`
-	Amount             *float64 `json:"amount,omitempty"`
-}
-
-type ExpenseResponse struct {
-	ID              uuid.UUID             `json:"id"`
-	OrganizationID  uuid.UUID             `json:"organization_id"`
-	OutletID        uuid.UUID             `json:"outlet_id"`
-	Receiver        string                `json:"receiver"`
-	TransactionDate time.Time             `json:"transaction_date"`
-	CodeNumber      string                `json:"code_number"`
-	Status          string                `json:"status"`
-	Description     *string               `json:"description"`
-	Tax             float64               `json:"tax"`
-	Total           float64               `json:"total"`
-	Reserved1       *string               `json:"reserved1,omitempty"`
-	CreatedAt       time.Time             `json:"created_at"`
-	UpdatedAt       time.Time             `json:"updated_at"`
-	Items           []ExpenseItemResponse `json:"items,omitempty"`
-}
-
-type ExpenseItemResponse struct {
-	ID                   uuid.UUID                 `json:"id"`
-	ExpenseID            uuid.UUID                 `json:"expense_id"`
-	ChartOfAccountID     uuid.UUID                 `json:"chart_of_account_id"`
-	ChartOfAccountName   string                    `json:"chart_of_account_name,omitempty"`
-	PurchaseCategoryID   uuid.UUID                 `json:"purchase_category_id"`
-	PurchaseCategoryName string                    `json:"purchase_category_name,omitempty"`
-	PurchaseCategoryType string                    `json:"purchase_category_type,omitempty"`
-	PurchaseCategory     *PurchaseCategoryResponse `json:"purchase_category,omitempty"`
-	Item                 string                    `json:"item"`
-	Description          *string                   `json:"description"`
-	Amount               float64                   `json:"amount"`
-	CreatedAt            time.Time                 `json:"created_at"`
-	UpdatedAt            time.Time                 `json:"updated_at"`
-}
-
-type ListExpenseRequest struct {
-	Page      int    `json:"page" validate:"min=1"`
-	Limit     int    `json:"limit" validate:"min=1,max=100"`
-	Search    string `json:"search,omitempty"`
-	OutletID  string `json:"outlet_id,omitempty"`
-	Status    string `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
-	StartDate string `json:"start_date,omitempty"`
-	EndDate   string `json:"end_date,omitempty"`
-}
-
-type ListExpenseResponse struct {
-	Expenses   []ExpenseResponse `json:"expenses"`
-	TotalCount int               `json:"total_count"`
-	Page       int               `json:"page"`
-	Limit      int               `json:"limit"`
-	TotalPages int               `json:"total_pages"`
-}
-
-type ExpenseAnalyticsRequest struct {
-	OutletID *string `form:"outlet_id,omitempty"`
-	DateFrom string  `form:"date_from" validate:"required"`
-	DateTo   string  `form:"date_to" validate:"required"`
-	GroupBy  string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
-}
-
-type ExpenseAnalyticsResponse struct {
-	OrganizationID     uuid.UUID                            `json:"organization_id"`
-	OutletID           *uuid.UUID                           `json:"outlet_id,omitempty"`
-	DateFrom           time.Time                            `json:"date_from"`
-	DateTo             time.Time                            `json:"date_to"`
-	GroupBy            string                               `json:"group_by"`
-	Summary            ExpenseAnalyticsSummary              `json:"summary"`
-	Data               []ExpenseAnalyticsData               `json:"data"`
-	CategoryData       []ExpenseAnalyticsCategoryData       `json:"category_data"`
-	ChartOfAccountData []ExpenseAnalyticsChartOfAccountData `json:"chart_of_account_data"`
-	ItemData           []ExpenseAnalyticsItemData           `json:"item_data"`
-}
-
-type ExpenseAnalyticsSummary struct {
-	TotalExpenses       float64 `json:"total_expenses"`
-	TotalExpenseCount   int64   `json:"total_expense_count"`
-	TotalTax            float64 `json:"total_tax"`
-	AverageExpenseValue float64 `json:"average_expense_value"`
-	TotalCategories     int64   `json:"total_categories"`
-	TotalItems          int64   `json:"total_items"`
-}
-
-type ExpenseAnalyticsData struct {
-	Date         time.Time `json:"date"`
-	Expenses     float64   `json:"expenses"`
-	ExpenseCount int64     `json:"expense_count"`
-	Tax          float64   `json:"tax"`
-	Items        int64     `json:"items"`
-	Categories   int64     `json:"categories"`
-}
-
-type ExpenseAnalyticsCategoryData struct {
-	PurchaseCategoryID   uuid.UUID `json:"purchase_category_id"`
-	PurchaseCategoryName string    `json:"purchase_category_name"`
-	PurchaseCategoryType string    `json:"purchase_category_type"`
-	TotalAmount          float64   `json:"total_amount"`
-	ExpenseCount         int64     `json:"expense_count"`
-	ItemCount            int64     `json:"item_count"`
-}
-
-type ExpenseAnalyticsChartOfAccountData struct {
-	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
-	ChartOfAccountName string    `json:"chart_of_account_name"`
-	TotalAmount        float64   `json:"total_amount"`
-	ExpenseCount       int64     `json:"expense_count"`
-	ItemCount          int64     `json:"item_count"`
-}
-
-type ExpenseAnalyticsItemData struct {
-	Item         string  `json:"item"`
-	TotalAmount  float64 `json:"total_amount"`
-	ExpenseCount int64   `json:"expense_count"`
-	ItemCount    int64   `json:"item_count"`
-}

internal/contract/ingredient_unit_converter_contract.go

@@ -81,3 +81,4 @@ type IngredientUnitsResponse struct {
 	BaseUnitName   string          `json:"base_unit_name"`
 	Units          []*UnitResponse `json:"units"`
 }
+

internal/contract/inventory_contract.go

@@ -26,9 +26,9 @@ type AdjustInventoryRequest struct {
 }
 
 type RestockInventoryRequest struct {
-	OutletID uuid.UUID     `json:"outlet_id" validate:"required"`
+	OutletID uuid.UUID `json:"outlet_id" validate:"required"`
 	Items    []RestockItem `json:"items" validate:"required,min=1,dive"`
-	Reason   string        `json:"reason" validate:"required,min=1,max=255"`
+	Reason   string    `json:"reason" validate:"required,min=1,max=255"`
 }
 
 type RestockItem struct {
@@ -82,10 +82,10 @@ type InventoryAdjustmentResponse struct {
 }
 
 type RestockInventoryResponse struct {
-	OutletID    uuid.UUID           `json:"outlet_id"`
+	OutletID uuid.UUID `json:"outlet_id"`
-	Items       []RestockItemResult `json:"items"`
+	Items    []RestockItemResult `json:"items"`
-	Reason      string              `json:"reason"`
+	Reason   string    `json:"reason"`
-	RestockedAt time.Time           `json:"restocked_at"`
+	RestockedAt time.Time `json:"restocked_at"`
 }
 
 type RestockItemResult struct {

internal/contract/notification_contract.go

@@ -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"`
-}

internal/contract/order_contract.go

@@ -98,8 +98,6 @@ type OrderItemResponse struct {
 	ProductName        string                   `json:"product_name"`
 	ProductVariantID   *uuid.UUID               `json:"product_variant_id"`
 	ProductVariantName *string                  `json:"product_variant_name,omitempty"`
-	CategoryID         *uuid.UUID               `json:"category_id,omitempty"`
-	CategoryName       *string                  `json:"category_name,omitempty"`
 	Quantity           int                      `json:"quantity"`
 	UnitPrice          float64                  `json:"unit_price"`
 	TotalPrice         float64                  `json:"total_price"`
@@ -110,7 +108,6 @@ type OrderItemResponse struct {
 	CreatedAt          time.Time                `json:"created_at"`
 	UpdatedAt          time.Time                `json:"updated_at"`
 	PrinterType        string                   `json:"printer_type"`
-	PrintToChecker     bool                     `json:"print_to_checker"`
 	PaidQuantity       int                      `json:"paid_quantity"`
 }
 

internal/contract/product_contract.go

@@ -8,7 +8,6 @@ import (
 
 type CreateProductRequest struct {
 	CategoryID      uuid.UUID                     `json:"category_id" validate:"required"`
-	OutletID        *uuid.UUID                    `json:"outlet_id,omitempty"`
 	SKU             *string                       `json:"sku,omitempty"`
 	Name            string                        `json:"name" validate:"required,min=1,max=255"`
 	Description     *string                       `json:"description,omitempty"`
@@ -17,30 +16,28 @@ type CreateProductRequest struct {
 	BusinessType    *string                       `json:"business_type,omitempty"`
 	ImageURL        *string                       `json:"image_url,omitempty" validate:"omitempty,max=500"`
 	PrinterType     *string                       `json:"printer_type,omitempty" validate:"omitempty,max=50"`
-	PrintToChecker  *bool                         `json:"print_to_checker,omitempty"`
 	Metadata        map[string]interface{}        `json:"metadata,omitempty"`
 	IsActive        *bool                         `json:"is_active,omitempty"`
 	Variants        []CreateProductVariantRequest `json:"variants,omitempty"`
-	InitialStock    *int                          `json:"initial_stock,omitempty" validate:"omitempty,min=0"`
+	InitialStock    *int                          `json:"initial_stock,omitempty" validate:"omitempty,min=0"` // Initial stock quantity for all outlets
-	ReorderLevel    *int                          `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
+	ReorderLevel    *int                          `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Reorder level for all outlets
-	CreateInventory bool                          `json:"create_inventory,omitempty"`
+	CreateInventory bool                          `json:"create_inventory,omitempty"`                         // Whether to create inventory records for all outlets
 }
 
 type UpdateProductRequest struct {
-	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
+	CategoryID   *uuid.UUID             `json:"category_id,omitempty"`
-	CategoryID     *uuid.UUID             `json:"category_id,omitempty"`
+	SKU          *string                `json:"sku,omitempty"`
-	SKU            *string                `json:"sku,omitempty"`
+	Name         *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
-	Name           *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
+	Description  *string                `json:"description,omitempty"`
-	Description    *string                `json:"description,omitempty"`
+	Price        *float64               `json:"price,omitempty" validate:"omitempty,min=0"`
-	Price          *float64               `json:"price,omitempty" validate:"omitempty,min=0"`
+	Cost         *float64               `json:"cost,omitempty" validate:"omitempty,min=0"`
-	Cost           *float64               `json:"cost,omitempty" validate:"omitempty,min=0"`
+	BusinessType *string                `json:"business_type,omitempty"`
-	BusinessType   *string                `json:"business_type,omitempty"`
+	ImageURL     *string                `json:"image_url,omitempty" validate:"omitempty,max=500"`
-	ImageURL       *string                `json:"image_url,omitempty" validate:"omitempty,max=500"`
+	PrinterType  *string                `json:"printer_type,omitempty" validate:"omitempty,max=50"`
-	PrinterType    *string                `json:"printer_type,omitempty" validate:"omitempty,max=50"`
+	Metadata     map[string]interface{} `json:"metadata,omitempty"`
-	PrintToChecker *bool                  `json:"print_to_checker,omitempty"`
+	IsActive     *bool                  `json:"is_active,omitempty"`
-	Metadata       map[string]interface{} `json:"metadata,omitempty"`
+	// Stock management fields
-	IsActive       *bool                  `json:"is_active,omitempty"`
+	ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Update reorder level for all existing inventory records
-	ReorderLevel   *int                   `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
 }
 
 type CreateProductVariantRequest struct {
@@ -59,27 +56,24 @@ type UpdateProductVariantRequest struct {
 }
 
 type ProductResponse struct {
-	ID             uuid.UUID                    `json:"id"`
+	ID             uuid.UUID                `json:"id"`
-	OrganizationID uuid.UUID                    `json:"organization_id"`
+	OrganizationID uuid.UUID                `json:"organization_id"`
-	CategoryID     uuid.UUID                    `json:"category_id"`
+	CategoryID     uuid.UUID                `json:"category_id"`
-	CategoryName   string                       `json:"category_name"`
+	CategoryName   string                   `json:"category_name"`
-	SKU            *string                      `json:"sku"`
+	SKU            *string                  `json:"sku"`
-	Name           string                       `json:"name"`
+	Name           string                   `json:"name"`
-	Description    *string                      `json:"description"`
+	Description    *string                  `json:"description"`
-	Price          float64                      `json:"price"`
+	Price          float64                  `json:"price"`
-	OutletPrice    *float64                     `json:"outlet_price,omitempty"`
+	Cost           float64                  `json:"cost"`
-	OutletPrices   []ProductOutletPriceResponse `json:"outlet_prices,omitempty"`
+	BusinessType   string                   `json:"business_type"`
-	Cost           float64                      `json:"cost"`
+	ImageURL       *string                  `json:"image_url"`
-	BusinessType   string                       `json:"business_type"`
+	PrinterType    string                   `json:"printer_type"`
-	ImageURL       *string                      `json:"image_url"`
+	Metadata       map[string]interface{}   `json:"metadata"`
-	PrinterType    string                       `json:"printer_type"`
+	IsActive       bool                     `json:"is_active"`
-	PrintToChecker bool                         `json:"print_to_checker"`
+	CreatedAt      time.Time                `json:"created_at"`
-	Metadata       map[string]interface{}       `json:"metadata"`
+	UpdatedAt      time.Time                `json:"updated_at"`
-	IsActive       bool                         `json:"is_active"`
+	Category       *CategoryResponse        `json:"category,omitempty"`
-	CreatedAt      time.Time                    `json:"created_at"`
+	Variants       []ProductVariantResponse `json:"variants,omitempty"`
-	UpdatedAt      time.Time                    `json:"updated_at"`
-	Category       *CategoryResponse            `json:"category,omitempty"`
-	Variants       []ProductVariantResponse     `json:"variants,omitempty"`
 }
 
 type ProductVariantResponse struct {
@@ -95,7 +89,6 @@ type ProductVariantResponse struct {
 
 type ListProductsRequest struct {
 	OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
-	OutletID       *uuid.UUID `json:"outlet_id,omitempty"`
 	CategoryID     *uuid.UUID `json:"category_id,omitempty"`
 	BusinessType   string     `json:"business_type,omitempty"`
 	IsActive       *bool      `json:"is_active,omitempty"`

internal/contract/product_outlet_price_contract.go

@@ -1,46 +0,0 @@
-package contract
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type CreateProductOutletPriceRequest struct {
-	ProductID      uuid.UUID `json:"product_id" validate:"required"`
-	OutletID       uuid.UUID `json:"outlet_id" validate:"required"`
-	Price          float64   `json:"price" validate:"required,min=0"`
-	PrintToChecker bool      `json:"print_to_checker"`
-}
-
-type UpdateProductOutletPriceRequest struct {
-	Price          float64 `json:"price" validate:"required,min=0"`
-	PrintToChecker *bool   `json:"print_to_checker"`
-}
-
-type ProductOutletPriceResponse struct {
-	ID             uuid.UUID `json:"id,omitempty"`
-	ProductID      uuid.UUID `json:"product_id,omitempty"`
-	OutletID       uuid.UUID `json:"outlet_id"`
-	OutletName     string    `json:"outlet_name,omitempty"`
-	Price          float64   `json:"price"`
-	PrintToChecker bool      `json:"print_to_checker"`
-	CreatedAt      time.Time `json:"created_at,omitempty"`
-	UpdatedAt      time.Time `json:"updated_at,omitempty"`
-}
-
-type ListProductOutletPricesResponse struct {
-	Prices     []ProductOutletPriceResponse `json:"prices"`
-	TotalCount int                          `json:"total_count"`
-}
-
-type BulkCreateProductOutletPriceRequest struct {
-	ProductID uuid.UUID                                  `json:"product_id" validate:"required"`
-	Prices    []CreateProductOutletPricePerOutletRequest `json:"prices" validate:"required,dive"`
-}
-
-type CreateProductOutletPricePerOutletRequest struct {
-	OutletID       uuid.UUID `json:"outlet_id" validate:"required"`
-	Price          float64   `json:"price" validate:"required,min=0"`
-	PrintToChecker bool      `json:"print_to_checker"`
-}

internal/contract/product_recipe_contract.go

@@ -34,34 +34,34 @@ type BulkCreateProductRecipeRequest struct {
 
 // Response structures
 type ProductRecipeResponse struct {
-	ID              uuid.UUID                        `json:"id"`
+	ID              uuid.UUID                      `json:"id"`
-	OrganizationID  uuid.UUID                        `json:"organization_id"`
+	OrganizationID  uuid.UUID                      `json:"organization_id"`
-	OutletID        *uuid.UUID                       `json:"outlet_id"`
+	OutletID        *uuid.UUID                     `json:"outlet_id"`
-	ProductID       uuid.UUID                        `json:"product_id"`
+	ProductID       uuid.UUID                      `json:"product_id"`
-	VariantID       *uuid.UUID                       `json:"variant_id"`
+	VariantID       *uuid.UUID                     `json:"variant_id"`
-	IngredientID    uuid.UUID                        `json:"ingredient_id"`
+	IngredientID    uuid.UUID                      `json:"ingredient_id"`
-	Quantity        float64                          `json:"quantity"`
+	Quantity        float64                        `json:"quantity"`
-	WastePercentage float64                          `json:"waste_percentage"`
+	WastePercentage float64                        `json:"waste_percentage"`
-	CreatedAt       time.Time                        `json:"created_at"`
+	CreatedAt       time.Time                      `json:"created_at"`
-	UpdatedAt       time.Time                        `json:"updated_at"`
+	UpdatedAt       time.Time                      `json:"updated_at"`
-	Product         *ProductResponse                 `json:"product,omitempty"`
+	Product         *ProductResponse               `json:"product,omitempty"`
-	ProductVariant  *ProductVariantResponse          `json:"product_variant,omitempty"`
+	ProductVariant  *ProductVariantResponse        `json:"product_variant,omitempty"`
 	Ingredient      *ProductRecipeIngredientResponse `json:"ingredient,omitempty"`
 }
 
 type ProductRecipeIngredientResponse struct {
-	ID             uuid.UUID                  `json:"id"`
+	ID             uuid.UUID                 `json:"id"`
-	OrganizationID uuid.UUID                  `json:"organization_id"`
+	OrganizationID uuid.UUID                 `json:"organization_id"`
-	OutletID       *uuid.UUID                 `json:"outlet_id"`
+	OutletID       *uuid.UUID                `json:"outlet_id"`
-	Name           string                     `json:"name"`
+	Name           string                    `json:"name"`
-	UnitID         uuid.UUID                  `json:"unit_id"`
+	UnitID         uuid.UUID                 `json:"unit_id"`
-	Cost           float64                    `json:"cost"`
+	Cost           float64                   `json:"cost"`
-	Stock          float64                    `json:"stock"`
+	Stock          float64                   `json:"stock"`
-	IsSemiFinished bool                       `json:"is_semi_finished"`
+	IsSemiFinished bool                      `json:"is_semi_finished"`
-	IsActive       bool                       `json:"is_active"`
+	IsActive       bool                      `json:"is_active"`
-	Metadata       map[string]interface{}     `json:"metadata"`
+	Metadata       map[string]interface{}    `json:"metadata"`
-	CreatedAt      time.Time                  `json:"created_at"`
+	CreatedAt      time.Time                 `json:"created_at"`
-	UpdatedAt      time.Time                  `json:"updated_at"`
+	UpdatedAt      time.Time                 `json:"updated_at"`
 	Unit           *ProductRecipeUnitResponse `json:"unit,omitempty"`
 }
 
@@ -71,4 +71,4 @@ type ProductRecipeUnitResponse struct {
 	Symbol    string    `json:"symbol"`
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`
-}
+}

internal/contract/purchase_category_contract.go

@@ -1,57 +0,0 @@
-package contract
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type CreatePurchaseCategoryRequest struct {
-	ParentID  *uuid.UUID `json:"parent_id,omitempty"`
-	Code      *string    `json:"code,omitempty"`
-	Name      string     `json:"name" validate:"required,min=1,max=255"`
-	Type      string     `json:"type" validate:"required,oneof=raw_material expense"`
-	SortOrder *int       `json:"sort_order,omitempty"`
-	IsActive  *bool      `json:"is_active,omitempty"`
-}
-
-type UpdatePurchaseCategoryRequest struct {
-	ParentID  *uuid.UUID `json:"parent_id,omitempty"`
-	Code      *string    `json:"code,omitempty"`
-	Name      *string    `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
-	Type      *string    `json:"type,omitempty" validate:"omitempty,oneof=raw_material expense"`
-	SortOrder *int       `json:"sort_order,omitempty"`
-	IsActive  *bool      `json:"is_active,omitempty"`
-}
-
-type ListPurchaseCategoriesRequest struct {
-	ParentID *uuid.UUID `json:"parent_id,omitempty"`
-	Type     string     `json:"type,omitempty" validate:"omitempty,oneof=raw_material expense"`
-	Search   string     `json:"search,omitempty"`
-	IsActive *bool      `json:"is_active,omitempty"`
-	Page     int        `json:"page" validate:"required,min=1"`
-	Limit    int        `json:"limit" validate:"required,min=1,max=100"`
-}
-
-type PurchaseCategoryResponse struct {
-	ID             uuid.UUID  `json:"id"`
-	OrganizationID uuid.UUID  `json:"organization_id"`
-	PresetID       *uuid.UUID `json:"preset_id"`
-	ParentID       *uuid.UUID `json:"parent_id"`
-	Code           string     `json:"code"`
-	Name           string     `json:"name"`
-	Type           string     `json:"type"`
-	SortOrder      int        `json:"sort_order"`
-	IsSystem       bool       `json:"is_system"`
-	IsActive       bool       `json:"is_active"`
-	CreatedAt      time.Time  `json:"created_at"`
-	UpdatedAt      time.Time  `json:"updated_at"`
-}
-
-type ListPurchaseCategoriesResponse struct {
-	PurchaseCategories []PurchaseCategoryResponse `json:"purchase_categories"`
-	TotalCount         int                        `json:"total_count"`
-	Page               int                        `json:"page"`
-	Limit              int                        `json:"limit"`
-	TotalPages         int                        `json:"total_pages"`
-}

internal/contract/purchase_order_contract.go

@@ -7,10 +7,10 @@ import (
 )
 
 type CreatePurchaseOrderRequest struct {
-	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty" validate:"omitempty"`
+	VendorID          uuid.UUID                        `json:"vendor_id" validate:"required"`
 	PONumber          string                           `json:"po_number" validate:"required,min=1,max=50"`
-	TransactionDate   string                           `json:"transaction_date" validate:"required"`    // Format: YYYY-MM-DD
+	TransactionDate   string                           `json:"transaction_date" validate:"required"` // Format: YYYY-MM-DD
-	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
+	DueDate           string                           `json:"due_date" validate:"required"`          // Format: YYYY-MM-DD
 	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
 	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
 	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
@@ -19,19 +19,18 @@ type CreatePurchaseOrderRequest struct {
 }
 
 type CreatePurchaseOrderItemRequest struct {
-	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty" validate:"omitempty"`
+	IngredientID uuid.UUID `json:"ingredient_id" validate:"required"`
-	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id" validate:"required"`
+	Description  *string   `json:"description,omitempty" validate:"omitempty"`
-	Description        *string    `json:"description,omitempty" validate:"omitempty"`
+	Quantity     float64   `json:"quantity" validate:"required,gt=0"`
-	Quantity           *float64   `json:"quantity,omitempty" validate:"omitempty,gt=0"`
+	UnitID       uuid.UUID `json:"unit_id" validate:"required"`
-	UnitID             *uuid.UUID `json:"unit_id,omitempty" validate:"omitempty"`
+	Amount       float64   `json:"amount" validate:"required,gte=0"`
-	Amount             float64    `json:"amount" validate:"required,gte=0"`
 }
 
 type UpdatePurchaseOrderRequest struct {
 	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty" validate:"omitempty"`
 	PONumber          *string                          `json:"po_number,omitempty" validate:"omitempty,min=1,max=50"`
 	TransactionDate   *string                          `json:"transaction_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
-	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"`         // Format: YYYY-MM-DD
+	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"`          // Format: YYYY-MM-DD
 	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
 	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
 	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
@@ -40,23 +39,21 @@ type UpdatePurchaseOrderRequest struct {
 }
 
 type UpdatePurchaseOrderItemRequest struct {
-	ID                 *uuid.UUID `json:"id,omitempty"` // For existing items
+	ID           *uuid.UUID `json:"id,omitempty"` // For existing items
-	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty" validate:"omitempty"`
+	IngredientID *uuid.UUID `json:"ingredient_id,omitempty" validate:"omitempty"`
-	PurchaseCategoryID *uuid.UUID `json:"purchase_category_id,omitempty" validate:"omitempty"`
+	Description  *string    `json:"description,omitempty" validate:"omitempty"`
-	Description        *string    `json:"description,omitempty" validate:"omitempty"`
+	Quantity     *float64   `json:"quantity,omitempty" validate:"omitempty,gt=0"`
-	Quantity           *float64   `json:"quantity,omitempty" validate:"omitempty,gt=0"`
+	UnitID       *uuid.UUID `json:"unit_id,omitempty" validate:"omitempty"`
-	UnitID             *uuid.UUID `json:"unit_id,omitempty" validate:"omitempty"`
+	Amount       *float64   `json:"amount,omitempty" validate:"omitempty,gte=0"`
-	Amount             *float64   `json:"amount,omitempty" validate:"omitempty,gte=0"`
 }
 
 type PurchaseOrderResponse struct {
 	ID              uuid.UUID                         `json:"id"`
 	OrganizationID  uuid.UUID                         `json:"organization_id"`
-	OutletID        *uuid.UUID                        `json:"outlet_id"`
+	VendorID        uuid.UUID                         `json:"vendor_id"`
-	VendorID        *uuid.UUID                        `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         *time.Time                        `json:"due_date"`
+	DueDate         time.Time                         `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`
@@ -69,19 +66,17 @@ type PurchaseOrderResponse struct {
 }
 
 type PurchaseOrderItemResponse struct {
-	ID                 uuid.UUID                 `json:"id"`
+	ID              uuid.UUID           `json:"id"`
-	PurchaseOrderID    uuid.UUID                 `json:"purchase_order_id"`
+	PurchaseOrderID uuid.UUID           `json:"purchase_order_id"`
-	IngredientID       *uuid.UUID                `json:"ingredient_id"`
+	IngredientID    uuid.UUID           `json:"ingredient_id"`
-	PurchaseCategoryID uuid.UUID                 `json:"purchase_category_id"`
+	Description     *string             `json:"description"`
-	Description        *string                   `json:"description"`
+	Quantity        float64             `json:"quantity"`
-	Quantity           *float64                  `json:"quantity"`
+	UnitID          uuid.UUID           `json:"unit_id"`
-	UnitID             *uuid.UUID                `json:"unit_id"`
+	Amount          float64             `json:"amount"`
-	Amount             float64                   `json:"amount"`
+	CreatedAt       time.Time           `json:"created_at"`
-	CreatedAt          time.Time                 `json:"created_at"`
+	UpdatedAt       time.Time           `json:"updated_at"`
-	UpdatedAt          time.Time                 `json:"updated_at"`
+	Ingredient      *IngredientResponse `json:"ingredient,omitempty"`
-	Ingredient         *IngredientResponse       `json:"ingredient,omitempty"`
+	Unit            *UnitResponse       `json:"unit,omitempty"`
-	PurchaseCategory   *PurchaseCategoryResponse `json:"purchase_category,omitempty"`
-	Unit               *UnitResponse             `json:"unit,omitempty"`
 }
 
 type PurchaseOrderAttachmentResponse struct {

internal/contract/self_order_contract.go

@@ -1,82 +0,0 @@
-package contract
-
-import (
-	"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"`
-	CustomerName string                     `json:"customer_name" validate:"required"`
-	OrderType    string                     `json:"order_type" validate:"required,oneof=dine_in takeaway delivery"`
-	OrderItems   []SelfOrderCreateOrderItem `json:"order_items" validate:"required,min=1,dive"`
-}
-
-type SelfOrderCreateOrderItem struct {
-	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:"organization_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 []OrderResponse `json:"orders"`
-}

internal/contract/user_contract.go

@@ -12,14 +12,14 @@ type CreateUserRequest struct {
 	Name           string                 `json:"name" validate:"required,min=1,max=255"`
 	Email          string                 `json:"email" validate:"required,email"`
 	Password       string                 `json:"password" validate:"required,min=6"`
-	Role           string                 `json:"role" validate:"required,oneof=admin manager cashier waiter owner purchasing"`
+	Role           string                 `json:"role" validate:"required,oneof=admin manager cashier waiter"`
 	Permissions    map[string]interface{} `json:"permissions,omitempty"`
 }
 
 type UpdateUserRequest struct {
 	Name        *string                 `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
 	Email       *string                 `json:"email,omitempty" validate:"omitempty,email"`
-	Role        *string                 `json:"role,omitempty" validate:"omitempty,oneof=admin manager cashier waiter owner purchasing"`
+	Role        *string                 `json:"role,omitempty" validate:"omitempty,oneof=admin manager cashier waiter"`
 	OutletID    *uuid.UUID              `json:"outlet_id,omitempty"`
 	IsActive    *bool                   `json:"is_active,omitempty"`
 	Permissions *map[string]interface{} `json:"permissions,omitempty"`
@@ -35,23 +35,16 @@ type UpdateUserOutletRequest struct {
 }
 
 type LoginRequest struct {
-	Email      string `json:"email" validate:"required,email"`
+	Email    string `json:"email" validate:"required,email"`
-	Password   string `json:"password" validate:"required"`
+	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"`
 }
 
 type LoginResponse struct {
-	Token            string       `json:"token"`
+	Token              string       `json:"token"`
-	RefreshToken     string       `json:"refresh_token"`
+	RefreshToken       string       `json:"refresh_token"`
-	ExpiresAt        time.Time    `json:"expires_at"`
+	ExpiresAt          time.Time    `json:"expires_at"`
-	RefreshExpiresAt time.Time    `json:"refresh_expires_at"`
+	RefreshExpiresAt   time.Time    `json:"refresh_expires_at"`
-	User             UserResponse `json:"user"`
+	User               UserResponse `json:"user"`
 }
 
 type UserResponse struct {

internal/contract/user_device_contract.go

@@ -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"`
-}

internal/db/redis.go

@@ -1,30 +0,0 @@
-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
-}

internal/entities/analytics.go

@@ -27,64 +27,10 @@ type SalesAnalytics struct {
 	NetSales float64   `json:"net_sales"`
 }
 
-// PurchasingAnalytics represents purchasing analytics data
-type PurchasingAnalytics struct {
-	OutletName     *string                    `json:"outlet_name,omitempty"`
-	Summary        PurchasingSummary          `json:"summary"`
-	Data           []PurchasingAnalyticsData  `json:"data"`
-	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
-	VendorData     []PurchasingVendorData     `json:"vendor_data"`
-}
-
-type PurchasingSummary struct {
-	TotalPurchases            float64 `json:"total_purchases"`
-	RawMaterialPurchases      float64 `json:"raw_material_purchases"`
-	ExpensePurchases          float64 `json:"expense_purchases"`
-	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
-	RawMaterialPurchaseOrders int64   `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64   `json:"expense_count"`
-	TotalQuantity             float64 `json:"total_quantity"`
-	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
-	TotalIngredients          int64   `json:"total_ingredients"`
-	TotalVendors              int64   `json:"total_vendors"`
-}
-
-type PurchasingAnalyticsData struct {
-	Date                      time.Time `json:"date"`
-	Purchases                 float64   `json:"purchases"`
-	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	ExpensePurchases          float64   `json:"expense_purchases"`
-	PurchaseOrders            int64     `json:"purchase_orders"`
-	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64     `json:"expense_count"`
-	Quantity                  float64   `json:"quantity"`
-	Ingredients               int64     `json:"ingredients"`
-	Vendors                   int64     `json:"vendors"`
-}
-
-type PurchasingIngredientData struct {
-	IngredientID       uuid.UUID `json:"ingredient_id"`
-	IngredientName     string    `json:"ingredient_name"`
-	Quantity           float64   `json:"quantity"`
-	TotalCost          float64   `json:"total_cost"`
-	AverageUnitCost    float64   `json:"average_unit_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-}
-
-type PurchasingVendorData struct {
-	VendorID           *uuid.UUID `json:"vendor_id"`
-	VendorName         string     `json:"vendor_name"`
-	TotalCost          float64    `json:"total_cost"`
-	PurchaseOrderCount int64      `json:"purchase_order_count"`
-	IngredientCount    int64      `json:"ingredient_count"`
-	Quantity           float64    `json:"quantity"`
-}
-
 type ProductAnalytics struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
-	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -120,125 +66,56 @@ type DashboardOverview struct {
 	TotalCustomers    int64   `json:"total_customers"`
 	VoidedOrders      int64   `json:"voided_orders"`
 	RefundedOrders    int64   `json:"refunded_orders"`
-	TotalItemSold     int64   `json:"total_item_sold"`
-	TotalLowStock     int64   `json:"total_low_stock"`
-	TotalProductActive int64  `json:"total_product_active"`
 }
 
+// ProfitLossAnalytics represents profit and loss analytics data
 type ProfitLossAnalytics struct {
-	Summary                    ProfitLossSummary
+	Summary     ProfitLossSummary   `json:"summary"`
-	Data                       []ProfitLossData
+	Data        []ProfitLossData    `json:"data"`
-	ProductData                []ProductProfitData
+	ProductData []ProductProfitData `json:"product_data"`
-	TodayRevenue               float64
-	TodayCost                  float64
-	MtdRevenue                 float64
-	MtdCost                    float64
-	TodayPurchasing            float64
-	MtdPurchasing              float64
-	TodayPurchasingRawMaterial float64
-	MtdPurchasingRawMaterial   float64
-	TodayPurchasingExpense     float64
-	MtdPurchasingExpense       float64
-	PurchasingItems            []PurchasingItemDetail
-	TodayExpenseByCategory     []ExpenseCategoryTotal
-	MtdExpenseByCategory       []ExpenseCategoryTotal
-	OperationalExpenseItems    []OperationalExpenseItem
-}
-
-type PurchasingItemDetail struct {
-	Date     time.Time
-	Item     string
-	Quantity float64
-	Amount   float64
 }
 
+// ProfitLossSummary represents profit and loss summary data
 type ProfitLossSummary struct {
-	TotalRevenue       float64
+	TotalRevenue       float64 `json:"total_revenue"`
-	TotalCost          float64
+	TotalCost          float64 `json:"total_cost"`
-	GrossProfit        float64
+	GrossProfit        float64 `json:"gross_profit"`
-	GrossProfitMargin  float64
+	GrossProfitMargin  float64 `json:"gross_profit_margin"`
-	TotalTax           float64
+	TotalTax           float64 `json:"total_tax"`
-	TotalDiscount      float64
+	TotalDiscount      float64 `json:"total_discount"`
-	NetProfit          float64
+	NetProfit          float64 `json:"net_profit"`
-	NetProfitMargin    float64
+	NetProfitMargin    float64 `json:"net_profit_margin"`
-	TotalOrders        int64
+	TotalOrders        int64   `json:"total_orders"`
-	AverageProfit      float64
+	AverageProfit      float64 `json:"average_profit"`
-	ProfitabilityRatio float64
+	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
+// ProfitLossData represents profit and loss data by time period
 type ProfitLossData struct {
-	Date              time.Time
+	Date              time.Time `json:"date"`
-	Revenue           float64
+	Revenue           float64   `json:"revenue"`
-	Cost              float64
+	Cost              float64   `json:"cost"`
-	GrossProfit       float64
+	GrossProfit       float64   `json:"gross_profit"`
-	GrossProfitMargin float64
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
-	Tax               float64
+	Tax               float64   `json:"tax"`
-	Discount          float64
+	Discount          float64   `json:"discount"`
-	NetProfit         float64
+	NetProfit         float64   `json:"net_profit"`
-	NetProfitMargin   float64
+	NetProfitMargin   float64   `json:"net_profit_margin"`
-	Orders            int64
+	Orders            int64     `json:"orders"`
 }
 
+// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
-	ProductID         uuid.UUID
+	ProductID         uuid.UUID `json:"product_id"`
-	ProductName       string
+	ProductName       string    `json:"product_name"`
-	CategoryID        uuid.UUID
+	CategoryID        uuid.UUID `json:"category_id"`
-	CategoryName      string
+	CategoryName      string    `json:"category_name"`
-	QuantitySold      int64
+	QuantitySold      int64     `json:"quantity_sold"`
-	Revenue           float64
+	Revenue           float64   `json:"revenue"`
-	Cost              float64
+	Cost              float64   `json:"cost"`
-	GrossProfit       float64
+	GrossProfit       float64   `json:"gross_profit"`
-	GrossProfitMargin float64
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
-	AveragePrice      float64
+	AveragePrice      float64   `json:"average_price"`
-	AverageCost       float64
+	AverageCost       float64   `json:"average_cost"`
-	ProfitPerUnit     float64
+	ProfitPerUnit     float64   `json:"profit_per_unit"`
-}
-
-type ExpenseCategoryTotal struct {
-	CategoryName string
-	Amount       float64
-}
-
-type OperationalExpenseItem struct {
-	Item   string
-	Amount float64
-}
-
-type ExclusiveSummaryAnalytics struct {
-	SalesTotal                  float64
-	SalesCount                  int64
-	HPPBreakdown                []ExclusiveSummaryCategoryTotal
-	OperationalExpenseBreakdown []ExclusiveSummaryCategoryTotal
-	DailySummary                []ExclusiveSummaryDailySummary
-	DailyTransactions           []ExclusiveSummaryDailyTransaction
-}
-
-type ExclusiveSummaryCategoryTotal struct {
-	CategoryCode string
-	CategoryName string
-	Amount       float64
-}
-
-type ExclusiveSummaryDailySummary struct {
-	Date             time.Time
-	TransactionCount int64
-	TotalCost        float64
-}
-
-type ExclusiveSummaryDailyTransaction struct {
-	Date         time.Time
-	CategoryCode string
-	CategoryName string
-	Description  string
-	Amount       float64
-	Source       string
-}
-
-type ExclusiveSummaryBankBalance struct {
-	Bank             string
-	OpeningBalance   *float64
-	IncomingMutation *float64
-	OutgoingMutation *float64
-	ClosingBalance   *float64
-	Notes            *string
 }

internal/entities/category.go

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

internal/entities/entities.go

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

internal/entities/expense.go

@@ -1,90 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-
-	"gorm.io/gorm"
-)
-
-type Expense struct {
-	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID  uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id"`
-	OutletID        uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
-	Receiver        string    `gorm:"not null;size:255" json:"receiver"`
-	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date"`
-	CodeNumber      string    `gorm:"not null;size:50" json:"code_number"`
-	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status"`
-	Description     *string   `gorm:"type:text" json:"description"`
-	Tax             float64   `gorm:"type:decimal(15,2);not null;default:0" json:"tax"`
-	Total           float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total"`
-	Reserved1       *string   `gorm:"type:text" json:"reserved1"`
-	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Organization *Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Outlet       *Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
-	Items        []ExpenseItem `gorm:"foreignKey:ExpenseID" json:"items,omitempty"`
-}
-
-type ExpenseAnalytics struct {
-	Summary            ExpenseAnalyticsSummary
-	Data               []ExpenseAnalyticsData
-	CategoryData       []ExpenseAnalyticsCategoryData
-	ChartOfAccountData []ExpenseAnalyticsChartOfAccountData
-	ItemData           []ExpenseAnalyticsItemData
-}
-
-type ExpenseAnalyticsSummary struct {
-	TotalExpenses       float64
-	TotalExpenseCount   int64
-	TotalTax            float64
-	AverageExpenseValue float64
-	TotalCategories     int64
-	TotalItems          int64
-}
-
-type ExpenseAnalyticsData struct {
-	Date         time.Time
-	Expenses     float64
-	ExpenseCount int64
-	Tax          float64
-	Items        int64
-	Categories   int64
-}
-
-type ExpenseAnalyticsCategoryData struct {
-	PurchaseCategoryID   uuid.UUID
-	PurchaseCategoryName string
-	PurchaseCategoryType string
-	TotalAmount          float64
-	ExpenseCount         int64
-	ItemCount            int64
-}
-
-type ExpenseAnalyticsChartOfAccountData struct {
-	ChartOfAccountID   uuid.UUID
-	ChartOfAccountName string
-	TotalAmount        float64
-	ExpenseCount       int64
-	ItemCount          int64
-}
-
-type ExpenseAnalyticsItemData struct {
-	Item         string
-	TotalAmount  float64
-	ExpenseCount int64
-	ItemCount    int64
-}
-
-func (e *Expense) BeforeCreate(tx *gorm.DB) error {
-	if e.ID == uuid.Nil {
-		e.ID = uuid.New()
-	}
-	return nil
-}
-
-func (Expense) TableName() string {
-	return "expenses"
-}

internal/entities/expense_item.go

@@ -1,36 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-
-	"gorm.io/gorm"
-)
-
-type ExpenseItem struct {
-	ID                 uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	ExpenseID          uuid.UUID `gorm:"type:uuid;not null;index" json:"expense_id"`
-	ChartOfAccountID   uuid.UUID `gorm:"type:uuid;not null;index" json:"chart_of_account_id"`
-	PurchaseCategoryID uuid.UUID `gorm:"type:uuid;not null;index" json:"purchase_category_id"`
-	Item               string    `gorm:"not null;size:255" json:"item"`
-	Description        *string   `gorm:"type:text" json:"description"`
-	Amount             float64   `gorm:"type:decimal(15,2);not null;default:0" json:"amount"`
-	CreatedAt          time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt          time.Time `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Expense          *Expense          `gorm:"foreignKey:ExpenseID" json:"expense,omitempty"`
-	ChartOfAccount   *ChartOfAccount   `gorm:"foreignKey:ChartOfAccountID" json:"chart_of_account,omitempty"`
-	PurchaseCategory *PurchaseCategory `gorm:"foreignKey:PurchaseCategoryID" json:"purchase_category,omitempty"`
-}
-
-func (e *ExpenseItem) BeforeCreate(tx *gorm.DB) error {
-	if e.ID == uuid.Nil {
-		e.ID = uuid.New()
-	}
-	return nil
-}
-
-func (ExpenseItem) TableName() string {
-	return "expense_items"
-}

internal/entities/ingredient_unit_converter.go

@@ -39,3 +39,4 @@ func (iuc *IngredientUnitConverter) BeforeCreate() error {
 	}
 	return nil
 }
+

internal/entities/inventory_movement.go

@@ -36,36 +36,34 @@ const (
 )
 
 type InventoryMovement struct {
-	ID                  uuid.UUID                       `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ID               uuid.UUID                       `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID      uuid.UUID                       `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
+	OrganizationID   uuid.UUID                       `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
-	OutletID            uuid.UUID                       `gorm:"type:uuid;not null;index" json:"outlet_id" validate:"required"`
+	OutletID         uuid.UUID                       `gorm:"type:uuid;not null;index" json:"outlet_id" validate:"required"`
-	ItemID              uuid.UUID                       `gorm:"type:uuid;not null;index" json:"item_id" validate:"required"`
+	ItemID           uuid.UUID                       `gorm:"type:uuid;not null;index" json:"item_id" validate:"required"`
-	ItemType            string                          `gorm:"not null;size:20" json:"item_type" validate:"required"` // "PRODUCT" or "INGREDIENT"
+	ItemType         string                          `gorm:"not null;size:20" json:"item_type" validate:"required"` // "PRODUCT" or "INGREDIENT"
-	MovementType        InventoryMovementType           `gorm:"not null;size:50" json:"movement_type" validate:"required"`
+	MovementType     InventoryMovementType           `gorm:"not null;size:50" json:"movement_type" validate:"required"`
-	Quantity            float64                         `gorm:"type:decimal(12,3);not null" json:"quantity" validate:"required"`
+	Quantity         float64                         `gorm:"type:decimal(12,3);not null" json:"quantity" validate:"required"`
-	PreviousQuantity    float64                         `gorm:"type:decimal(12,3)" json:"previous_quantity"`
+	PreviousQuantity float64                         `gorm:"type:decimal(12,3)" json:"previous_quantity"`
-	NewQuantity         float64                         `gorm:"type:decimal(12,3)" json:"new_quantity"`
+	NewQuantity      float64                         `gorm:"type:decimal(12,3)" json:"new_quantity"`
-	UnitCost            float64                         `gorm:"type:decimal(12,2);default:0.00" json:"unit_cost"`
+	UnitCost         float64                         `gorm:"type:decimal(12,2);default:0.00" json:"unit_cost"`
-	TotalCost           float64                         `gorm:"type:decimal(12,2);default:0.00" json:"total_cost"`
+	TotalCost        float64                         `gorm:"type:decimal(12,2);default:0.00" json:"total_cost"`
-	ReferenceType       *InventoryMovementReferenceType `gorm:"size:50" json:"reference_type"`
+	ReferenceType    *InventoryMovementReferenceType `gorm:"size:50" json:"reference_type"`
-	ReferenceID         *uuid.UUID                      `gorm:"type:uuid;index" json:"reference_id"`
+	ReferenceID      *uuid.UUID                      `gorm:"type:uuid;index" json:"reference_id"`
-	PurchaseOrderItemID *uuid.UUID                      `gorm:"type:uuid;index" json:"purchase_order_item_id"`
+	OrderID          *uuid.UUID                      `gorm:"type:uuid;index" json:"order_id"`
-	OrderID             *uuid.UUID                      `gorm:"type:uuid;index" json:"order_id"`
+	PaymentID        *uuid.UUID                      `gorm:"type:uuid;index" json:"payment_id"`
-	PaymentID           *uuid.UUID                      `gorm:"type:uuid;index" json:"payment_id"`
+	UserID           uuid.UUID                       `gorm:"type:uuid;not null;index" json:"user_id" validate:"required"`
-	UserID              uuid.UUID                       `gorm:"type:uuid;not null;index" json:"user_id" validate:"required"`
+	Reason           *string                         `gorm:"size:255" json:"reason"`
-	Reason              *string                         `gorm:"size:255" json:"reason"`
+	Notes            *string                         `gorm:"type:text" json:"notes"`
-	Notes               *string                         `gorm:"type:text" json:"notes"`
+	Metadata         Metadata                        `gorm:"type:jsonb;default:'{}'" json:"metadata"`
-	Metadata            Metadata                        `gorm:"type:jsonb;default:'{}'" json:"metadata"`
+	CreatedAt        time.Time                       `gorm:"autoCreateTime" json:"created_at"`
-	CreatedAt           time.Time                       `gorm:"autoCreateTime" json:"created_at"`
 
-	Organization      Organization       `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Outlet            Outlet             `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
+	Outlet       Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
-	Product           *Product           `gorm:"foreignKey:ItemID" json:"product,omitempty"`
+	Product      *Product     `gorm:"foreignKey:ItemID" json:"product,omitempty"`
-	Ingredient        *Ingredient        `gorm:"foreignKey:ItemID" json:"ingredient,omitempty"`
+	Ingredient   *Ingredient  `gorm:"foreignKey:ItemID" json:"ingredient,omitempty"`
-	PurchaseOrderItem *PurchaseOrderItem `gorm:"foreignKey:PurchaseOrderItemID" json:"purchase_order_item,omitempty"`
+	Order        *Order       `gorm:"foreignKey:OrderID" json:"order,omitempty"`
-	Order             *Order             `gorm:"foreignKey:OrderID" json:"order,omitempty"`
+	Payment      *Payment     `gorm:"foreignKey:PaymentID" json:"payment,omitempty"`
-	Payment           *Payment           `gorm:"foreignKey:PaymentID" json:"payment,omitempty"`
+	User         User         `gorm:"foreignKey:UserID" json:"user,omitempty"`
-	User              User               `gorm:"foreignKey:UserID" json:"user,omitempty"`
 }
 
 func (im *InventoryMovement) BeforeCreate(tx *gorm.DB) error {

internal/entities/notification.go

@@ -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"
-}

internal/entities/order_ingredient_transaction.go

@@ -26,14 +26,14 @@ type OrderIngredientTransaction struct {
 	UpdatedAt        time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	// Relations
-	Organization   Organization    `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Organization   Organization   `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Outlet         *Outlet         `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
+	Outlet         *Outlet        `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
-	Order          Order           `gorm:"foreignKey:OrderID" json:"order,omitempty"`
+	Order          Order          `gorm:"foreignKey:OrderID" json:"order,omitempty"`
-	OrderItem      *OrderItem      `gorm:"foreignKey:OrderItemID" json:"order_item,omitempty"`
+	OrderItem      *OrderItem     `gorm:"foreignKey:OrderItemID" json:"order_item,omitempty"`
-	Product        Product         `gorm:"foreignKey:ProductID" json:"product,omitempty"`
+	Product        Product        `gorm:"foreignKey:ProductID" json:"product,omitempty"`
 	ProductVariant *ProductVariant `gorm:"foreignKey:ProductVariantID" json:"product_variant,omitempty"`
-	Ingredient     Ingredient      `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`
+	Ingredient     Ingredient     `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`
-	CreatedByUser  User            `gorm:"foreignKey:CreatedBy" json:"created_by_user,omitempty"`
+	CreatedByUser  User           `gorm:"foreignKey:CreatedBy" json:"created_by_user,omitempty"`
 }
 
 func (oit *OrderIngredientTransaction) BeforeCreate(tx *gorm.DB) error {

internal/entities/product.go

@@ -26,14 +26,13 @@ type Product struct {
 	CreatedAt      time.Time  `gorm:"autoCreateTime" json:"created_at"`
 	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
-	Organization        Organization         `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Organization       Organization        `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Category            Category             `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
+	Category           Category            `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
-	Unit                *Unit                `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
+	Unit               *Unit               `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
-	ProductVariants     []ProductVariant     `gorm:"foreignKey:ProductID" json:"variants,omitempty"`
+	ProductVariants    []ProductVariant    `gorm:"foreignKey:ProductID" json:"variants,omitempty"`
-	ProductRecipes      []ProductRecipe      `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
+	ProductRecipes []ProductRecipe `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
-	Inventory           []Inventory          `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
+	Inventory          []Inventory         `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
-	OrderItems          []OrderItem          `gorm:"foreignKey:ProductID" json:"order_items,omitempty"`
+	OrderItems         []OrderItem         `gorm:"foreignKey:ProductID" json:"order_items,omitempty"`
-	ProductOutletPrices []ProductOutletPrice `gorm:"foreignKey:ProductID" json:"product_outlet_prices,omitempty"`
 }
 
 func (p *Product) BeforeCreate(tx *gorm.DB) error {

internal/entities/product_ingredient.go

@@ -7,15 +7,15 @@ import (
 )
 
 type ProductIngredient struct {
-	ID              uuid.UUID  `json:"id" db:"id"`
+	ID               uuid.UUID  `json:"id" db:"id"`
-	OrganizationID  uuid.UUID  `json:"organization_id" db:"organization_id"`
+	OrganizationID   uuid.UUID  `json:"organization_id" db:"organization_id"`
-	OutletID        *uuid.UUID `json:"outlet_id" db:"outlet_id"`
+	OutletID         *uuid.UUID `json:"outlet_id" db:"outlet_id"`
-	ProductID       uuid.UUID  `json:"product_id" db:"product_id"`
+	ProductID        uuid.UUID  `json:"product_id" db:"product_id"`
-	IngredientID    uuid.UUID  `json:"ingredient_id" db:"ingredient_id"`
+	IngredientID     uuid.UUID  `json:"ingredient_id" db:"ingredient_id"`
-	Quantity        float64    `json:"quantity" db:"quantity"`
+	Quantity         float64    `json:"quantity" db:"quantity"`
-	WastePercentage float64    `json:"waste_percentage" db:"waste_percentage"`
+	WastePercentage  float64    `json:"waste_percentage" db:"waste_percentage"`
-	CreatedAt       time.Time  `json:"created_at" db:"created_at"`
+	CreatedAt        time.Time  `json:"created_at" db:"created_at"`
-	UpdatedAt       time.Time  `json:"updated_at" db:"updated_at"`
+	UpdatedAt        time.Time  `json:"updated_at" db:"updated_at"`
 
 	// Relations
 	Product    *Product    `json:"product,omitempty"`

internal/entities/product_outlet_price.go

@@ -1,32 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type ProductOutletPrice struct {
-	ID             uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	ProductID      uuid.UUID `gorm:"type:uuid;not null;index" json:"product_id"`
-	OutletID       uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
-	Price          float64   `gorm:"type:decimal(10,2);not null" json:"price"`
-	PrintToChecker bool      `gorm:"not null;default:true" json:"print_to_checker"`
-	CreatedAt      time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt      time.Time `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Product Product `gorm:"foreignKey:ProductID" json:"product,omitempty"`
-	Outlet  Outlet  `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
-}
-
-func (p *ProductOutletPrice) BeforeCreate(tx *gorm.DB) error {
-	if p.ID == uuid.Nil {
-		p.ID = uuid.New()
-	}
-	return nil
-}
-
-func (ProductOutletPrice) TableName() string {
-	return "product_outlet_prices"
-}

internal/entities/product_recipe.go

@@ -34,4 +34,4 @@ func (pr *ProductRecipe) BeforeCreate(tx *gorm.DB) error {
 
 func (ProductRecipe) TableName() string {
 	return "product_recipes"
-}
+}

internal/entities/purchase_category.go

@@ -1,71 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type PurchaseCategoryType string
-
-const (
-	PurchaseCategoryTypeRawMaterial PurchaseCategoryType = "raw_material"
-	PurchaseCategoryTypeExpense     PurchaseCategoryType = "expense"
-)
-
-type PurchaseCategoryPreset struct {
-	ID        uuid.UUID            `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	ParentID  *uuid.UUID           `gorm:"type:uuid;index" json:"parent_id"`
-	Code      string               `gorm:"not null;unique;size:100" json:"code"`
-	Name      string               `gorm:"not null;size:255" json:"name"`
-	Type      PurchaseCategoryType `gorm:"not null;size:20" json:"type"`
-	SortOrder int                  `gorm:"not null;default:0" json:"sort_order"`
-	IsActive  bool                 `gorm:"not null;default:true" json:"is_active"`
-	CreatedAt time.Time            `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt time.Time            `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Parent *PurchaseCategoryPreset `gorm:"foreignKey:ParentID" json:"parent,omitempty"`
-}
-
-func (p *PurchaseCategoryPreset) BeforeCreate(tx *gorm.DB) error {
-	if p.ID == uuid.Nil {
-		p.ID = uuid.New()
-	}
-	return nil
-}
-
-func (PurchaseCategoryPreset) TableName() string {
-	return "purchase_category_presets"
-}
-
-type PurchaseCategory struct {
-	ID             uuid.UUID            `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID uuid.UUID            `gorm:"type:uuid;not null;index" json:"organization_id"`
-	PresetID       *uuid.UUID           `gorm:"type:uuid;index" json:"preset_id"`
-	ParentID       *uuid.UUID           `gorm:"type:uuid;index" json:"parent_id"`
-	Code           string               `gorm:"not null;size:100" json:"code"`
-	Name           string               `gorm:"not null;size:255" json:"name"`
-	Type           PurchaseCategoryType `gorm:"not null;size:20" json:"type"`
-	SortOrder      int                  `gorm:"not null;default:0" json:"sort_order"`
-	IsSystem       bool                 `gorm:"not null;default:false" json:"is_system"`
-	IsActive       bool                 `gorm:"not null;default:true" json:"is_active"`
-	CreatedAt      time.Time            `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt      time.Time            `gorm:"autoUpdateTime" json:"updated_at"`
-
-	Organization *Organization           `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Preset       *PurchaseCategoryPreset `gorm:"foreignKey:PresetID" json:"preset,omitempty"`
-	Parent       *PurchaseCategory       `gorm:"foreignKey:ParentID" json:"parent,omitempty"`
-	Children     []PurchaseCategory      `gorm:"foreignKey:ParentID" json:"children,omitempty"`
-}
-
-func (c *PurchaseCategory) BeforeCreate(tx *gorm.DB) error {
-	if c.ID == uuid.Nil {
-		c.ID = uuid.New()
-	}
-	return nil
-}
-
-func (PurchaseCategory) TableName() string {
-	return "purchase_categories"
-}

internal/entities/purchase_order.go

@@ -9,22 +9,20 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID  uuid.UUID  `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
+	OrganizationID  uuid.UUID `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
-	OutletID        *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id" validate:"omitempty"`
+	VendorID        uuid.UUID `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
-	VendorID        *uuid.UUID `gorm:"type:uuid" json:"vendor_id" validate:"omitempty"`
+	PONumber        string    `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
-	PONumber        string     `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
+	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
-	TransactionDate time.Time  `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
+	DueDate         time.Time `gorm:"type:date;not null" json:"due_date" validate:"required"`
-	DueDate         *time.Time `gorm:"type:date" json:"due_date" validate:"omitempty"`
+	Reference       *string   `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
-	Reference       *string    `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
+	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
-	Status          string     `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
+	Message         *string   `gorm:"type:text" json:"message" validate:"omitempty"`
-	Message         *string    `gorm:"type:text" json:"message" validate:"omitempty"`
+	TotalAmount     float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
-	TotalAmount     float64    `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
+	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
-	CreatedAt       time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
-	UpdatedAt       time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization *Organization             `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Outlet       *Outlet                   `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
 	Vendor       *Vendor                   `gorm:"foreignKey:VendorID" json:"vendor,omitempty"`
 	Items        []PurchaseOrderItem       `gorm:"foreignKey:PurchaseOrderID" json:"items,omitempty"`
 	Attachments  []PurchaseOrderAttachment `gorm:"foreignKey:PurchaseOrderID" json:"attachments,omitempty"`
@@ -43,21 +41,19 @@ func (PurchaseOrder) TableName() string {
 }
 
 type PurchaseOrderItem struct {
-	ID                 uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	PurchaseOrderID    uuid.UUID  `gorm:"type:uuid;not null" json:"purchase_order_id" validate:"required"`
+	PurchaseOrderID uuid.UUID `gorm:"type:uuid;not null" json:"purchase_order_id" validate:"required"`
-	IngredientID       *uuid.UUID `gorm:"type:uuid" json:"ingredient_id" validate:"omitempty"`
+	IngredientID    uuid.UUID `gorm:"type:uuid;not null" json:"ingredient_id" validate:"required"`
-	PurchaseCategoryID uuid.UUID  `gorm:"type:uuid;not null;index" json:"purchase_category_id" validate:"required"`
+	Description     *string   `gorm:"type:text" json:"description" validate:"omitempty"`
-	Description        *string    `gorm:"type:text" json:"description" validate:"omitempty"`
+	Quantity        float64   `gorm:"type:decimal(10,3);not null" json:"quantity" validate:"required,gt=0"`
-	Quantity           *float64   `gorm:"type:decimal(10,3)" json:"quantity" validate:"omitempty,gt=0"`
+	UnitID          uuid.UUID `gorm:"type:uuid;not null" json:"unit_id" validate:"required"`
-	UnitID             *uuid.UUID `gorm:"type:uuid" json:"unit_id" validate:"omitempty"`
+	Amount          float64   `gorm:"type:decimal(15,2);not null" json:"amount" validate:"required,gte=0"`
-	Amount             float64    `gorm:"type:decimal(15,2);not null" json:"amount" validate:"required,gte=0"`
+	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
-	CreatedAt          time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
-	UpdatedAt          time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
-	PurchaseOrder    *PurchaseOrder    `gorm:"foreignKey:PurchaseOrderID" json:"purchase_order,omitempty"`
+	PurchaseOrder *PurchaseOrder `gorm:"foreignKey:PurchaseOrderID" json:"purchase_order,omitempty"`
-	Ingredient       *Ingredient       `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`
+	Ingredient    *Ingredient    `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`
-	PurchaseCategory *PurchaseCategory `gorm:"foreignKey:PurchaseCategoryID" json:"purchase_category,omitempty"`
+	Unit          *Unit          `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
-	Unit             *Unit             `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
 }
 
 func (poi *PurchaseOrderItem) BeforeCreate(tx *gorm.DB) error {

internal/entities/table.go

@@ -1,7 +1,6 @@
 package entities
 
 import (
-	"apskel-pos-be/internal/pkg/tabletoken"
 	"time"
 
 	"github.com/google/uuid"
@@ -13,7 +12,6 @@ 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"`
@@ -35,9 +33,6 @@ 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
 }
 

internal/entities/user.go

@@ -13,12 +13,10 @@ import (
 type UserRole string
 
 const (
-	RoleAdmin      UserRole = "admin"
+	RoleAdmin   UserRole = "admin"
-	RoleManager    UserRole = "manager"
+	RoleManager UserRole = "manager"
-	RoleCashier    UserRole = "cashier"
+	RoleCashier UserRole = "cashier"
-	RoleWaiter     UserRole = "waiter"
+	RoleWaiter  UserRole = "waiter"
-	RoleOwner      UserRole = "owner"
-	RolePurchasing UserRole = "purchasing"
 )
 
 type Permissions map[string]interface{}
@@ -48,7 +46,7 @@ type User struct {
 	Name           string       `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
 	Email          string       `gorm:"uniqueIndex;not null;size:255" json:"email" validate:"required,email"`
 	PasswordHash   string       `gorm:"not null;size:255" json:"-"`
-	Role           UserRole     `gorm:"not null;size:50" json:"role" validate:"required,oneof=admin manager cashier waiter owner purchasing"`
+	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"`
 	CreatedAt      time.Time    `gorm:"autoCreateTime" json:"created_at"`

internal/entities/user_device.go

@@ -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"
-}

internal/handler/analytics_handler.go

@@ -8,7 +8,6 @@ import (
 	"apskel-pos-be/internal/util"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 type AnalyticsHandler struct {
@@ -26,17 +25,6 @@ func NewAnalyticsHandler(
 	}
 }
 
-func (h *AnalyticsHandler) resolveOutletID(c *gin.Context, contextOutletID uuid.UUID) *string {
-	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
-		return &outletIDStr
-	}
-	if contextOutletID != uuid.Nil {
-		s := contextOutletID.String()
-		return &s
-	}
-	return nil
-}
-
 func (h *AnalyticsHandler) GetPaymentMethodAnalytics(c *gin.Context) {
 	ctx := c.Request.Context()
 	contextInfo := appcontext.FromGinContext(ctx)
@@ -48,7 +36,7 @@ func (h *AnalyticsHandler) GetPaymentMethodAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
+	req.OutletID = &contextInfo.OutletID
 	modelReq := transformer.PaymentMethodAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetPaymentMethodAnalytics(ctx, modelReq)
@@ -72,7 +60,7 @@ func (h *AnalyticsHandler) GetSalesAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
+	req.OutletID = &contextInfo.OutletID
 	modelReq := transformer.SalesAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetSalesAnalytics(ctx, modelReq)
@@ -85,30 +73,6 @@ func (h *AnalyticsHandler) GetSalesAnalytics(c *gin.Context) {
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetSalesAnalytics")
 }
 
-func (h *AnalyticsHandler) GetPurchasingAnalytics(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.PurchasingAnalyticsRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetPurchasingAnalytics", err.Error())}), "AnalyticsHandler::GetPurchasingAnalytics")
-		return
-	}
-
-	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
-	modelReq := transformer.PurchasingAnalyticsContractToModel(&req)
-
-	response, err := h.analyticsService.GetPurchasingAnalytics(ctx, modelReq)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetPurchasingAnalytics", err.Error())}), "AnalyticsHandler::GetPurchasingAnalytics")
-		return
-	}
-
-	contractResp := transformer.PurchasingAnalyticsModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetPurchasingAnalytics")
-}
-
 func (h *AnalyticsHandler) GetProductAnalytics(c *gin.Context) {
 	ctx := c.Request.Context()
 	contextInfo := appcontext.FromGinContext(ctx)
@@ -120,7 +84,7 @@ func (h *AnalyticsHandler) GetProductAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
+	req.OutletID = &contextInfo.OutletID
 	modelReq := transformer.ProductAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetProductAnalytics(ctx, modelReq)
@@ -144,7 +108,7 @@ func (h *AnalyticsHandler) GetProductAnalyticsPerCategory(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
+	req.OutletID = &contextInfo.OutletID
 	modelReq := transformer.ProductAnalyticsPerCategoryContractToModel(&req)
 
 	response, err := h.analyticsService.GetProductAnalyticsPerCategory(ctx, modelReq)
@@ -168,7 +132,7 @@ func (h *AnalyticsHandler) GetDashboardAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
+	req.OutletID = &contextInfo.OutletID
 	modelReq := transformer.DashboardAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetDashboardAnalytics(ctx, modelReq)
@@ -192,7 +156,6 @@ func (h *AnalyticsHandler) GetProfitLossAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq, err := transformer.ProfitLossAnalyticsContractToModel(&req)
 	if err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetProfitLossAnalytics", err.Error())}), "AnalyticsHandler::GetProfitLossAnalytics")
@@ -210,87 +173,3 @@ func (h *AnalyticsHandler) GetProfitLossAnalytics(c *gin.Context) {
 	contractResp := transformer.ProfitLossAnalyticsModelToContract(response)
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetProfitLossAnalytics")
 }
-
-func (h *AnalyticsHandler) GetExclusiveSummaryPeriod(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.ExclusiveSummaryPeriodRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryPeriod", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryPeriod")
-		return
-	}
-
-	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
-	modelReq, err := transformer.ExclusiveSummaryPeriodContractToModel(&req)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryPeriod", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryPeriod")
-		return
-	}
-
-	response, err := h.analyticsService.GetExclusiveSummaryPeriod(ctx, modelReq)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetExclusiveSummaryPeriod", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryPeriod")
-		return
-	}
-
-	contractResp := transformer.ExclusiveSummaryPeriodModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetExclusiveSummaryPeriod")
-}
-
-func (h *AnalyticsHandler) GetExclusiveSummaryMonthly(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.ExclusiveSummaryMonthlyRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryMonthly", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMonthly")
-		return
-	}
-
-	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
-	modelReq, err := transformer.ExclusiveSummaryMonthlyContractToModel(&req)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryMonthly", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMonthly")
-		return
-	}
-
-	response, err := h.analyticsService.GetExclusiveSummaryMonthly(ctx, modelReq)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetExclusiveSummaryMonthly", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMonthly")
-		return
-	}
-
-	contractResp := transformer.ExclusiveSummaryMonthlyModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetExclusiveSummaryMonthly")
-}
-
-func (h *AnalyticsHandler) GetExclusiveSummaryMTD(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.ExclusiveSummaryMTDRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
-		return
-	}
-
-	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
-	modelReq, err := transformer.ExclusiveSummaryMTDContractToModel(&req)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
-		return
-	}
-
-	response, err := h.analyticsService.GetExclusiveSummaryMTD(ctx, modelReq)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
-		return
-	}
-
-	contractResp := transformer.ExclusiveSummaryPeriodModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetExclusiveSummaryMTD")
-}

internal/handler/category_handler.go

@@ -36,7 +36,7 @@ func (h *CategoryHandler) CreateCategory(c *gin.Context) {
 	contextInfo := appcontext.FromGinContext(ctx)
 
 	var req contract.CreateCategoryRequest
-	fmt.Printf("CategoryHandler::CreateCategory -> Request: %+v\n", req)
+		fmt.Printf("CategoryHandler::CreateCategory -> Request: %+v\n", req)
 	if err := c.ShouldBindJSON(&req); err != nil {
 		logger.FromContext(c.Request.Context()).WithError(err).Error("CategoryHandler::CreateCategory -> request binding failed")
 		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
@@ -44,11 +44,6 @@ func (h *CategoryHandler) CreateCategory(c *gin.Context) {
 		return
 	}
 
-	// Inject outlet_id from context if user has one and request doesn't provide it
-	if req.OutletID == nil && contextInfo.OutletID != uuid.Nil {
-		req.OutletID = &contextInfo.OutletID
-	}
-
 	validationError, validationErrorCode := h.categoryValidator.ValidateCreateCategoryRequest(&req)
 	if validationError != nil {
 		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
@@ -154,11 +149,6 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
 		OrganizationID: &contextInfo.OrganizationID,
 	}
 
-	// Inject outlet_id from context if user has one
-	if contextInfo.OutletID != uuid.Nil {
-		req.OutletID = &contextInfo.OutletID
-	}
-
 	// Parse query parameters
 	if pageStr := c.Query("page"); pageStr != "" {
 		if page, err := strconv.Atoi(pageStr); err == nil {
@@ -186,11 +176,6 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
 		}
 	}
 
-	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
-		if outletID, err := uuid.Parse(outletIDStr); err == nil {
-			req.OutletID = &outletID
-		}
-	}
 	validationError, validationErrorCode := h.categoryValidator.ValidateListCategoriesRequest(req)
 	if validationError != nil {
 		logger.FromContext(ctx).WithError(validationError).Error("CategoryHandler::ListCategories -> request validation failed")

internal/handler/chart_of_account_type_handler.go

@@ -99,7 +99,7 @@ func (h *ChartOfAccountTypeHandler) DeleteChartOfAccountType(c *gin.Context) {
 func (h *ChartOfAccountTypeHandler) ListChartOfAccountTypes(c *gin.Context) {
 	// Parse query parameters
 	filters := make(map[string]interface{})
-
+	
 	if isActive := c.Query("is_active"); isActive != "" {
 		if isActiveBool, err := strconv.ParseBool(isActive); err == nil {
 			filters["is_active"] = isActiveBool

internal/handler/common.go

@@ -1,8 +1,6 @@
 package handler
 
 import (
-	"apskel-pos-be/internal/logger"
-	"fmt"
 	"net/http"
 	"time"
 )
@@ -49,7 +47,7 @@ func (m *CommonMiddleware) Recovery(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		defer func() {
 			if err := recover(); err != nil {
-				logger.FromContext(r.Context()).Error("Recovery", fmt.Sprintf("panic recovered: %v", err))
+
 				http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 			}
 		}()

internal/handler/expense_handler.go

@@ -1,229 +0,0 @@
-package handler
-
-import (
-	"apskel-pos-be/internal/appcontext"
-	"apskel-pos-be/internal/util"
-	"strconv"
-
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/logger"
-	"apskel-pos-be/internal/service"
-	"apskel-pos-be/internal/validator"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-type ExpenseHandler struct {
-	expenseService   service.ExpenseService
-	expenseValidator validator.ExpenseValidator
-}
-
-func NewExpenseHandler(
-	expenseService service.ExpenseService,
-	expenseValidator validator.ExpenseValidator,
-) *ExpenseHandler {
-	return &ExpenseHandler{
-		expenseService:   expenseService,
-		expenseValidator: expenseValidator,
-	}
-}
-
-func (h *ExpenseHandler) CreateExpense(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.CreateExpenseRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::CreateExpense -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::CreateExpense")
-		return
-	}
-
-	validationError, validationErrorCode := h.expenseValidator.ValidateCreateExpenseRequest(&req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::CreateExpense")
-		return
-	}
-
-	expenseResponse := h.expenseService.CreateExpense(ctx, contextInfo, &req)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::CreateExpense -> Failed to create expense from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::CreateExpense")
-}
-
-func (h *ExpenseHandler) UpdateExpense(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	expenseIDStr := c.Param("id")
-	expenseID, err := uuid.Parse(expenseIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::UpdateExpense -> Invalid expense ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
-		return
-	}
-
-	var req contract.UpdateExpenseRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::UpdateExpense -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "Invalid request body")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
-		return
-	}
-
-	validationError, validationErrorCode := h.expenseValidator.ValidateUpdateExpenseRequest(&req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
-		return
-	}
-
-	expenseResponse := h.expenseService.UpdateExpense(ctx, contextInfo, expenseID, &req)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::UpdateExpense -> Failed to update expense from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::UpdateExpense")
-}
-
-func (h *ExpenseHandler) DeleteExpense(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	expenseIDStr := c.Param("id")
-	expenseID, err := uuid.Parse(expenseIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::DeleteExpense -> Invalid expense ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::DeleteExpense")
-		return
-	}
-
-	expenseResponse := h.expenseService.DeleteExpense(ctx, contextInfo, expenseID)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::DeleteExpense -> Failed to delete expense from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::DeleteExpense")
-}
-
-func (h *ExpenseHandler) GetExpense(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	expenseIDStr := c.Param("id")
-	expenseID, err := uuid.Parse(expenseIDStr)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::GetExpense -> Invalid expense ID")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::GetExpense")
-		return
-	}
-
-	expenseResponse := h.expenseService.GetExpenseByID(ctx, contextInfo, expenseID)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::GetExpense -> Failed to get expense from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::GetExpense")
-}
-
-func (h *ExpenseHandler) ListExpenses(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	req := &contract.ListExpenseRequest{
-		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 search := c.Query("search"); search != "" {
-		req.Search = search
-	}
-
-	if status := c.Query("status"); status != "" {
-		req.Status = status
-	}
-
-	// Prioritize outlet_id from context (e.g. outlet-scoped user),
-	// fall back to query param if context has no outlet.
-	if contextInfo.OutletID != uuid.Nil {
-		req.OutletID = contextInfo.OutletID.String()
-	} else if outletID := c.Query("outlet_id"); outletID != "" {
-		req.OutletID = outletID
-	}
-
-	if startDate := c.Query("start_date"); startDate != "" {
-		req.StartDate = startDate
-	}
-
-	if endDate := c.Query("end_date"); endDate != "" {
-		req.EndDate = endDate
-	}
-
-	validationError, validationErrorCode := h.expenseValidator.ValidateListExpenseRequest(req)
-	if validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::ListExpenses")
-		return
-	}
-
-	expenseResponse := h.expenseService.ListExpenses(ctx, contextInfo, req)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::ListExpenses -> Failed to list expenses from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::ListExpenses")
-}
-
-func (h *ExpenseHandler) GetExpenseAnalytics(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.ExpenseAnalyticsRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::GetExpenseAnalytics -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::GetExpenseAnalytics")
-		return
-	}
-
-	if contextInfo.OutletID != uuid.Nil {
-		outletID := contextInfo.OutletID.String()
-		req.OutletID = &outletID
-	} else if outletID := c.Query("outlet_id"); outletID != "" {
-		req.OutletID = &outletID
-	}
-
-	expenseResponse := h.expenseService.GetExpenseAnalytics(ctx, contextInfo, &req)
-	if expenseResponse.HasErrors() {
-		errorResp := expenseResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::GetExpenseAnalytics -> Failed to get expense analytics from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::GetExpenseAnalytics")
-}

internal/handler/ingredient_unit_converter_handler.go

@@ -275,3 +275,4 @@ func (h *IngredientUnitConverterHandler) GetUnitsByIngredientID(c *gin.Context)
 
 	util.HandleResponse(c.Writer, c.Request, unitsResponse, "IngredientUnitConverterHandler::GetUnitsByIngredientID")
 }
+

internal/handler/notification_handler.go

@@ -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")
-}

internal/handler/order_handler.go

@@ -137,10 +137,6 @@ func (h *OrderHandler) ListOrders(c *gin.Context) {
 	}
 
 	modelReq.OrganizationID = &contextInfo.OrganizationID
-	if modelReq.OutletID == nil && contextInfo.OutletID != uuid.Nil {
-		modelReq.OutletID = &contextInfo.OutletID
-	}
-
 	response, err := h.orderService.ListOrders(c.Request.Context(), modelReq)
 	if err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "OrderHandler::ListOrders", err.Error())}), "OrderHandler::ListOrders")

internal/handler/product_handler.go

@@ -60,7 +60,6 @@ func (h *ProductHandler) CreateProduct(c *gin.Context) {
 
 func (h *ProductHandler) UpdateProduct(c *gin.Context) {
 	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
 
 	productIDStr := c.Param("id")
 	productID, err := uuid.Parse(productIDStr)
@@ -86,7 +85,7 @@ func (h *ProductHandler) UpdateProduct(c *gin.Context) {
 		return
 	}
 
-	productResponse := h.productService.UpdateProduct(ctx, contextInfo, productID, &req)
+	productResponse := h.productService.UpdateProduct(ctx, productID, &req)
 	if productResponse.HasErrors() {
 		errorResp := productResponse.GetErrors()[0]
 		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::UpdateProduct -> Failed to update product from service")
@@ -118,7 +117,6 @@ func (h *ProductHandler) DeleteProduct(c *gin.Context) {
 
 func (h *ProductHandler) GetProduct(c *gin.Context) {
 	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
 
 	productIDStr := c.Param("id")
 	productID, err := uuid.Parse(productIDStr)
@@ -129,7 +127,7 @@ func (h *ProductHandler) GetProduct(c *gin.Context) {
 		return
 	}
 
-	productResponse := h.productService.GetProductByID(ctx, productID, contextInfo.OutletID)
+	productResponse := h.productService.GetProductByID(ctx, productID)
 	if productResponse.HasErrors() {
 		errorResp := productResponse.GetErrors()[0]
 		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::GetProduct -> Failed to get product from service")
@@ -186,97 +184,6 @@ func (h *ProductHandler) ListProducts(c *gin.Context) {
 		}
 	}
 
-	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
-		if outletID, err := uuid.Parse(outletIDStr); err == nil {
-			req.OutletID = &outletID
-		}
-	} else if contextInfo.OutletID != uuid.Nil {
-		req.OutletID = &contextInfo.OutletID
-	}
-
-	if minPriceStr := c.Query("min_price"); minPriceStr != "" {
-		if minPrice, err := strconv.ParseFloat(minPriceStr, 64); err == nil {
-			req.MinPrice = &minPrice
-		}
-	}
-
-	if maxPriceStr := c.Query("max_price"); maxPriceStr != "" {
-		if maxPrice, err := strconv.ParseFloat(maxPriceStr, 64); err == nil {
-			req.MaxPrice = &maxPrice
-		}
-	}
-
-	validationError, validationErrorCode := h.productValidator.ValidateListProductsRequest(req)
-	if validationError != nil {
-		logger.FromContext(ctx).WithError(validationError).Error("ProductHandler::ListProducts -> request validation failed")
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductHandler::ListProducts")
-		return
-	}
-
-	productsResponse := h.productService.ListProducts(ctx, req)
-	if productsResponse.HasErrors() {
-		errorResp := productsResponse.GetErrors()[0]
-		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::ListProducts -> Failed to list products from service")
-	}
-
-	util.HandleResponse(c.Writer, c.Request, productsResponse, "ProductHandler::ListProducts")
-}
-
-func (h *ProductHandler) ListProductAll(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	req := &contract.ListProductsRequest{
-		Page:           1,
-		Limit:          10,
-		OrganizationID: &contextInfo.OrganizationID,
-	}
-
-	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 search := c.Query("search"); search != "" {
-		req.Search = search
-	}
-
-	if businessType := c.Query("business_type"); businessType != "" {
-		req.BusinessType = businessType
-	}
-
-	if organizationIDStr := c.Query("organization_id"); organizationIDStr != "" {
-		if organizationID, err := uuid.Parse(organizationIDStr); err == nil {
-			req.OrganizationID = &organizationID
-		}
-	}
-
-	if categoryIDStr := c.Query("category_id"); categoryIDStr != "" {
-		if categoryID, err := uuid.Parse(categoryIDStr); err == nil {
-			req.CategoryID = &categoryID
-		}
-	}
-
-	if isActiveStr := c.Query("is_active"); isActiveStr != "" {
-		if isActive, err := strconv.ParseBool(isActiveStr); err == nil {
-			req.IsActive = &isActive
-		}
-	}
-
-	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
-		if outletID, err := uuid.Parse(outletIDStr); err == nil {
-			req.OutletID = &outletID
-		}
-	}
-
 	if minPriceStr := c.Query("min_price"); minPriceStr != "" {
 		if minPrice, err := strconv.ParseFloat(minPriceStr, 64); err == nil {
 			req.MinPrice = &minPrice

internal/handler/product_outlet_price_handler.go

@@ -1,135 +0,0 @@
-package handler
-
-import (
-	"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 ProductOutletPriceHandler struct {
-	service   service.ProductOutletPriceService
-	validator validator.ProductOutletPriceValidator
-}
-
-func NewProductOutletPriceHandler(svc service.ProductOutletPriceService, v validator.ProductOutletPriceValidator) *ProductOutletPriceHandler {
-	return &ProductOutletPriceHandler{
-		service:   svc,
-		validator: v,
-	}
-}
-
-func (h *ProductOutletPriceHandler) Upsert(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	var req contract.CreateProductOutletPriceRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ProductOutletPriceHandler::Upsert -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Upsert")
-		return
-	}
-
-	if validationErr, code := h.validator.ValidateCreateRequest(&req); validationErr != nil {
-		validationResponseError := contract.NewResponseError(code, constants.RequestEntity, validationErr.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Upsert")
-		return
-	}
-
-	resp := h.service.Upsert(ctx, &req)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::Upsert")
-}
-
-func (h *ProductOutletPriceHandler) GetByProductAndOutlet(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	productIDStr := c.Param("product_id")
-	productID, err := uuid.Parse(productIDStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid product ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProductAndOutlet")
-		return
-	}
-
-	outletIDStr := c.Param("outlet_id")
-	outletID, err := uuid.Parse(outletIDStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid outlet ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProductAndOutlet")
-		return
-	}
-
-	resp := h.service.GetByProductAndOutlet(ctx, productID, outletID)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByProductAndOutlet")
-}
-
-func (h *ProductOutletPriceHandler) GetByProduct(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	productIDStr := c.Param("product_id")
-	productID, err := uuid.Parse(productIDStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid product ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProduct")
-		return
-	}
-
-	resp := h.service.GetByProduct(ctx, productID)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByProduct")
-}
-
-func (h *ProductOutletPriceHandler) GetByOutlet(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	outletIDStr := c.Param("outlet_id")
-	outletID, err := uuid.Parse(outletIDStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid outlet ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByOutlet")
-		return
-	}
-
-	resp := h.service.GetByOutlet(ctx, outletID)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByOutlet")
-}
-
-func (h *ProductOutletPriceHandler) Delete(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	idStr := c.Param("id")
-	id, err := uuid.Parse(idStr)
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Delete")
-		return
-	}
-
-	resp := h.service.Delete(ctx, id)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::Delete")
-}
-
-func (h *ProductOutletPriceHandler) BulkUpsert(c *gin.Context) {
-	ctx := c.Request.Context()
-
-	var req contract.BulkCreateProductOutletPriceRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("ProductOutletPriceHandler::BulkUpsert -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::BulkUpsert")
-		return
-	}
-
-	if validationErr, code := h.validator.ValidateBulkCreateRequest(&req); validationErr != nil {
-		validationResponseError := contract.NewResponseError(code, constants.RequestEntity, validationErr.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::BulkUpsert")
-		return
-	}
-
-	resp := h.service.BulkUpsert(ctx, &req)
-	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::BulkUpsert")
-}

internal/handler/product_recipe_handler.go

@@ -219,4 +219,4 @@ func (h *ProductRecipeHandler) BulkCreate(c *gin.Context) {
 	}
 
 	c.JSON(http.StatusCreated, contract.BuildSuccessResponse(recipes))
-}
+}

internal/handler/purchase_category_handler.go

@@ -1,160 +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 PurchaseCategoryHandler struct {
-	purchaseCategoryService   service.PurchaseCategoryService
-	purchaseCategoryValidator validator.PurchaseCategoryValidator
-}
-
-func NewPurchaseCategoryHandler(purchaseCategoryService service.PurchaseCategoryService, purchaseCategoryValidator validator.PurchaseCategoryValidator) *PurchaseCategoryHandler {
-	return &PurchaseCategoryHandler{
-		purchaseCategoryService:   purchaseCategoryService,
-		purchaseCategoryValidator: purchaseCategoryValidator,
-	}
-}
-
-func (h *PurchaseCategoryHandler) CreatePurchaseCategory(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.CreatePurchaseCategoryRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("PurchaseCategoryHandler::CreatePurchaseCategory -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::CreatePurchaseCategory")
-		return
-	}
-
-	if validationError, validationErrorCode := h.purchaseCategoryValidator.ValidateCreatePurchaseCategoryRequest(&req); validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::CreatePurchaseCategory")
-		return
-	}
-
-	response := h.purchaseCategoryService.CreatePurchaseCategory(ctx, contextInfo, &req)
-	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::CreatePurchaseCategory")
-}
-
-func (h *PurchaseCategoryHandler) UpdatePurchaseCategory(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	categoryID, err := uuid.Parse(c.Param("id"))
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid purchase category ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::UpdatePurchaseCategory")
-		return
-	}
-
-	var req contract.UpdatePurchaseCategoryRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		logger.FromContext(ctx).WithError(err).Error("PurchaseCategoryHandler::UpdatePurchaseCategory -> request binding failed")
-		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::UpdatePurchaseCategory")
-		return
-	}
-
-	if validationError, validationErrorCode := h.purchaseCategoryValidator.ValidateUpdatePurchaseCategoryRequest(&req); validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::UpdatePurchaseCategory")
-		return
-	}
-
-	response := h.purchaseCategoryService.UpdatePurchaseCategory(ctx, contextInfo, categoryID, &req)
-	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::UpdatePurchaseCategory")
-}
-
-func (h *PurchaseCategoryHandler) DeletePurchaseCategory(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	categoryID, err := uuid.Parse(c.Param("id"))
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid purchase category ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::DeletePurchaseCategory")
-		return
-	}
-
-	response := h.purchaseCategoryService.DeletePurchaseCategory(ctx, contextInfo, categoryID)
-	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::DeletePurchaseCategory")
-}
-
-func (h *PurchaseCategoryHandler) GetPurchaseCategory(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	categoryID, err := uuid.Parse(c.Param("id"))
-	if err != nil {
-		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid purchase category ID")
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::GetPurchaseCategory")
-		return
-	}
-
-	response := h.purchaseCategoryService.GetPurchaseCategoryByID(ctx, contextInfo, categoryID)
-	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::GetPurchaseCategory")
-}
-
-func (h *PurchaseCategoryHandler) ListPurchaseCategories(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	req := &contract.ListPurchaseCategoriesRequest{
-		Page:  1,
-		Limit: 100,
-	}
-
-	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 parentIDStr := c.Query("parent_id"); parentIDStr != "" {
-		if parentID, err := uuid.Parse(parentIDStr); err == nil {
-			req.ParentID = &parentID
-		}
-	}
-
-	if categoryType := c.Query("type"); categoryType != "" {
-		req.Type = categoryType
-	}
-
-	if search := c.Query("search"); search != "" {
-		req.Search = search
-	}
-
-	if isActiveStr := c.Query("is_active"); isActiveStr != "" {
-		if isActive, err := strconv.ParseBool(isActiveStr); err == nil {
-			req.IsActive = &isActive
-		}
-	}
-
-	if validationError, validationErrorCode := h.purchaseCategoryValidator.ValidateListPurchaseCategoriesRequest(req); validationError != nil {
-		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::ListPurchaseCategories")
-		return
-	}
-
-	response := h.purchaseCategoryService.ListPurchaseCategories(ctx, contextInfo, req)
-	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::ListPurchaseCategories")
-}

internal/handler/report_handler.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 type ReportHandler struct {
@@ -20,26 +19,11 @@ func NewReportHandler(reportService service.ReportService, userService UserServi
 	return &ReportHandler{reportService: reportService, userService: userService}
 }
 
-func (h *ReportHandler) resolveOutletID(c *gin.Context, contextOutletID uuid.UUID) string {
-	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
-		if _, err := uuid.Parse(outletIDStr); err == nil {
-			return outletIDStr
-		}
-	}
-	if pathOutletID := c.Param("outlet_id"); pathOutletID != "" {
-		return pathOutletID
-	}
-	if contextOutletID != uuid.Nil {
-		return contextOutletID.String()
-	}
-	return ""
-}
-
 func (h *ReportHandler) GetDailyTransactionReportPDF(c *gin.Context) {
 	ctx := c.Request.Context()
 	ci := appcontext.FromGinContext(ctx)
 
-	outletID := h.resolveOutletID(c, ci.OutletID)
+	outletID := c.Param("outlet_id")
 	var dayPtr *time.Time
 	if d := c.Query("date"); d != "" {
 		if t, err := time.Parse("2006-01-02", d); err == nil {
@@ -66,35 +50,3 @@ func (h *ReportHandler) GetDailyTransactionReportPDF(c *gin.Context) {
 		"file_name": fileName,
 	}), "ReportHandler::GetDailyTransactionReportPDF")
 }
-
-func (h *ReportHandler) GetProfitLossReportPDF(c *gin.Context) {
-	ctx := c.Request.Context()
-	ci := appcontext.FromGinContext(ctx)
-
-	outletID := h.resolveOutletID(c, ci.OutletID)
-	var dayPtr *time.Time
-	if d := c.Query("date"); d != "" {
-		if t, err := time.Parse("2006-01-02", d); err == nil {
-			dayPtr = &t
-		}
-	}
-
-	user, err := h.userService.GetUserByID(ctx, ci.UserID)
-	var genBy string
-	if err != nil {
-		genBy = ci.UserID.String()
-	} else {
-		genBy = user.Name
-	}
-
-	publicURL, fileName, err := h.reportService.GenerateProfitLossPDF(ctx, ci.OrganizationID.String(), outletID, dayPtr, genBy)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "ReportHandler::GetProfitLossReportPDF", err.Error())}), "ReportHandler::GetProfitLossReportPDF")
-		return
-	}
-
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(map[string]string{
-		"url":       publicURL,
-		"file_name": fileName,
-	}), "ReportHandler::GetProfitLossReportPDF")
-}

internal/handler/self_order_handler.go

@@ -1,571 +0,0 @@
-package handler
-
-import (
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/contract"
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/logger"
-	"apskel-pos-be/internal/mappers"
-	"apskel-pos-be/internal/models"
-	"apskel-pos-be/internal/pkg/tabletoken"
-	"apskel-pos-be/internal/processor"
-	"apskel-pos-be/internal/repository"
-	"apskel-pos-be/internal/service"
-	"apskel-pos-be/internal/transformer"
-	"apskel-pos-be/internal/util"
-	"context"
-	"fmt"
-
-	"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
-	productOutletPriceService service.ProductOutletPriceService
-}
-
-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,
-	productOutletPriceService service.ProductOutletPriceService,
-) *SelfOrderHandler {
-	return &SelfOrderHandler{
-		orderService:              orderService,
-		categoryService:           categoryService,
-		productService:            productService,
-		tableRepo:                 tableRepo,
-		outletRepo:                outletRepo,
-		userRepo:                  userRepo,
-		sessionRepo:               sessionRepo,
-		orderRepo:                 orderRepo,
-		productOutletPriceService: productOutletPriceService,
-	}
-}
-
-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(ctx, outlet, table, catList.Categories, prodList.Products)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(menu), "SelfOrderHandler::GetMenu")
-}
-
-func (h *SelfOrderHandler) buildMenuResponse(
-	ctx context.Context,
-	outlet *entities.Outlet,
-	table *entities.Table,
-	categories []contract.CategoryResponse,
-	products []contract.ProductResponse,
-) *contract.SelfOrderMenuResponse {
-	outletPriceMap := make(map[uuid.UUID]float64)
-	if h.productOutletPriceService != nil {
-		priceResp := h.productOutletPriceService.GetByOutlet(ctx, outlet.ID)
-		if priceResp != nil && !priceResp.HasErrors() {
-			if priceList, ok := priceResp.Data.(*contract.ListProductOutletPricesResponse); ok {
-				for _, p := range priceList.Prices {
-					outletPriceMap[p.ProductID] = p.Price
-				}
-			}
-		}
-	}
-
-	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 {
-				price := p.Price
-				if outletPrice, exists := outletPriceMap[p.ID]; exists {
-					price = outletPrice
-				}
-				item := contract.SelfOrderMenuItem{
-					ID:          p.ID,
-					Name:        p.Name,
-					Description: p.Description,
-					Price:       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
-	metadata["customer_name"] = req.CustomerName
-
-	tableID := table.ID
-	modelReq := &models.CreateOrderRequest{
-		OutletID:    table.OutletID,
-		UserID:      userID,
-		TableID:     &tableID,
-		TableNumber: &table.TableName,
-		OrderType:   constants.OrderType(req.OrderType),
-		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
-	}
-
-	contractResp := transformer.OrderModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "SelfOrderHandler::CreateOrder")
-}
-
-func (h *SelfOrderHandler) GetOrdersBySession(c *gin.Context) {
-	ctx := c.Request.Context()
-	sessionID := c.Param("session_id")
-
-	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
-	}
-
-	modelOrders := mappers.OrderEntitiesToResponses(orders)
-	contractOrders := make([]contract.OrderResponse, len(modelOrders))
-	for i := range modelOrders {
-		contractOrders[i] = *transformer.OrderModelToContract(&modelOrders[i])
-	}
-
-	resp := &contract.SelfOrderListOrdersResponse{
-		Orders: contractOrders,
-	}
-	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, "organization_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 organization_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
-}

internal/handler/table_handler.go

@@ -5,11 +5,8 @@ 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"
@@ -19,14 +16,12 @@ import (
 type TableHandler struct {
 	tableService   TableService
 	tableValidator *validator.TableValidator
-	selfOrderURL   string
 }
 
-func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator, selfOrderURL string) *TableHandler {
+func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator) *TableHandler {
 	return &TableHandler{
 		tableService:   tableService,
 		tableValidator: tableValidator,
-		selfOrderURL:   selfOrderURL,
 	}
 }
 
@@ -150,11 +145,6 @@ func (h *TableHandler) List(c *gin.Context) {
 		Limit:          100,
 	}
 
-	// Fallback to context outlet ID if not provided in query
-	if query.OutletID == "" && contextInfo.OutletID != uuid.Nil {
-		query.OutletID = contextInfo.OutletID.String()
-	}
-
 	if pageStr := c.Query("page"); pageStr != "" {
 		if page, err := strconv.Atoi(pageStr); err == nil && page > 0 {
 			query.Page = page
@@ -296,45 +286,3 @@ 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
-	}
-
-	selfOrderURLResult := fmt.Sprintf("%s/menu?token=%s", h.selfOrderURL, 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(selfOrderURLResult, size)
-	if err != nil {
-		logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> QR generation failed")
-		validationResponseError := contract.NewResponseError(constants.InternalServerErrorCode, constants.TableEntity, "Failed to generate QR code")
-		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)
-}

internal/handler/table_service.go

@@ -17,5 +17,4 @@ 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)
 }

internal/handler/user_device_handler.go

@@ -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")
-}

internal/mappers/category_mapper.go

@@ -13,12 +13,11 @@ func CategoryEntityToModel(entity *entities.Category) *models.Category {
 	return &models.Category{
 		ID:             entity.ID,
 		OrganizationID: entity.OrganizationID,
-		OutletID:       entity.OutletID,
 		Name:           entity.Name,
 		Description:    entity.Description,
-		ImageURL:       nil,
+		ImageURL:       nil,  // Entity doesn't have ImageURL, model does
-		Order:          entity.Order,
+		Order:      	entity.Order,    // Entity doesn't have SortOrder, model does
-		IsActive:       true,
+		IsActive:       true, // Entity doesn't have IsActive, default to true
 		CreatedAt:      entity.CreatedAt,
 		UpdatedAt:      entity.UpdatedAt,
 	}
@@ -33,14 +32,14 @@ func CategoryModelToEntity(model *models.Category) *entities.Category {
 	if model.ImageURL != nil {
 		metadata["image_url"] = *model.ImageURL
 	}
+	// metadata["sort_order"] = model.SortOrder
 
 	return &entities.Category{
 		ID:             model.ID,
 		OrganizationID: model.OrganizationID,
-		OutletID:       model.OutletID,
 		Name:           model.Name,
 		Description:    model.Description,
-		BusinessType:   "restaurant",
+		BusinessType:   "restaurant", // Default business type
 		Order:          model.Order,
 		Metadata:       metadata,
 		CreatedAt:      model.CreatedAt,
@@ -57,14 +56,14 @@ func CreateCategoryRequestToEntity(req *models.CreateCategoryRequest) *entities.
 	if req.ImageURL != nil {
 		metadata["image_url"] = *req.ImageURL
 	}
+	// metadata["sort_order"] = req.SortOrder
 
 	return &entities.Category{
 		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
 		Name:           req.Name,
 		Description:    req.Description,
 		Order:          req.Order,
-		BusinessType:   "restaurant",
+		BusinessType:   "restaurant", // Default business type
 		Metadata:       metadata,
 	}
 }
@@ -88,12 +87,11 @@ func CategoryEntityToResponse(entity *entities.Category) *models.CategoryRespons
 	return &models.CategoryResponse{
 		ID:             entity.ID,
 		OrganizationID: entity.OrganizationID,
-		OutletID:       entity.OutletID,
 		Name:           entity.Name,
 		Description:    entity.Description,
 		ImageURL:       imageURL,
-		Order:          entity.Order,
+		Order:      	entity.Order,
-		IsActive:       true,
+		IsActive:       true, // Default to true since entity doesn't have this field
 		CreatedAt:      entity.CreatedAt,
 		UpdatedAt:      entity.UpdatedAt,
 	}
@@ -123,10 +121,6 @@ func UpdateCategoryEntityFromRequest(entity *entities.Category, req *models.Upda
 	if req.Order != nil {
 		entity.Order = *req.Order
 	}
-
-	if req.OutletID != nil {
-		entity.OutletID = req.OutletID
-	}
 }
 
 func CategoryEntitiesToModels(entities []*entities.Category) []*models.Category {

internal/mappers/expense_mapper.go

@@ -1,135 +0,0 @@
-package mappers
-
-import (
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/models"
-)
-
-func ExpenseEntityToModel(entity *entities.Expense) *models.Expense {
-	if entity == nil {
-		return nil
-	}
-
-	return &models.Expense{
-		ID:              entity.ID,
-		OrganizationID:  entity.OrganizationID,
-		OutletID:        entity.OutletID,
-		Receiver:        entity.Receiver,
-		TransactionDate: entity.TransactionDate,
-		CodeNumber:      entity.CodeNumber,
-		Status:          entity.Status,
-		Description:     entity.Description,
-		Tax:             entity.Tax,
-		Total:           entity.Total,
-		Reserved1:       entity.Reserved1,
-		CreatedAt:       entity.CreatedAt,
-		UpdatedAt:       entity.UpdatedAt,
-	}
-}
-
-func ExpenseModelToEntity(model *models.Expense) *entities.Expense {
-	if model == nil {
-		return nil
-	}
-
-	return &entities.Expense{
-		ID:              model.ID,
-		OrganizationID:  model.OrganizationID,
-		OutletID:        model.OutletID,
-		Receiver:        model.Receiver,
-		TransactionDate: model.TransactionDate,
-		CodeNumber:      model.CodeNumber,
-		Status:          model.Status,
-		Description:     model.Description,
-		Tax:             model.Tax,
-		Total:           model.Total,
-		Reserved1:       model.Reserved1,
-		CreatedAt:       model.CreatedAt,
-		UpdatedAt:       model.UpdatedAt,
-	}
-}
-
-func ExpenseEntityToResponse(entity *entities.Expense) *models.ExpenseResponse {
-	if entity == nil {
-		return nil
-	}
-
-	resp := &models.ExpenseResponse{
-		ID:              entity.ID,
-		OrganizationID:  entity.OrganizationID,
-		OutletID:        entity.OutletID,
-		Receiver:        entity.Receiver,
-		TransactionDate: entity.TransactionDate,
-		CodeNumber:      entity.CodeNumber,
-		Status:          entity.Status,
-		Description:     entity.Description,
-		Tax:             entity.Tax,
-		Total:           entity.Total,
-		Reserved1:       entity.Reserved1,
-		CreatedAt:       entity.CreatedAt,
-		UpdatedAt:       entity.UpdatedAt,
-	}
-
-	if entity.Items != nil {
-		resp.Items = ExpenseItemEntitiesToResponses(entity.Items)
-	}
-
-	return resp
-}
-
-func ExpenseEntitiesToResponses(entities []*entities.Expense) []*models.ExpenseResponse {
-	if entities == nil {
-		return nil
-	}
-
-	responses := make([]*models.ExpenseResponse, len(entities))
-	for i, entity := range entities {
-		responses[i] = ExpenseEntityToResponse(entity)
-	}
-	return responses
-}
-
-func ExpenseItemEntityToResponse(entity *entities.ExpenseItem) *models.ExpenseItemResponse {
-	if entity == nil {
-		return nil
-	}
-
-	response := &models.ExpenseItemResponse{
-		ID:                 entity.ID,
-		ExpenseID:          entity.ExpenseID,
-		ChartOfAccountID:   entity.ChartOfAccountID,
-		PurchaseCategoryID: entity.PurchaseCategoryID,
-		Item:               entity.Item,
-		Description:        entity.Description,
-		Amount:             entity.Amount,
-		CreatedAt:          entity.CreatedAt,
-		UpdatedAt:          entity.UpdatedAt,
-	}
-
-	if entity.ChartOfAccount != nil {
-		response.ChartOfAccountName = entity.ChartOfAccount.Name
-	}
-
-	if entity.PurchaseCategory != nil {
-		response.PurchaseCategoryName = entity.PurchaseCategory.Name
-		response.PurchaseCategoryType = string(entity.PurchaseCategory.Type)
-		response.PurchaseCategory = PurchaseCategoryEntityToResponse(entity.PurchaseCategory)
-	}
-
-	return response
-}
-
-func ExpenseItemEntitiesToResponses(entities []entities.ExpenseItem) []models.ExpenseItemResponse {
-	if entities == nil {
-		return nil
-	}
-
-	responses := make([]models.ExpenseItemResponse, len(entities))
-	for i, entity := range entities {
-		response := ExpenseItemEntityToResponse(&entity)
-		if response != nil {
-			responses[i] = *response
-		}
-	}
-	return responses
-}

internal/mappers/notification_mapper.go

@@ -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,
-	}
-}

internal/mappers/order_mapper.go

@@ -82,7 +82,7 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
 		}
 
 		for i, item := range order.OrderItems {
-			resp := OrderItemEntityToResponse(&item, order.OutletID)
+			resp := OrderItemEntityToResponse(&item)
 			if resp != nil {
 				resp.PaidQuantity = paidQtyByOrderItem[item.ID]
 				response.OrderItems[i] = *resp
@@ -101,20 +101,11 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
 	return response
 }
 
-func OrderItemEntityToResponse(item *entities.OrderItem, outletID uuid.UUID) *models.OrderItemResponse {
+func OrderItemEntityToResponse(item *entities.OrderItem) *models.OrderItemResponse {
 	if item == nil {
 		return nil
 	}
 
-	// Resolve print_to_checker from preloaded outlet prices
-	printToChecker := true // default
-	for _, op := range item.Product.ProductOutletPrices {
-		if op.OutletID == outletID {
-			printToChecker = op.PrintToChecker
-			break
-		}
-	}
-
 	response := &models.OrderItemResponse{
 		ID:                  item.ID,
 		OrderID:             item.OrderID,
@@ -139,19 +130,10 @@ func OrderItemEntityToResponse(item *entities.OrderItem, outletID uuid.UUID) *mo
 		CreatedAt:           item.CreatedAt,
 		UpdatedAt:           item.UpdatedAt,
 		PrinterType:         item.Product.PrinterType,
-		PrintToChecker:      printToChecker,
 	}
 
 	if item.Product.ID != uuid.Nil {
 		response.ProductName = item.Product.Name
-		if item.Product.CategoryID != uuid.Nil {
-			categoryID := item.Product.CategoryID
-			response.CategoryID = &categoryID
-		}
-		if item.Product.Category.ID != uuid.Nil {
-			categoryName := item.Product.Category.Name
-			response.CategoryName = &categoryName
-		}
 	}
 
 	if item.ProductVariant != nil {
@@ -334,14 +316,14 @@ func OrderEntitiesToResponses(orders []*entities.Order) []models.OrderResponse {
 	return responses
 }
 
-func OrderItemEntitiesToResponses(items []*entities.OrderItem, outletID uuid.UUID) []models.OrderItemResponse {
+func OrderItemEntitiesToResponses(items []*entities.OrderItem) []models.OrderItemResponse {
 	if items == nil {
 		return nil
 	}
 
 	responses := make([]models.OrderItemResponse, len(items))
 	for i, item := range items {
-		response := OrderItemEntityToResponse(item, outletID)
+		response := OrderItemEntityToResponse(item)
 		if response != nil {
 			responses[i] = *response
 		}

internal/mappers/order_mapper_test.go

@@ -45,7 +45,7 @@ func TestOrderItemEntityToResponse_WithProductNames(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
+	result := OrderItemEntityToResponse(orderItem)
 
 	// Assert
 	assert.NotNil(t, result)
@@ -89,7 +89,7 @@ func TestOrderItemEntityToResponse_WithoutProductVariant(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
+	result := OrderItemEntityToResponse(orderItem)
 
 	// Assert
 	assert.NotNil(t, result)
@@ -129,7 +129,7 @@ func TestOrderItemEntityToResponse_WithoutProductPreload(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
+	result := OrderItemEntityToResponse(orderItem)
 
 	// Assert
 	assert.NotNil(t, result)

internal/mappers/product_ingredient_mapper.go

@@ -11,17 +11,17 @@ func MapProductIngredientEntityToModel(entity *entities.ProductIngredient) *mode
 	}
 
 	return &models.ProductIngredient{
-		ID:              entity.ID,
+		ID:               entity.ID,
-		OrganizationID:  entity.OrganizationID,
+		OrganizationID:   entity.OrganizationID,
-		OutletID:        entity.OutletID,
+		OutletID:         entity.OutletID,
-		ProductID:       entity.ProductID,
+		ProductID:        entity.ProductID,
-		IngredientID:    entity.IngredientID,
+		IngredientID:     entity.IngredientID,
-		Quantity:        entity.Quantity,
+		Quantity:         entity.Quantity,
-		WastePercentage: entity.WastePercentage,
+		WastePercentage:  entity.WastePercentage,
-		CreatedAt:       entity.CreatedAt,
+		CreatedAt:        entity.CreatedAt,
-		UpdatedAt:       entity.UpdatedAt,
+		UpdatedAt:        entity.UpdatedAt,
-		Product:         ProductEntityToModel(entity.Product),
+		Product:          ProductEntityToModel(entity.Product),
-		Ingredient:      MapIngredientEntityToModel(entity.Ingredient),
+		Ingredient:       MapIngredientEntityToModel(entity.Ingredient),
 	}
 }
 
@@ -31,17 +31,17 @@ func MapProductIngredientModelToEntity(model *models.ProductIngredient) *entitie
 	}
 
 	return &entities.ProductIngredient{
-		ID:              model.ID,
+		ID:               model.ID,
-		OrganizationID:  model.OrganizationID,
+		OrganizationID:   model.OrganizationID,
-		OutletID:        model.OutletID,
+		OutletID:         model.OutletID,
-		ProductID:       model.ProductID,
+		ProductID:        model.ProductID,
-		IngredientID:    model.IngredientID,
+		IngredientID:     model.IngredientID,
-		Quantity:        model.Quantity,
+		Quantity:         model.Quantity,
-		WastePercentage: model.WastePercentage,
+		WastePercentage:  model.WastePercentage,
-		CreatedAt:       model.CreatedAt,
+		CreatedAt:        model.CreatedAt,
-		UpdatedAt:       model.UpdatedAt,
+		UpdatedAt:        model.UpdatedAt,
-		Product:         ProductModelToEntity(model.Product),
+		Product:          ProductModelToEntity(model.Product),
-		Ingredient:      MapIngredientModelToEntity(model.Ingredient),
+		Ingredient:       MapIngredientModelToEntity(model.Ingredient),
 	}
 }
 

internal/mappers/product_mapper.go

@@ -135,7 +135,6 @@ func ProductEntityToResponse(entity *entities.Product) *models.ProductResponse {
 		Name:           entity.Name,
 		Description:    entity.Description,
 		Price:          entity.Price,
-		OutletPrice:    nil, // populated by processor when outletID is available
 		Cost:           entity.Cost,
 		BusinessType:   constants.BusinessType(entity.BusinessType),
 		ImageURL:       entity.ImageURL,

internal/mappers/product_outlet_price_mapper.go

@@ -1,50 +0,0 @@
-package mappers
-
-import (
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/models"
-)
-
-func ProductOutletPriceEntityToModel(entity *entities.ProductOutletPrice) *models.ProductOutletPrice {
-	if entity == nil {
-		return nil
-	}
-
-	return &models.ProductOutletPrice{
-		ID:             entity.ID,
-		ProductID:      entity.ProductID,
-		OutletID:       entity.OutletID,
-		Price:          entity.Price,
-		PrintToChecker: entity.PrintToChecker,
-		CreatedAt:      entity.CreatedAt,
-		UpdatedAt:      entity.UpdatedAt,
-	}
-}
-
-func ProductOutletPriceModelToEntity(model *models.ProductOutletPrice) *entities.ProductOutletPrice {
-	if model == nil {
-		return nil
-	}
-
-	return &entities.ProductOutletPrice{
-		ID:             model.ID,
-		ProductID:      model.ProductID,
-		OutletID:       model.OutletID,
-		Price:          model.Price,
-		PrintToChecker: model.PrintToChecker,
-		CreatedAt:      model.CreatedAt,
-		UpdatedAt:      model.UpdatedAt,
-	}
-}
-
-func ProductOutletPriceEntitiesToModels(entities []*entities.ProductOutletPrice) []*models.ProductOutletPrice {
-	if entities == nil {
-		return nil
-	}
-
-	models := make([]*models.ProductOutletPrice, len(entities))
-	for i, entity := range entities {
-		models[i] = ProductOutletPriceEntityToModel(entity)
-	}
-	return models
-}

internal/mappers/purchase_category_mapper.go

@@ -1,53 +0,0 @@
-package mappers
-
-import (
-	"apskel-pos-be/internal/entities"
-	"apskel-pos-be/internal/models"
-)
-
-func CreatePurchaseCategoryRequestToEntity(req *models.CreatePurchaseCategoryRequest) *entities.PurchaseCategory {
-	if req == nil {
-		return nil
-	}
-
-	return &entities.PurchaseCategory{
-		OrganizationID: req.OrganizationID,
-		ParentID:       req.ParentID,
-		Name:           req.Name,
-		Type:           entities.PurchaseCategoryType(req.Type),
-		SortOrder:      req.SortOrder,
-		IsActive:       req.IsActive,
-	}
-}
-
-func PurchaseCategoryEntityToResponse(entity *entities.PurchaseCategory) *models.PurchaseCategoryResponse {
-	if entity == nil {
-		return nil
-	}
-
-	return &models.PurchaseCategoryResponse{
-		ID:             entity.ID,
-		OrganizationID: entity.OrganizationID,
-		PresetID:       entity.PresetID,
-		ParentID:       entity.ParentID,
-		Code:           entity.Code,
-		Name:           entity.Name,
-		Type:           string(entity.Type),
-		SortOrder:      entity.SortOrder,
-		IsSystem:       entity.IsSystem,
-		IsActive:       entity.IsActive,
-		CreatedAt:      entity.CreatedAt,
-		UpdatedAt:      entity.UpdatedAt,
-	}
-}
-
-func PurchaseCategoryEntitiesToResponses(categoryEntities []*entities.PurchaseCategory) []models.PurchaseCategoryResponse {
-	responses := make([]models.PurchaseCategoryResponse, len(categoryEntities))
-	for i, entity := range categoryEntities {
-		response := PurchaseCategoryEntityToResponse(entity)
-		if response != nil {
-			responses[i] = *response
-		}
-	}
-	return responses
-}

internal/mappers/purchase_order_mapper.go

@@ -13,7 +13,6 @@ func PurchaseOrderEntityToModel(entity *entities.PurchaseOrder) *models.Purchase
 	return &models.PurchaseOrder{
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
-		OutletID:        entity.OutletID,
 		VendorID:        entity.VendorID,
 		PONumber:        entity.PONumber,
 		TransactionDate: entity.TransactionDate,
@@ -35,7 +34,6 @@ func PurchaseOrderModelToEntity(model *models.PurchaseOrder) *entities.PurchaseO
 	return &entities.PurchaseOrder{
 		ID:              model.ID,
 		OrganizationID:  model.OrganizationID,
-		OutletID:        model.OutletID,
 		VendorID:        model.VendorID,
 		PONumber:        model.PONumber,
 		TransactionDate: model.TransactionDate,
@@ -57,7 +55,6 @@ func PurchaseOrderEntityToResponse(entity *entities.PurchaseOrder) *models.Purch
 	response := &models.PurchaseOrderResponse{
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
-		OutletID:        entity.OutletID,
 		VendorID:        entity.VendorID,
 		PONumber:        entity.PONumber,
 		TransactionDate: entity.TransactionDate,
@@ -94,16 +91,15 @@ func PurchaseOrderItemEntityToModel(entity *entities.PurchaseOrderItem) *models.
 	}
 
 	return &models.PurchaseOrderItem{
-		ID:                 entity.ID,
+		ID:              entity.ID,
-		PurchaseOrderID:    entity.PurchaseOrderID,
+		PurchaseOrderID: entity.PurchaseOrderID,
-		IngredientID:       entity.IngredientID,
+		IngredientID:    entity.IngredientID,
-		PurchaseCategoryID: entity.PurchaseCategoryID,
+		Description:     entity.Description,
-		Description:        entity.Description,
+		Quantity:        entity.Quantity,
-		Quantity:           entity.Quantity,
+		UnitID:          entity.UnitID,
-		UnitID:             entity.UnitID,
+		Amount:          entity.Amount,
-		Amount:             entity.Amount,
+		CreatedAt:       entity.CreatedAt,
-		CreatedAt:          entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
-		UpdatedAt:          entity.UpdatedAt,
 	}
 }
 
@@ -113,16 +109,15 @@ func PurchaseOrderItemModelToEntity(model *models.PurchaseOrderItem) *entities.P
 	}
 
 	return &entities.PurchaseOrderItem{
-		ID:                 model.ID,
+		ID:              model.ID,
-		PurchaseOrderID:    model.PurchaseOrderID,
+		PurchaseOrderID: model.PurchaseOrderID,
-		IngredientID:       model.IngredientID,
+		IngredientID:    model.IngredientID,
-		PurchaseCategoryID: model.PurchaseCategoryID,
+		Description:     model.Description,
-		Description:        model.Description,
+		Quantity:        model.Quantity,
-		Quantity:           model.Quantity,
+		UnitID:          model.UnitID,
-		UnitID:             model.UnitID,
+		Amount:          model.Amount,
-		Amount:             model.Amount,
+		CreatedAt:       model.CreatedAt,
-		CreatedAt:          model.CreatedAt,
+		UpdatedAt:       model.UpdatedAt,
-		UpdatedAt:          model.UpdatedAt,
 	}
 }
 
@@ -132,16 +127,15 @@ func PurchaseOrderItemEntityToResponse(entity *entities.PurchaseOrderItem) *mode
 	}
 
 	response := &models.PurchaseOrderItemResponse{
-		ID:                 entity.ID,
+		ID:              entity.ID,
-		PurchaseOrderID:    entity.PurchaseOrderID,
+		PurchaseOrderID: entity.PurchaseOrderID,
-		IngredientID:       entity.IngredientID,
+		IngredientID:    entity.IngredientID,
-		PurchaseCategoryID: entity.PurchaseCategoryID,
+		Description:     entity.Description,
-		Description:        entity.Description,
+		Quantity:        entity.Quantity,
-		Quantity:           entity.Quantity,
+		UnitID:          entity.UnitID,
-		UnitID:             entity.UnitID,
+		Amount:          entity.Amount,
-		Amount:             entity.Amount,
+		CreatedAt:       entity.CreatedAt,
-		CreatedAt:          entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
-		UpdatedAt:          entity.UpdatedAt,
 	}
 
 	// Map ingredient if present
@@ -152,10 +146,6 @@ func PurchaseOrderItemEntityToResponse(entity *entities.PurchaseOrderItem) *mode
 		}
 	}
 
-	if entity.PurchaseCategory != nil {
-		response.PurchaseCategory = PurchaseCategoryEntityToResponse(entity.PurchaseCategory)
-	}
-
 	// Map unit if present
 	if entity.Unit != nil {
 		response.Unit = &models.UnitResponse{

internal/mappers/user_device_mapper.go

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

internal/middleware/auth_middleware.go

@@ -11,7 +11,6 @@ import (
 	"apskel-pos-be/internal/service"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 type AuthMiddleware struct {
@@ -46,13 +45,9 @@ func (m *AuthMiddleware) RequireAuth() gin.HandlerFunc {
 		setKeyInContext(c, appcontext.OrganizationIDKey, userResponse.OrganizationID.String())
 		setKeyInContext(c, appcontext.UserIDKey, userResponse.ID.String())
 
-		// Always override OutletID from token to prevent header injection.
+		if userResponse.Role != "superadmin" {
-		// Set empty string if user has no outlet, so PopulateContext header value is ignored.
+			setKeyInContext(c, appcontext.OutletIDKey, userResponse.OutletID.String())
-		outletIDStr := ""
-		if userResponse.OutletID != nil && *userResponse.OutletID != uuid.Nil {
-			outletIDStr = userResponse.OutletID.String()
 		}
-		setKeyInContext(c, appcontext.OutletIDKey, outletIDStr)
 
 		logger.FromContext(c.Request.Context()).Infof("AuthMiddleware::RequireAuth -> User authenticated: %s", userResponse.Email)
 		c.Next()
@@ -82,11 +77,7 @@ func (m *AuthMiddleware) RequireRole(allowedRoles ...string) gin.HandlerFunc {
 }
 
 func (m *AuthMiddleware) RequireAdminOrManager() gin.HandlerFunc {
-	return m.RequireRole("superadmin", "admin", "manager", "owner",  "purchasing")
+	return m.RequireRole("superadmin", "admin", "manager")
-}
-
-func (m *AuthMiddleware) RequireAdminOrManagerOrPurchasing() gin.HandlerFunc {
-	return m.RequireRole("superadmin", "admin", "manager", "owner", "purchasing")
 }
 
 func (m *AuthMiddleware) RequireAdmin() gin.HandlerFunc {

internal/middleware/idempotency.go

@@ -1,137 +0,0 @@
-package middleware
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/redis/go-redis/v9"
-)
-
-const (
-	IdempotencyKeyHeader = "X-Idempotency-Key"
-	idempotencyTTL       = 24 * time.Hour
-	idempotencyPrefix    = "idempotency:"
-)
-
-type cachedResponse struct {
-	StatusCode int               `json:"status_code"`
-	Headers    map[string]string `json:"headers"`
-	Body       string            `json:"body"`
-}
-
-// IdempotencyMiddleware returns a Gin middleware that ensures idempotent processing
-// for mutating operations. Client must send X-Idempotency-Key header.
-func IdempotencyMiddleware(redisClient *redis.Client) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		key := c.GetHeader(IdempotencyKeyHeader)
-		if key == "" {
-			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{
-				"success": false,
-				"errors": []gin.H{
-					{
-						"code":   "missing_idempotency_key",
-						"entity": "IdempotencyMiddleware",
-						"cause":  "X-Idempotency-Key header is required",
-					},
-				},
-			})
-			return
-		}
-
-		redisKey := fmt.Sprintf("%s%s", idempotencyPrefix, key)
-		ctx := context.Background()
-
-		fmt.Printf("[DEBUG] IdempotencyMiddleware: key=%s redisKey=%s\n", key, redisKey)
-
-		// Check if key already exists (request was already processed)
-		cached, err := redisClient.Get(ctx, redisKey).Result()
-		if err == nil {
-			// Key exists — return cached response
-			fmt.Printf("[DEBUG] IdempotencyMiddleware: cache HIT for key=%s\n", key)
-			var resp cachedResponse
-			if err := json.Unmarshal([]byte(cached), &resp); err == nil {
-				for k, v := range resp.Headers {
-					c.Writer.Header().Set(k, v)
-				}
-				c.Writer.Header().Set("X-Idempotent-Replay", "true")
-				c.Data(resp.StatusCode, "application/json", []byte(resp.Body))
-				c.Abort()
-				return
-			}
-		} else {
-			fmt.Printf("[DEBUG] IdempotencyMiddleware: cache MISS for key=%s err=%v\n", key, err)
-		}
-
-		// Mark key as in-progress to prevent concurrent duplicates
-		set, err := redisClient.SetNX(ctx, redisKey, "processing", idempotencyTTL).Result()
-		if err != nil {
-			// Redis error — proceed without idempotency (fail open)
-			c.Next()
-			return
-		}
-		if !set {
-			// Another request with the same key is being processed
-			c.AbortWithStatusJSON(http.StatusConflict, gin.H{
-				"success": false,
-				"errors": []gin.H{
-					{
-						"code":   "request_in_progress",
-						"entity": "IdempotencyMiddleware",
-						"cause":  "A request with this idempotency key is already being processed",
-					},
-				},
-			})
-			return
-		}
-
-		// Capture response using a custom writer
-		writer := &responseCapture{
-			ResponseWriter: c.Writer,
-			body:           &bytes.Buffer{},
-		}
-		c.Writer = writer
-
-		c.Next()
-
-		// After handler completes, cache the response only if successful (2xx)
-		statusCode := writer.Status()
-		if statusCode >= 200 && statusCode < 300 {
-			resp := cachedResponse{
-				StatusCode: statusCode,
-				Headers: map[string]string{
-					"Content-Type": writer.Header().Get("Content-Type"),
-				},
-				Body: writer.body.String(),
-			}
-
-			respJSON, err := json.Marshal(resp)
-			if err == nil {
-				redisClient.Set(ctx, redisKey, string(respJSON), idempotencyTTL)
-			}
-		} else {
-			// Remove the in-progress key so the client can retry with the same key
-			redisClient.Del(ctx, redisKey)
-		}
-	}
-}
-
-// responseCapture wraps gin.ResponseWriter to capture the response body
-type responseCapture struct {
-	gin.ResponseWriter
-	body *bytes.Buffer
-}
-
-func (w *responseCapture) Write(b []byte) (int, error) {
-	w.body.Write(b)
-	return w.ResponseWriter.Write(b)
-}
-
-func (w *responseCapture) WriteString(s string) (int, error) {
-	w.body.WriteString(s)
-	return w.ResponseWriter.WriteString(s)
-}

internal/models/account.go

@@ -25,12 +25,12 @@ type AccountResponse struct {
 }
 
 type CreateAccountRequest struct {
-	ChartOfAccountID uuid.UUID `json:"chart_of_account_id" validate:"required"`
+	ChartOfAccountID uuid.UUID  `json:"chart_of_account_id" validate:"required"`
-	Name             string    `json:"name" validate:"required,min=1,max=255"`
+	Name             string     `json:"name" validate:"required,min=1,max=255"`
-	Number           string    `json:"number" validate:"required,min=1,max=50"`
+	Number           string     `json:"number" validate:"required,min=1,max=50"`
-	AccountType      string    `json:"account_type" validate:"required,oneof=cash wallet bank credit debit asset liability equity revenue expense"`
+	AccountType      string     `json:"account_type" validate:"required,oneof=cash wallet bank credit debit asset liability equity revenue expense"`
-	OpeningBalance   float64   `json:"opening_balance"`
+	OpeningBalance   float64    `json:"opening_balance"`
-	Description      *string   `json:"description"`
+	Description      *string    `json:"description"`
 }
 
 type UpdateAccountRequest struct {

internal/models/analytics.go

@@ -19,7 +19,6 @@ type PaymentMethodAnalyticsRequest struct {
 type PaymentMethodAnalyticsResponse struct {
 	OrganizationID uuid.UUID                    `json:"organization_id"`
 	OutletID       *uuid.UUID                   `json:"outlet_id,omitempty"`
-	OutletName     *string                      `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                    `json:"date_from"`
 	DateTo         time.Time                    `json:"date_to"`
 	GroupBy        string                       `json:"group_by"`
@@ -59,7 +58,6 @@ type SalesAnalyticsRequest struct {
 type SalesAnalyticsResponse struct {
 	OrganizationID uuid.UUID            `json:"organization_id"`
 	OutletID       *uuid.UUID           `json:"outlet_id,omitempty"`
-	OutletName     *string              `json:"outlet_name,omitempty"`
 	DateFrom       time.Time            `json:"date_from"`
 	DateTo         time.Time            `json:"date_to"`
 	GroupBy        string               `json:"group_by"`
@@ -89,77 +87,6 @@ type SalesAnalyticsData struct {
 	NetSales float64   `json:"net_sales"`
 }
 
-// PurchasingAnalyticsRequest represents the request for purchasing analytics
-type PurchasingAnalyticsRequest struct {
-	OrganizationID uuid.UUID  `validate:"required"`
-	OutletID       *uuid.UUID `validate:"omitempty"`
-	DateFrom       time.Time  `validate:"required"`
-	DateTo         time.Time  `validate:"required"`
-	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
-}
-
-// PurchasingAnalyticsResponse represents the response for purchasing analytics
-type PurchasingAnalyticsResponse struct {
-	OrganizationID uuid.UUID                  `json:"organization_id"`
-	OutletID       *uuid.UUID                 `json:"outlet_id,omitempty"`
-	OutletName     *string                    `json:"outlet_name,omitempty"`
-	DateFrom       time.Time                  `json:"date_from"`
-	DateTo         time.Time                  `json:"date_to"`
-	GroupBy        string                     `json:"group_by"`
-	Summary        PurchasingSummary          `json:"summary"`
-	Data           []PurchasingAnalyticsData  `json:"data"`
-	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
-	VendorData     []PurchasingVendorData     `json:"vendor_data"`
-}
-
-// PurchasingSummary represents the summary of purchasing analytics
-type PurchasingSummary struct {
-	TotalPurchases            float64 `json:"total_purchases"`
-	RawMaterialPurchases      float64 `json:"raw_material_purchases"`
-	ExpensePurchases          float64 `json:"expense_purchases"`
-	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
-	RawMaterialPurchaseOrders int64   `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64   `json:"expense_count"`
-	TotalQuantity             float64 `json:"total_quantity"`
-	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
-	TotalIngredients          int64   `json:"total_ingredients"`
-	TotalVendors              int64   `json:"total_vendors"`
-}
-
-// PurchasingAnalyticsData represents purchasing analytics by time period
-type PurchasingAnalyticsData struct {
-	Date                      time.Time `json:"date"`
-	Purchases                 float64   `json:"purchases"`
-	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	ExpensePurchases          float64   `json:"expense_purchases"`
-	PurchaseOrders            int64     `json:"purchase_orders"`
-	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64     `json:"expense_count"`
-	Quantity                  float64   `json:"quantity"`
-	Ingredients               int64     `json:"ingredients"`
-	Vendors                   int64     `json:"vendors"`
-}
-
-// PurchasingIngredientData represents purchasing analytics for an ingredient
-type PurchasingIngredientData struct {
-	IngredientID       uuid.UUID `json:"ingredient_id"`
-	IngredientName     string    `json:"ingredient_name"`
-	Quantity           float64   `json:"quantity"`
-	TotalCost          float64   `json:"total_cost"`
-	AverageUnitCost    float64   `json:"average_unit_cost"`
-	PurchaseOrderCount int64     `json:"purchase_order_count"`
-}
-
-// PurchasingVendorData represents purchasing analytics for a vendor
-type PurchasingVendorData struct {
-	VendorID           *uuid.UUID `json:"vendor_id"`
-	VendorName         string     `json:"vendor_name"`
-	TotalCost          float64    `json:"total_cost"`
-	PurchaseOrderCount int64      `json:"purchase_order_count"`
-	IngredientCount    int64      `json:"ingredient_count"`
-	Quantity           float64    `json:"quantity"`
-}
-
 // ProductAnalyticsRequest represents the request for product analytics
 type ProductAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
@@ -173,7 +100,6 @@ type ProductAnalyticsRequest struct {
 type ProductAnalyticsResponse struct {
 	OrganizationID uuid.UUID              `json:"organization_id"`
 	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
-	OutletName     *string                `json:"outlet_name,omitempty"`
 	DateFrom       time.Time              `json:"date_from"`
 	DateTo         time.Time              `json:"date_to"`
 	Data           []ProductAnalyticsData `json:"data"`
@@ -183,7 +109,6 @@ type ProductAnalyticsData struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
-	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -211,7 +136,6 @@ type ProductAnalyticsPerCategoryRequest struct {
 type ProductAnalyticsPerCategoryResponse struct {
 	OrganizationID uuid.UUID                         `json:"organization_id"`
 	OutletID       *uuid.UUID                        `json:"outlet_id,omitempty"`
-	OutletName     *string                           `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                         `json:"date_from"`
 	DateTo         time.Time                         `json:"date_to"`
 	Data           []ProductAnalyticsPerCategoryData `json:"data"`
@@ -241,7 +165,6 @@ type DashboardAnalyticsRequest struct {
 type DashboardAnalyticsResponse struct {
 	OrganizationID uuid.UUID                    `json:"organization_id"`
 	OutletID       *uuid.UUID                   `json:"outlet_id,omitempty"`
-	OutletName     *string                      `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                    `json:"date_from"`
 	DateTo         time.Time                    `json:"date_to"`
 	Overview       DashboardOverview            `json:"overview"`
@@ -252,17 +175,15 @@ type DashboardAnalyticsResponse struct {
 
 // DashboardOverview represents the overview data for dashboard
 type DashboardOverview struct {
-	TotalSales         float64 `json:"total_sales"`
+	TotalSales        float64 `json:"total_sales"`
-	TotalOrders        int64   `json:"total_orders"`
+	TotalOrders       int64   `json:"total_orders"`
-	AverageOrderValue  float64 `json:"average_order_value"`
+	AverageOrderValue float64 `json:"average_order_value"`
-	TotalCustomers     int64   `json:"total_customers"`
+	TotalCustomers    int64   `json:"total_customers"`
-	VoidedOrders       int64   `json:"voided_orders"`
+	VoidedOrders      int64   `json:"voided_orders"`
-	RefundedOrders     int64   `json:"refunded_orders"`
+	RefundedOrders    int64   `json:"refunded_orders"`
-	TotalItemSold      int64   `json:"total_item_sold"`
-	TotalLowStock      int64   `json:"total_low_stock"`
-	TotalProductActive int64   `json:"total_product_active"`
 }
 
+// ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
 	OutletID       *uuid.UUID `validate:"omitempty"`
@@ -271,39 +192,19 @@ type ProfitLossAnalyticsRequest struct {
 	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
 }
 
+// ProfitLossAnalyticsResponse represents the response for profit and loss analytics
 type ProfitLossAnalyticsResponse struct {
-	OrganizationID           uuid.UUID                `json:"organization_id"`
+	OrganizationID uuid.UUID           `json:"organization_id"`
-	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
+	OutletID       *uuid.UUID          `json:"outlet_id,omitempty"`
-	OutletName               *string                  `json:"outlet_name,omitempty"`
+	DateFrom       time.Time           `json:"date_from"`
-	DateFrom                 time.Time                `json:"date_from"`
+	DateTo         time.Time           `json:"date_to"`
-	DateTo                   time.Time                `json:"date_to"`
+	GroupBy        string              `json:"group_by"`
-	GroupBy                  string                   `json:"group_by"`
+	Summary        ProfitLossSummary   `json:"summary"`
-	Summary                  ProfitLossSummary        `json:"summary"`
+	Data           []ProfitLossData    `json:"data"`
-	Data                     []ProfitLossData         `json:"data"`
+	ProductData    []ProductProfitData `json:"product_data"`
-	ProductData              []ProductProfitData      `json:"product_data"`
-	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
-	Purchasing               ProfitLossPurchasing     `json:"purchasing"`
-	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
-	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
-}
-
-type ProfitLossPurchasing struct {
-	TodayTotal       float64                `json:"today_total"`
-	MtdTotal         float64                `json:"mtd_total"`
-	TodayRawMaterial float64                `json:"today_raw_material"`
-	MtdRawMaterial   float64                `json:"mtd_raw_material"`
-	TodayExpense     float64                `json:"today_expense"`
-	MtdExpense       float64                `json:"mtd_expense"`
-	Items            []ProfitLossPurchasingItem `json:"items"`
-}
-
-type ProfitLossPurchasingItem struct {
-	Date     time.Time `json:"date"`
-	Item     string    `json:"item"`
-	Quantity float64   `json:"quantity"`
-	Nominal  float64   `json:"nominal"`
 }
 
+// ProfitLossSummary represents the summary of profit and loss analytics
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -318,6 +219,7 @@ type ProfitLossSummary struct {
 	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
+// ProfitLossData represents individual profit and loss data point by time period
 type ProfitLossData struct {
 	Date              time.Time `json:"date"`
 	Revenue           float64   `json:"revenue"`
@@ -331,6 +233,7 @@ type ProfitLossData struct {
 	Orders            int64     `json:"orders"`
 }
 
+// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
 	ProductID         uuid.UUID `json:"product_id"`
 	ProductName       string    `json:"product_name"`
@@ -345,139 +248,3 @@ type ProductProfitData struct {
 	AverageCost       float64   `json:"average_cost"`
 	ProfitPerUnit     float64   `json:"profit_per_unit"`
 }
-
-type ProfitLossSummaryRow struct {
-	ID           string                 `json:"id"`
-	Label        string                 `json:"label"`
-	IsBold       bool                   `json:"is_bold"`
-	TodayNominal float64                `json:"today_nominal"`
-	TodayPct     float64                `json:"today_pct"`
-	MtdNominal   float64                `json:"mtd_nominal"`
-	MtdPct       float64                `json:"mtd_pct"`
-	SubItems     []ProfitLossSummaryRow `json:"sub_items,omitempty"`
-}
-
-type OperationalExpenseItem struct {
-	Item    string  `json:"item"`
-	Nominal float64 `json:"nominal"`
-}
-
-type ExclusiveSummaryPeriodRequest struct {
-	OrganizationID                uuid.UUID  `validate:"required"`
-	OutletID                      *uuid.UUID `validate:"omitempty"`
-	DateFrom                      time.Time  `validate:"required"`
-	DateTo                        time.Time  `validate:"required"`
-	ExcludeGajiStaffFromReimburse bool       `validate:"omitempty"`
-}
-
-type ExclusiveSummaryMonthlyRequest struct {
-	OrganizationID uuid.UUID  `validate:"required"`
-	OutletID       *uuid.UUID `validate:"omitempty"`
-	Month          time.Time  `validate:"required"`
-}
-
-type ExclusiveSummaryMTDRequest struct {
-	OrganizationID                uuid.UUID  `validate:"required"`
-	OutletID                      *uuid.UUID `validate:"omitempty"`
-	DateTo                        time.Time  `validate:"required"`
-	ExcludeGajiStaffFromReimburse bool       `validate:"omitempty"`
-}
-
-type ExclusiveSummaryPeriodResponse struct {
-	OrganizationID              uuid.UUID                           `json:"organization_id"`
-	OutletID                    *uuid.UUID                          `json:"outlet_id,omitempty"`
-	OutletName                  *string                             `json:"outlet_name,omitempty"`
-	Period                      ExclusiveSummaryPeriodRange         `json:"period"`
-	Summary                     ExclusiveSummaryPeriodSummary       `json:"summary"`
-	Reimburse                   ExclusiveSummaryReimburse           `json:"reimburse"`
-	HPPBreakdown                []ExclusiveSummaryCategoryBreakdown `json:"hpp_breakdown"`
-	OperationalExpenseBreakdown []ExclusiveSummaryCategoryBreakdown `json:"operational_expense_breakdown"`
-	DailySummary                []ExclusiveSummaryDailySummary      `json:"daily_summary"`
-	DailyTransactions           []ExclusiveSummaryDailyTransaction  `json:"daily_transactions"`
-}
-
-type ExclusiveSummaryPeriodRange struct {
-	DateFrom time.Time `json:"date_from"`
-	DateTo   time.Time `json:"date_to"`
-}
-
-type ExclusiveSummaryPeriodSummary struct {
-	Sales                    float64 `json:"sales"`
-	HPP                      float64 `json:"hpp"`
-	GrossProfit              float64 `json:"gross_profit"`
-	SalaryTotal              float64 `json:"salary_total"`
-	SalaryDW                 float64 `json:"salary_dw"`
-	SalaryStaff              float64 `json:"salary_staff"`
-	SalaryOther              float64 `json:"salary_other"`
-	OtherOperationalExpenses float64 `json:"other_operational_expenses"`
-	OperationalExpensesTotal float64 `json:"operational_expenses_total"`
-	TotalCost                float64 `json:"total_cost"`
-	NetProfit                float64 `json:"net_profit"`
-}
-
-type ExclusiveSummaryReimburse struct {
-	TotalCost           float64 `json:"total_cost"`
-	ExcludedSalaryStaff float64 `json:"excluded_salary_staff"`
-	TotalReimburse      float64 `json:"total_reimburse"`
-}
-
-type ExclusiveSummaryCategoryBreakdown struct {
-	CategoryCode string  `json:"category_code"`
-	CategoryName string  `json:"category_name"`
-	Amount       float64 `json:"amount"`
-	Percentage   float64 `json:"percentage"`
-}
-
-type ExclusiveSummaryDailySummary struct {
-	Date             time.Time `json:"date"`
-	TransactionCount int64     `json:"transaction_count"`
-	TotalCost        float64   `json:"total_cost"`
-}
-
-type ExclusiveSummaryDailyTransaction struct {
-	Date         time.Time `json:"date"`
-	CategoryCode string    `json:"category_code"`
-	CategoryName string    `json:"category_name"`
-	Description  string    `json:"description"`
-	Amount       float64   `json:"amount"`
-	Source       string    `json:"source"`
-}
-
-type ExclusiveSummaryMonthlyResponse struct {
-	OrganizationID uuid.UUID                       `json:"organization_id"`
-	OutletID       *uuid.UUID                      `json:"outlet_id,omitempty"`
-	OutletName     *string                         `json:"outlet_name,omitempty"`
-	Month          string                          `json:"month"`
-	Summary        ExclusiveSummaryMonthlySummary  `json:"summary"`
-	Periods        []ExclusiveSummaryMonthlyPeriod `json:"periods"`
-	BankBalance    []ExclusiveSummaryBankBalance   `json:"bank_balance"`
-}
-
-type ExclusiveSummaryMonthlySummary struct {
-	TotalSales               float64 `json:"total_sales"`
-	HPP                      float64 `json:"hpp"`
-	GrossProfit              float64 `json:"gross_profit"`
-	OperationalExpensesTotal float64 `json:"operational_expenses_total"`
-	TotalCost                float64 `json:"total_cost"`
-	NetProfit                float64 `json:"net_profit"`
-	NetProfitMargin          float64 `json:"net_profit_margin"`
-}
-
-type ExclusiveSummaryMonthlyPeriod struct {
-	Label       string    `json:"label"`
-	DateFrom    time.Time `json:"date_from"`
-	DateTo      time.Time `json:"date_to"`
-	Sales       float64   `json:"sales"`
-	HPP         float64   `json:"hpp"`
-	GrossProfit float64   `json:"gross_profit"`
-	GrossMargin float64   `json:"gross_margin"`
-}
-
-type ExclusiveSummaryBankBalance struct {
-	Bank             string   `json:"bank"`
-	OpeningBalance   *float64 `json:"opening_balance"`
-	IncomingMutation *float64 `json:"incoming_mutation"`
-	OutgoingMutation *float64 `json:"outgoing_mutation"`
-	ClosingBalance   *float64 `json:"closing_balance"`
-	Notes            *string  `json:"notes"`
-}

internal/models/category.go

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

internal/models/customer.go

@@ -23,17 +23,17 @@ type UpdateCustomerRequest struct {
 }
 
 type CustomerResponse struct {
-	ID             uuid.UUID         `json:"id"`
+	ID             uuid.UUID `json:"id"`
-	OrganizationID uuid.UUID         `json:"organization_id"`
+	OrganizationID uuid.UUID `json:"organization_id"`
-	Name           string            `json:"name"`
+	Name           string    `json:"name"`
-	Email          *string           `json:"email,omitempty"`
+	Email          *string   `json:"email,omitempty"`
-	Phone          *string           `json:"phone,omitempty"`
+	Phone          *string   `json:"phone,omitempty"`
-	Address        *string           `json:"address,omitempty"`
+	Address        *string   `json:"address,omitempty"`
-	IsDefault      bool              `json:"is_default"`
+	IsDefault      bool      `json:"is_default"`
-	IsActive       bool              `json:"is_active"`
+	IsActive       bool      `json:"is_active"`
-	Metadata       entities.Metadata `json:"metadata"`
+	Metadata       entities.Metadata  `json:"metadata"`
-	CreatedAt      time.Time         `json:"created_at"`
+	CreatedAt      time.Time `json:"created_at"`
-	UpdatedAt      time.Time         `json:"updated_at"`
+	UpdatedAt      time.Time `json:"updated_at"`
 }
 
 // ListCustomersQuery represents query parameters for listing customers

internal/models/expense.go

@@ -1,190 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type Expense struct {
-	ID              uuid.UUID `json:"id"`
-	OrganizationID  uuid.UUID `json:"organization_id"`
-	OutletID        uuid.UUID `json:"outlet_id"`
-	Receiver        string    `json:"receiver"`
-	TransactionDate time.Time `json:"transaction_date"`
-	CodeNumber      string    `json:"code_number"`
-	Status          string    `json:"status"`
-	Description     *string   `json:"description"`
-	Tax             float64   `json:"tax"`
-	Total           float64   `json:"total"`
-	Reserved1       *string   `json:"reserved1"`
-	CreatedAt       time.Time `json:"created_at"`
-	UpdatedAt       time.Time `json:"updated_at"`
-}
-
-type ExpenseItem struct {
-	ID                 uuid.UUID `json:"id"`
-	ExpenseID          uuid.UUID `json:"expense_id"`
-	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
-	PurchaseCategoryID uuid.UUID `json:"purchase_category_id"`
-	Item               string    `json:"item"`
-	Description        *string   `json:"description"`
-	Amount             float64   `json:"amount"`
-	CreatedAt          time.Time `json:"created_at"`
-	UpdatedAt          time.Time `json:"updated_at"`
-}
-
-type ExpenseResponse struct {
-	ID              uuid.UUID             `json:"id"`
-	OrganizationID  uuid.UUID             `json:"organization_id"`
-	OutletID        uuid.UUID             `json:"outlet_id"`
-	Receiver        string                `json:"receiver"`
-	TransactionDate time.Time             `json:"transaction_date"`
-	CodeNumber      string                `json:"code_number"`
-	Status          string                `json:"status"`
-	Description     *string               `json:"description"`
-	Tax             float64               `json:"tax"`
-	Total           float64               `json:"total"`
-	Reserved1       *string               `json:"reserved1"`
-	CreatedAt       time.Time             `json:"created_at"`
-	UpdatedAt       time.Time             `json:"updated_at"`
-	Items           []ExpenseItemResponse `json:"items,omitempty"`
-}
-
-type ExpenseItemResponse struct {
-	ID                   uuid.UUID                 `json:"id"`
-	ExpenseID            uuid.UUID                 `json:"expense_id"`
-	ChartOfAccountID     uuid.UUID                 `json:"chart_of_account_id"`
-	ChartOfAccountName   string                    `json:"chart_of_account_name,omitempty"`
-	PurchaseCategoryID   uuid.UUID                 `json:"purchase_category_id"`
-	PurchaseCategoryName string                    `json:"purchase_category_name,omitempty"`
-	PurchaseCategoryType string                    `json:"purchase_category_type,omitempty"`
-	PurchaseCategory     *PurchaseCategoryResponse `json:"purchase_category,omitempty"`
-	Item                 string                    `json:"item"`
-	Description          *string                   `json:"description"`
-	Amount               float64                   `json:"amount"`
-	CreatedAt            time.Time                 `json:"created_at"`
-	UpdatedAt            time.Time                 `json:"updated_at"`
-}
-
-type CreateExpenseRequest struct {
-	Receiver        string                     `json:"receiver"`
-	TransactionDate string                     `json:"transaction_date"`
-	CodeNumber      string                     `json:"code_number"`
-	OutletID        string                     `json:"outlet_id"`
-	Status          *string                    `json:"status,omitempty"`
-	Description     *string                    `json:"description"`
-	Tax             float64                    `json:"tax"`
-	Total           float64                    `json:"total"`
-	Items           []CreateExpenseItemRequest `json:"items"`
-}
-
-type CreateExpenseItemRequest struct {
-	ChartOfAccountID   string  `json:"chart_of_account_id"`
-	PurchaseCategoryID string  `json:"purchase_category_id"`
-	Item               string  `json:"item"`
-	Description        *string `json:"description,omitempty"`
-	Amount             float64 `json:"amount"`
-}
-
-type UpdateExpenseRequest struct {
-	Receiver        *string                    `json:"receiver,omitempty"`
-	TransactionDate *string                    `json:"transaction_date,omitempty"`
-	CodeNumber      *string                    `json:"code_number,omitempty"`
-	OutletID        *string                    `json:"outlet_id,omitempty"`
-	Status          *string                    `json:"status,omitempty"`
-	Description     *string                    `json:"description,omitempty"`
-	Tax             *float64                   `json:"tax,omitempty"`
-	Total           *float64                   `json:"total,omitempty"`
-	Reserved1       *string                    `json:"reserved1,omitempty"`
-	Items           []UpdateExpenseItemRequest `json:"items,omitempty"`
-}
-
-type UpdateExpenseItemRequest struct {
-	ChartOfAccountID   *string  `json:"chart_of_account_id,omitempty"`
-	PurchaseCategoryID *string  `json:"purchase_category_id,omitempty"`
-	Item               *string  `json:"item,omitempty"`
-	Description        *string  `json:"description,omitempty"`
-	Amount             *float64 `json:"amount,omitempty"`
-}
-
-type ListExpenseRequest struct {
-	Page      int    `json:"page"`
-	Limit     int    `json:"limit"`
-	Search    string `json:"search,omitempty"`
-	OutletID  string `json:"outlet_id,omitempty"`
-	Status    string `json:"status,omitempty"`
-	StartDate string `json:"start_date,omitempty"`
-	EndDate   string `json:"end_date,omitempty"`
-}
-
-type ListExpenseResponse struct {
-	Expenses   []*ExpenseResponse `json:"expenses"`
-	TotalCount int                `json:"total_count"`
-	Page       int                `json:"page"`
-	Limit      int                `json:"limit"`
-	TotalPages int                `json:"total_pages"`
-}
-
-type ExpenseAnalyticsRequest struct {
-	OrganizationID uuid.UUID  `json:"organization_id"`
-	OutletID       *uuid.UUID `json:"outlet_id,omitempty"`
-	DateFrom       time.Time  `json:"date_from"`
-	DateTo         time.Time  `json:"date_to"`
-	GroupBy        string     `json:"group_by"`
-}
-
-type ExpenseAnalyticsResponse struct {
-	OrganizationID     uuid.UUID                            `json:"organization_id"`
-	OutletID           *uuid.UUID                           `json:"outlet_id,omitempty"`
-	DateFrom           time.Time                            `json:"date_from"`
-	DateTo             time.Time                            `json:"date_to"`
-	GroupBy            string                               `json:"group_by"`
-	Summary            ExpenseAnalyticsSummary              `json:"summary"`
-	Data               []ExpenseAnalyticsData               `json:"data"`
-	CategoryData       []ExpenseAnalyticsCategoryData       `json:"category_data"`
-	ChartOfAccountData []ExpenseAnalyticsChartOfAccountData `json:"chart_of_account_data"`
-	ItemData           []ExpenseAnalyticsItemData           `json:"item_data"`
-}
-
-type ExpenseAnalyticsSummary struct {
-	TotalExpenses       float64 `json:"total_expenses"`
-	TotalExpenseCount   int64   `json:"total_expense_count"`
-	TotalTax            float64 `json:"total_tax"`
-	AverageExpenseValue float64 `json:"average_expense_value"`
-	TotalCategories     int64   `json:"total_categories"`
-	TotalItems          int64   `json:"total_items"`
-}
-
-type ExpenseAnalyticsData struct {
-	Date         time.Time `json:"date"`
-	Expenses     float64   `json:"expenses"`
-	ExpenseCount int64     `json:"expense_count"`
-	Tax          float64   `json:"tax"`
-	Items        int64     `json:"items"`
-	Categories   int64     `json:"categories"`
-}
-
-type ExpenseAnalyticsCategoryData struct {
-	PurchaseCategoryID   uuid.UUID `json:"purchase_category_id"`
-	PurchaseCategoryName string    `json:"purchase_category_name"`
-	PurchaseCategoryType string    `json:"purchase_category_type"`
-	TotalAmount          float64   `json:"total_amount"`
-	ExpenseCount         int64     `json:"expense_count"`
-	ItemCount            int64     `json:"item_count"`
-}
-
-type ExpenseAnalyticsChartOfAccountData struct {
-	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
-	ChartOfAccountName string    `json:"chart_of_account_name"`
-	TotalAmount        float64   `json:"total_amount"`
-	ExpenseCount       int64     `json:"expense_count"`
-	ItemCount          int64     `json:"item_count"`
-}
-
-type ExpenseAnalyticsItemData struct {
-	Item         string  `json:"item"`
-	TotalAmount  float64 `json:"total_amount"`
-	ExpenseCount int64   `json:"expense_count"`
-	ItemCount    int64   `json:"item_count"`
-}

internal/models/ingredient_unit_converter.go

@@ -101,3 +101,4 @@ type IngredientUnitsResponse struct {
 	BaseUnitName   string          `json:"base_unit_name"`
 	Units          []*UnitResponse `json:"units"`
 }
+

internal/models/notification.go

@@ -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"`
-}

internal/models/order.go

@@ -188,8 +188,6 @@ type OrderItemResponse struct {
 	ProductName         string
 	ProductVariantID    *uuid.UUID
 	ProductVariantName  *string
-	CategoryID          *uuid.UUID
-	CategoryName        *string
 	Quantity            int
 	UnitPrice           float64
 	TotalPrice          float64
@@ -209,7 +207,6 @@ type OrderItemResponse struct {
 	CreatedAt           time.Time
 	UpdatedAt           time.Time
 	PrinterType         string
-	PrintToChecker      bool
 	PaidQuantity        int
 }
 

internal/models/order_ingredient_transaction.go

@@ -52,8 +52,8 @@ type UpdateOrderIngredientTransactionRequest struct {
 	GrossQty        *float64   `json:"gross_qty,omitempty" validate:"omitempty,gt=0"`
 	NetQty          *float64   `json:"net_qty,omitempty" validate:"omitempty,gt=0"`
 	WasteQty        *float64   `json:"waste_qty,omitempty" validate:"min=0"`
-	Unit            *string    `json:"unit,omitempty" validate:"omitempty,max=50"`
+	Unit             *string   `json:"unit,omitempty" validate:"omitempty,max=50"`
-	TransactionDate *time.Time `json:"transaction_date,omitempty"`
+	TransactionDate  *time.Time `json:"transaction_date,omitempty"`
 }
 
 type OrderIngredientTransactionResponse struct {
@@ -98,11 +98,11 @@ type ListOrderIngredientTransactionsRequest struct {
 }
 
 type OrderIngredientTransactionSummary struct {
-	IngredientID    uuid.UUID `json:"ingredient_id"`
+	IngredientID     uuid.UUID `json:"ingredient_id"`
-	IngredientName  string    `json:"ingredient_name"`
+	IngredientName   string    `json:"ingredient_name"`
-	TotalGrossQty   float64   `json:"total_gross_qty"`
+	TotalGrossQty    float64   `json:"total_gross_qty"`
-	TotalNetQty     float64   `json:"total_net_qty"`
+	TotalNetQty      float64   `json:"total_net_qty"`
-	TotalWasteQty   float64   `json:"total_waste_qty"`
+	TotalWasteQty    float64   `json:"total_waste_qty"`
-	WastePercentage float64   `json:"waste_percentage"`
+	WastePercentage  float64   `json:"waste_percentage"`
-	Unit            string    `json:"unit"`
+	Unit             string    `json:"unit"`
 }

internal/models/product.go

@@ -40,7 +40,6 @@ type ProductVariant struct {
 
 type CreateProductRequest struct {
 	OrganizationID uuid.UUID              `validate:"required"`
-	OutletID       uuid.UUID              `validate:"omitempty"` // If set, upsert product_outlet_prices on create
 	CategoryID     uuid.UUID              `validate:"required"`
 	SKU            *string                `validate:"omitempty,max=100"`
 	Name           string                 `validate:"required,min=1,max=255"`
@@ -50,7 +49,6 @@ type CreateProductRequest struct {
 	BusinessType   constants.BusinessType `validate:"required"`
 	ImageURL       *string                `validate:"omitempty,max=500"`
 	PrinterType    *string                `validate:"omitempty,max=50"`
-	PrintToChecker *bool                  `validate:"omitempty"`
 	UnitID         *uuid.UUID             `validate:"omitempty"`
 	HasIngredients bool                   `validate:"omitempty"`
 	Metadata       map[string]interface{}
@@ -62,7 +60,6 @@ type CreateProductRequest struct {
 }
 
 type UpdateProductRequest struct {
-	OutletID       uuid.UUID  `validate:"omitempty"` // If set, upsert product_outlet_prices on update
 	CategoryID     *uuid.UUID `validate:"omitempty"`
 	SKU            *string    `validate:"omitempty,max=100"`
 	Name           *string    `validate:"omitempty,min=1,max=255"`
@@ -71,7 +68,6 @@ type UpdateProductRequest struct {
 	Cost           *float64   `validate:"omitempty,min=0"`
 	ImageURL       *string    `validate:"omitempty,max=500"`
 	PrinterType    *string    `validate:"omitempty,max=50"`
-	PrintToChecker *bool      `validate:"omitempty"`
 	UnitID         *uuid.UUID `validate:"omitempty"`
 	HasIngredients *bool      `validate:"omitempty"`
 	Metadata       map[string]interface{}
@@ -104,13 +100,10 @@ type ProductResponse struct {
 	Name           string
 	Description    *string
 	Price          float64
-	OutletPrice    *float64      // outlet-specific price, nil if not set
-	OutletPrices   []OutletPrice // all outlet prices, populated when no outletID in context
 	Cost           float64
 	BusinessType   constants.BusinessType
 	ImageURL       *string
 	PrinterType    string
-	PrintToChecker bool
 	UnitID         *uuid.UUID
 	HasIngredients bool
 	Metadata       map[string]interface{}
@@ -120,13 +113,6 @@ type ProductResponse struct {
 	Variants       []ProductVariantResponse
 }
 
-type OutletPrice struct {
-	OutletID       uuid.UUID
-	OutletName     string
-	Price          float64
-	PrintToChecker bool
-}
-
 type ProductVariantResponse struct {
 	ID            uuid.UUID
 	ProductID     uuid.UUID

internal/models/product_ingredient.go

@@ -7,15 +7,15 @@ import (
 )
 
 type ProductIngredient struct {
-	ID              uuid.UUID  `json:"id"`
+	ID               uuid.UUID  `json:"id"`
-	OrganizationID  uuid.UUID  `json:"organization_id"`
+	OrganizationID   uuid.UUID  `json:"organization_id"`
-	OutletID        *uuid.UUID `json:"outlet_id"`
+	OutletID         *uuid.UUID `json:"outlet_id"`
-	ProductID       uuid.UUID  `json:"product_id"`
+	ProductID        uuid.UUID  `json:"product_id"`
-	IngredientID    uuid.UUID  `json:"ingredient_id"`
+	IngredientID     uuid.UUID  `json:"ingredient_id"`
-	Quantity        float64    `json:"quantity"`
+	Quantity         float64    `json:"quantity"`
-	WastePercentage float64    `json:"waste_percentage"`
+	WastePercentage  float64    `json:"waste_percentage"`
-	CreatedAt       time.Time  `json:"created_at"`
+	CreatedAt        time.Time  `json:"created_at"`
-	UpdatedAt       time.Time  `json:"updated_at"`
+	UpdatedAt        time.Time  `json:"updated_at"`
 
 	// Relations
 	Product    *Product    `json:"product,omitempty"`
@@ -37,15 +37,15 @@ type UpdateProductIngredientRequest struct {
 }
 
 type ProductIngredientResponse struct {
-	ID              uuid.UUID  `json:"id"`
+	ID               uuid.UUID  `json:"id"`
-	OrganizationID  uuid.UUID  `json:"organization_id"`
+	OrganizationID   uuid.UUID  `json:"organization_id"`
-	OutletID        *uuid.UUID `json:"outlet_id"`
+	OutletID         *uuid.UUID `json:"outlet_id"`
-	ProductID       uuid.UUID  `json:"product_id"`
+	ProductID        uuid.UUID  `json:"product_id"`
-	IngredientID    uuid.UUID  `json:"ingredient_id"`
+	IngredientID     uuid.UUID  `json:"ingredient_id"`
-	Quantity        float64    `json:"quantity"`
+	Quantity         float64    `json:"quantity"`
-	WastePercentage float64    `json:"waste_percentage"`
+	WastePercentage  float64    `json:"waste_percentage"`
-	CreatedAt       time.Time  `json:"created_at"`
+	CreatedAt        time.Time  `json:"created_at"`
-	UpdatedAt       time.Time  `json:"updated_at"`
+	UpdatedAt        time.Time  `json:"updated_at"`
 
 	// Relations
 	Product    *Product    `json:"product,omitempty"`

internal/models/product_outlet_price.go

@@ -1,38 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type ProductOutletPrice struct {
-	ID             uuid.UUID
-	ProductID      uuid.UUID
-	OutletID       uuid.UUID
-	Price          float64
-	PrintToChecker bool
-	CreatedAt      time.Time
-	UpdatedAt      time.Time
-}
-
-type CreateProductOutletPriceRequest struct {
-	ProductID      uuid.UUID `validate:"required"`
-	OutletID       uuid.UUID `validate:"required"`
-	Price          float64   `validate:"required,min=0"`
-	PrintToChecker bool
-}
-
-type UpdateProductOutletPriceRequest struct {
-	Price          *float64 `validate:"required,min=0"`
-	PrintToChecker *bool
-}
-
-type ProductOutletPriceResponse struct {
-	ID        uuid.UUID `json:"id"`
-	ProductID uuid.UUID `json:"product_id"`
-	OutletID  uuid.UUID `json:"outlet_id"`
-	Price     float64   `json:"price"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
-}

internal/models/product_recipe.go

@@ -56,4 +56,4 @@ type ProductRecipeResponse struct {
 	Product        *Product        `json:"product,omitempty"`
 	ProductVariant *ProductVariant `json:"product_variant,omitempty"`
 	Ingredient     *Ingredient     `json:"ingredient,omitempty"`
-}
+}

internal/models/purchase_category.go

@@ -1,51 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type PurchaseCategoryResponse struct {
-	ID             uuid.UUID
-	OrganizationID uuid.UUID
-	PresetID       *uuid.UUID
-	ParentID       *uuid.UUID
-	Code           string
-	Name           string
-	Type           string
-	SortOrder      int
-	IsSystem       bool
-	IsActive       bool
-	CreatedAt      time.Time
-	UpdatedAt      time.Time
-}
-
-type CreatePurchaseCategoryRequest struct {
-	OrganizationID uuid.UUID
-	ParentID       *uuid.UUID
-	Code           *string
-	Name           string
-	Type           string
-	SortOrder      int
-	IsActive       bool
-}
-
-type UpdatePurchaseCategoryRequest struct {
-	ParentID  *uuid.UUID
-	Code      *string
-	Name      *string
-	Type      *string
-	SortOrder *int
-	IsActive  *bool
-}
-
-type ListPurchaseCategoriesRequest struct {
-	OrganizationID uuid.UUID
-	ParentID       *uuid.UUID
-	Type           string
-	Search         string
-	IsActive       *bool
-	Page           int
-	Limit          int
-}

internal/models/purchase_order.go

@@ -7,32 +7,30 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID  `json:"id"`
+	ID              uuid.UUID `json:"id"`
-	OrganizationID  uuid.UUID  `json:"organization_id"`
+	OrganizationID  uuid.UUID `json:"organization_id"`
-	OutletID        *uuid.UUID `json:"outlet_id"`
+	VendorID        uuid.UUID `json:"vendor_id"`
-	VendorID        *uuid.UUID `json:"vendor_id"`
+	PONumber        string    `json:"po_number"`
-	PONumber        string     `json:"po_number"`
+	TransactionDate time.Time `json:"transaction_date"`
-	TransactionDate time.Time  `json:"transaction_date"`
+	DueDate         time.Time `json:"due_date"`
-	DueDate         *time.Time `json:"due_date"`
+	Reference       *string   `json:"reference"`
-	Reference       *string    `json:"reference"`
+	Status          string    `json:"status"`
-	Status          string     `json:"status"`
+	Message         *string   `json:"message"`
-	Message         *string    `json:"message"`
+	TotalAmount     float64   `json:"total_amount"`
-	TotalAmount     float64    `json:"total_amount"`
+	CreatedAt       time.Time `json:"created_at"`
-	CreatedAt       time.Time  `json:"created_at"`
+	UpdatedAt       time.Time `json:"updated_at"`
-	UpdatedAt       time.Time  `json:"updated_at"`
 }
 
 type PurchaseOrderItem struct {
-	ID                 uuid.UUID  `json:"id"`
+	ID              uuid.UUID `json:"id"`
-	PurchaseOrderID    uuid.UUID  `json:"purchase_order_id"`
+	PurchaseOrderID uuid.UUID `json:"purchase_order_id"`
-	IngredientID       *uuid.UUID `json:"ingredient_id"`
+	IngredientID    uuid.UUID `json:"ingredient_id"`
-	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id"`
+	Description     *string   `json:"description"`
-	Description        *string    `json:"description"`
+	Quantity        float64   `json:"quantity"`
-	Quantity           *float64   `json:"quantity"`
+	UnitID          uuid.UUID `json:"unit_id"`
-	UnitID             *uuid.UUID `json:"unit_id"`
+	Amount          float64   `json:"amount"`
-	Amount             float64    `json:"amount"`
+	CreatedAt       time.Time `json:"created_at"`
-	CreatedAt          time.Time  `json:"created_at"`
+	UpdatedAt       time.Time `json:"updated_at"`
-	UpdatedAt          time.Time  `json:"updated_at"`
 }
 
 type PurchaseOrderAttachment struct {
@@ -45,11 +43,10 @@ type PurchaseOrderAttachment struct {
 type PurchaseOrderResponse struct {
 	ID              uuid.UUID                         `json:"id"`
 	OrganizationID  uuid.UUID                         `json:"organization_id"`
-	OutletID        *uuid.UUID                        `json:"outlet_id"`
+	VendorID        uuid.UUID                         `json:"vendor_id"`
-	VendorID        *uuid.UUID                        `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         *time.Time                        `json:"due_date"`
+	DueDate         time.Time                         `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`
@@ -62,19 +59,17 @@ type PurchaseOrderResponse struct {
 }
 
 type PurchaseOrderItemResponse struct {
-	ID                 uuid.UUID                 `json:"id"`
+	ID              uuid.UUID           `json:"id"`
-	PurchaseOrderID    uuid.UUID                 `json:"purchase_order_id"`
+	PurchaseOrderID uuid.UUID           `json:"purchase_order_id"`
-	IngredientID       *uuid.UUID                `json:"ingredient_id"`
+	IngredientID    uuid.UUID           `json:"ingredient_id"`
-	PurchaseCategoryID uuid.UUID                 `json:"purchase_category_id"`
+	Description     *string             `json:"description"`
-	Description        *string                   `json:"description"`
+	Quantity        float64             `json:"quantity"`
-	Quantity           *float64                  `json:"quantity"`
+	UnitID          uuid.UUID           `json:"unit_id"`
-	UnitID             *uuid.UUID                `json:"unit_id"`
+	Amount          float64             `json:"amount"`
-	Amount             float64                   `json:"amount"`
+	CreatedAt       time.Time           `json:"created_at"`
-	CreatedAt          time.Time                 `json:"created_at"`
+	UpdatedAt       time.Time           `json:"updated_at"`
-	UpdatedAt          time.Time                 `json:"updated_at"`
+	Ingredient      *IngredientResponse `json:"ingredient,omitempty"`
-	Ingredient         *IngredientResponse       `json:"ingredient,omitempty"`
+	Unit            *UnitResponse       `json:"unit,omitempty"`
-	PurchaseCategory   *PurchaseCategoryResponse `json:"purchase_category,omitempty"`
-	Unit               *UnitResponse             `json:"unit,omitempty"`
 }
 
 type PurchaseOrderAttachmentResponse struct {
@@ -86,11 +81,10 @@ type PurchaseOrderAttachmentResponse struct {
 }
 
 type CreatePurchaseOrderRequest struct {
-	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty"`
+	VendorID          uuid.UUID                        `json:"vendor_id"`
-	OutletID          *uuid.UUID                       `json:"outlet_id,omitempty"`
 	PONumber          string                           `json:"po_number"`
 	TransactionDate   time.Time                        `json:"transaction_date"`
-	DueDate           *time.Time                       `json:"due_date,omitempty"`
+	DueDate           time.Time                        `json:"due_date"`
 	Reference         *string                          `json:"reference,omitempty"`
 	Status            *string                          `json:"status,omitempty"`
 	Message           *string                          `json:"message,omitempty"`
@@ -99,12 +93,11 @@ type CreatePurchaseOrderRequest struct {
 }
 
 type CreatePurchaseOrderItemRequest struct {
-	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty"`
+	IngredientID uuid.UUID `json:"ingredient_id"`
-	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id"`
+	Description  *string   `json:"description,omitempty"`
-	Description        *string    `json:"description,omitempty"`
+	Quantity     float64   `json:"quantity"`
-	Quantity           *float64   `json:"quantity,omitempty"`
+	UnitID       uuid.UUID `json:"unit_id"`
-	UnitID             *uuid.UUID `json:"unit_id,omitempty"`
+	Amount       float64   `json:"amount"`
-	Amount             float64    `json:"amount"`
 }
 
 type UpdatePurchaseOrderRequest struct {
@@ -120,13 +113,12 @@ type UpdatePurchaseOrderRequest struct {
 }
 
 type UpdatePurchaseOrderItemRequest struct {
-	ID                 *uuid.UUID `json:"id,omitempty"` // For existing items
+	ID           *uuid.UUID `json:"id,omitempty"` // For existing items
-	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty"`
+	IngredientID *uuid.UUID `json:"ingredient_id,omitempty"`
-	PurchaseCategoryID *uuid.UUID `json:"purchase_category_id,omitempty"`
+	Description  *string    `json:"description,omitempty"`
-	Description        *string    `json:"description,omitempty"`
+	Quantity     *float64   `json:"quantity,omitempty"`
-	Quantity           *float64   `json:"quantity,omitempty"`
+	UnitID       *uuid.UUID `json:"unit_id,omitempty"`
-	UnitID             *uuid.UUID `json:"unit_id,omitempty"`
+	Amount       *float64   `json:"amount,omitempty"`
-	Amount             *float64   `json:"amount,omitempty"`
 }
 
 type ListPurchaseOrdersRequest struct {

internal/models/session.go

@@ -1,18 +0,0 @@
-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"`
-}

internal/models/user.go

@@ -63,12 +63,10 @@ type UserResponse struct {
 
 func (u *User) HasPermission(requiredRole constants.UserRole) bool {
 	roleHierarchy := map[constants.UserRole]int{
-		constants.RoleWaiter:     1,
+		constants.RoleWaiter:  1,
-		constants.RoleCashier:    2,
+		constants.RoleCashier: 2,
-		constants.RolePurchasing: 3,
+		constants.RoleManager: 3,
-		constants.RoleManager:    4,
+		constants.RoleAdmin:   4,
-		constants.RoleAdmin:      5,
-		constants.RoleOwner:      6,
 	}
 
 	userLevel := roleHierarchy[u.Role]

internal/models/user_device.go

@@ -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"`
-}