Merge pull request #333 from Shuffle/revert-332-fix

Revert "Subscription / Billing bug fixes and some enhancements "

Author: 0x0elliot

shared.go

@@ -1113,7 +1113,7 @@ func HandleGetOrg(resp http.ResponseWriter, request *http.Request) {
 		//log.Printf("LIMIT: %s", org.SyncFeatures.AppExecutions.Limit)
 		orgChanged := false
 		if org.SyncFeatures.AppExecutions.Limit == 0 || org.SyncFeatures.AppExecutions.Limit == 1500 {
-			org.SyncFeatures.AppExecutions.Limit = 2000
+			org.SyncFeatures.AppExecutions.Limit = 10000
 			orgChanged = true
 		}
 
@@ -1161,83 +1161,18 @@ func HandleGetOrg(resp http.ResponseWriter, request *http.Request) {
 			org.SyncFeatures.MultiEnv.Usage = int64(len(envs))
 		}
 
-		// Backfill subscription IDs if any subscription is missing an ID
-		addSubId := false
-		for _, sub := range org.Subscriptions {
-			if sub.Id == "" {
-				addSubId = true
-				break
-			}
-		}
-
-		if addSubId {
-			for i := range org.Subscriptions {
-				if org.Subscriptions[i].Id == "" {
-					org.Subscriptions[i].Id = uuid.NewV4().String()
-				}
-			}
-			if err := SetOrg(ctx, *org, org.Id); err != nil {
-				log.Printf("[WARNING] Failed to backfill subscription IDs for org %s: %s", org.Id, err)
-			} else {
-				log.Printf("[INFO] Backfilled subscription IDs for org %s", org.Id)
-			}
-		}
-
 		if len(org.Subscriptions) == 0 && len(org.CreatorOrg) == 0 {
 			// Only when there is no subscription in the org and it's not a suborg :)
 			// Placeholder subscription that to add at very first time
-			base := BuildBaseSubscription(*org, org.SyncFeatures.AppExecutions.Limit)
+			base := buildBaseSubscription(*org, org.SyncFeatures.AppExecutions.Limit)
 			org.Subscriptions = append(org.Subscriptions, base)
 
 			if err := SetOrg(ctx, *org, org.Id); err != nil {
 				log.Printf("[WARNING] Failed to persist base subscription for org %s: %s", org.Id, err)
 			} else {
 				log.Printf("[INFO] Added a base subscription (%s) for org %s", base.Name, org.Id)
 			}
-		} else if len(org.CreatorOrg) == 0 && len(org.Subscriptions) >= 1 {
-			hasActivePaidSubscription := false
-			hasFreeSubscription := false
-
-			updateSub := false
-
-			for _, sub := range org.Subscriptions {
-				if sub.Active && sub.Amount != "0" {
-					hasActivePaidSubscription = true
-				}
-				if sub.Amount == "0" && sub.Reference == "" {
-					hasFreeSubscription = true
-				}
-			}
-
-			if hasActivePaidSubscription && hasFreeSubscription {
-				// Remove free subscriptions since user has active paid plan
-				var filteredSubs []PaymentSubscription
-				for _, sub := range org.Subscriptions {
-					if !(sub.Amount == "0" && sub.Reference == "") {
-						filteredSubs = append(filteredSubs, sub)
-					}
-				}
-				org.Subscriptions = filteredSubs
-				updateSub = true
-				log.Printf("[INFO] Removed free subscription for org %s (active paid subscription exists)", org.Id)
-			} else if !hasActivePaidSubscription && !hasFreeSubscription {
-				// No active paid subscription and no free plan, add one
-				org.Subscriptions = append(org.Subscriptions, BuildBaseSubscription(*org, 2000))
-				updateSub = true
-				log.Printf("[INFO] Added free subscription for org %s (no active paid subscriptions found)", org.Id)
-			}
-
-			// Persist any subscription changes made above
-			if updateSub {
-				if err := SetOrg(ctx, *org, org.Id); err != nil {
-					log.Printf("[ERROR] Failed to persist subscription changes for org %s: %v", org.Id, err)
-				} else {
-					log.Printf("[DEBUG] Successfully persisted subscription changes for org %s", org.Id)
-				}
-			}
-		}
-
-		if len(org.CreatorOrg) == 0 && project.Environment == "onprem" {
+		} else if len(org.CreatorOrg) == 0 && project.Environment == "onprem" {
 			// This is used to update the subscription for the onprem orgs
 			// That have cloud sync active
 			// Not a suborg
@@ -12495,7 +12430,7 @@ func getSignatureSample(org Org) PaymentSubscription {
 	return PaymentSubscription{}
 }
 
-func BuildBaseSubscription(org Org, monthlyExecLimit int64) PaymentSubscription {
+func buildBaseSubscription(org Org, monthlyExecLimit int64) PaymentSubscription {
 
 	now := int64(time.Now().Unix())
 	log.Printf("[DEBUG] Building base subscription for org %s that has %d monthly exec limit", org.Id, monthlyExecLimit)
@@ -12534,7 +12469,7 @@ func BuildBaseSubscription(org Org, monthlyExecLimit int64) PaymentSubscription
 				"15 Users",
 				"Select Datacenter Region",
 			}
-			amount = fmt.Sprintf("%d", int64(((monthlyExecLimit-2000)/10000)*32)) // Calculate based on app runs: (paid_runs / 10k) * $32
+			amount = "32" // Just for placeholder
 		} else if monthlyExecLimit >= 2000 && monthlyExecLimit < 12000 {
 			planName = "Free License"
 			supportLevel = "Community Support"
@@ -12566,7 +12501,6 @@ func BuildBaseSubscription(org Org, monthlyExecLimit int64) PaymentSubscription
 	endDate := int64(firstNextMonth.Unix())
 
 	return PaymentSubscription{
-		Id:               uuid.NewV4().String(),
 		Active:           true,
 		Startdate:        now,
 		Enddate:          endDate,
@@ -12641,7 +12575,7 @@ func HandleEditOrg(resp http.ResponseWriter, request *http.Request) {
 
 		CreatorConfig     string              `json:"creator_config" datastore:"creator_config"`
 		Subscription      PaymentSubscription `json:"subscription" datastore:"subscription"`
-		SubscriptionIndex string              `json:"subscription_index" datastore:"subscription_index"`
+		SubscriptionIndex int                 `json:"subscription_index" datastore:"subscription_index"`
 
 		SyncFeatures    SyncFeatures `json:"sync_features" datastore:"sync_features"`
 		Billing         Billing      `json:"billing" datastore:"billing"`
@@ -12735,24 +12669,16 @@ func HandleEditOrg(resp http.ResponseWriter, request *http.Request) {
 
 	// Allow editing a specific subscription card from UI except Eula and Reference
 	if tmpData.Editing == "subscription_update" {
-		// Find subscription by ID (SubscriptionIndex now holds the ID string)
-		var idx int = -1
-		for i, sub := range org.Subscriptions {
-			if sub.Id == tmpData.SubscriptionIndex {
-				idx = i
-				break
-			}
-		}
-		if idx == -1 {
+		idx := tmpData.SubscriptionIndex
+		if idx < 0 || idx >= len(org.Subscriptions) {
 			resp.WriteHeader(400)
-			resp.Write([]byte(`{"success": false, "reason": "subscription not found by ID"}`))
+			resp.Write([]byte(`{"success": false, "reason": "invalid subscription index"}`))
 			return
 		}
 
 		// Preserve immutable fields
 		existing := org.Subscriptions[idx]
 		updated := tmpData.Subscription
-		updated.Id = existing.Id
 		updated.Eula = existing.Eula
 
 		// Do not overwrite existing EULA signature info if it's already signed
@@ -12764,41 +12690,12 @@ func HandleEditOrg(resp http.ResponseWriter, request *http.Request) {
 			updated.EulaSigned = true
 			updated.EulaSignedBy = user.Username
 		}
+		// Do not overwrite subscription reference number
+		updated.Reference = existing.Reference
 
 		// Apply the rest
 		org.Subscriptions[idx] = updated
 
-		// This is to set user in free plan is the current plan is Inactive by us
-		if len(org.CreatorOrg) == 0 {
-			hasActivePaidSubscription := false
-			hasFreeSubscription := false
-
-			for _, sub := range org.Subscriptions {
-				if sub.Active && sub.Amount != "0" {
-					hasActivePaidSubscription = true
-				}
-				if sub.Amount == "0" && sub.Reference == "" {
-					hasFreeSubscription = true
-				}
-			}
-
-			if hasActivePaidSubscription && hasFreeSubscription {
-				// Remove free subscriptions since user has active paid plan
-				var filteredSubs []PaymentSubscription
-				for _, sub := range org.Subscriptions {
-					if !(sub.Amount == "0" && sub.Reference == "") {
-						filteredSubs = append(filteredSubs, sub)
-					}
-				}
-				org.Subscriptions = filteredSubs
-				log.Printf("[INFO] Removed free subscription for org %s (active paid subscription exists)", org.Id)
-			} else if !hasActivePaidSubscription && !hasFreeSubscription {
-				// No active paid subscription and no free plan, add one
-				org.Subscriptions = append(org.Subscriptions, BuildBaseSubscription(*org, 2000))
-				log.Printf("[INFO] Added free subscription for org %s (no active paid subscriptions found)", org.Id)
-			}
-		}
-
 		if err := SetOrg(ctx, *org, org.Id); err != nil {
 			log.Printf("[WARNING] Failed to update subscription for org %s: %s", org.Id, err)
 			resp.WriteHeader(500)