Merge branch 'main' into f/email_templates

vocdoni · Nov 22, 2024 · 55e5ec3 · 55e5ec3
2 parents a1f3e2b + 7dc894f
commit 55e5ec3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/api/docs.md b/api/docs.md
@@ -833,6 +833,7 @@ This request can be made only by organization admins.
       "id":1,
       "name":"Basic",
       "stripeID":"stripe_123",
+      "startingPrice": "9900",
       "organization":{
         "memberships":1,
         "subOrgs":1
@@ -879,6 +880,7 @@ This request can be made only by organization admins.
   "id":1,
   "name":"Basic",
   "stripeID":"stripe_123",
+  "startingPrice": "9900",
   "organization":{
     "memberships":1,
     "subOrgs":1

diff --git a/assets/plans.json b/assets/plans.json
@@ -1,6 +1,6 @@
 [
     {
-        "ID": 1,
+        "ID": 0,
         "Name": "Essential Annual Plan",
         "StripeID": "price_1QBEmzDW6VLep8WGpkwjynXV",
         "StartingPrice": 9900,
@@ -22,7 +22,7 @@
         }
     },
     {
-        "ID": 2,
+        "ID": 1,
         "Name": "Premium Annual Plan",
         "StripeID": "price_1Q8iyUDW6VLep8WGWXdjC78r",
         "StartingPrice": 30000,
@@ -44,7 +44,7 @@
         }
     },
     {
-        "ID": 3,
+        "ID": 2,
         "Name": "Free Plan",
         "StripeID": "price_1QMtoJDW6VLep8WGC2vsJ2CV",
         "StartingPrice": 0,

diff --git a/db/organizations_test.go b/db/organizations_test.go
@@ -200,6 +200,7 @@ func TestAddOrganizationPlan(t *testing.T) {
 	active := true
 	stripeID := "stripeID"
 	orgSubscription := &OrganizationSubscription{
+		PlanID:    100,
 		StartDate: startDate,
 		EndDate:   endDate,
 		Active:    true,

diff --git a/db/types.go b/db/types.go
@@ -92,7 +92,7 @@ type Plan struct {
 }
 
 type PlanTier struct {
-	Amount int64 `json:"Amount" bson:"Amount"`
+	Amount int64 `json:"amount" bson:"amount"`
 	UpTo   int64 `json:"upTo" bson:"upTo"`
 }