Migrate to PlanIDs

jobs/jobrunner_test.go

@@ -10,4 +10,5 @@ import (
 func Test_Init_Jobs(t *testing.T) {
 	utils.SetTesting("../.env")
 	models.Connect(utils.Env.DatabaseURL)
+	models.SetTestPlans()
 }

jobs/metric_collector.go

@@ -3,6 +3,7 @@ package jobs
 import (
 	"github.com/opacity/storage-node/models"
 	"github.com/opacity/storage-node/utils"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 type metricCollector struct{}
@@ -32,8 +33,10 @@ func (m metricCollector) spaceUsageMetrics() {
 
 	utils.Metrics_Percent_Of_Space_Used_Map[utils.TotalLbl].Set(models.CalculatePercentSpaceUsed(spaceReport))
 
-	for _, plan := range utils.Env.Plans {
-		spaceReport := models.CreateSpaceUsedReportForPlanType(models.StorageLimitType(plan.StorageInGB))
+	plans, _ := models.GetAllPlans()
+
+	for _, plan := range plans {
+		spaceReport := models.CreateSpaceUsedReportForPlanType(plan)
 
 		utils.Metrics_Percent_Of_Space_Used_Map[plan.Name].Set(models.CalculatePercentSpaceUsed(spaceReport))
 	}
@@ -79,22 +82,40 @@ func (m metricCollector) accountsMetrics() {
 		utils.Metrics_Percent_Of_Paid_Accounts_Collected.Set(float64(percentOfPaidAccountsCollected))
 	}
 
-	for _, plan := range utils.Env.Plans {
+	plans, _ := models.GetAllPlans()
+
+	for _, plan := range plans {
 		name := plan.Name
-		accountCount, err := models.CountPaidAccountsByPlanType(models.StorageLimitType(plan.StorageInGB))
+		accountCount, err := models.CountPaidAccountsByPlanType(plan)
 		if err == nil {
 			utils.Metrics_Total_Paid_Accounts_Map[name].Set(float64(accountCount))
 		}
 		utils.LogIfError(err, nil)
 
-		stripeCount, err := models.CountPaidAccountsByPaymentMethodAndPlanType(models.StorageLimitType(plan.StorageInGB), models.PaymentMethodWithCreditCard)
+		stripeCount, err := models.CountPaidAccountsByPaymentMethodAndPlanType(plan, models.PaymentMethodWithCreditCard)
 		if err == nil {
 			utils.Metrics_Total_Stripe_Paid_Accounts_Map[name].Set(float64(stripeCount))
 		}
 		utils.LogIfError(err, nil)
 	}
 }
 
+func CreatePlanMetrics() {
+	utils.Metrics_Percent_Of_Space_Used_Map[utils.TotalLbl] = utils.Metrics_Percent_Of_Space_Used.With(prometheus.Labels{"plan_type": utils.TotalLbl})
+	utils.Metrics_Total_Paid_Accounts_Map[utils.TotalLbl] = utils.Metrics_Total_Paid_Accounts.With(prometheus.Labels{"plan_type": utils.TotalLbl})
+
+	utils.Metrics_Total_Stripe_Paid_Accounts_Map[utils.TotalLbl] = utils.Metrics_Total_Stripe_Paid_Accounts.With(prometheus.Labels{"plan_type": utils.TotalLbl})
+
+	plans, _ := models.GetAllPlans()
+
+	for _, plan := range plans {
+		name := plan.Name
+		utils.Metrics_Percent_Of_Space_Used_Map[name] = utils.Metrics_Percent_Of_Space_Used.With(prometheus.Labels{"plan_type": name})
+		utils.Metrics_Total_Paid_Accounts_Map[name] = utils.Metrics_Total_Paid_Accounts.With(prometheus.Labels{"plan_type": name})
+		utils.Metrics_Total_Stripe_Paid_Accounts_Map[name] = utils.Metrics_Total_Stripe_Paid_Accounts.With(prometheus.Labels{"plan_type": name})
+	}
+}
+
 func (m metricCollector) fileMetrics() {
 	completedFileInSQLCount := 0
 	err := models.DB.Model(&models.CompletedFile{}).Count(&completedFileInSQLCount).Error

jobs/s3_deleter_test.go

@@ -12,6 +12,7 @@ import (
 func Test_Init_S3_Deleter(t *testing.T) {
 	utils.SetTesting("../.env")
 	models.Connect(utils.Env.DatabaseURL)
+	models.SetTestPlans()
 }
 
 func Test_DeleteAllExpiredCompletedFiles(t *testing.T) {

jobs/s3_expire_access_test.go

@@ -12,6 +12,7 @@ import (
 func Test_Init_S3_Life_Cycle(t *testing.T) {
 	utils.SetTesting("../.env")
 	models.Connect(utils.Env.DatabaseURL)
+	models.SetTestPlans()
 }
 
 func Test_Delete_S3Object(t *testing.T) {

main.go

@@ -57,7 +57,14 @@ func main() {
 		models.Connect(utils.Env.DatabaseURL)
 	}
 
-	setEnvPlans()
+	migratePlanIds := utils.GetPlansMigrationDone()
+	if !migratePlanIds {
+		err = models.MigratePlanIds()
+		utils.PanicOnError(err)
+	}
+
+	jobs.CreatePlanMetrics()
+
 	models.MigrateEnvWallets()
 
 	jobs.StartupJobs()
@@ -68,28 +75,6 @@ func main() {
 	routes.CreateRoutes()
 }
 
-func setEnvPlans() {
-	plans := []utils.PlanInfo{}
-	results := models.DB.Find(&plans)
-
-	utils.Env.Plans = make(utils.PlanResponseType)
-
-	if results.RowsAffected == 0 {
-		err := json.Unmarshal([]byte(utils.DefaultPlansJson), &utils.Env.Plans)
-		utils.LogIfError(err, nil)
-
-		for _, plan := range utils.Env.Plans {
-			models.DB.Model(&utils.PlanInfo{}).Create(&plan)
-		}
-	} else {
-		for _, plan := range plans {
-			utils.Env.Plans[plan.StorageInGB] = plan
-		}
-	}
-
-	utils.CreatePlanMetrics()
-}
-
 func sentryOpacityBeforeSend(event *sentry.Event, hint *sentry.EventHint) *sentry.Event {
 	if event.Request != nil {
 		req := routes.GenericRequest{}