Merge pull request #1629 from solven-eu/solven/FixMarketPlanPlans

Fix unit of marketPlace plans
hub4j · Mar 20, 2023 · 3cb78af · 3cb78af
2 parents dc304e1 + cb089b9
commit 3cb78af
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 38 deletions.
diff --git a/src/main/java/org/kohsuke/github/GHMarketplacePriceModel.java b/src/main/java/org/kohsuke/github/GHMarketplacePriceModel.java
@@ -12,11 +12,11 @@
 public enum GHMarketplacePriceModel {
 
     /** The free. */
-    FREE("free"),
+    FREE("FREE"),
     /** The per unit. */
-    PER_UNIT("per-unit"),
+    PER_UNIT("PER_UNIT"),
     /** The flat rate. */
-    FLAT_RATE("flat-rate");
+    FLAT_RATE("FLAT_RATE");
 
     @JsonValue
     private final String internalName;

diff --git a/...iremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json b/...iremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "flat-rate",
+        "price_model": "FLAT_RATE",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [

diff --git a/...ePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-C43G2.json b/...ePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-C43G2.json
@@ -8,7 +8,7 @@
     "description": "A free CI solution",
     "monthly_price_in_cents": 0,
     "yearly_price_in_cents": 0,
-    "price_model": "free",
+    "price_model": "FREE",
     "has_free_trial": false,
     "state": "published",
     "unit_name": null,
@@ -27,7 +27,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "per-unit",
+    "price_model": "PER_UNIT",
     "state": "published",
     "unit_name": "seat",
     "bullets": [
@@ -45,7 +45,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "flat-rate",
+    "price_model": "FLAT_RATE",
     "state": "published",
     "unit_name": null,
     "bullets": [

diff --git a/...ccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json b/...ccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "flat-rate",
+        "price_model": "FLAT_RATE",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [

diff --git a/...ccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json b/...ccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "flat-rate",
+        "price_model": "FLAT_RATE",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [

diff --git a/...ccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json b/...ccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "flat-rate",
+        "price_model": "FLAT_RATE",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [

diff --git a/...emock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-uewkE.json b/...emock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-uewkE.json
@@ -8,7 +8,7 @@
     "description": "A free CI solution",
     "monthly_price_in_cents": 0,
     "yearly_price_in_cents": 0,
-    "price_model": "free",
+    "price_model": "FREE",
     "has_free_trial": false,
     "state": "published",
     "unit_name": null,
@@ -27,7 +27,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "per-unit",
+    "price_model": "PER_UNIT",
     "state": "published",
     "unit_name": "seat",
     "bullets": [
@@ -45,7 +45,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "flat-rate",
+    "price_model": "FLAT_RATE",
     "state": "published",
     "unit_name": null,
     "bullets": [

diff --git a/...WithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-cz27N.json b/...WithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-cz27N.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "flat-rate",
+        "price_model": "FLAT_RATE",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [

diff --git a/...WithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json b/...WithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "flat-rate",
+        "price_model": "FLAT_RATE",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [

diff --git a/...WithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-VT77w.json b/...WithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-VT77w.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "flat-rate",
+        "price_model": "FLAT_RATE",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "per-unit",
+        "price_model": "PER_UNIT",
         "state": "published",
         "unit_name": "seat",
         "bullets": [

diff --git a/...istAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-xk1MF.json b/...istAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-xk1MF.json
@@ -8,7 +8,7 @@
     "description": "A free CI solution",
     "monthly_price_in_cents": 0,
     "yearly_price_in_cents": 0,
-    "price_model": "free",
+    "price_model": "FREE",
     "has_free_trial": false,
     "state": "published",
     "unit_name": null,
@@ -27,7 +27,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "per-unit",
+    "price_model": "PER_UNIT",
     "state": "published",
     "unit_name": "seat",
     "bullets": [
@@ -45,7 +45,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "flat-rate",
+    "price_model": "FLAT_RATE",
     "state": "published",
     "unit_name": null,
     "bullets": [

diff --git a/...t/wiremock/listMarketplacePlans/__files/body-marketplace_listing-stubbed-plans-ZDjdu.json b/...t/wiremock/listMarketplacePlans/__files/body-marketplace_listing-stubbed-plans-ZDjdu.json
@@ -8,7 +8,7 @@
     "description": "A free CI solution",
     "monthly_price_in_cents": 0,
     "yearly_price_in_cents": 0,
-    "price_model": "free",
+    "price_model": "FREE",
     "has_free_trial": false,
     "state": "published",
     "unit_name": null,
@@ -27,7 +27,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "per-unit",
+    "price_model": "PER_UNIT",
     "state": "published",
     "unit_name": "seat",
     "bullets": [
@@ -45,7 +45,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "flat-rate",
+    "price_model": "FLAT_RATE",
     "state": "published",
     "unit_name": null,
     "bullets": [

diff --git a/...mock/getMyMarketplacePurchases/__files/body-user-marketplace_purchases-stubbed-eVWvD.json b/...mock/getMyMarketplacePurchases/__files/body-user-marketplace_purchases-stubbed-eVWvD.json
@@ -24,7 +24,7 @@
       "monthly_price_in_cents": 1099,
       "yearly_price_in_cents": 11870,
       "has_free_trial": false,
-      "price_model": "flat-rate",
+      "price_model": "FLAT_RATE",
       "state": "published",
       "unit_name": null,
       "bullets": [
@@ -56,7 +56,7 @@
       "description": "A free CI solution",
       "monthly_price_in_cents": 0,
       "yearly_price_in_cents": 0,
-      "price_model": "free",
+      "price_model": "FREE",
       "has_free_trial": false,
       "state": "published",
       "unit_name": null,