Merge old/master into main, resolving conflicts by preferring old in workflows and removing deprecated adapter files

internal/handler/public/portal/getSubscriptionHandler.go

@@ -4,14 +4,23 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/public/portal"
 	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/result"
 )
 
 // Get Subscription
 func GetSubscriptionHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
+		var req types.GetSubscriptionRequest
+		_ = c.ShouldBind(&req)
+		validateErr := svcCtx.Validate(&req)
+		if validateErr != nil {
+			result.ParamErrorResult(c, validateErr)
+			return
+		}
+
 		l := portal.NewGetSubscriptionLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetSubscription()
+		resp, err := l.GetSubscription(&req)
 		result.HttpResult(c, resp, err)
 	}
 }

internal/handler/public/portal/purchaseCheckoutHandler.go

@@ -8,7 +8,7 @@ import (
 	"github.com/perfect-panel/server/pkg/result"
 )
 
-// Purchase Checkout
+// PurchaseCheckoutHandler Purchase Checkout
 func PurchaseCheckoutHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
 		var req types.CheckoutOrderRequest

internal/handler/public/subscribe/queryApplicationConfigHandler.go

@@ -1,18 +0,0 @@
-package subscribe
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/public/subscribe"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-// Get application config
-func QueryApplicationConfigHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-
-		l := subscribe.NewQueryApplicationConfigLogic(c.Request.Context(), svcCtx)
-		resp, err := l.QueryApplicationConfig()
-		result.HttpResult(c, resp, err)
-	}
-}

internal/handler/public/subscribe/querySubscribeListHandler.go

@@ -4,15 +4,23 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/public/subscribe"
 	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/result"
 )
 
-// Get subscribe list
+// QuerySubscribeListHandler Get subscribe list
 func QuerySubscribeListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
+		var req types.QuerySubscribeListRequest
+		_ = c.ShouldBind(&req)
+		validateErr := svcCtx.Validate(&req)
+		if validateErr != nil {
+			result.ParamErrorResult(c, validateErr)
+			return
+		}
 
 		l := subscribe.NewQuerySubscribeListLogic(c.Request.Context(), svcCtx)
-		resp, err := l.QuerySubscribeList()
+		resp, err := l.QuerySubscribeList(&req)
 		result.HttpResult(c, resp, err)
 	}
 }