Add loyalty wait time

bosagora · Mar 6, 2024 · 2fd1a81 · 2fd1a81
1 parent 5a0f842
commit 2fd1a81
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/packages/relay/config/config.yaml b/packages/relay/config/config.yaml
@@ -79,7 +79,6 @@ relay:
   forcedCloseSecond: 300
   expoAccessToken: "${EXPO_ACCESS_TOKEN}"
   relayEndpoint: "${RELAY_ENDPOINT}"
-  storePurchaseWaitingSecond: 694800
   encryptKey: "${RELAY_ENCRYPT_KEY}"
 
 contracts:

diff --git a/packages/relay/config/config_test.yaml b/packages/relay/config/config_test.yaml
@@ -79,7 +79,6 @@ relay:
   forcedCloseSecond: 300
   expoAccessToken: "${EXPO_ACCESS_TOKEN}"
   relayEndpoint: "${RELAY_ENDPOINT}"
-  storePurchaseWaitingSecond: 694800
   encryptKey: "${RELAY_ENCRYPT_KEY}"
 
 contracts:

diff --git a/packages/relay/src/common/Config.ts b/packages/relay/src/common/Config.ts
@@ -310,7 +310,6 @@ export class RelayConfig implements IRelayConfig {
     public forcedCloseSecond: number;
     public expoAccessToken: string;
     public relayEndpoint: string;
-    public storePurchaseWaitingSecond: number;
     public encryptKey: string;
 
     /**
@@ -328,7 +327,6 @@ export class RelayConfig implements IRelayConfig {
         this.forcedCloseSecond = defaults.forcedCloseSecond;
         this.expoAccessToken = defaults.expoAccessToken;
         this.relayEndpoint = defaults.relayEndpoint;
-        this.storePurchaseWaitingSecond = defaults.storePurchaseWaitingSecond;
         this.encryptKey = defaults.encryptKey;
     }
 
@@ -352,7 +350,6 @@ export class RelayConfig implements IRelayConfig {
             forcedCloseSecond: 300,
             expoAccessToken: "",
             relayEndpoint: "",
-            storePurchaseWaitingSecond: 694800,
             encryptKey: "",
         };
     }
@@ -371,8 +368,6 @@ export class RelayConfig implements IRelayConfig {
         if (config.forcedCloseSecond !== undefined) this.forcedCloseSecond = config.forcedCloseSecond;
         if (config.expoAccessToken !== undefined) this.expoAccessToken = config.expoAccessToken;
         if (config.relayEndpoint !== undefined) this.relayEndpoint = config.relayEndpoint;
-        if (config.storePurchaseWaitingSecond !== undefined)
-            this.storePurchaseWaitingSecond = config.storePurchaseWaitingSecond;
         if (config.encryptKey !== undefined) this.encryptKey = config.encryptKey;
     }
 }
@@ -614,7 +609,6 @@ export interface IRelayConfig {
     forcedCloseSecond: number;
     expoAccessToken: string;
     relayEndpoint: string;
-    storePurchaseWaitingSecond: number;
     encryptKey: string;
 }
 

diff --git a/packages/relay/src/routers/StorePurchaseRouter.ts b/packages/relay/src/routers/StorePurchaseRouter.ts
@@ -180,6 +180,7 @@ export class StorePurchaseRouter {
             [
                 body("purchaseId").exists().not().isEmpty(),
                 body("timestamp").exists().isNumeric(),
+                body("waiting").exists().isNumeric(),
                 body("account").exists().trim().isEthereumAddress(),
                 body("phone")
                     .exists()
@@ -261,6 +262,7 @@ export class StorePurchaseRouter {
                 const purchaseData: IStorePurchaseData = {
                     purchaseId: String(req.body.purchaseId).trim(),
                     timestamp: BigInt(String(req.body.timestamp).trim()),
+                    waiting: BigInt(String(req.body.waiting).trim()),
                     account: String(req.body.account).trim(),
                     loyaltyType: ContractLoyaltyType.POINT,
                     currency: String(req.body.currency).trim(),

diff --git a/packages/relay/src/scheduler/StorePurchaseScheduler.ts b/packages/relay/src/scheduler/StorePurchaseScheduler.ts
@@ -7,6 +7,7 @@ import { ContractUtils } from "../utils/ContractUtils";
 import { Scheduler } from "./Scheduler";
 
 import * as hre from "hardhat";
+import { BigNumber } from "ethers";
 
 /**
  * Creates blocks at regular intervals and stores them in IPFS and databases.
@@ -70,10 +71,7 @@ export class StorePurchaseScheduler extends Scheduler {
             const stored = await (await this.getProviderContract()).purchasesOf(purchase.purchaseId);
             if (stored) {
                 await this.storage.doneStorePurchase(purchase.purchaseId);
-            } else if (
-                purchase.timestamp <
-                ContractUtils.getTimeStampBigInt() - BigInt(this.config.relay.storePurchaseWaitingSecond)
-            ) {
+            } else if (purchase.timestamp + purchase.waiting + BigInt(60) < ContractUtils.getTimeStampBigInt()) {
                 await this.storage.doneStorePurchase(purchase.purchaseId);
             }
         }

diff --git a/packages/relay/src/storage/RelayStorage.ts b/packages/relay/src/storage/RelayStorage.ts
@@ -705,6 +705,7 @@ export class RelayStorage extends Storage {
             this.queryForMapper("purchase", "postStorePurchase", {
                 purchaseId: data.purchaseId,
                 timestamp: data.timestamp.toString(),
+                waiting: data.waiting.toString(),
                 account: data.account.toLowerCase(),
                 loyaltyType: data.loyaltyType,
                 currency: data.currency,
@@ -734,6 +735,7 @@ export class RelayStorage extends Storage {
                             return {
                                 purchaseId: m.purchaseId,
                                 timestamp: BigInt(m.timestamp.toString()),
+                                waiting: BigInt(m.waiting.toString()),
                                 account: m.account,
                                 loyaltyType: m.loyaltyType,
                                 currency: m.currency,
@@ -789,6 +791,7 @@ export class RelayStorage extends Storage {
                             return {
                                 account: m.account,
                                 timestamp: BigInt(m.timestamp.toString()),
+                                waiting: BigInt(m.waiting.toString()),
                                 loyaltyType: m.loyaltyType,
                                 currency: m.currency,
                                 providePoint: BigNumber.from(m.providePoint.toString()).mul(GWI_UNIT),

diff --git a/packages/relay/src/storage/mapper/purchase.xml b/packages/relay/src/storage/mapper/purchase.xml
@@ -7,6 +7,7 @@
             (
                 "purchaseId"                ,
                 "timestamp"                 ,
+                "waiting"                   ,
                 "account"                   ,
                 "loyaltyType"               ,
                 "currency"                  ,
@@ -21,6 +22,7 @@
             (
                 #{purchaseId}               ,
                 #{timestamp}                ,
+                #{waiting}                  ,
                 #{account}                  ,
                 #{loyaltyType}              ,
                 #{currency}                 ,
@@ -56,6 +58,7 @@
         SELECT
             "purchaseId",
             "timestamp",
+            "waiting",
             "account",
             "currency",
             "loyaltyType",
@@ -83,6 +86,7 @@
         SELECT
             "purchaseId",
             "timestamp",
+            "waiting",
             "shopId",
             "shopCurrency" as "currency",
             "shopProvidedAmount" as "providedAmount"

diff --git a/packages/relay/src/storage/mapper/table.xml b/packages/relay/src/storage/mapper/table.xml
@@ -71,6 +71,7 @@
         (
             "purchaseId"            VARCHAR(66) NOT NULL,
             "timestamp"             BIGINT NOT NULL,
+            "waiting"               BIGINT NOT NULL,
             "account"               VARCHAR(42)  NOT NULL,
             "loyaltyType"           INTEGER NOT NULL,
             "currency"              VARCHAR(12) NOT NULL,

diff --git a/packages/relay/src/types/index.ts b/packages/relay/src/types/index.ts
@@ -236,6 +236,7 @@ export interface IGraphPageInfo {
 export interface IStorePurchaseData {
     purchaseId: string;
     timestamp: bigint;
+    waiting: bigint;
     account: string;
     loyaltyType: number;
     currency: string;