Validte badge claim command

Muzikie · Oct 28, 2023 · c3a6026 · c3a6026
1 parent 4b870e1
commit c3a6026
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 36 deletions.
diff --git a/src/app/modules/anchor/commands/create_command.ts b/src/app/modules/anchor/commands/create_command.ts
@@ -12,7 +12,8 @@ import { AnchorAccountStore } from '../stores/anchorAccount';
 import { AnchorCreated } from '../events/anchorCreated';
 import { CreateCommandParams, Anchor, AnchorAccount } from '../types';
 import { createCommandParamsSchema } from '../schemas';
-import { getCreatedAt, getAnchorID } from '../utils';
+import { getAnchorID } from '../utils';
+import { getCreatedAt } from '../../../utils';
 import { VOTE_RATE_LIMIT } from '../constants';
 import { BadgeMethod } from '../../badge/method';
 import { Badges } from '../../badge/types';
@@ -50,7 +51,7 @@ export class CreateCommand extends BaseCommand {
       if (IDS.length >= VOTE_RATE_LIMIT) {
         const anchor = await anchorStore.get(context, IDS[0]);
 
-        if (anchor.createdAt === getCreatedAt(Math.floor(new Date().getTime()))) {
+        if (anchor.createdAt === getCreatedAt(new Date())) {
           throw new Error(
             `You have exceeded the ${VOTE_RATE_LIMIT} anchor submissions daily limit.`,
           );
@@ -73,7 +74,7 @@ export class CreateCommand extends BaseCommand {
 
     // Create anchor ID
     const anchorID = getAnchorID(context.params);
-    const createdAt = getCreatedAt(new Date().getTime());
+    const createdAt = getCreatedAt(new Date());
     // Create anchor object
     const anchor: Anchor = {
       ...params,

diff --git a/src/app/modules/anchor/commands/vote_command.ts b/src/app/modules/anchor/commands/vote_command.ts
@@ -15,7 +15,7 @@ import { AnchorAccountStore } from '../stores/anchorAccount';
 import { VoteCommandParams, AnchorAccount, Anchor } from '../types';
 import { voteCommandParamsSchema } from '../schemas';
 import { CONTRIBUTION_FEE, VOTE_RATE_LIMIT } from '../constants';
-import { getCreatedAt } from '../utils';
+import { getCreatedAt } from '../../../utils';
 import { TREASURY_ADDRESS } from '../../../constants';
 import { BadgeMethod } from '../../badge/method';
 import { AnchorStatsStore } from '../stores/anchorStats';
@@ -62,7 +62,7 @@ export class VoteCommand extends BaseCommand {
       if (IDS.length >= VOTE_RATE_LIMIT) {
         const thresholdAnchor = await anchorStore.get(context, IDS[0]);
 
-        if (thresholdAnchor.createdAt === getCreatedAt(Math.floor(new Date().getTime()))) {
+        if (thresholdAnchor.createdAt === getCreatedAt(new Date())) {
           throw new Error(`You have exceeded the ${VOTE_RATE_LIMIT} vote submissions daily limit.`);
         }
       }

diff --git a/src/app/modules/anchor/method.ts b/src/app/modules/anchor/method.ts
@@ -23,7 +23,8 @@ export class AnchorMethod extends BaseMethod {
   // Get VotesCount by date
   public async getVoteCounts(context: MethodContext, date: string): Promise<number> {
     const anchorStatsStore = this.stores.get(AnchorStatsStore);
-    return getVoteCounts(context, date, anchorStatsStore);
+    const response = await getVoteCounts(context, date, anchorStatsStore);
+    return response;
   }
 }
 
diff --git a/src/app/modules/anchor/utils.ts b/src/app/modules/anchor/utils.ts
@@ -2,8 +2,3 @@ import { CreateCommandParams } from './types';
 
 export const getAnchorID = (params: CreateCommandParams): Buffer =>
   Buffer.concat([Buffer.from(params.spotifyId, 'utf8')]);
-
-export const getCreatedAt = (timestamp: number): string => {
-  const date = new Date(timestamp);
-  return date.toISOString().substring(0, 10);
-};
diff --git a/src/app/modules/badge/commands/claim_command.ts b/src/app/modules/badge/commands/claim_command.ts
@@ -42,6 +42,26 @@ export class ClaimCommand extends BaseCommand {
         error: new Error('You are not authorized to claim this badge.'),
       };
     }
+    // Only claim unclaimed badges
+    if (badgeNFT.claimed) {
+      return {
+        status: VerifyStatus.FAIL,
+        error: new Error('This badge has already been claimed.'),
+      };
+    }
+
+    // Only claim badges of 3 dys ago
+    const awardDate = new Date(badgeNFT.awardDate);
+
+    const threeDaysAgo = new Date();
+    threeDaysAgo.setDate(threeDaysAgo.getDate() - 3);
+
+    if (awardDate > threeDaysAgo) {
+      return {
+        status: VerifyStatus.FAIL,
+        error: new Error('This badge cannot be claimed yet.'),
+      };
+    }
     return { status: VerifyStatus.OK };
   }
 

diff --git a/src/app/utils.ts b/src/app/utils.ts
@@ -1,25 +1,9 @@
-// import { createHash } from 'crypto';
-// import { ed } from '@liskhq/lisk-cryptography';
-// import { codec } from '@liskhq/lisk-codec';
-// import { Transaction } from './types';
-// import { baseTransactionSchema } from './schemas';
-
-// // export const getEntityID = <T>(transaction: Transaction<T>): Buffer => {
-// //   const txBytes = codec.encode(baseTransactionSchema, transaction);
-// //   return createHash('md5').update(txBytes).digest();
-// // };
-
-// // export const verifyHash = (signature: Buffer, message: Buffer, publicKey: Buffer) => {
-// //   let isCorrect = false;
-
-// //   try {
-// //     isCorrect = ed.verifyMessageWithPublicKey({
-// //       message: message.toString('hex'),
-// //       publicKey,
-// //       signature,
-// //     });
-// //   } catch (e) {
-// //     isCorrect = false;
-// //   }
-// //   return isCorrect;
-// // };
+export const getCreatedAt = (value: number|Date): string => {
+  let date: Date;
+  if (typeof value === 'number') {
+    date = new Date(value);
+  } else {
+    date = value;
+  }
+  return date.toISOString().substring(0, 10);
+};