Merge pull request #169 from hypersign-protocol/bug/fix

varsha766 · web-flow · commit ba330fca39a5 · 2025-03-12T09:20:44.000+05:30
Bug/fix
diff --git a/src/credit-manager/controllers/credit-manager.controller.ts b/src/credit-manager/controllers/credit-manager.controller.ts
@@ -97,6 +97,7 @@ export class CreditManagerController {
   @ApiOkResponse({
     description: 'Fetched all credit detail',
     type: createCreditResponse,
+    isArray: true,
   })
   @ApiBadRequestResponse({
     description: 'Unable to fetch credit detail',
@@ -118,7 +119,7 @@ export class CreditManagerController {
   @UseGuards(AuthGuard('jwt'))
   @ApiOkResponse({
     description: 'The details of the credit have been successfully fetched.',
-    type: ActivateCredtiResponse,
+    type: createCreditResponse,
   })
   @ApiBadRequestResponse({
     description: 'Unable to fetch particular credit detail',
diff --git a/src/credit-manager/dto/create-credit-manager.dto.ts b/src/credit-manager/dto/create-credit-manager.dto.ts
@@ -1,6 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNumber, IsString, Min } from 'class-validator';
+import { IsNumber, IsString, Min, ValidateNested } from 'class-validator';
 import { Status } from '../schema/credit-manager.schema';
+import { Type } from 'class-transformer';
 export enum ValidityPeriodUnit {
   DAYS = 'DAYS',
   WEEK = 'WEEK',
@@ -22,6 +23,29 @@ export class CreateCreditManagerDto {
   creditDenom: string;
 }
 
+export class Credit {
+  @ApiProperty({
+    name: 'amount',
+    description: 'Total available hid',
+    example: '5000000',
+  })
+  @IsNumber()
+  amount: number;
+  @ApiProperty({
+    name: 'denom',
+    description: 'Token denom',
+    example: 'uhid',
+  })
+  @IsNumber()
+  denom: number;
+  @ApiProperty({
+    name: 'used',
+    description: 'Total used credit',
+    example: 0,
+  })
+  @IsNumber()
+  used: number;
+}
 export class createCreditResponse {
   @ApiProperty({
     name: 'totalCredits',
@@ -30,6 +54,13 @@ export class createCreditResponse {
   })
   @IsNumber()
   totalCredits: number;
+  @ApiProperty({
+    name: 'creditDenom',
+    description: 'Token denom',
+    example: 'uHID',
+  })
+  @IsNumber()
+  creditDenom: string;
   @ApiProperty({
     name: 'used',
     description: 'Total number of credit used till now',
@@ -41,10 +72,17 @@ export class createCreditResponse {
     name: 'validityDuration',
     description:
       'The number of days the credit is valid from the date of activation',
-    example: 60,
+    example: 42,
   })
   @IsNumber()
   validityDuration: number;
+  // @ApiProperty({
+  //   name: 'expiresAt',
+  //   description: 'Time at which document is added',
+  //   example: '2025-04-22T12:50:03.984Z',
+  //   required: false
+  // })
+  // expiresAt: Date;
   @ApiProperty({
     name: 'status',
     description:
@@ -54,6 +92,34 @@ export class createCreditResponse {
   })
   @IsString()
   status: string;
+  @ApiProperty({
+    name: 'serviceId',
+    description: 'Id of the service',
+    example: 'fc0392830696e097b1d7e0607968e9dd3400',
+  })
+  @IsString()
+  serviceId: string;
+  @ApiProperty({
+    name: 'credit',
+    type: Credit,
+  })
+  @Type(() => Credit)
+  @ValidateNested()
+  credit: Credit;
+  @ApiProperty({
+    name: 'creditScope',
+    description: 'Scope that one will get',
+    example: [
+      'MsgRegisterDID',
+      'MsgDeactivateDID',
+      'MsgRegisterCredentialSchema',
+      'MsgUpdateDID',
+      'MsgUpdateCredentialStatus',
+      'MsgRegisterCredentialStatus',
+    ],
+  })
+  @IsString()
+  creditScope: Array<string>;
   @ApiProperty({
     name: '_id',
     description: 'Unique identifier of credit detail',
@@ -64,14 +130,14 @@ export class createCreditResponse {
   @ApiProperty({
     name: 'createdAt',
     description: 'Time at which document is added',
-    example: '2024-09-10T12:50:03.984Z',
+    example: '2025-03-10T12:50:03.984Z',
   })
   @IsString()
   createdAt: string;
   @ApiProperty({
     name: 'updatedAt',
     description: 'Time at which document last updated',
-    example: '2024-09-10T12:50:03.984Z',
+    example: '2025-03-10T12:50:03.984Z',
   })
   @IsString()
   updatedAt: string;
@@ -91,8 +157,8 @@ export class ActivateCredtiResponse extends createCreditResponse {
     name: 'expiresAt',
     description:
       'The date and time when the credit expires. After this timestamp, the credit is no longer valid.',
-    example: '2024-11-10T12:50:03.984Z',
+    example: '2025-04-22T12:50:03.984Z',
   })
   @IsString()
-  expiresAt: string;
+  expiresAt: Date;
 }
diff --git a/src/credit-manager/gaurd/reduce-credit.gaurd.ts b/src/credit-manager/gaurd/reduce-credit.gaurd.ts
@@ -23,7 +23,7 @@ export class ReduceCreditGuard implements CanActivate {
     //Check if the user has a valid plan with enough balance
     const creditDetails = await this.creditManagerService.hasValidCredit(req);
     const activeCredit = await this.creditService.getActiveCredit(
-      String(creditDetails.attestationCost),
+      String(creditDetails.attestationCost.hidCost),
     );
     if (!creditDetails['hasSufficientFund']) {
       Logger.error(
@@ -53,7 +53,7 @@ export class ReduceCreditGuard implements CanActivate {
               used: activeCredit.used + creditDetails.creditAmountRequired,
               [`credit.used`]:
                 Number(activeCredit?.credit?.used || 0) +
-                Number(creditDetails.attestationCost),
+                Number(creditDetails.attestationCost.hidCost),
             },
           );
           Logger.log('Credits deducted successfully', 'ReduceCreditGuard');
diff --git a/src/credit-manager/managers/credit-manager.service.ts b/src/credit-manager/managers/credit-manager.service.ts
@@ -27,12 +27,13 @@ export class CreditManagerService {
       : 0;
     const attestationCost = attestationType
       ? await this.attestationCreditService.calculateCost(attestationType)
-      : '0';
-    const creditAmountRequired = apiCost + storageCost;
+      : { hidCost: 0, creditCost: 0 };
+    const { hidCost, creditCost } = attestationCost;
+    const creditAmountRequired = apiCost + storageCost + creditCost;
 
     // Fetch user's active plan
     let activeCredit = await this.creditService.getActiveCredit(
-      String(attestationCost),
+      String(hidCost),
     );
 
     if (
@@ -69,8 +70,9 @@ export class CreditManagerService {
       : 0;
     const attestationCost = attestationType
       ? await this.attestationCreditService.calculateCost(attestationType)
-      : '0';
-    const creditAmountRequired = apiCost + storageCost;
-    return { attestationCost, creditAmountRequired };
+      : { hidCost: 0, creditCost: 0 };
+    const { hidCost, creditCost } = attestationCost;
+    const creditAmountRequired = apiCost + storageCost + creditCost;
+    return { hidCost, creditAmountRequired };
   }
 }
diff --git a/src/credit-manager/services/attestation-credit.service.ts b/src/credit-manager/services/attestation-credit.service.ts
@@ -8,6 +8,8 @@ export class AttestationCreditService {
       'Inside calculateCost to calculate credit',
       'AttestationCreditService',
     );
-    return `${CREDIT_COSTS.ATTESTATION[type]}` || '50';
+    const hidCost = CREDIT_COSTS.ATTESTATION[type] || 50;
+    const creditCost = hidCost / 10;
+    return { hidCost, creditCost };
   }
 }
diff --git a/src/log/services/log.service.ts b/src/log/services/log.service.ts
@@ -8,7 +8,7 @@ export class LogService {
   constructor(
     private readonly logRepo: LogRepository,
     private readonly creditManagerService: CreditManagerService,
-  ) {}
+  ) { }
   async createLog(log: any) {
     Logger.log(
       `Storing log to db:  ${log.method} ${log.path} ${log.statusCode} ${log.contentLenght} ${log.userAgent} ${log.appId}`,
@@ -68,10 +68,49 @@ export class LogService {
           ],
         },
       },
+      {
+        $project: {
+          method: 1,
+          normalizedPath: {
+            $switch: {
+              branches: [
+                {
+                  case: {
+                    $regexMatch: {
+                      input: '$path',
+                      regex: '^/api/v1/did/resolve/',
+                    },
+                  },
+                  then: '/api/v1/did/resolve',
+                },
+                {
+                  case: {
+                    $regexMatch: {
+                      input: '$path',
+                      regex: '^/api/v1/schema/sch:',
+                    },
+                  },
+                  then: '/api/v1/schema/resolve',
+                },
+                {
+                  case: {
+                    $regexMatch: {
+                      input: '$path',
+                      regex: '^/api/v1/credential/vc:',
+                    },
+                  },
+                  then: '/api/v1/credential/resolve',
+                },
+              ],
+              default: '$path', // If no match, keep the original path
+            },
+          },
+        },
+      },
       {
         $group: {
           _id: {
-            path: '$path',
+            path: '$normalizedPath',
             method: '$method',
           },
           count: { $sum: 1 },
@@ -86,9 +125,9 @@ export class LogService {
         },
       },
     ];
+
     const serviceDetails =
       await this.logRepo.findDataBasedOnAgggregationPipeline(pipeline);
-
     const updatedServiceDetails = await Promise.all(
       serviceDetails.map(async (x) => {
         x['apiPath'] = x['apiPath'];
@@ -98,7 +137,7 @@ export class LogService {
             x['method'],
             x['apiPath'],
           );
-        (x['onchain_unit_cost'] = x['unit_cost']['attestationCost']),
+        (x['onchain_unit_cost'] = x['unit_cost']['hidCost']),
           (x['offchain_unit_cost'] = x['unit_cost']['creditAmountRequired']);
         x['onchainAmount'] = Number(
           (x['onchain_unit_cost'] * x['quantity']).toFixed(2),
@@ -129,19 +168,67 @@ export class LogService {
       {
         $match: {
           createdAt: { $gte: startDate, $lte: endDate },
+          path: { $exists: true, $ne: null },
           $nor: [
             { path: { $regex: 'usage' } },
             { path: { $regex: 'credit' } },
             { path: { $regex: 'presentation' } },
           ],
         },
       },
+      {
+        $project: {
+          method: 1,
+          createdAt: 1,
+          path: { $ifNull: ['$path', 'unknown'] },
+          normalizedPath: {
+            $switch: {
+              branches: [
+                {
+                  case: {
+                    $regexMatch: {
+                      input: '$path',
+                      regex: '^/api/v1/did/resolve/',
+                    },
+                  },
+                  then: '/api/v1/did/resolve',
+                },
+                {
+                  case: {
+                    $regexMatch: {
+                      input: '$path',
+                      regex: '^/api/v1/schema/sch:',
+                    },
+                  },
+                  then: '/api/v1/schema/resolve',
+                },
+                {
+                  case: {
+                    $regexMatch: {
+                      input: '$path',
+                      regex: '^/api/v1/credential(/|$)',
+                    },
+                  },
+                  then: '/api/v1/credential/resolve',
+                },
+              ],
+              default: '$path', // Keep original path if no match
+            },
+          },
+        },
+      },
       {
         $group: {
           _id: {
-            path: '$path',
-            date: { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
+            path: '$normalizedPath',
+            date: {
+              $ifNull: [
+                { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
+                'unknown-date',
+              ],
+            },
           },
+
           count: { $sum: 1 },
         },
       },

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ export class AttestationCreditService {`
`8`	`8`	`'Inside calculateCost to calculate credit',`
`9`	`9`	`'AttestationCreditService',`
`10`	`10`	`);`
`11`		- return `${CREDIT_COSTS.ATTESTATION[type]}` \|\| '50';
	`11`	`+ const hidCost = CREDIT_COSTS.ATTESTATION[type] \|\| 50;`
	`12`	`+ const creditCost = hidCost / 10;`
	`13`	`+ return { hidCost, creditCost };`
`12`	`14`	`}`
`13`	`15`	`}`