[PM-8830] Billing Enums Rename (#9612)

* Renamed ProductType to ProductTierType

* Renamed Product properties to ProductTier

* Moved product-tier-type.enum.ts to billing folder

* Added ProductType enum

libs/common/src/admin-console/models/data/organization.data.spec.ts

@@ -1,4 +1,4 @@
-import { ProductType } from "../../../enums/product-type.enum";
+import { ProductTierType } from "../../../billing/enums/product-tier-type.enum";
 import { OrganizationUserStatusType, OrganizationUserType } from "../../enums";
 import { ORGANIZATIONS } from "../../services/organization/organization.service";
 
@@ -47,7 +47,7 @@ describe("ORGANIZATIONS state", () => {
         isMember: false,
         familySponsorshipFriendlyName: "fsfn",
         familySponsorshipAvailable: false,
-        planProductType: ProductType.Free,
+        productTierType: ProductTierType.Free,
         keyConnectorEnabled: false,
         keyConnectorUrl: "kcu",
         accessSecretsManager: false,

libs/common/src/admin-console/models/data/organization.data.ts

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { ProductType } from "../../../enums";
+import { ProductTierType } from "../../../billing/enums";
 import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 import { ProfileOrganizationResponse } from "../response/profile-organization.response";
@@ -45,7 +45,7 @@ export class OrganizationData {
   isMember: boolean;
   familySponsorshipFriendlyName: string;
   familySponsorshipAvailable: boolean;
-  planProductType: ProductType;
+  productTierType: ProductTierType;
   keyConnectorEnabled: boolean;
   keyConnectorUrl: string;
   familySponsorshipLastSyncDate?: Date;
@@ -104,7 +104,7 @@ export class OrganizationData {
     this.providerType = response.providerType;
     this.familySponsorshipFriendlyName = response.familySponsorshipFriendlyName;
     this.familySponsorshipAvailable = response.familySponsorshipAvailable;
-    this.planProductType = response.planProductType;
+    this.productTierType = response.planProductType;
     this.keyConnectorEnabled = response.keyConnectorEnabled;
     this.keyConnectorUrl = response.keyConnectorUrl;
     this.familySponsorshipLastSyncDate = response.familySponsorshipLastSyncDate;

libs/common/src/admin-console/models/domain/organization.ts

@@ -1,6 +1,6 @@
 import { Jsonify } from "type-fest";
 
-import { ProductType } from "../../../enums";
+import { ProductTierType } from "../../../billing/enums";
 import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 import { OrganizationData } from "../data/organization.data";
@@ -58,7 +58,7 @@ export class Organization {
   isMember: boolean;
   familySponsorshipFriendlyName: string;
   familySponsorshipAvailable: boolean;
-  planProductType: ProductType;
+  productTierType: ProductTierType;
   keyConnectorEnabled: boolean;
   keyConnectorUrl: string;
   familySponsorshipLastSyncDate?: Date;
@@ -123,7 +123,7 @@ export class Organization {
     this.isMember = obj.isMember;
     this.familySponsorshipFriendlyName = obj.familySponsorshipFriendlyName;
     this.familySponsorshipAvailable = obj.familySponsorshipAvailable;
-    this.planProductType = obj.planProductType;
+    this.productTierType = obj.productTierType;
     this.keyConnectorEnabled = obj.keyConnectorEnabled;
     this.keyConnectorUrl = obj.keyConnectorUrl;
     this.familySponsorshipLastSyncDate = obj.familySponsorshipLastSyncDate;

libs/common/src/admin-console/models/response/profile-organization.response.ts

@@ -1,4 +1,4 @@
-import { ProductType } from "../../../enums";
+import { ProductTierType } from "../../../billing/enums";
 import { BaseResponse } from "../../../models/response/base.response";
 import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
@@ -42,7 +42,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
   providerType?: ProviderType;
   familySponsorshipFriendlyName: string;
   familySponsorshipAvailable: boolean;
-  planProductType: ProductType;
+  planProductType: ProductTierType;
   keyConnectorEnabled: boolean;
   keyConnectorUrl: string;
   familySponsorshipLastSyncDate?: Date;

libs/common/src/billing/enums/index.ts

@@ -3,3 +3,4 @@ export * from "./plan-sponsorship-type.enum";
 export * from "./plan-type.enum";
 export * from "./transaction-type.enum";
 export * from "./bitwarden-product-type.enum";
+export * from "./product-tier-type.enum";

libs/common/src/billing/enums/product-tier-type.enum.ts

@@ -1,4 +1,4 @@
-export enum ProductType {
+export enum ProductTierType {
   Free = 0,
   Families = 1,
   Teams = 2,

libs/common/src/billing/enums/product-type.enum.ts

@@ -0,0 +1,4 @@
+export enum ProductType {
+  PasswordManager = 0,
+  SecretsManager = 1,
+}

libs/common/src/billing/models/response/plan.response.ts

@@ -1,10 +1,9 @@
-import { ProductType } from "../../../enums";
+import { ProductTierType, PlanType } from "../../../billing/enums";
 import { BaseResponse } from "../../../models/response/base.response";
-import { PlanType } from "../../enums";
 
 export class PlanResponse extends BaseResponse {
   type: PlanType;
-  product: ProductType;
+  productTier: ProductTierType;
   name: string;
   isAnnual: boolean;
   nameLocalizationKey: string;
@@ -32,7 +31,7 @@ export class PlanResponse extends BaseResponse {
   constructor(response: any) {
     super(response);
     this.type = this.getResponseProperty("Type");
-    this.product = this.getResponseProperty("Product");
+    this.productTier = this.getResponseProperty("ProductTier");
     this.name = this.getResponseProperty("Name");
     this.isAnnual = this.getResponseProperty("IsAnnual");
     this.nameLocalizationKey = this.getResponseProperty("NameLocalizationKey");

libs/common/src/enums/index.ts

@@ -6,4 +6,3 @@ export * from "./http-status-code.enum";
 export * from "./integration-type.enum";
 export * from "./native-messaging-version.enum";
 export * from "./notification-type.enum";
-export * from "./product-type.enum";