fix: resolve comments

Author: bietkul

util/billing.go

@@ -13,7 +13,24 @@ import (
 	"github.com/olivere/elastic/v7"
 )
 
-var TierValidity int64
+var TimeValidity int64
+
+type ArcUsage struct {
+	ArcID          string `json:"arc_id"`
+	Timestamp      int64  `json:"timestamp"`
+	SubscriptionID string `json:"subscription_id"`
+	Quantity       int    `json:"quantity"`
+	Email          string `json:"email"`
+}
+
+type ArcUsageResponse struct {
+	Accepted      bool   `json:"accepted"`
+	FailureReason string `json:"failure_reason"`
+	ErrorMsg      string `json:"error_msg"`
+	WarningMsg    string `json:"warning_msg"`
+	StatusCode    int    `json:"status_code"`
+	TimeValidity  int64  `json:"time_validity"`
+}
 
 const (
 	envEsURL       = "ES_CLUSTER_URL"
@@ -25,14 +42,12 @@ const (
 // Middleware function, which will be called for each request
 func BillingMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		currentTime := time.Now().Unix()
 		// Valid plan
-		if TierValidity > currentTime {
-			remainingTime := TierValidity - currentTime
+		if TimeValidity > 0 {
 			// Check if remaining time is less than 24 hrs
-			if remainingTime <= 3600*24 {
-				// Print waring message if remaining time is less than 24 hrs
-				log.Println("warning: payment required. arc will start sending out error messages in next", remainingTime/3600, "hours")
+			if TimeValidity <= 3600*24 {
+				// Print warning message if remaining time is less than 24 hrs
+				log.Println("warning: payment required. arc will start sending out error messages in next", TimeValidity/3600, "hours")
 			}
 			next.ServeHTTP(w, r)
 		} else {
@@ -42,23 +57,6 @@ func BillingMiddleware(next http.Handler) http.Handler {
 	})
 }
 
-type ArcUsage struct {
-	ArcID          string `json:"arc_id"`
-	Timestamp      int64  `json:"timestamp"`
-	SubscriptionID string `json:"subscription_id"`
-	Quantity       int    `json:"quantity"`
-	Email          string `json:"email"`
-}
-
-type ArcUsageResponse struct {
-	Accepted      bool   `json:"accepted"`
-	FailureReason string `json:"failure_reason"`
-	ErrorMsg      string `json:"error_msg"`
-	WarningMsg    string `json:"warning_msg"`
-	StatusCode    int    `json:"status_code"`
-	TierValidity  int64  `json:"tier_validity"`
-}
-
 func ReportUsageRequest(arcUsage ArcUsage) (ArcUsageResponse, error) {
 	response := ArcUsageResponse{}
 	url := "https://accapi.appbase.io/arc/" + arcUsage.ArcID + "/report_usage"
@@ -73,7 +71,7 @@ func ReportUsageRequest(arcUsage ArcUsage) (ArcUsageResponse, error) {
 
 	res, err := http.DefaultClient.Do(req)
 	if err != nil {
-		log.Println("error while sending reequest: ", err)
+		log.Println("error while sending request: ", err)
 		return response, err
 	}
 	defer res.Body.Close()
@@ -123,7 +121,7 @@ func ReportUsage() {
 		log.Println("please contact support. Usage not getting reported: ", err)
 	}
 
-	TierValidity = response.TierValidity
+	TimeValidity = response.TimeValidity
 	if response.WarningMsg != "" {
 		log.Println("warning:", response.WarningMsg)
 	}