v1.9.0 (#1130)

Merging Next into ----> Main

Author: thisismayuresh

.env.example

@@ -0,0 +1,11 @@
+# SubOS Configuration
+NEXT_PUBLIC_PAYMENT_GATEWAY_URL=
+NEXT_PUBLIC_SUBOS_PROJECT_ID=
+NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=
+
+# App Configuration
+NEXT_PUBLIC_APP_NAME=Impler.io
+NEXT_PUBLIC_APP_VERSION=1.0.0
+
+# Environment is automatically set by NODE_ENV
+# NODE_ENV=development

apps/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impler/api",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "author": "implerhq",
   "license": "MIT",
   "private": true,

apps/api/src/app/column/dtos/column-request.dto.ts

@@ -17,7 +17,7 @@ import { ValidationTypesEnum } from '@impler/client';
 import { IsValidRegex } from '@shared/framework/is-valid-regex.validator';
 import { IsValidDigitsConstraint } from '@shared/framework/is-valid-digits.validator';
 import { IsNumberOrString } from '@shared/framework/number-or-string.validator';
-import { ColumnDelimiterEnum, ColumnTypesEnum, Defaults } from '@impler/shared';
+import { ColumnDelimiterEnum, ColumnTypesEnum } from '@impler/shared';
 
 export class ValidationDto {
   @ApiProperty({
@@ -154,7 +154,7 @@ export class ColumnRequestDto {
   })
   @ValidateIf((object) => object.type === ColumnTypesEnum.DATE)
   @Type(() => Array<string>)
-  dateFormats: string[] = Defaults.DATE_FORMATS;
+  dateFormats: string[];
 
   @ApiProperty({
     description: 'Sequence of column',

apps/api/src/app/common/common.controller.ts

@@ -12,9 +12,9 @@ import {
   UploadedFile,
 } from '@nestjs/common';
 
-import { ACCESS_KEY_NAME } from '@impler/shared';
+import { ACCESS_KEY_NAME, IImportConfig } from '@impler/shared';
 import { JwtAuthGuard } from '@shared/framework/auth.gaurd';
-import { ValidRequestDto, SignedUrlDto, ImportConfigResponseDto } from './dtos';
+import { ValidRequestDto, SignedUrlDto } from './dtos';
 import { ValidImportFile } from '@shared/validations/valid-import-file.validation';
 import { ValidRequestCommand, GetSignedUrl, ValidRequest, GetImportConfig, GetSheetNames } from './usecases';
 
@@ -60,7 +60,7 @@ export class CommonController {
   async getImportConfigRoute(
     @Query('projectId') projectId: string,
     @Query('templateId') templateId: string
-  ): Promise<ImportConfigResponseDto> {
+  ): Promise<IImportConfig> {
     if (!projectId) {
       throw new BadRequestException();
     }

apps/api/src/app/common/dtos/Schema.dto.ts

@@ -13,7 +13,7 @@ import {
   ValidateNested,
 } from 'class-validator';
 import { Type } from 'class-transformer';
-import { ColumnTypesEnum, Defaults } from '@impler/shared';
+import { ColumnTypesEnum } from '@impler/shared';
 import { IsValidRegex } from '@shared/framework/is-valid-regex.validator';
 import { ValidationDto } from 'app/column/dtos/column-request.dto';
 
@@ -101,7 +101,7 @@ export class SchemaDto {
   @Type(() => Array<string>)
   @IsArray({ message: "'dateFormats' must be an array, when type is Date" })
   @ArrayMinSize(1, { message: "'dateFormats' must not be empty, when type is Date" })
-  dateFormats: string[] = Defaults.DATE_FORMATS;
+  dateFormats: string[];
 
   @ApiProperty({
     description: 'Sequence of column',

apps/api/src/app/common/dtos/import-config-response.dto.ts

@@ -1,4 +1,3 @@
 export { SignedUrlDto } from './signed-url.dto';
 export { ValidRequestDto } from './valid.dto';
 export { SheetNamesDto } from './sheet-names.dto';
-export { ImportConfigResponseDto } from './import-config-response.dto';

apps/api/src/app/common/dtos/index.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { UserRepository, TemplateRepository, TemplateEntity } from '@impler/dal';
-import { AVAILABLE_BILLABLEMETRIC_CODE_ENUM, IImportConfig } from '@impler/shared';
+import { BILLABLEMETRIC_CODE_ENUM, IImportConfig } from '@impler/shared';
 import { PaymentAPIService } from '@impler/services';
 import { APIMessages } from '@shared/constants';
 
@@ -14,12 +14,22 @@ export class GetImportConfig {
 
   async execute(projectId: string, templateId?: string): Promise<IImportConfig> {
     const userEmail = await this.userRepository.findUserEmailFromProjectId(projectId);
+    const isFeatureAvailableMap = new Map<string, boolean>();
 
-    const removeBrandingAvailable = await this.paymentAPIService.checkEvent({
-      email: userEmail,
-      billableMetricCode: AVAILABLE_BILLABLEMETRIC_CODE_ENUM.REMOVE_BRANDING,
+    Object.values(BILLABLEMETRIC_CODE_ENUM).forEach((code) => {
+      isFeatureAvailableMap.set(code, false);
     });
 
+    for (const billableMetricCode of Object.values(BILLABLEMETRIC_CODE_ENUM)) {
+      try {
+        const isAvailable = await this.paymentAPIService.checkEvent({
+          email: userEmail,
+          billableMetricCode: BILLABLEMETRIC_CODE_ENUM[billableMetricCode],
+        });
+        isFeatureAvailableMap.set(billableMetricCode, isAvailable);
+      } catch (error) {}
+    }
+
     let template: TemplateEntity;
     if (templateId) {
       template = await this.templateRepository.findOne({
@@ -32,6 +42,11 @@ export class GetImportConfig {
       }
     }
 
-    return { showBranding: !removeBrandingAvailable, mode: template?.mode, title: template?.name };
+    return {
+      ...Object.fromEntries(isFeatureAvailableMap),
+      showBranding: !isFeatureAvailableMap.get(BILLABLEMETRIC_CODE_ENUM.REMOVE_BRANDING),
+      mode: template?.mode,
+      title: template?.name,
+    };
   }
 }

apps/api/src/app/common/usecases/get-import-config/get-import-config.usecase.ts

@@ -8,7 +8,7 @@ import { PaymentAPIService } from '@impler/services';
 import { ValidRequestCommand } from './valid-request.command';
 import { ProjectRepository, TemplateRepository, UserEntity } from '@impler/dal';
 import { UniqueColumnException } from '@shared/exceptions/unique-column.exception';
-import { AVAILABLE_BILLABLEMETRIC_CODE_ENUM, ColumnTypesEnum } from '@impler/shared';
+import { BILLABLEMETRIC_CODE_ENUM, ColumnTypesEnum } from '@impler/shared';
 import { DocumentNotFoundException } from '@shared/exceptions/document-not-found.exception';
 
 @Injectable()
@@ -98,7 +98,7 @@ export class ValidRequest {
         if (hasImageColumns && email) {
           const imageImportAvailable = await this.paymentAPIService.checkEvent({
             email,
-            billableMetricCode: AVAILABLE_BILLABLEMETRIC_CODE_ENUM.IMAGE_IMPORT,
+            billableMetricCode: BILLABLEMETRIC_CODE_ENUM.IMAGE_IMPORT,
           });
 
           if (!imageImportAvailable) {
@@ -108,7 +108,7 @@ export class ValidRequest {
         if (hasValidations && email) {
           const validationsAvailable = await this.paymentAPIService.checkEvent({
             email,
-            billableMetricCode: AVAILABLE_BILLABLEMETRIC_CODE_ENUM.ADVANCED_VALIDATORS,
+            billableMetricCode: BILLABLEMETRIC_CODE_ENUM.ADVANCED_VALIDATORS,
           });
 
           if (!validationsAvailable) {

apps/api/src/app/common/usecases/valid-request/valid-request.usecase.ts

@@ -8,6 +8,7 @@ import { ReanameFileHeadings } from './rename-file-headings/rename-file-headings
 
 import { DoMappingCommand } from './do-mapping/do-mapping.command';
 import { ValidateMappingCommand } from './validate-mapping/validate-mapping.command';
+import { PaymentAPIService } from '@impler/services';
 
 export const USE_CASES = [
   DoMapping,
@@ -17,9 +18,19 @@ export const USE_CASES = [
   ValidateMapping,
   ReanameFileHeadings,
   GetUpload,
+  PaymentAPIService,
   //
 ];
 
-export { DoMapping, ValidateMapping, GetMappings, UpdateMappings, FinalizeUpload, ReanameFileHeadings, GetUpload };
+export {
+  DoMapping,
+  ValidateMapping,
+  GetMappings,
+  UpdateMappings,
+  FinalizeUpload,
+  ReanameFileHeadings,
+  GetUpload,
+  PaymentAPIService,
+};
 
 export { DoMappingCommand, ValidateMappingCommand };