chore: tweaking time based calcs

subtopia-algo · Oct 9, 2023 · 704cde6 · 704cde6
1 parent 570291c
commit 704cde6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/src/clients/SubtopiaClient.ts b/src/clients/SubtopiaClient.ts
@@ -28,6 +28,7 @@ import {
   calculateProductSubscriptionBoxCreateMbr,
   optInAsset,
   asyncWithTimeout,
+  durationToMonths,
 } from "../utils";
 import { getAssetByID } from "../utils";
 import {
@@ -609,7 +610,7 @@ export class SubtopiaClient {
 
     const lockerAddress = getApplicationAddress(managerLockerID);
 
-    let subscriptionPrice = this.price;
+    let subscriptionPrice = this.price * durationToMonths(duration);
     for (const discount of state.discounts) {
       if (discount.duration === duration.valueOf()) {
         if (discount.discountType === DiscountType.PERCENTAGE) {

diff --git a/src/index.ts b/src/index.ts
@@ -3,7 +3,12 @@
 // Copyright (C) 2023 Altynbek Orumbayev
 // =============================================================================
 
-import { normalizePrice, optInAsset, optOutAsset } from "./utils";
+import {
+  normalizePrice,
+  optInAsset,
+  optOutAsset,
+  durationToMonths,
+} from "./utils";
 import { SubtopiaClient, SubtopiaRegistryClient } from "./clients";
 
 export {
@@ -12,6 +17,7 @@ export {
   normalizePrice,
   optInAsset,
   optOutAsset,
+  durationToMonths,
 };
 
 export * from "./interfaces";

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -25,7 +25,7 @@ import {
   LOCKER_GLOBAL_NUM_BYTE_SLICES,
   DEFAULT_TXN_SIGN_TIMEOUT_SECONDS,
 } from "../constants";
-import { LockerType, PriceNormalizationType } from "../enums";
+import { Duration, LockerType, PriceNormalizationType } from "../enums";
 import { APP_PAGE_MAX_SIZE } from "@algorandfoundation/algokit-utils/types/app";
 import { TransactionSignerAccount } from "@algorandfoundation/algokit-utils/types/account";
 import AlgodClient from "algosdk/dist/types/client/v2/algod/algod";
@@ -357,3 +357,19 @@ export async function asyncWithTimeout<T, A extends any[]>(
       });
   });
 }
+
+export function durationToMonths(duration: Duration | undefined): number {
+  if (duration === Duration.UNLIMITED) {
+    return 1;
+  } else if (duration === Duration.MONTH) {
+    return 1;
+  } else if (duration === Duration.QUARTER) {
+    return 3;
+  } else if (duration === Duration.SEMI_ANNUAL) {
+    return 6;
+  } else if (duration === Duration.ANNUAL) {
+    return 12;
+  } else {
+    throw new Error("Invalid expiration type");
+  }
+}
diff --git a/tests/subtopia.test.ts b/tests/subtopia.test.ts
@@ -98,6 +98,9 @@ async function setupSubtopiaRegistryClient(
 
 describe("subtopia", () => {
   beforeAll(async () => {
+    await refundTestnetAlgos(creatorAccount);
+    await refundTestnetAlgos(bobTestAccount);
+
     const dispenserInfo = await algodClient
       .accountInformation(dispenserAccount.addr)
       .do();