[fix] #144

pkg/api/api.go

@@ -169,13 +169,6 @@ func AdminRestAPI() {
 			//
 			v1.POST("/group/:id/payment/subscribe", payment.PostAdminSubscribeGettingURL)
 			v1.GET("/group/:id/payment", payment.GetAdminBillingPortalURL)
-			// Delete
-			v1.DELETE("/payment/:id", payment.DeleteByAdmin)
-			v1.POST("/payment/:id/refund", payment.RefundByAdmin)
-			// Update
-			//v1.PUT("/service/:id", service.UpdateByAdmin)
-			v1.GET("/payment", payment.GetAllByAdmin)
-			//v1.GET("/service/:id", service.GetByAdmin)
 
 			//
 			// JPNIC ByAdmin

pkg/api/core/payment/v0/admin.go

@@ -7,16 +7,13 @@ import (
 	auth "github.com/homenoc/dsbd-backend/pkg/api/core/auth/v0"
 	"github.com/homenoc/dsbd-backend/pkg/api/core/common"
 	"github.com/homenoc/dsbd-backend/pkg/api/core/group"
-	"github.com/homenoc/dsbd-backend/pkg/api/core/notice"
 	"github.com/homenoc/dsbd-backend/pkg/api/core/payment"
 	"github.com/homenoc/dsbd-backend/pkg/api/core/tool/config"
 	dbGroup "github.com/homenoc/dsbd-backend/pkg/api/store/group/v0"
-	dbPayment "github.com/homenoc/dsbd-backend/pkg/api/store/payment/v0"
 	"github.com/stripe/stripe-go/v73"
 	billingSession "github.com/stripe/stripe-go/v73/billingportal/session"
 	"github.com/stripe/stripe-go/v73/checkout/session"
 	"github.com/stripe/stripe-go/v73/customer"
-	"github.com/stripe/stripe-go/v73/refund"
 	"gorm.io/gorm"
 	"log"
 	"net/http"
@@ -166,86 +163,3 @@ func GetAdminBillingPortalURL(c *gin.Context) {
 
 	c.JSON(http.StatusOK, map[string]string{"url": s.URL})
 }
-
-func DeleteByAdmin(c *gin.Context) {
-	resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
-	if resultAdmin.Err != nil {
-		c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
-		return
-	}
-
-	id, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		c.JSON(http.StatusBadRequest, common.Error{Error: err.Error()})
-		return
-	}
-
-	if err = dbPayment.Delete(&core.Payment{Model: gorm.Model{ID: uint(id)}}); err != nil {
-		c.JSON(http.StatusInternalServerError, common.Error{Error: err.Error()})
-		return
-	}
-	c.JSON(http.StatusOK, notice.Result{})
-}
-
-func GetByAdmin(c *gin.Context) {
-	resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
-	if resultAdmin.Err != nil {
-		c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
-		return
-	}
-	id, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		c.JSON(http.StatusBadRequest, common.Error{Error: err.Error()})
-		return
-	}
-
-	result, err := dbPayment.Get(payment.ID, core.Payment{Model: gorm.Model{ID: uint(id)}})
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, common.Error{Error: err.Error()})
-		return
-	}
-	c.JSON(http.StatusOK, payment.ResultByAdmin{Payment: result})
-}
-
-func GetAllByAdmin(c *gin.Context) {
-	resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
-	if resultAdmin.Err != nil {
-		c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
-		return
-	}
-
-	if result, err := dbPayment.GetAll(); err != nil {
-		c.JSON(http.StatusInternalServerError, common.Error{Error: err.Error()})
-	} else {
-		c.JSON(http.StatusOK, payment.ResultByAdmin{Payment: result})
-	}
-}
-
-func RefundByAdmin(c *gin.Context) {
-	resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
-	if resultAdmin.Err != nil {
-		c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
-		return
-	}
-
-	id, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		c.JSON(http.StatusBadRequest, common.Error{Error: err.Error()})
-		return
-	}
-
-	result, err := dbPayment.Get(payment.ID, core.Payment{Model: gorm.Model{ID: uint(id)}})
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, common.Error{Error: err.Error()})
-		return
-	}
-
-	_, err = refund.New(&stripe.RefundParams{
-		PaymentIntent: stripe.String(result[0].PaymentIntentID),
-	})
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, common.Error{Error: err.Error()})
-		return
-	}
-	c.JSON(http.StatusOK, common.Result{})
-}

pkg/api/core/payment/v0/websocket.go

@@ -9,7 +9,6 @@ import (
 	"github.com/homenoc/dsbd-backend/pkg/api/core/group"
 	"github.com/homenoc/dsbd-backend/pkg/api/core/tool/config"
 	dbGroup "github.com/homenoc/dsbd-backend/pkg/api/store/group/v0"
-	dbPayment "github.com/homenoc/dsbd-backend/pkg/api/store/payment/v0"
 	"github.com/stripe/stripe-go/v73"
 	"github.com/stripe/stripe-go/v73/webhook"
 	"gorm.io/gorm"
@@ -62,28 +61,13 @@ func GetStripeWebHook(c *gin.Context) {
 		name := event.Data.Object["metadata"].(map[string]interface{})["name"].(string)
 		groupIDStr := event.Data.Object["metadata"].(map[string]interface{})["group_id"].(string)
 		etc := "GroupID: " + groupIDStr + ",  UserName: " + name
-		groupID, _ := strconv.Atoi(groupIDStr)
 
 		// stripe standard data
 		amountTotal := event.Data.Object["amount_total"].(float64)
 		paymentIntent := event.Data.Object["payment_intent"].(string)
 		if dataType == "donate" {
-			dbPayment.Create(&core.Payment{
-				Type:            core.PaymentDonate,
-				GroupID:         nil,
-				Refund:          &[]bool{false}[0],
-				PaymentIntentID: paymentIntent,
-				Fee:             uint(amountTotal),
-			})
 			etc += "UserName: " + name
 		} else if dataType == "membership" {
-			dbPayment.Create(&core.Payment{
-				Type:            core.PaymentMembership,
-				GroupID:         &[]uint{uint(groupID)}[0],
-				Refund:          &[]bool{false}[0],
-				PaymentIntentID: paymentIntent,
-				Fee:             uint(amountTotal),
-			})
 			etc += "GroupID: " + groupIDStr
 			break
 		}