fix: [GTM-1239]: Subscription MAUs and Number of Developers Reversed (#34269)

* [GTM-1192]: Use ModuleType for subscription price endpoint

* [GTM-1239]: Subscription number of developers and MAUs reversed

Author: thomas-grasman

925-subscription-service/src/main/java/io/harness/subscription/resource/SubscriptionResource.java

@@ -99,7 +99,7 @@ public class SubscriptionResource {
   public ResponseDTO<PriceCollectionDTO>
   retrieveProductPrices(@Parameter(required = true, description = ACCOUNT_PARAM_MESSAGE) @NotNull @QueryParam(
                             NGCommonEntityConstants.ACCOUNT_KEY) @AccountIdentifier String accountIdentifier,
-      @Parameter(required = true, description = "Module Type") @NotNull @QueryParam("moduleType") String moduleType) {
+      @Parameter(required = true, description = "Module Type") @NotNull @QueryParam("moduleType") ModuleType moduleType) {
     return ResponseDTO.newResponse(subscriptionService.listPrices(accountIdentifier, moduleType));
   }
 

925-subscription-service/src/main/java/io/harness/subscription/services/SubscriptionService.java

@@ -20,7 +20,7 @@
 import java.util.List;
 
 public interface SubscriptionService {
-  PriceCollectionDTO listPrices(String accountIdentifier, String module);
+  PriceCollectionDTO listPrices(String accountIdentifier, ModuleType moduleType);
   InvoiceDetailDTO previewInvoice(String accountIdentifier, SubscriptionDTO subscriptionDTO);
 
   SubscriptionDetailDTO createSubscription(String accountIdentifier, SubscriptionDTO subscriptionDTO);
@@ -35,7 +35,6 @@ SubscriptionDetailDTO updateSubscription(
   CustomerDetailDTO createStripeCustomer(String accountIdentifier, CustomerDTO customerDTO);
   CustomerDetailDTO updateStripeCustomer(String accountIdentifier, String customerId, CustomerDTO customerDTO);
   CustomerDetailDTO getStripeCustomer(String accountIdentifier, String customerId);
-  //  List<CustomerDetailDTO> listStripeCustomers(String accountIdentifier);
 
   PaymentMethodCollectionDTO listPaymentMethods(String accountIdentifier, String customerId);
 

925-subscription-service/src/main/java/io/harness/subscription/services/impl/SubscriptionServiceImpl.java

@@ -70,12 +70,12 @@ public SubscriptionServiceImpl(StripeHelper stripeHelper, StripeCustomerReposito
   }
 
   @Override
-  public PriceCollectionDTO listPrices(String accountIdentifier, String module) {
+  public PriceCollectionDTO listPrices(String accountIdentifier, ModuleType module) {
     isSelfServiceEnable(accountIdentifier);
 
     List<String> prices;
 
-    switch (module) {
+    switch (module.toString()) {
       case "CI":
         prices = Arrays.asList(Prices.CI_PRICES);
         break;
@@ -145,12 +145,12 @@ public InvoiceDetailDTO createFfSubscription(String accountIdentifier, FfSubscri
 
     val developerPriceId = stripeHelper.getPrice(
         Prices.getLookupKey("FF", subscriptionDTO.getEdition(), "DEVELOPERS", subscriptionDTO.getPaymentFreq()));
-    subscriptionItems.add(new ItemParams(developerPriceId.getId(), (long) subscriptionDTO.getNumberOfMau(),
+    subscriptionItems.add(new ItemParams(developerPriceId.getId(), (long) subscriptionDTO.getNumberOfDevelopers(),
         Prices.getLookupKey("FF", subscriptionDTO.getEdition(), "DEVELOPERS", subscriptionDTO.getPaymentFreq())));
 
     val mauPriceId = stripeHelper.getPrice(
         Prices.getLookupKey("FF", subscriptionDTO.getEdition(), "MAU", subscriptionDTO.getPaymentFreq()));
-    subscriptionItems.add(new ItemParams(mauPriceId.getId(), (long) subscriptionDTO.getNumberOfDevelopers(),
+    subscriptionItems.add(new ItemParams(mauPriceId.getId(), (long) subscriptionDTO.getNumberOfMau(),
         Prices.getLookupKey("FF", subscriptionDTO.getEdition(), "MAU", subscriptionDTO.getPaymentFreq())));
 
     if (subscriptionDTO.isPremiumSupport()) {

950-subscription-beans/src/main/java/io/harness/subscription/constant/Prices.java

@@ -8,14 +8,17 @@
 package io.harness.subscription.constant;
 
 public class Prices {
+  public static final String PREMIUM_SUPPORT = "PREMIUM_SUPPORT";
   public static final String[] CD_PRICES = new String[] {"CD_ENTERPRISE_SERVICE_MONTHLY",
-      "CD_ENTERPRISE_SERVICE_YEARLY", "CD_ENTERPRISE_PREMIUM_SUPPORT_MONTHLY", "CD_ENTERPRISE_PREMIUM_SUPPORT_YEARLY"};
+      "CD_ENTERPRISE_SERVICE_YEARLY", "CD_ENTERPRISE_PREMIUM_SUPPORT_MONTHLY", "CD_ENTERPRISE_PREMIUM_SUPPORT_YEARLY",
+      PREMIUM_SUPPORT};
   public static final String[] CI_PRICES = new String[] {"CI_ENTERPRISE_DEVELOPERS_MONTHLY",
-      "CI_ENTERPRISE_DEVELOPERS_YEARLY", "CI_TEAM_DEVELOPERS_MONTHLY", "CI_TEAM_DEVELOPERS_YEARLY"};
+      "CI_ENTERPRISE_DEVELOPERS_YEARLY", "CI_TEAM_DEVELOPERS_MONTHLY", "CI_TEAM_DEVELOPERS_YEARLY",
+      PREMIUM_SUPPORT};
   public static final String[] FF_PRICES = new String[] {"FF_ENTERPRISE_DEVELOPERS_MONTHLY",
       "FF_ENTERPRISE_DEVELOPERS_YEARLY", "FF_TEAM_DEVELOPERS_MONTHLY", "FF_TEAM_DEVELOPERS_YEARLY",
-      "FF_ENTERPRISE_MAU_MONTHLY", "FF_ENTERPRISE_MAU_YEARLY", "FF_TEAM_MAU_MONTHLY", "FF_TEAM_MAU_YEARLY"};
-  public static final String PREMIUM_SUPPORT = "PREMIUM_SUPPORT";
+      "FF_ENTERPRISE_MAU_MONTHLY", "FF_ENTERPRISE_MAU_YEARLY", "FF_TEAM_MAU_MONTHLY", "FF_TEAM_MAU_YEARLY",
+      PREMIUM_SUPPORT};
   public static String getLookupKey(String module, String edition, String product, String paymentFrequency) {
     return module.toUpperCase().trim() + "_" + edition.toUpperCase().trim() + "_" + product.toUpperCase().trim() + "_"
         + paymentFrequency.toUpperCase().trim();