From 2d6df8e4c6b4dff93a4c7190eb65b0aba1bf5936 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 5 May 2026 21:07:03 +0700 Subject: [PATCH 1/9] Self Order - BE --- internal/app/app.go | 9 + internal/contract/self_order_contract.go | 54 ++++ internal/handler/self_order_handler.go | 308 +++++++++++++++++++++++ internal/router/router.go | 10 +- 4 files changed, 380 insertions(+), 1 deletion(-) create mode 100644 internal/contract/self_order_contract.go create mode 100644 internal/handler/self_order_handler.go diff --git a/internal/app/app.go b/internal/app/app.go index 0be0306..1596bb2 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -44,6 +44,14 @@ func (a *App) Initialize(cfg *config.Config) error { validators := a.initValidators() middleware := a.initMiddleware(services, cfg) healthHandler := handler.NewHealthHandler() + selfOrderHandler := handler.NewSelfOrderHandler( + services.orderService, + services.categoryService, + services.productService, + repos.tableRepo, + repos.outletRepo, + repos.userRepo, + ) a.router = router.NewRouter( cfg, @@ -105,6 +113,7 @@ func (a *App) Initialize(cfg *config.Config) error { services.customerPointsService, services.spinGameService, middleware.customerAuthMiddleware, + selfOrderHandler, ) return nil diff --git a/internal/contract/self_order_contract.go b/internal/contract/self_order_contract.go new file mode 100644 index 0000000..8306ba5 --- /dev/null +++ b/internal/contract/self_order_contract.go @@ -0,0 +1,54 @@ +package contract + +import ( + "github.com/google/uuid" +) + +type SelfOrderMenuRequest struct { + TableID uuid.UUID `json:"table_id" validate:"required"` + CustomerName string `json:"customer_name" validate:"required"` + Phone *string `json:"phone,omitempty"` +} + +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 { + TableID uuid.UUID `json:"table_id" validate:"required"` + CustomerName string `json:"customer_name" validate:"required"` + Phone *string `json:"phone,omitempty"` + 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"` +} diff --git a/internal/handler/self_order_handler.go b/internal/handler/self_order_handler.go new file mode 100644 index 0000000..1d5cf13 --- /dev/null +++ b/internal/handler/self_order_handler.go @@ -0,0 +1,308 @@ +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/models" + "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 +} + +func NewSelfOrderHandler( + orderService service.OrderService, + categoryService service.CategoryService, + productService service.ProductService, + tableRepo repository.TableRepositoryInterface, + outletRepo processor.OutletRepository, + userRepo processor.UserRepository, +) *SelfOrderHandler { + return &SelfOrderHandler{ + orderService: orderService, + categoryService: categoryService, + productService: productService, + tableRepo: tableRepo, + outletRepo: outletRepo, + userRepo: userRepo, + } +} + +func (h *SelfOrderHandler) GetMenu(c *gin.Context) { + ctx := c.Request.Context() + + var req contract.SelfOrderMenuRequest + if err := c.ShouldBindJSON(&req); err != nil { + logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetMenu -> request binding failed") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error()), + }), "SelfOrderHandler::GetMenu") + return + } + + if req.TableID == uuid.Nil { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "table_id is required"), + }), "SelfOrderHandler::GetMenu") + return + } + + if req.CustomerName == "" { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "customer_name is required"), + }), "SelfOrderHandler::GetMenu") + return + } + + table, err := h.tableRepo.GetByID(ctx, req.TableID) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetMenu -> table not found") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "table not found"), + }), "SelfOrderHandler::GetMenu") + 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::GetMenu") + return + } + + outlet, err := h.outletRepo.GetByID(ctx, table.OutletID) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetMenu -> outlet not found") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.NotFoundErrorCode, constants.OrderServiceEntity, "outlet not found"), + }), "SelfOrderHandler::GetMenu") + return + } + + isActive := true + catResp := h.categoryService.ListCategories(ctx, &contract.ListCategoriesRequest{ + OrganizationID: &table.OrganizationID, + Page: 1, + Limit: 100, + }) + if catResp.HasErrors() { + logger.FromContext(ctx).WithError(catResp.GetErrors()[0]).Error("SelfOrderHandler::GetMenu -> failed to list categories") + util.HandleResponse(c.Writer, c.Request, catResp, "SelfOrderHandler::GetMenu") + return + } + + prodResp := h.productService.ListProducts(ctx, &contract.ListProductsRequest{ + OrganizationID: &table.OrganizationID, + IsActive: &isActive, + Page: 1, + Limit: 1000, + }) + if prodResp.HasErrors() { + logger.FromContext(ctx).WithError(prodResp.GetErrors()[0]).Error("SelfOrderHandler::GetMenu -> failed to list products") + util.HandleResponse(c.Writer, c.Request, prodResp, "SelfOrderHandler::GetMenu") + return + } + + catList, ok := catResp.Data.(*contract.ListCategoriesResponse) + if !ok { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.InternalServerErrorCode, constants.CategoryServiceEntity, "unexpected categories response type"), + }), "SelfOrderHandler::GetMenu") + return + } + + prodList, ok := prodResp.Data.(*contract.ListProductsResponse) + if !ok { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductServiceEntity, "unexpected products response type"), + }), "SelfOrderHandler::GetMenu") + return + } + + menu := h.buildMenuResponse(outlet, table, catList.Categories, prodList.Products) + util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(menu), "SelfOrderHandler::GetMenu") +} + +func (h *SelfOrderHandler) buildMenuResponse( + outlet *entities.Outlet, + table *entities.Table, + categories []contract.CategoryResponse, + products []contract.ProductResponse, +) *contract.SelfOrderMenuResponse { + productMap := make(map[uuid.UUID][]contract.ProductResponse) + for _, p := range products { + productMap[p.CategoryID] = append(productMap[p.CategoryID], p) + } + + menuCategories := make([]contract.SelfOrderMenuCategory, 0, len(categories)) + for _, cat := range categories { + menuItems := make([]contract.SelfOrderMenuItem, 0) + if prods, ok := productMap[cat.ID]; ok { + for _, p := range prods { + item := contract.SelfOrderMenuItem{ + ID: p.ID, + Name: p.Name, + Description: p.Description, + Price: p.Price, + ImageURL: p.ImageURL, + } + for _, v := range p.Variants { + item.Variants = append(item.Variants, contract.SelfOrderMenuVariant{ + ID: v.ID, + Name: v.Name, + PriceModifier: v.PriceModifier, + }) + } + menuItems = append(menuItems, item) + } + } + menuCategories = append(menuCategories, contract.SelfOrderMenuCategory{ + ID: cat.ID, + Name: cat.Name, + Description: cat.Description, + Order: cat.Order, + Products: menuItems, + }) + } + + return &contract.SelfOrderMenuResponse{ + OutletName: outlet.Name, + TableName: table.TableName, + Categories: menuCategories, + } +} + +func (h *SelfOrderHandler) CreateOrder(c *gin.Context) { + ctx := c.Request.Context() + + var req contract.SelfOrderCreateOrderRequest + if err := c.ShouldBindJSON(&req); err != nil { + logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> request binding failed") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error()), + }), "SelfOrderHandler::CreateOrder") + return + } + + if err := h.validateCreateOrderRequest(&req); err != nil { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()), + }), "SelfOrderHandler::CreateOrder") + return + } + + table, err := h.tableRepo.GetByID(ctx, req.TableID) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> table not found") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "table not found"), + }), "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["customer_name"] = req.CustomerName + if req.Phone != nil { + metadata["customer_phone"] = *req.Phone + } + + tableID := req.TableID + modelReq := &models.CreateOrderRequest{ + OutletID: table.OutletID, + UserID: userID, + TableID: &tableID, + TableNumber: &table.TableName, + OrderType: constants.OrderTypeDineIn, + OrderItems: orderItems, + CustomerName: &req.CustomerName, + 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) validateCreateOrderRequest(req *contract.SelfOrderCreateOrderRequest) error { + if req.TableID == uuid.Nil { + return fmt.Errorf("table_id is required") + } + if req.CustomerName == "" { + return fmt.Errorf("customer_name 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) 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 +} diff --git a/internal/router/router.go b/internal/router/router.go index 287ba3f..ece4868 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -46,11 +46,12 @@ type Router struct { customerAuthHandler *handler.CustomerAuthHandler customerPointsHandler *handler.CustomerPointsHandler spinGameHandler *handler.SpinGameHandler + selfOrderHandler *handler.SelfOrderHandler authMiddleware *middleware.AuthMiddleware customerAuthMiddleware *middleware.CustomerAuthMiddleware } -func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware) *Router { +func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, selfOrderHandler *handler.SelfOrderHandler) *Router { return &Router{ config: cfg, @@ -89,6 +90,7 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer authMiddleware: authMiddleware, customerAuthMiddleware: customerAuthMiddleware, productVariantHandler: handler.NewProductVariantHandler(productVariantService, productVariantValidator), + selfOrderHandler: selfOrderHandler, } } @@ -145,6 +147,12 @@ func (r *Router) addAppRoutes(rg *gin.Engine) { customer.POST("/spin", r.spinGameHandler.PlaySpinGame) } + selfOrder := v1.Group("/self-order") + { + selfOrder.POST("/menu", r.selfOrderHandler.GetMenu) + selfOrder.POST("/order", r.selfOrderHandler.CreateOrder) + } + organizations := v1.Group("/organizations") { organizations.POST("", r.organizationHandler.CreateOrganization) -- 2.47.2 From 3721fb3cd70375596f6391b6b475129be84a5061 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 6 May 2026 11:56:11 +0700 Subject: [PATCH 2/9] List categories for self-order --- internal/contract/self_order_contract.go | 15 ++++++ internal/handler/self_order_handler.go | 62 ++++++++++++++++++++++++ internal/router/router.go | 1 + 3 files changed, 78 insertions(+) diff --git a/internal/contract/self_order_contract.go b/internal/contract/self_order_contract.go index 8306ba5..8cea50f 100644 --- a/internal/contract/self_order_contract.go +++ b/internal/contract/self_order_contract.go @@ -52,3 +52,18 @@ type SelfOrderCreateOrderItem struct { Quantity int `json:"quantity" validate:"required,min=1"` Notes *string `json:"notes,omitempty"` } + +type SelfOrderListCategoriesRequest struct { + TableID uuid.UUID `form:"table_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"` +} diff --git a/internal/handler/self_order_handler.go b/internal/handler/self_order_handler.go index 1d5cf13..563f2c7 100644 --- a/internal/handler/self_order_handler.go +++ b/internal/handler/self_order_handler.go @@ -296,6 +296,68 @@ func (h *SelfOrderHandler) validateCreateOrderRequest(req *contract.SelfOrderCre 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.TableID == uuid.Nil { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "table_id is required"), + }), "SelfOrderHandler::ListCategories") + return + } + + table, err := h.tableRepo.GetByID(ctx, req.TableID) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ListCategories -> table not found") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "table not found"), + }), "SelfOrderHandler::ListCategories") + return + } + + 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::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) resolveOrgUser(ctx context.Context, organizationID uuid.UUID) (uuid.UUID, error) { users, err := h.userRepo.GetByOrganizationID(ctx, organizationID) if err != nil { diff --git a/internal/router/router.go b/internal/router/router.go index ece4868..9a11c20 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -149,6 +149,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) { selfOrder := v1.Group("/self-order") { + selfOrder.GET("/categories", r.selfOrderHandler.ListCategories) selfOrder.POST("/menu", r.selfOrderHandler.GetMenu) selfOrder.POST("/order", r.selfOrderHandler.CreateOrder) } -- 2.47.2 From fe57aab3b41b583430dd442b56e8ca91c2a1d6f7 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 8 May 2026 14:19:40 +0700 Subject: [PATCH 3/9] Fix categories with table --- internal/contract/self_order_contract.go | 2 +- internal/handler/self_order_handler.go | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/internal/contract/self_order_contract.go b/internal/contract/self_order_contract.go index 8cea50f..0b10f88 100644 --- a/internal/contract/self_order_contract.go +++ b/internal/contract/self_order_contract.go @@ -54,7 +54,7 @@ type SelfOrderCreateOrderItem struct { } type SelfOrderListCategoriesRequest struct { - TableID uuid.UUID `form:"table_id" validate:"required"` + TableID string `form:"table_id" validate:"required"` } type SelfOrderCategoryItem struct { diff --git a/internal/handler/self_order_handler.go b/internal/handler/self_order_handler.go index 563f2c7..d806d87 100644 --- a/internal/handler/self_order_handler.go +++ b/internal/handler/self_order_handler.go @@ -308,14 +308,22 @@ func (h *SelfOrderHandler) ListCategories(c *gin.Context) { return } - if req.TableID == uuid.Nil { + if req.TableID == "" { util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "table_id is required"), }), "SelfOrderHandler::ListCategories") return } - table, err := h.tableRepo.GetByID(ctx, req.TableID) + parsedTableID, err := uuid.Parse(req.TableID) + if err != nil { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "table_id must be a valid UUID"), + }), "SelfOrderHandler::ListCategories") + return + } + + table, err := h.tableRepo.GetByID(ctx, parsedTableID) if err != nil { logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ListCategories -> table not found") util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ -- 2.47.2 From 3c103b7692c1444fcd4c1a411cbedd98bb01621e Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 8 May 2026 18:41:14 +0700 Subject: [PATCH 4/9] Token and session implementation with Redis --- cmd/server/main.go | 9 +- config/configs.go | 1 + config/redis.go | 55 +++++ go.mod | 10 +- go.sum | 22 +- infra/development.yaml | 11 + internal/app/app.go | 24 +- internal/contract/self_order_contract.go | 22 +- internal/db/redis.go | 30 +++ internal/entities/table.go | 5 + internal/handler/self_order_handler.go | 214 +++++++++++++----- internal/models/session.go | 18 ++ internal/pkg/tabletoken/token.go | 43 ++++ internal/repository/session_repository.go | 141 ++++++++++++ internal/repository/table_repository.go | 14 ++ .../repository/table_repository_interface.go | 1 + internal/router/router.go | 3 +- internal/service/order_service.go | 10 +- .../000063_add_token_to_tables.down.sql | 1 + migrations/000063_add_token_to_tables.up.sql | 1 + 20 files changed, 545 insertions(+), 90 deletions(-) create mode 100644 config/redis.go create mode 100644 internal/db/redis.go create mode 100644 internal/models/session.go create mode 100644 internal/pkg/tabletoken/token.go create mode 100644 internal/repository/session_repository.go create mode 100644 migrations/000063_add_token_to_tables.down.sql create mode 100644 migrations/000063_add_token_to_tables.up.sql diff --git a/cmd/server/main.go b/cmd/server/main.go index d99e6f0..2e492bb 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -12,13 +12,18 @@ func main() { cfg := config.LoadConfig() logger.Setup(cfg.LogLevel(), cfg.LogFormat()) - db, err := db.NewPostgres(cfg.Database) + pg, err := db.NewPostgres(cfg.Database) + if err != nil { + log.Fatal(err) + } + + redisClient, err := db.NewRedisClient(cfg.Redis) if err != nil { log.Fatal(err) } logger.NonContext.Info("helloworld") - application := app.NewApp(db) + application := app.NewApp(pg, redisClient) if err := application.Initialize(cfg); err != nil { log.Fatalf("Failed to initialize application: %v", err) diff --git a/config/configs.go b/config/configs.go index 6a8dfe0..170d32d 100644 --- a/config/configs.go +++ b/config/configs.go @@ -26,6 +26,7 @@ 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"` diff --git a/config/redis.go b/config/redis.go new file mode 100644 index 0000000..d12f8c2 --- /dev/null +++ b/config/redis.go @@ -0,0 +1,55 @@ +package config + +import ( + "fmt" + "time" +) + +type Redis struct { + Host string `mapstructure:"host"` + Port int `mapstructure:"port"` + Password string `mapstructure:"password"` + DB int `mapstructure:"db"` + DialTimeout string `mapstructure:"dial_timeout"` + ReadTimeout string `mapstructure:"read_timeout"` + WriteTimeout string `mapstructure:"write_timeout"` + PoolSize int `mapstructure:"pool_size"` + MinIdleConnections int `mapstructure:"min_idle_connections"` +} + +func (r Redis) Addr() string { + return fmt.Sprintf("%s:%d", r.Host, r.Port) +} + +func (r Redis) ParseDialTimeout() time.Duration { + if r.DialTimeout == "" { + return 5 * time.Second + } + d, err := time.ParseDuration(r.DialTimeout) + if err != nil { + return 5 * time.Second + } + return d +} + +func (r Redis) ParseReadTimeout() time.Duration { + if r.ReadTimeout == "" { + return 3 * time.Second + } + d, err := time.ParseDuration(r.ReadTimeout) + if err != nil { + return 3 * time.Second + } + return d +} + +func (r Redis) ParseWriteTimeout() time.Duration { + if r.WriteTimeout == "" { + return 3 * time.Second + } + d, err := time.ParseDuration(r.WriteTimeout) + if err != nil { + return 3 * time.Second + } + return d +} diff --git a/go.mod b/go.mod index 3539fbb..e502de5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module apskel-pos-be -go 1.21 +go 1.24 require ( github.com/gin-gonic/gin v1.9.1 @@ -13,6 +13,7 @@ require ( require ( 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/davecgh/go-spew v1.1.1 // indirect @@ -31,7 +32,7 @@ require ( github.com/jinzhu/now v1.1.5 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.6 // indirect + github.com/klauspost/cpuid/v2 v2.2.10 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -49,11 +50,11 @@ require ( 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 - go.uber.org/atomic v1.10.0 // indirect + go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/arch v0.7.0 // indirect golang.org/x/net v0.30.0 // indirect - golang.org/x/sys v0.26.0 // indirect + golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.20.0 // indirect google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect @@ -63,6 +64,7 @@ require ( require ( github.com/aws/aws-sdk-go v1.55.7 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.8.4 go.uber.org/zap v1.21.0 diff --git a/go.sum b/go.sum index 6cc295c..67735e8 100644 --- a/go.sum +++ b/go.sum @@ -42,11 +42,17 @@ 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/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= @@ -181,8 +187,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= -github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= +github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -218,6 +224,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR 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.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= @@ -261,6 +269,8 @@ 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/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= @@ -268,8 +278,8 @@ 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.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= @@ -428,8 +438,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.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.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= diff --git a/infra/development.yaml b/infra/development.yaml index 6880e35..dc1f891 100644 --- a/infra/development.yaml +++ b/infra/development.yaml @@ -27,6 +27,17 @@ postgresql: connection-max-life-time-in-second: 600 debug: false +redis: + host: 127.0.0.1 + port: 6379 + password: "CmICdmnX1EZPhVBYzQPEGw==U" + db: 0 + dial_timeout: 5s + read_timeout: 3s + write_timeout: 3s + pool_size: 10 + min_idle_connections: 5 + s3: access_key_id: cf9a475e18bc7626cbdbf09709d82a64 access_key_secret: 91f3321294d3e23035427a0ecb893ada diff --git a/internal/app/app.go b/internal/app/app.go index 1596bb2..e466e6e 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -20,20 +20,23 @@ import ( "apskel-pos-be/internal/service" "apskel-pos-be/internal/validator" + "github.com/redis/go-redis/v9" "gorm.io/gorm" ) type App struct { - server *http.Server - db *gorm.DB - router *router.Router - shutdown chan os.Signal + server *http.Server + db *gorm.DB + redisClient *redis.Client + router *router.Router + shutdown chan os.Signal } -func NewApp(db *gorm.DB) *App { +func NewApp(db *gorm.DB, redisClient *redis.Client) *App { return &App{ - db: db, - shutdown: make(chan os.Signal, 1), + db: db, + redisClient: redisClient, + shutdown: make(chan os.Signal, 1), } } @@ -51,6 +54,7 @@ func (a *App) Initialize(cfg *config.Config) error { repos.tableRepo, repos.outletRepo, repos.userRepo, + repos.sessionRepo, ) a.router = router.NewRouter( @@ -200,6 +204,7 @@ type repositories struct { customerAuthRepo repository.CustomerAuthRepository customerPointsRepo repository.CustomerPointsRepository otpRepo repository.OtpRepository + sessionRepo repository.SessionRepository txManager *repository.TxManager } @@ -246,6 +251,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), } } @@ -384,7 +390,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con productService := service.NewProductService(processors.productProcessor) productVariantService := service.NewProductVariantService(processors.productVariantProcessor) inventoryService := service.NewInventoryService(processors.inventoryProcessor) - orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager) // Will be updated after orderIngredientTransactionService is created + orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo) // Will be updated after orderIngredientTransactionService is created paymentMethodService := service.NewPaymentMethodService(processors.paymentMethodProcessor) fileService := service.NewFileServiceImpl(processors.fileProcessor) var customerService service.CustomerService = service.NewCustomerService(processors.customerProcessor) @@ -409,7 +415,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con spinGameService := service.NewSpinGameService(processors.gamePlayProcessor, repos.txManager) // Update order service with order ingredient transaction service - orderService = service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, orderIngredientTransactionService, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager) + orderService = service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, orderIngredientTransactionService, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo) return &services{ userService: service.NewUserService(processors.userProcessor), diff --git a/internal/contract/self_order_contract.go b/internal/contract/self_order_contract.go index 0b10f88..69c6096 100644 --- a/internal/contract/self_order_contract.go +++ b/internal/contract/self_order_contract.go @@ -4,10 +4,18 @@ 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 { - TableID uuid.UUID `json:"table_id" validate:"required"` - CustomerName string `json:"customer_name" validate:"required"` - Phone *string `json:"phone,omitempty"` + SessionID string `json:"session_id" validate:"required"` } type SelfOrderMenuResponse struct { @@ -40,10 +48,8 @@ type SelfOrderMenuVariant struct { } type SelfOrderCreateOrderRequest struct { - TableID uuid.UUID `json:"table_id" validate:"required"` - CustomerName string `json:"customer_name" validate:"required"` - Phone *string `json:"phone,omitempty"` - OrderItems []SelfOrderCreateOrderItem `json:"order_items" validate:"required,min=1,dive"` + SessionID string `json:"session_id" validate:"required"` + OrderItems []SelfOrderCreateOrderItem `json:"order_items" validate:"required,min=1,dive"` } type SelfOrderCreateOrderItem struct { @@ -54,7 +60,7 @@ type SelfOrderCreateOrderItem struct { } type SelfOrderListCategoriesRequest struct { - TableID string `form:"table_id" validate:"required"` + SessionID string `form:"session_id" validate:"required"` } type SelfOrderCategoryItem struct { diff --git a/internal/db/redis.go b/internal/db/redis.go new file mode 100644 index 0000000..9748f2e --- /dev/null +++ b/internal/db/redis.go @@ -0,0 +1,30 @@ +package db + +import ( + "apskel-pos-be/config" + "fmt" + + "github.com/redis/go-redis/v9" +) + +func NewRedisClient(c config.Redis) (*redis.Client, error) { + opts := &redis.Options{ + Addr: c.Addr(), + Password: c.Password, + DB: c.DB, + DialTimeout: c.ParseDialTimeout(), + ReadTimeout: c.ParseReadTimeout(), + WriteTimeout: c.ParseWriteTimeout(), + } + if c.PoolSize > 0 { + opts.PoolSize = c.PoolSize + } + if c.MinIdleConnections > 0 { + opts.MinIdleConns = c.MinIdleConnections + } + + client := redis.NewClient(opts) + + fmt.Println("Successfully connected to Redis") + return client, nil +} diff --git a/internal/entities/table.go b/internal/entities/table.go index 0468879..c16f06c 100644 --- a/internal/entities/table.go +++ b/internal/entities/table.go @@ -1,6 +1,7 @@ package entities import ( + "apskel-pos-be/internal/pkg/tabletoken" "time" "github.com/google/uuid" @@ -12,6 +13,7 @@ type Table struct { OrganizationID uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"` OutletID uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id" validate:"required"` TableName string `gorm:"not null;size:100" json:"table_name" validate:"required"` + Token string `gorm:"uniqueIndex;not null;size:255" json:"token"` StartTime *time.Time `gorm:"" json:"start_time"` Status string `gorm:"default:'available';size:50" json:"status"` OrderID *uuid.UUID `gorm:"type:uuid;index" json:"order_id"` @@ -33,6 +35,9 @@ func (t *Table) BeforeCreate(tx *gorm.DB) error { if t.ID == uuid.Nil { t.ID = uuid.New() } + if t.Token == "" { + t.Token = tabletoken.Encode(t.ID, t.OrganizationID, t.OutletID) + } return nil } diff --git a/internal/handler/self_order_handler.go b/internal/handler/self_order_handler.go index d806d87..8c5a709 100644 --- a/internal/handler/self_order_handler.go +++ b/internal/handler/self_order_handler.go @@ -6,6 +6,7 @@ import ( "apskel-pos-be/internal/entities" "apskel-pos-be/internal/logger" "apskel-pos-be/internal/models" + "apskel-pos-be/internal/pkg/tabletoken" "apskel-pos-be/internal/processor" "apskel-pos-be/internal/repository" "apskel-pos-be/internal/service" @@ -25,6 +26,7 @@ type SelfOrderHandler struct { tableRepo repository.TableRepositoryInterface outletRepo processor.OutletRepository userRepo processor.UserRepository + sessionRepo repository.SessionRepository } func NewSelfOrderHandler( @@ -34,6 +36,7 @@ func NewSelfOrderHandler( tableRepo repository.TableRepositoryInterface, outletRepo processor.OutletRepository, userRepo processor.UserRepository, + sessionRepo repository.SessionRepository, ) *SelfOrderHandler { return &SelfOrderHandler{ orderService: orderService, @@ -42,9 +45,107 @@ func NewSelfOrderHandler( tableRepo: tableRepo, outletRepo: outletRepo, userRepo: userRepo, + sessionRepo: sessionRepo, } } +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() @@ -57,41 +158,16 @@ func (h *SelfOrderHandler) GetMenu(c *gin.Context) { return } - if req.TableID == uuid.Nil { - util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "table_id is required"), - }), "SelfOrderHandler::GetMenu") - return - } - - if req.CustomerName == "" { - util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "customer_name is required"), - }), "SelfOrderHandler::GetMenu") - return - } - - table, err := h.tableRepo.GetByID(ctx, req.TableID) + session, table, outlet, err := h.resolveSession(ctx, req.SessionID) if err != nil { - logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetMenu -> table not found") util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "table not found"), + contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()), }), "SelfOrderHandler::GetMenu") return } - - if !table.IsActive { + if session == nil { util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.ValidationErrorCode, constants.TableEntity, "table is not active"), - }), "SelfOrderHandler::GetMenu") - return - } - - outlet, err := h.outletRepo.GetByID(ctx, table.OutletID) - if err != nil { - logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetMenu -> outlet not found") - util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.NotFoundErrorCode, constants.OrderServiceEntity, "outlet not found"), + contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found or expired"), }), "SelfOrderHandler::GetMenu") return } @@ -208,11 +284,16 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) { return } - table, err := h.tableRepo.GetByID(ctx, req.TableID) + session, table, _, err := h.resolveSession(ctx, req.SessionID) if err != nil { - logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> table not found") util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "table not found"), + 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 } @@ -245,21 +326,17 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) { metadata := make(map[string]interface{}) metadata["self_order"] = true - metadata["customer_name"] = req.CustomerName - if req.Phone != nil { - metadata["customer_phone"] = *req.Phone - } + metadata["session_id"] = session.ID - tableID := req.TableID + tableID := table.ID modelReq := &models.CreateOrderRequest{ - OutletID: table.OutletID, - UserID: userID, - TableID: &tableID, - TableNumber: &table.TableName, - OrderType: constants.OrderTypeDineIn, - OrderItems: orderItems, - CustomerName: &req.CustomerName, - Metadata: metadata, + OutletID: table.OutletID, + UserID: userID, + TableID: &tableID, + TableNumber: &table.TableName, + OrderType: constants.OrderTypeDineIn, + OrderItems: orderItems, + Metadata: metadata, } response, err := h.orderService.CreateOrder(ctx, modelReq, table.OrganizationID) @@ -276,11 +353,8 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) { } func (h *SelfOrderHandler) validateCreateOrderRequest(req *contract.SelfOrderCreateOrderRequest) error { - if req.TableID == uuid.Nil { - return fmt.Errorf("table_id is required") - } - if req.CustomerName == "" { - return fmt.Errorf("customer_name is required") + 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") @@ -308,26 +382,23 @@ func (h *SelfOrderHandler) ListCategories(c *gin.Context) { return } - if req.TableID == "" { + if req.SessionID == "" { util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "table_id is required"), + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "session_id is required"), }), "SelfOrderHandler::ListCategories") return } - parsedTableID, err := uuid.Parse(req.TableID) + 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, "table_id must be a valid UUID"), + contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()), }), "SelfOrderHandler::ListCategories") return } - - table, err := h.tableRepo.GetByID(ctx, parsedTableID) - if err != nil { - logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ListCategories -> table not found") + if session == nil { util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "table not found"), + contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found or expired"), }), "SelfOrderHandler::ListCategories") return } @@ -366,6 +437,31 @@ func (h *SelfOrderHandler) ListCategories(c *gin.Context) { }), "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 { diff --git a/internal/models/session.go b/internal/models/session.go new file mode 100644 index 0000000..12c9189 --- /dev/null +++ b/internal/models/session.go @@ -0,0 +1,18 @@ +package models + +import ( + "time" + + "github.com/google/uuid" +) + +type SelfOrderSession struct { + ID string `json:"id"` + TableID uuid.UUID `json:"table_id"` + OrganizationID uuid.UUID `json:"organization_id"` + OutletID uuid.UUID `json:"outlet_id"` + Status string `json:"status"` + CustomerName string `json:"customer_name"` + CreatedAt time.Time `json:"created_at"` + ClosedAt *time.Time `json:"closed_at,omitempty"` +} diff --git a/internal/pkg/tabletoken/token.go b/internal/pkg/tabletoken/token.go new file mode 100644 index 0000000..bd8b67d --- /dev/null +++ b/internal/pkg/tabletoken/token.go @@ -0,0 +1,43 @@ +package tabletoken + +import ( + "encoding/base64" + "encoding/json" + "fmt" + + "github.com/google/uuid" +) + +type TableTokenPayload struct { + TableID uuid.UUID `json:"table_id"` + OrganizationID uuid.UUID `json:"organization_id"` + OutletID uuid.UUID `json:"outlet_id"` +} + +func Encode(tableID, organizationID, outletID uuid.UUID) string { + payload := TableTokenPayload{ + TableID: tableID, + OrganizationID: organizationID, + OutletID: outletID, + } + jsonBytes, _ := json.Marshal(payload) + return base64.URLEncoding.EncodeToString(jsonBytes) +} + +func Decode(token string) (tableID, organizationID, outletID uuid.UUID, err error) { + jsonBytes, err := base64.URLEncoding.DecodeString(token) + if err != nil { + return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("invalid token encoding: %w", err) + } + + var payload TableTokenPayload + if err := json.Unmarshal(jsonBytes, &payload); err != nil { + return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("invalid token format: %w", err) + } + + if payload.TableID == uuid.Nil || payload.OrganizationID == uuid.Nil || payload.OutletID == uuid.Nil { + return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("token missing required fields") + } + + return payload.TableID, payload.OrganizationID, payload.OutletID, nil +} diff --git a/internal/repository/session_repository.go b/internal/repository/session_repository.go new file mode 100644 index 0000000..6c283ac --- /dev/null +++ b/internal/repository/session_repository.go @@ -0,0 +1,141 @@ +package repository + +import ( + "apskel-pos-be/internal/models" + "context" + "encoding/json" + "fmt" + "time" + + "github.com/google/uuid" + "github.com/redis/go-redis/v9" +) + +const ( + sessionKeyPrefix = "self_order:session:" + tableSessionKeyPrefix = "self_order:table_session:" + sessionTTL = 24 * time.Hour + sessionStatusActive = "active" + sessionStatusClosed = "closed" +) + +type SessionRepository interface { + Create(ctx context.Context, session *models.SelfOrderSession) error + GetByID(ctx context.Context, sessionID string) (*models.SelfOrderSession, error) + GetActiveByTableID(ctx context.Context, tableID uuid.UUID) (*models.SelfOrderSession, error) + Close(ctx context.Context, sessionID string) error + CloseByTableID(ctx context.Context, tableID uuid.UUID) error +} + +type sessionRepository struct { + client *redis.Client +} + +func NewSessionRepository(client *redis.Client) SessionRepository { + return &sessionRepository{client: client} +} + +func (r *sessionRepository) Create(ctx context.Context, session *models.SelfOrderSession) error { + if session.ID == "" { + session.ID = uuid.New().String() + } + session.Status = sessionStatusActive + session.CreatedAt = time.Now() + + data, err := json.Marshal(session) + if err != nil { + return fmt.Errorf("failed to marshal session: %w", err) + } + + sessionKey := sessionKeyPrefix + session.ID + tableSessionKey := tableSessionKeyPrefix + session.TableID.String() + + pipe := r.client.Pipeline() + pipe.Set(ctx, sessionKey, data, sessionTTL) + pipe.Set(ctx, tableSessionKey, session.ID, sessionTTL) + + if _, err := pipe.Exec(ctx); err != nil { + return fmt.Errorf("failed to store session in redis: %w", err) + } + + return nil +} + +func (r *sessionRepository) GetByID(ctx context.Context, sessionID string) (*models.SelfOrderSession, error) { + data, err := r.client.Get(ctx, sessionKeyPrefix+sessionID).Bytes() + if err != nil { + if err == redis.Nil { + return nil, nil + } + return nil, fmt.Errorf("failed to get session: %w", err) + } + + var session models.SelfOrderSession + if err := json.Unmarshal(data, &session); err != nil { + return nil, fmt.Errorf("failed to unmarshal session: %w", err) + } + + return &session, nil +} + +func (r *sessionRepository) GetActiveByTableID(ctx context.Context, tableID uuid.UUID) (*models.SelfOrderSession, error) { + sessionID, err := r.client.Get(ctx, tableSessionKeyPrefix+tableID.String()).Result() + if err != nil { + if err == redis.Nil { + return nil, nil + } + return nil, fmt.Errorf("failed to get session for table: %w", err) + } + + session, err := r.GetByID(ctx, sessionID) + if err != nil { + return nil, err + } + + if session != nil && session.Status != sessionStatusActive { + return nil, nil + } + + return session, nil +} + +func (r *sessionRepository) Close(ctx context.Context, sessionID string) error { + session, err := r.GetByID(ctx, sessionID) + if err != nil { + return err + } + if session == nil { + return fmt.Errorf("session not found") + } + + now := time.Now() + session.Status = sessionStatusClosed + session.ClosedAt = &now + + data, err := json.Marshal(session) + if err != nil { + return fmt.Errorf("failed to marshal session: %w", err) + } + + pipe := r.client.Pipeline() + pipe.Set(ctx, sessionKeyPrefix+session.ID, data, sessionTTL) + pipe.Del(ctx, tableSessionKeyPrefix+session.TableID.String()) + + if _, err := pipe.Exec(ctx); err != nil { + return fmt.Errorf("failed to close session: %w", err) + } + + return nil +} + +func (r *sessionRepository) CloseByTableID(ctx context.Context, tableID uuid.UUID) error { + session, err := r.GetActiveByTableID(ctx, tableID) + if err != nil { + return err + } + if session == nil { + return nil + } + + return r.Close(ctx, session.ID) +} diff --git a/internal/repository/table_repository.go b/internal/repository/table_repository.go index 4a7a782..add78c8 100644 --- a/internal/repository/table_repository.go +++ b/internal/repository/table_repository.go @@ -36,6 +36,20 @@ func (r *TableRepository) GetByID(ctx context.Context, id uuid.UUID) (*entities. return &table, nil } +func (r *TableRepository) GetByToken(ctx context.Context, token string) (*entities.Table, error) { + var table entities.Table + err := r.db.WithContext(ctx). + Preload("Organization"). + Preload("Outlet"). + Preload("Order"). + Where("token = ?", token). + First(&table).Error + if err != nil { + return nil, err + } + return &table, nil +} + func (r *TableRepository) GetByOutletID(ctx context.Context, outletID uuid.UUID) ([]entities.Table, error) { var tables []entities.Table err := r.db.WithContext(ctx). diff --git a/internal/repository/table_repository_interface.go b/internal/repository/table_repository_interface.go index a405482..33f1367 100644 --- a/internal/repository/table_repository_interface.go +++ b/internal/repository/table_repository_interface.go @@ -13,6 +13,7 @@ import ( type TableRepositoryInterface interface { Create(ctx context.Context, table *entities.Table) error GetByID(ctx context.Context, id uuid.UUID) (*entities.Table, error) + GetByToken(ctx context.Context, token string) (*entities.Table, error) GetByOutletID(ctx context.Context, outletID uuid.UUID) ([]entities.Table, error) GetByOrganizationID(ctx context.Context, organizationID uuid.UUID) ([]entities.Table, error) Update(ctx context.Context, table *entities.Table) error diff --git a/internal/router/router.go b/internal/router/router.go index 9a11c20..726b12f 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -149,9 +149,10 @@ func (r *Router) addAppRoutes(rg *gin.Engine) { selfOrder := v1.Group("/self-order") { + selfOrder.GET("/table/:token", r.selfOrderHandler.ValidateToken) selfOrder.GET("/categories", r.selfOrderHandler.ListCategories) selfOrder.POST("/menu", r.selfOrderHandler.GetMenu) - selfOrder.POST("/order", r.selfOrderHandler.CreateOrder) + selfOrder.POST("/orders", r.selfOrderHandler.CreateOrder) } organizations := v1.Group("/organizations") diff --git a/internal/service/order_service.go b/internal/service/order_service.go index 33d334a..056fc99 100644 --- a/internal/service/order_service.go +++ b/internal/service/order_service.go @@ -37,9 +37,10 @@ type OrderServiceImpl struct { orderIngredientTransactionProcessor processor.OrderIngredientTransactionProcessor productRecipeRepo repository.ProductRecipeRepository txManager *repository.TxManager + sessionRepo repository.SessionRepository } -func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repository.TableRepositoryInterface, orderIngredientTransactionService *OrderIngredientTransactionService, orderIngredientTransactionProcessor processor.OrderIngredientTransactionProcessor, productRecipeRepo repository.ProductRecipeRepository, txManager *repository.TxManager) *OrderServiceImpl { +func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repository.TableRepositoryInterface, orderIngredientTransactionService *OrderIngredientTransactionService, orderIngredientTransactionProcessor processor.OrderIngredientTransactionProcessor, productRecipeRepo repository.ProductRecipeRepository, txManager *repository.TxManager, sessionRepo repository.SessionRepository) *OrderServiceImpl { return &OrderServiceImpl{ orderProcessor: orderProcessor, tableRepo: tableRepo, @@ -47,6 +48,7 @@ func NewOrderServiceImpl(orderProcessor processor.OrderProcessor, tableRepo repo orderIngredientTransactionProcessor: orderIngredientTransactionProcessor, productRecipeRepo: productRecipeRepo, txManager: txManager, + sessionRepo: sessionRepo, } } @@ -621,6 +623,12 @@ func (s *OrderServiceImpl) handleTableReleaseOnPayment(ctx context.Context, orde if err := s.tableRepo.ReleaseTable(ctx, table.ID, order.TotalAmount); err != nil { return fmt.Errorf("failed to release table: %w", err) } + + if s.sessionRepo != nil { + if err := s.sessionRepo.CloseByTableID(ctx, table.ID); err != nil { + fmt.Printf("Warning: failed to close self-order session for table %s: %v\n", table.ID, err) + } + } } } diff --git a/migrations/000063_add_token_to_tables.down.sql b/migrations/000063_add_token_to_tables.down.sql new file mode 100644 index 0000000..b9b1d2b --- /dev/null +++ b/migrations/000063_add_token_to_tables.down.sql @@ -0,0 +1 @@ +ALTER TABLE tables DROP COLUMN IF EXISTS token; diff --git a/migrations/000063_add_token_to_tables.up.sql b/migrations/000063_add_token_to_tables.up.sql new file mode 100644 index 0000000..6c4256c --- /dev/null +++ b/migrations/000063_add_token_to_tables.up.sql @@ -0,0 +1 @@ +ALTER TABLE tables ADD COLUMN token VARCHAR(255) UNIQUE NOT NULL DEFAULT gen_random_uuid()::text; -- 2.47.2 From f957b07d23773758add60f8d9ecc58f59613962e Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 8 May 2026 23:18:52 +0700 Subject: [PATCH 5/9] Change self-order/menu from POST to GET --- internal/contract/self_order_contract.go | 2 +- internal/handler/self_order_handler.go | 4 ++-- internal/router/router.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/contract/self_order_contract.go b/internal/contract/self_order_contract.go index 69c6096..fe9d938 100644 --- a/internal/contract/self_order_contract.go +++ b/internal/contract/self_order_contract.go @@ -15,7 +15,7 @@ type SelfOrderTableTokenResponse struct { } type SelfOrderMenuRequest struct { - SessionID string `json:"session_id" validate:"required"` + SessionID string `form:"session_id" validate:"required"` } type SelfOrderMenuResponse struct { diff --git a/internal/handler/self_order_handler.go b/internal/handler/self_order_handler.go index 8c5a709..c383d2e 100644 --- a/internal/handler/self_order_handler.go +++ b/internal/handler/self_order_handler.go @@ -150,8 +150,8 @@ func (h *SelfOrderHandler) GetMenu(c *gin.Context) { ctx := c.Request.Context() var req contract.SelfOrderMenuRequest - if err := c.ShouldBindJSON(&req); err != nil { - logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetMenu -> request binding failed") + 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") diff --git a/internal/router/router.go b/internal/router/router.go index 726b12f..3edf861 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -151,7 +151,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) { { selfOrder.GET("/table/:token", r.selfOrderHandler.ValidateToken) selfOrder.GET("/categories", r.selfOrderHandler.ListCategories) - selfOrder.POST("/menu", r.selfOrderHandler.GetMenu) + selfOrder.GET("/menu", r.selfOrderHandler.GetMenu) selfOrder.POST("/orders", r.selfOrderHandler.CreateOrder) } -- 2.47.2 From e7c4681102e89af84e1f0edf86fea68a49e8bae4 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 8 May 2026 23:56:06 +0700 Subject: [PATCH 6/9] Add outlet_id to self-order/categories --- internal/contract/self_order_contract.go | 3 +- internal/handler/self_order_handler.go | 40 +++++++++++++++++++----- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/internal/contract/self_order_contract.go b/internal/contract/self_order_contract.go index fe9d938..4918f92 100644 --- a/internal/contract/self_order_contract.go +++ b/internal/contract/self_order_contract.go @@ -60,7 +60,8 @@ type SelfOrderCreateOrderItem struct { } type SelfOrderListCategoriesRequest struct { - SessionID string `form:"session_id" validate:"required"` + OrganizationID string `form:"organisasi_id" validate:"required"` + OutletID string `form:"outlet_id" validate:"required"` } type SelfOrderCategoryItem struct { diff --git a/internal/handler/self_order_handler.go b/internal/handler/self_order_handler.go index c383d2e..c632a7c 100644 --- a/internal/handler/self_order_handler.go +++ b/internal/handler/self_order_handler.go @@ -382,29 +382,53 @@ func (h *SelfOrderHandler) ListCategories(c *gin.Context) { return } - if req.SessionID == "" { + if req.OrganizationID == "" { util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "session_id is required"), + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "organisasi_id is required"), }), "SelfOrderHandler::ListCategories") return } - session, table, _, err := h.resolveSession(ctx, req.SessionID) - if err != nil { + if req.OutletID == "" { util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()), + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "outlet_id is required"), }), "SelfOrderHandler::ListCategories") return } - if session == nil { + + orgID, err := uuid.Parse(req.OrganizationID) + if err != nil { util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ - contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found or expired"), + contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid organisasi_id format"), + }), "SelfOrderHandler::ListCategories") + return + } + + outletID, err := uuid.Parse(req.OutletID) + if err != nil { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid outlet_id format"), + }), "SelfOrderHandler::ListCategories") + return + } + + outlet, err := h.outletRepo.GetByID(ctx, outletID) + if err != nil || outlet == nil { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "outlet not found"), + }), "SelfOrderHandler::ListCategories") + return + } + + if outlet.OrganizationID != orgID { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "outlet does not belong to the specified organization"), }), "SelfOrderHandler::ListCategories") return } catResp := h.categoryService.ListCategories(ctx, &contract.ListCategoriesRequest{ - OrganizationID: &table.OrganizationID, + OrganizationID: &orgID, Page: 1, Limit: 100, }) -- 2.47.2 From 4cc563f6f11f6957030c7b84a1bdc6350d42f6b7 Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 9 May 2026 00:12:00 +0700 Subject: [PATCH 7/9] Add self-order/orders/:sessionId --- internal/app/app.go | 1 + internal/contract/self_order_contract.go | 36 +++++++++++ internal/handler/self_order_handler.go | 82 ++++++++++++++++++++++++ internal/repository/order_repository.go | 19 ++++++ internal/router/router.go | 1 + 5 files changed, 139 insertions(+) diff --git a/internal/app/app.go b/internal/app/app.go index e466e6e..65dbb71 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -55,6 +55,7 @@ func (a *App) Initialize(cfg *config.Config) error { repos.outletRepo, repos.userRepo, repos.sessionRepo, + repos.orderRepo, ) a.router = router.NewRouter( diff --git a/internal/contract/self_order_contract.go b/internal/contract/self_order_contract.go index 4918f92..4e0d227 100644 --- a/internal/contract/self_order_contract.go +++ b/internal/contract/self_order_contract.go @@ -1,6 +1,8 @@ package contract import ( + "time" + "github.com/google/uuid" ) @@ -74,3 +76,37 @@ type SelfOrderCategoryItem struct { type SelfOrderListCategoriesResponse struct { Categories []SelfOrderCategoryItem `json:"categories"` } + +type SelfOrderListOrdersResponse struct { + Orders []SelfOrderOrderItem `json:"orders"` +} + +type SelfOrderOrderItem struct { + ID uuid.UUID `json:"id"` + OrderNumber string `json:"order_number"` + TableNumber *string `json:"table_number,omitempty"` + OrderType string `json:"order_type"` + Status string `json:"status"` + Subtotal float64 `json:"subtotal"` + TaxAmount float64 `json:"tax_amount"` + DiscountAmount float64 `json:"discount_amount"` + TotalAmount float64 `json:"total_amount"` + RemainingAmount float64 `json:"remaining_amount"` + PaymentStatus string `json:"payment_status"` + IsVoid bool `json:"is_void"` + IsRefund bool `json:"is_refund"` + Items []SelfOrderOrderLineItem `json:"items,omitempty"` + CreatedAt time.Time `json:"created_at"` +} + +type SelfOrderOrderLineItem struct { + ProductID uuid.UUID `json:"product_id"` + ProductName string `json:"product_name"` + ProductVariantID *uuid.UUID `json:"product_variant_id,omitempty"` + ProductVariantNam *string `json:"product_variant_name,omitempty"` + Quantity int `json:"quantity"` + UnitPrice float64 `json:"unit_price"` + TotalPrice float64 `json:"total_price"` + Notes *string `json:"notes,omitempty"` + Status string `json:"status"` +} diff --git a/internal/handler/self_order_handler.go b/internal/handler/self_order_handler.go index c632a7c..605a137 100644 --- a/internal/handler/self_order_handler.go +++ b/internal/handler/self_order_handler.go @@ -27,6 +27,7 @@ type SelfOrderHandler struct { outletRepo processor.OutletRepository userRepo processor.UserRepository sessionRepo repository.SessionRepository + orderRepo repository.OrderRepository } func NewSelfOrderHandler( @@ -37,6 +38,7 @@ func NewSelfOrderHandler( outletRepo processor.OutletRepository, userRepo processor.UserRepository, sessionRepo repository.SessionRepository, + orderRepo repository.OrderRepository, ) *SelfOrderHandler { return &SelfOrderHandler{ orderService: orderService, @@ -46,6 +48,7 @@ func NewSelfOrderHandler( outletRepo: outletRepo, userRepo: userRepo, sessionRepo: sessionRepo, + orderRepo: orderRepo, } } @@ -352,6 +355,85 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) { 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("sessionId") + + if sessionID == "" { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "session_id is required"), + }), "SelfOrderHandler::GetOrdersBySession") + return + } + + session, err := h.sessionRepo.GetByID(ctx, sessionID) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetOrdersBySession -> failed to get session") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found"), + }), "SelfOrderHandler::GetOrdersBySession") + return + } + if session == nil { + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found"), + }), "SelfOrderHandler::GetOrdersBySession") + return + } + + orders, err := h.orderRepo.ListBySessionID(ctx, sessionID) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetOrdersBySession -> failed to list orders") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{ + contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to list orders"), + }), "SelfOrderHandler::GetOrdersBySession") + return + } + + resp := &contract.SelfOrderListOrdersResponse{ + Orders: make([]contract.SelfOrderOrderItem, 0, len(orders)), + } + for _, o := range orders { + item := contract.SelfOrderOrderItem{ + ID: o.ID, + OrderNumber: o.OrderNumber, + TableNumber: o.TableNumber, + OrderType: string(o.OrderType), + Status: string(o.Status), + Subtotal: o.Subtotal, + TaxAmount: o.TaxAmount, + DiscountAmount: o.DiscountAmount, + TotalAmount: o.TotalAmount, + RemainingAmount: o.RemainingAmount, + PaymentStatus: string(o.PaymentStatus), + IsVoid: o.IsVoid, + IsRefund: o.IsRefund, + CreatedAt: o.CreatedAt, + } + for _, oi := range o.OrderItems { + lineItem := contract.SelfOrderOrderLineItem{ + ProductID: oi.ProductID, + Quantity: oi.Quantity, + UnitPrice: oi.UnitPrice, + TotalPrice: oi.TotalPrice, + Notes: oi.Notes, + Status: string(oi.Status), + ProductVariantID: oi.ProductVariantID, + } + if oi.Product.ID != uuid.Nil { + lineItem.ProductName = oi.Product.Name + } + if oi.ProductVariant != nil { + lineItem.ProductVariantNam = &oi.ProductVariant.Name + } + item.Items = append(item.Items, lineItem) + } + resp.Orders = append(resp.Orders, item) + } + + util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(resp), "SelfOrderHandler::GetOrdersBySession") +} + func (h *SelfOrderHandler) validateCreateOrderRequest(req *contract.SelfOrderCreateOrderRequest) error { if req.SessionID == "" { return fmt.Errorf("session_id is required") diff --git a/internal/repository/order_repository.go b/internal/repository/order_repository.go index e7e4b36..1ba460b 100644 --- a/internal/repository/order_repository.go +++ b/internal/repository/order_repository.go @@ -18,6 +18,7 @@ type OrderRepository interface { Update(ctx context.Context, order *entities.Order) error Delete(ctx context.Context, id uuid.UUID) error List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Order, int64, error) + ListBySessionID(ctx context.Context, sessionID string) ([]*entities.Order, error) GetByOrderNumber(ctx context.Context, orderNumber string) (*entities.Order, error) ExistsByOrderNumber(ctx context.Context, orderNumber string) (bool, error) VoidOrder(ctx context.Context, id uuid.UUID, reason string, voidedBy uuid.UUID) error @@ -130,6 +131,24 @@ func (r *OrderRepositoryImpl) List(ctx context.Context, filters map[string]inter return orders, total, err } +func (r *OrderRepositoryImpl) ListBySessionID(ctx context.Context, sessionID string) ([]*entities.Order, error) { + var orders []*entities.Order + err := r.db.WithContext(ctx).Model(&entities.Order{}). + Preload("Organization"). + Preload("Outlet"). + Preload("User"). + Preload("OrderItems"). + Preload("OrderItems.Product"). + Preload("OrderItems.ProductVariant"). + Preload("Payments"). + Preload("Payments.PaymentMethod"). + Preload("Payments.PaymentOrderItems"). + Where("metadata->>'session_id' = ?", sessionID). + Order("created_at ASC"). + Find(&orders).Error + return orders, err +} + func (r *OrderRepositoryImpl) GetByOrderNumber(ctx context.Context, orderNumber string) (*entities.Order, error) { var order entities.Order err := r.db.WithContext(ctx).First(&order, "order_number = ?", orderNumber).Error diff --git a/internal/router/router.go b/internal/router/router.go index 3edf861..ea62af9 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -153,6 +153,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) { selfOrder.GET("/categories", r.selfOrderHandler.ListCategories) selfOrder.GET("/menu", r.selfOrderHandler.GetMenu) selfOrder.POST("/orders", r.selfOrderHandler.CreateOrder) + selfOrder.GET("/orders/:sessionId", r.selfOrderHandler.GetOrdersBySession) } organizations := v1.Group("/organizations") -- 2.47.2 From 07b186c9864cd677a416ae4df2fc49c1099e94a5 Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 9 May 2026 01:01:25 +0700 Subject: [PATCH 8/9] Barcode generation with Boombuler --- go.mod | 1 + go.sum | 2 ++ internal/handler/table_handler.go | 49 ++++++++++++++++++++++++++- internal/handler/table_service.go | 1 + internal/pkg/qrcode/generator.go | 32 +++++++++++++++++ internal/processor/table_processor.go | 8 +++++ internal/router/router.go | 3 +- internal/service/table_service.go | 4 +++ 8 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 internal/pkg/qrcode/generator.go diff --git a/go.mod b/go.mod index e502de5..bd967f9 100644 --- a/go.mod +++ b/go.mod @@ -63,6 +63,7 @@ require ( require ( 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 diff --git a/go.sum b/go.sum index 67735e8..b1a6622 100644 --- a/go.sum +++ b/go.sum @@ -42,6 +42,8 @@ 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= diff --git a/internal/handler/table_handler.go b/internal/handler/table_handler.go index e22aea9..c9eee19 100644 --- a/internal/handler/table_handler.go +++ b/internal/handler/table_handler.go @@ -5,8 +5,11 @@ import ( "apskel-pos-be/internal/constants" "apskel-pos-be/internal/contract" "apskel-pos-be/internal/logger" + "apskel-pos-be/internal/pkg/qrcode" "apskel-pos-be/internal/util" "apskel-pos-be/internal/validator" + "fmt" + "net/http" "strconv" "github.com/gin-gonic/gin" @@ -16,12 +19,14 @@ import ( type TableHandler struct { tableService TableService tableValidator *validator.TableValidator + baseURL string } -func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator) *TableHandler { +func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator, baseURL string) *TableHandler { return &TableHandler{ tableService: tableService, tableValidator: tableValidator, + baseURL: baseURL, } } @@ -286,3 +291,45 @@ func (h *TableHandler) GetOccupiedTables(c *gin.Context) { util.HandleResponse(c.Writer, c.Request, response, "TableHandler::GetOccupiedTables") } + +func (h *TableHandler) GenerateQRCode(c *gin.Context) { + ctx := c.Request.Context() + + id := c.Param("id") + tableID, err := uuid.Parse(id) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> Invalid table ID") + validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid table ID") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode") + return + } + + token, err := h.tableService.GetTableToken(ctx, tableID) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> table not found") + validationResponseError := contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "Table not found") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode") + return + } + + selfOrderURL := fmt.Sprintf("%s/api/v1/self-order/table/%s", h.baseURL, token) + + size := 256 + if sizeStr := c.Query("size"); sizeStr != "" { + if s, err := strconv.Atoi(sizeStr); err == nil && s > 0 && s <= 1024 { + size = s + } + } + + pngBytes, err := qrcode.GeneratePNG(selfOrderURL, size) + if err != nil { + logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> QR generation failed") + validationResponseError := contract.NewResponseError(constants.InternalServerErrorCode, constants.TableEntity, "Failed to generate QR code") + util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode") + return + } + + c.Header("Content-Type", "image/png") + c.Header("Content-Disposition", fmt.Sprintf("inline; filename=\"table-%s-qr.png\"", tableID)) + c.Data(http.StatusOK, "image/png", pngBytes) +} diff --git a/internal/handler/table_service.go b/internal/handler/table_service.go index 067706c..5149ab9 100644 --- a/internal/handler/table_service.go +++ b/internal/handler/table_service.go @@ -17,4 +17,5 @@ type TableService interface { ReleaseTable(ctx context.Context, tableID uuid.UUID, req *contract.ReleaseTableRequest) *contract.Response GetAvailableTables(ctx context.Context, outletID uuid.UUID) *contract.Response GetOccupiedTables(ctx context.Context, outletID uuid.UUID) *contract.Response + GetTableToken(ctx context.Context, tableID uuid.UUID) (string, error) } diff --git a/internal/pkg/qrcode/generator.go b/internal/pkg/qrcode/generator.go new file mode 100644 index 0000000..c07b760 --- /dev/null +++ b/internal/pkg/qrcode/generator.go @@ -0,0 +1,32 @@ +package qrcode + +import ( + "bytes" + "image/png" + + "github.com/boombuler/barcode" + "github.com/boombuler/barcode/qr" +) + +func GeneratePNG(content string, size int) ([]byte, error) { + if size <= 0 { + size = 256 + } + + qrCode, err := qr.Encode(content, qr.M, qr.Auto) + if err != nil { + return nil, err + } + + qrCode, err = barcode.Scale(qrCode, size, size) + if err != nil { + return nil, err + } + + var buf bytes.Buffer + if err := png.Encode(&buf, qrCode); err != nil { + return nil, err + } + + return buf.Bytes(), nil +} diff --git a/internal/processor/table_processor.go b/internal/processor/table_processor.go index 5cc872e..0adf23c 100644 --- a/internal/processor/table_processor.go +++ b/internal/processor/table_processor.go @@ -207,6 +207,14 @@ func (p *TableProcessor) GetOccupiedTables(ctx context.Context, outletID uuid.UU return responses, nil } +func (p *TableProcessor) GetTokenByID(ctx context.Context, id uuid.UUID) (string, error) { + table, err := p.tableRepo.GetByID(ctx, id) + if err != nil { + return "", err + } + return table.Token, nil +} + func (p *TableProcessor) mapTableToResponse(table *entities.Table) *models.TableResponse { response := &models.TableResponse{ ID: table.ID, diff --git a/internal/router/router.go b/internal/router/router.go index ea62af9..e8b2d95 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -70,7 +70,7 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer paymentMethodHandler: handler.NewPaymentMethodHandler(paymentMethodService, paymentMethodValidator), analyticsHandler: handler.NewAnalyticsHandler(analyticsService, transformer.NewTransformer()), reportHandler: handler.NewReportHandler(reportService, userService), - tableHandler: handler.NewTableHandler(tableService, tableValidator), + tableHandler: handler.NewTableHandler(tableService, tableValidator, cfg.Server.BaseUrl), unitHandler: handler.NewUnitHandler(unitService), ingredientHandler: handler.NewIngredientHandler(ingredientService), productRecipeHandler: handler.NewProductRecipeHandler(productRecipeService), @@ -323,6 +323,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) { tables.DELETE("/:id", r.tableHandler.Delete) tables.POST("/:id/occupy", r.tableHandler.OccupyTable) tables.POST("/:id/release", r.tableHandler.ReleaseTable) + tables.GET("/:id/qr", r.tableHandler.GenerateQRCode) } ingredients := protected.Group("/ingredients") diff --git a/internal/service/table_service.go b/internal/service/table_service.go index 47072f4..c374a80 100644 --- a/internal/service/table_service.go +++ b/internal/service/table_service.go @@ -152,3 +152,7 @@ func (s *TableServiceImpl) GetOccupiedTables(ctx context.Context, outletID uuid. return contract.BuildSuccessResponse(responses) } + +func (s *TableServiceImpl) GetTableToken(ctx context.Context, tableID uuid.UUID) (string, error) { + return s.tableProcessor.GetTokenByID(ctx, tableID) +} -- 2.47.2 From 15805a48532af29436579f2449e62d0c75050e8d Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 9 May 2026 14:18:36 +0700 Subject: [PATCH 9/9] Implement FCM --- .gitignore | 2 + config/configs.go | 5 + config/firebase.go | 9 + go.mod | 68 ++++++-- go.sum | 162 +++++++++++++++--- infra/development.yaml | 5 +- internal/app/app.go | 4 + internal/client/fcm_client.go | 83 +++++++++ internal/contract/user_contract.go | 15 +- internal/entities/user.go | 1 + internal/handler/self_order_handler.go | 33 ++++ internal/processor/user_processor.go | 14 ++ internal/processor/user_repository.go | 2 + internal/repository/user_repository.go | 14 ++ internal/service/auth_service.go | 21 ++- internal/service/user_processor.go | 1 + .../000064_add_fcm_token_to_users.down.sql | 1 + .../000064_add_fcm_token_to_users.up.sql | 1 + 18 files changed, 397 insertions(+), 44 deletions(-) create mode 100644 config/firebase.go create mode 100644 internal/client/fcm_client.go create mode 100644 migrations/000064_add_fcm_token_to_users.down.sql create mode 100644 migrations/000064_add_fcm_token_to_users.up.sql diff --git a/.gitignore b/.gitignore index 497deaa..6f5bf57 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ config/env/* !.env vendor + +*firebase-adminsdk*.json diff --git a/config/configs.go b/config/configs.go index 170d32d..8b2831e 100644 --- a/config/configs.go +++ b/config/configs.go @@ -31,6 +31,7 @@ type Config struct { Log Log `mapstructure:"log"` S3Config S3Config `mapstructure:"s3"` Fonnte Fonnte `mapstructure:"fonnte"` + Firebase Firebase `mapstructure:"firebase"` } var ( @@ -95,3 +96,7 @@ func (c *Config) LogFormat() string { func (c *Config) GetFonnte() *Fonnte { return &c.Fonnte } + +func (c *Config) GetFirebase() *Firebase { + return &c.Firebase +} diff --git a/config/firebase.go b/config/firebase.go new file mode 100644 index 0000000..02a6eaf --- /dev/null +++ b/config/firebase.go @@ -0,0 +1,9 @@ +package config + +type Firebase struct { + CredentialsFile string `mapstructure:"credentials_file"` +} + +func (f *Firebase) GetCredentialsFile() string { + return f.CredentialsFile +} diff --git a/go.mod b/go.mod index bd967f9..fa0aba6 100644 --- a/go.mod +++ b/go.mod @@ -5,25 +5,50 @@ go 1.24 require ( github.com/gin-gonic/gin v1.9.1 github.com/go-playground/validator/v10 v10.17.0 - github.com/google/uuid v1.1.2 + github.com/google/uuid v1.6.0 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/google/go-cmp v0.6.0 // indirect + github.com/golang-jwt/jwt/v4 v4.5.2 // 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 @@ -40,36 +65,57 @@ 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/rogpeppe/go-internal v1.11.0 // indirect - github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/afero v1.10.0 // 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/stretchr/objx v0.5.0 // indirect + github.com/spiffe/go-spiffe/v2 v2.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.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.30.0 // indirect - golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.20.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + golang.org/x/net v0.42.0 // indirect + golang.org/x/oauth2 v0.30.0 // indirect + golang.org/x/sync v0.16.0 // indirect + golang.org/x/sys v0.34.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.8.4 + github.com/stretchr/testify v1.10.0 go.uber.org/zap v1.21.0 - golang.org/x/crypto v0.28.0 + golang.org/x/crypto v0.40.0 + google.golang.org/api v0.231.0 gorm.io/driver/postgres v1.5.0 gorm.io/gorm v1.30.0 ) diff --git a/go.sum b/go.sum index b1a6622..3f6c466 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +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= @@ -17,14 +19,32 @@ 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= @@ -35,9 +55,25 @@ 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= @@ -69,6 +105,8 @@ 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= @@ -78,7 +116,17 @@ 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= @@ -92,6 +140,13 @@ 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= @@ -102,6 +157,9 @@ 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= @@ -129,6 +187,9 @@ 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= @@ -140,12 +201,16 @@ 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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +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= @@ -157,10 +222,17 @@ 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/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0= +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= @@ -223,6 +295,8 @@ 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= @@ -230,12 +304,12 @@ github.com/redis/go-redis/v9 v9.19.0 h1:XPVaaPSnG6RhYf7p+rmSa9zZfeVAnWsH5h3lxthO 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.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= 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.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/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= @@ -244,10 +318,13 @@ 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= @@ -257,8 +334,9 @@ 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= @@ -271,6 +349,8 @@ 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= @@ -279,11 +359,32 @@ 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.11.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= @@ -301,8 +402,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.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= +golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= 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= @@ -373,8 +474,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.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= +golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= 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= @@ -384,6 +485,8 @@ 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= @@ -397,6 +500,8 @@ 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= @@ -440,8 +545,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.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= +golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= 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= @@ -453,12 +558,15 @@ 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.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= +golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= 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= @@ -531,6 +639,8 @@ 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= @@ -538,6 +648,8 @@ 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= @@ -574,6 +686,12 @@ 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= @@ -590,6 +708,8 @@ 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= @@ -600,8 +720,10 @@ 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.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +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= diff --git a/infra/development.yaml b/infra/development.yaml index dc1f891..b1cba22 100644 --- a/infra/development.yaml +++ b/infra/development.yaml @@ -53,4 +53,7 @@ log: fonnte: api_url: "https://api.fonnte.com/send" token: "bADQrf9NTXfLZQCK2wGg" - timeout: 30 \ No newline at end of file + timeout: 30 + +firebase: + credentials_file: "apskel-pos-v2-firebase-adminsdk-fbsvc-ae00499526.json" \ No newline at end of file diff --git a/internal/app/app.go b/internal/app/app.go index 65dbb71..fe61127 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -56,6 +56,7 @@ func (a *App) Initialize(cfg *config.Config) error { repos.userRepo, repos.sessionRepo, repos.orderRepo, + processors.fcmClient, ) a.router = router.NewRouter( @@ -295,12 +296,14 @@ type processors struct { customerPointsProcessor *processor.CustomerPointsProcessor otpProcessor processor.OtpProcessor fileClient processor.FileClient + fcmClient client.FcmClient inventoryMovementService service.InventoryMovementService } func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors { fileClient := client.NewFileClient(cfg.S3Config) fonnteClient := client.NewFonnteClient(cfg.GetFonnte()) + fcmClient := client.NewFcmClient(cfg.GetFirebase()) otpProcessor := processor.NewOtpProcessor(fonnteClient, repos.otpRepo) inventoryMovementService := service.NewInventoryMovementService(repos.inventoryMovementRepo, repos.ingredientRepo) @@ -342,6 +345,7 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor customerPointsProcessor: processor.NewCustomerPointsProcessor(repos.customerPointsRepo, repos.gameRepo), otpProcessor: otpProcessor, fileClient: fileClient, + fcmClient: fcmClient, inventoryMovementService: inventoryMovementService, } } diff --git a/internal/client/fcm_client.go b/internal/client/fcm_client.go new file mode 100644 index 0000000..e0b196e --- /dev/null +++ b/internal/client/fcm_client.go @@ -0,0 +1,83 @@ +package client + +import ( + "context" + "fmt" + "log" + + "apskel-pos-be/config" + + firebase "firebase.google.com/go/v4" + "firebase.google.com/go/v4/messaging" + "google.golang.org/api/option" +) + +type FcmClient interface { + SendMulticastNotification(ctx context.Context, tokens []string, title string, body string) error +} + +type fcmClient struct { + messagingClient *messaging.Client +} + +func NewFcmClient(cfg *config.Firebase) FcmClient { + if cfg == nil || cfg.GetCredentialsFile() == "" { + log.Println("FCM: credentials file not configured, FCM client is disabled") + return &fcmClient{messagingClient: nil} + } + + opt := option.WithCredentialsFile(cfg.GetCredentialsFile()) + app, err := firebase.NewApp(context.Background(), nil, opt) + if err != nil { + log.Printf("FCM: failed to initialize Firebase app: %v", err) + return &fcmClient{messagingClient: nil} + } + + client, err := app.Messaging(context.Background()) + if err != nil { + log.Printf("FCM: failed to create messaging client: %v", err) + return &fcmClient{messagingClient: nil} + } + + log.Println("FCM: client initialized successfully") + return &fcmClient{messagingClient: client} +} + +func (c *fcmClient) SendMulticastNotification(ctx context.Context, tokens []string, title string, body string) error { + if c.messagingClient == nil { + log.Println("FCM: client not initialized, skipping notification") + return nil + } + + if len(tokens) == 0 { + return nil + } + + message := &messaging.MulticastMessage{ + Notification: &messaging.Notification{ + Title: title, + Body: body, + }, + Tokens: tokens, + Android: &messaging.AndroidConfig{ + Priority: "high", + }, + } + + response, err := c.messagingClient.SendMulticast(ctx, message) + if err != nil { + return fmt.Errorf("FCM: failed to send multicast notification: %w", err) + } + + if response.FailureCount > 0 { + log.Printf("FCM: %d tokens failed out of %d", response.FailureCount, len(tokens)) + for i, resp := range response.Responses { + if !resp.Success { + log.Printf("FCM: token[%d] failed: %v", i, resp.Error) + } + } + } + + log.Printf("FCM: sent %d/%d notifications successfully", response.SuccessCount, len(tokens)) + return nil +} diff --git a/internal/contract/user_contract.go b/internal/contract/user_contract.go index 5607005..ec5cded 100644 --- a/internal/contract/user_contract.go +++ b/internal/contract/user_contract.go @@ -35,16 +35,17 @@ type UpdateUserOutletRequest struct { } type LoginRequest struct { - Email string `json:"email" validate:"required,email"` - Password string `json:"password" validate:"required"` + Email string `json:"email" validate:"required,email"` + Password string `json:"password" validate:"required"` + FcmToken *string `json:"fcm_token,omitempty"` } type LoginResponse struct { - Token string `json:"token"` - RefreshToken string `json:"refresh_token"` - ExpiresAt time.Time `json:"expires_at"` - RefreshExpiresAt time.Time `json:"refresh_expires_at"` - User UserResponse `json:"user"` + Token string `json:"token"` + RefreshToken string `json:"refresh_token"` + ExpiresAt time.Time `json:"expires_at"` + RefreshExpiresAt time.Time `json:"refresh_expires_at"` + User UserResponse `json:"user"` } type UserResponse struct { diff --git a/internal/entities/user.go b/internal/entities/user.go index d69214b..d85d3a2 100644 --- a/internal/entities/user.go +++ b/internal/entities/user.go @@ -49,6 +49,7 @@ type User struct { Role UserRole `gorm:"not null;size:50" json:"role" validate:"required,oneof=admin manager cashier waiter"` Permissions Permissions `gorm:"type:jsonb;default:'{}'" json:"permissions"` IsActive bool `gorm:"default:true" json:"is_active"` + FcmToken *string `gorm:"size:512" json:"fcm_token,omitempty"` CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"` UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"` Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"` diff --git a/internal/handler/self_order_handler.go b/internal/handler/self_order_handler.go index 605a137..18ba0cb 100644 --- a/internal/handler/self_order_handler.go +++ b/internal/handler/self_order_handler.go @@ -1,6 +1,7 @@ package handler import ( + "apskel-pos-be/internal/client" "apskel-pos-be/internal/constants" "apskel-pos-be/internal/contract" "apskel-pos-be/internal/entities" @@ -14,6 +15,7 @@ import ( "apskel-pos-be/internal/util" "context" "fmt" + "log" "github.com/gin-gonic/gin" "github.com/google/uuid" @@ -28,6 +30,7 @@ type SelfOrderHandler struct { userRepo processor.UserRepository sessionRepo repository.SessionRepository orderRepo repository.OrderRepository + fcmClient client.FcmClient } func NewSelfOrderHandler( @@ -39,6 +42,7 @@ func NewSelfOrderHandler( userRepo processor.UserRepository, sessionRepo repository.SessionRepository, orderRepo repository.OrderRepository, + fcmClient client.FcmClient, ) *SelfOrderHandler { return &SelfOrderHandler{ orderService: orderService, @@ -49,6 +53,7 @@ func NewSelfOrderHandler( userRepo: userRepo, sessionRepo: sessionRepo, orderRepo: orderRepo, + fcmClient: fcmClient, } } @@ -351,10 +356,38 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) { return } + go h.sendNewOrderNotification(context.Background(), table.OrganizationID, table.TableName, len(req.OrderItems)) + contractResp := transformer.OrderModelToContract(response) util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "SelfOrderHandler::CreateOrder") } +func (h *SelfOrderHandler) sendNewOrderNotification(ctx context.Context, organizationID uuid.UUID, tableName string, itemCount int) { + users, err := h.userRepo.GetUsersWithFcmTokenByOrganization(ctx, organizationID) + if err != nil { + log.Printf("SelfOrderHandler::sendNewOrderNotification -> failed to get users with FCM token: %v", err) + return + } + + tokens := make([]string, 0, len(users)) + for _, u := range users { + if u.FcmToken != nil && *u.FcmToken != "" { + tokens = append(tokens, *u.FcmToken) + } + } + + if len(tokens) == 0 { + return + } + + title := "Order Baru" + body := fmt.Sprintf("Order baru dari Meja %s — %d item", tableName, itemCount) + + if err := h.fcmClient.SendMulticastNotification(ctx, tokens, title, body); err != nil { + log.Printf("SelfOrderHandler::sendNewOrderNotification -> failed to send FCM notification: %v", err) + } +} + func (h *SelfOrderHandler) GetOrdersBySession(c *gin.Context) { ctx := c.Request.Context() sessionID := c.Param("sessionId") diff --git a/internal/processor/user_processor.go b/internal/processor/user_processor.go index be0942d..b318d73 100644 --- a/internal/processor/user_processor.go +++ b/internal/processor/user_processor.go @@ -253,3 +253,17 @@ func (p *UserProcessorImpl) UpdateUserOutlet(ctx context.Context, userID uuid.UU return mappers.UserEntityToResponse(existingUser), nil } + +func (p *UserProcessorImpl) UpdateFcmToken(ctx context.Context, userID uuid.UUID, fcmToken string) error { + _, err := p.userRepo.GetByID(ctx, userID) + if err != nil { + return fmt.Errorf("user not found: %w", err) + } + + err = p.userRepo.UpdateFcmToken(ctx, userID, fcmToken) + if err != nil { + return fmt.Errorf("failed to update FCM token: %w", err) + } + + return nil +} diff --git a/internal/processor/user_repository.go b/internal/processor/user_repository.go index 6b71b69..d4ea484 100644 --- a/internal/processor/user_repository.go +++ b/internal/processor/user_repository.go @@ -19,4 +19,6 @@ type UserRepository interface { UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.User, int64, error) Count(ctx context.Context, filters map[string]interface{}) (int64, error) + UpdateFcmToken(ctx context.Context, id uuid.UUID, fcmToken string) error + GetUsersWithFcmTokenByOrganization(ctx context.Context, organizationID uuid.UUID) ([]*entities.User, error) } diff --git a/internal/repository/user_repository.go b/internal/repository/user_repository.go index a9e2747..a101493 100644 --- a/internal/repository/user_repository.go +++ b/internal/repository/user_repository.go @@ -110,3 +110,17 @@ func (r *UserRepositoryImpl) Count(ctx context.Context, filters map[string]inter err := query.Count(&count).Error return count, err } + +func (r *UserRepositoryImpl) UpdateFcmToken(ctx context.Context, id uuid.UUID, fcmToken string) error { + return r.db.WithContext(ctx).Model(&entities.User{}). + Where("id = ?", id). + Update("fcm_token", fcmToken).Error +} + +func (r *UserRepositoryImpl) GetUsersWithFcmTokenByOrganization(ctx context.Context, organizationID uuid.UUID) ([]*entities.User, error) { + var users []*entities.User + err := r.db.WithContext(ctx). + Where("organization_id = ? AND is_active = ? AND fcm_token IS NOT NULL AND fcm_token != ''", organizationID, true). + Find(&users).Error + return users, err +} diff --git a/internal/service/auth_service.go b/internal/service/auth_service.go index 547e072..450fc2d 100644 --- a/internal/service/auth_service.go +++ b/internal/service/auth_service.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "log" "time" "apskel-pos-be/config" @@ -24,11 +25,11 @@ type AuthService interface { } type AuthServiceImpl struct { - userProcessor UserProcessor - jwtSecret string - refreshSecret string - tokenTTL time.Duration - refreshTokenTTL time.Duration + userProcessor UserProcessor + jwtSecret string + refreshSecret string + tokenTTL time.Duration + refreshTokenTTL time.Duration } type Claims struct { @@ -81,6 +82,8 @@ func (s *AuthServiceImpl) Login(ctx context.Context, req *contract.LoginRequest) return nil, fmt.Errorf("failed to generate refresh token: %w", err) } + go s.saveFcmToken(context.Background(), userResponse.ID, req.FcmToken) + return &contract.LoginResponse{ Token: token, RefreshToken: refreshToken, @@ -90,6 +93,14 @@ func (s *AuthServiceImpl) Login(ctx context.Context, req *contract.LoginRequest) }, nil } +func (s *AuthServiceImpl) saveFcmToken(ctx context.Context, userID uuid.UUID, fcmToken *string) { + if fcmToken != nil && *fcmToken != "" { + if err := s.userProcessor.UpdateFcmToken(ctx, userID, *fcmToken); err != nil { + log.Printf("failed to save FCM token for user %s: %v", userID, err) + } + } +} + func (s *AuthServiceImpl) ValidateToken(tokenString string) (*contract.UserResponse, error) { claims, err := s.parseToken(tokenString) if err != nil { diff --git a/internal/service/user_processor.go b/internal/service/user_processor.go index 716f321..fb91027 100644 --- a/internal/service/user_processor.go +++ b/internal/service/user_processor.go @@ -20,4 +20,5 @@ type UserProcessor interface { ActivateUser(ctx context.Context, userID uuid.UUID) error DeactivateUser(ctx context.Context, userID uuid.UUID) error UpdateUserOutlet(ctx context.Context, userID uuid.UUID, req *models.UpdateUserOutletRequest) (*models.UserResponse, error) + UpdateFcmToken(ctx context.Context, userID uuid.UUID, fcmToken string) error } diff --git a/migrations/000064_add_fcm_token_to_users.down.sql b/migrations/000064_add_fcm_token_to_users.down.sql new file mode 100644 index 0000000..aad76e5 --- /dev/null +++ b/migrations/000064_add_fcm_token_to_users.down.sql @@ -0,0 +1 @@ +ALTER TABLE users DROP COLUMN fcm_token; diff --git a/migrations/000064_add_fcm_token_to_users.up.sql b/migrations/000064_add_fcm_token_to_users.up.sql new file mode 100644 index 0000000..cd1519c --- /dev/null +++ b/migrations/000064_add_fcm_token_to_users.up.sql @@ -0,0 +1 @@ +ALTER TABLE users ADD COLUMN fcm_token VARCHAR(512) NULL; -- 2.47.2