refactor

Author: bstrdlord

api/internal/delivery/rest/v1/invoice_public.go

@@ -184,7 +184,7 @@ func (h *Handler) invoiceInfo(c *gin.Context) {
 		CreatedAt:      invoice.CreatedAt.Format("2006-01-02 15:04:05"),
 	}
 
-	if time.Now().Unix() > invoice.EndTimestamp && invoice.Status.IsNotPaid() && !invoice.Status.IsCancelled() {
+	if time.Now().Unix() > invoice.EndTimestamp && invoice.Status.IsNotPaid() && !invoice.Status.IsCanceled() {
 		response.Status = "end"
 	}
 
@@ -279,7 +279,7 @@ func (h *Handler) invoiceCancel(c *gin.Context) {
 		return
 	}
 
-	c.AbortWithStatusJSON(http.StatusOK, responseInvoiceCancelled{
+	c.AbortWithStatusJSON(http.StatusOK, responseInvoiceCanceled{
 		Error: false,
 	})
 

api/internal/delivery/rest/v1/response.go

@@ -77,7 +77,7 @@ type responseMerchantCreated struct {
 	MerchantId string `json:"merchant_id"`
 }
 
-type responseInvoiceCancelled struct {
+type responseInvoiceCanceled struct {
 	Error bool `json:"error"`
 	// Message string `json:"message"`
 }

api/internal/domain/invoices.go

@@ -28,10 +28,10 @@ const (
 	STATUS_END
 	STATUS_PAID_LESS
 	STATUS_IN_PROCESSING
-	STATUS_CANCELLED
+	STATUS_CANCELED
 )
 
-var Statuses = [...]string{"not_paid", "paid", "paid_over", "end", "paid_less", "processing", "cancelled"}
+var Statuses = [...]string{"not_paid", "paid", "paid_over", "end", "paid_less", "processing", "canceled"}
 
 // methods
 
@@ -49,8 +49,8 @@ func (s Status) ToString() string {
 	return Statuses[s]
 }
 
-func (s Status) IsCancelled() bool {
-	return s == STATUS_CANCELLED
+func (s Status) IsCanceled() bool {
+	return s == STATUS_CANCELED
 }
 func (s Status) IsPaid() bool {
 	return s == STATUS_PAID || s == STATUS_PAID_OVER

api/internal/domain/responses.go

@@ -54,7 +54,7 @@ var (
 	ErrInternalServerError ResponseError = fmt.Errorf(ErrMsgInternalServerError)
 	ErrInvoiceIdNotFound   ResponseError = fmt.Errorf("invoice id not found")
 
-	ErrInvoiceAlreadyCancelled ResponseError = fmt.Errorf("invoice already cancelled")
+	ErrInvoiceAlreadyCanceled ResponseError = fmt.Errorf("the invoice is already canceled")
 )
 
 const (
@@ -73,7 +73,7 @@ func GetStatusByErr(err ResponseError) (status int) {
 		status = http.StatusBadRequest
 	case errors.Is(err, ErrInvoiceIdNotFound):
 		status = http.StatusBadRequest
-	case errors.Is(err, ErrInvoiceAlreadyCancelled):
+	case errors.Is(err, ErrInvoiceAlreadyCanceled):
 		status = http.StatusBadRequest
 	default:
 		status = http.StatusInternalServerError

api/internal/service/invoices.go

@@ -158,8 +158,8 @@ func (s *InvoicesService) RunCheck(ctx context.Context, cancel context.CancelFun
 				continue
 			}
 
-			if invoice.Status.IsCancelled() {
-				fmt.Println("CANCELLED")
+			if invoice.Status.IsCanceled() {
+				fmt.Println("CANCELED")
 				return
 			}
 
@@ -355,12 +355,12 @@ func (s *InvoicesService) Cancel(invoiceId string) domain.ResponseError {
 		return err
 	}
 
-	if invoice.Status.IsCancelled() {
-		return domain.ErrInvoiceAlreadyCancelled
+	if invoice.Status.IsCanceled() {
+		return domain.ErrInvoiceAlreadyCanceled
 	}
 
 	return s.db.Transaction(func(tx *gorm.DB) error {
-		invoice.Status = domain.STATUS_CANCELLED
+		invoice.Status = domain.STATUS_CANCELED
 
 		// update invoice table
 		err := s.repo.Update(tx, invoice)

pkg/nats/natsdomain/helpers.go

@@ -74,58 +74,6 @@ func (ns *Ns) InitBuckets(ctx context.Context) error {
 	return nil
 }
 
-func (ns *Ns) KvWatch(ctx context.Context, bucket BucketType, key string) (jetstream.KeyWatcher, error) {
-	kv, err := kvGet(ns.Js, bucket.String())
-	if err != nil {
-		return nil, err
-	}
-
-	watcher, err := kv.Watch(ctx, key)
-	if err != nil {
-		return nil, err
-	}
-	return watcher, nil
-
-}
-
-func kvGet(js jetstream.JetStream, bucket string) (jetstream.KeyValue, error) {
-	return js.KeyValue(context.Background(), bucket)
-}
-
-func (ns *Ns) KvPut(bucket BucketType, key string, value []byte) {
-	fmt.Println("SET KEY VALUE", key)
-	kv, err := kvGet(ns.Js, bucket.String())
-	if err != nil {
-		panic(err)
-	}
-
-	_, err = kv.Put(context.Background(), key, value)
-	if err != nil {
-		panic(err)
-	}
-}
-
-func (ns *Ns) KVPutStr(bucket BucketType, key string, value string) {
-	kv, err := kvGet(ns.Js, bucket.String())
-	if err != nil {
-		panic(err)
-	}
-
-	_, err = kv.PutString(context.Background(), key, value)
-	if err != nil {
-		panic(err)
-	}
-}
-
-func (ns *Ns) KVGet(bucket BucketType, key string) (jetstream.KeyValueEntry, error) {
-	kv, err := kvGet(ns.Js, bucket.String())
-	if err != nil {
-		panic(err)
-	}
-
-	return kv.Get(context.Background(), key)
-}
-
 func sendrecv(nc *nats.Conn, timeout time.Duration, subj SubjType, jsonMsg []byte) (*nats.Msg, error) {
 	resp, err := nc.Request(subj.String(), jsonMsg, timeout)
 	if err != nil {