Merge pull request #11 from iamshabell/dev

add: currency enums for requests
iamshabell · Dec 11, 2023 · c4e1f59 · c4e1f59
2 parents 7a9ddb7 + 454be02
commit c4e1f59
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/apps/docs/pages/guide.mdx b/apps/docs/pages/guide.mdx
@@ -5,7 +5,7 @@ To start using the MaruPay SDK in your application, the first step is to configu
 ```typescript
 import { config } from 'dotenv';
 import express from 'express';
-import { HandlerName, ConfigObject, getPaymentHandler } from 'marupay';
+import { HandlerName, ConfigObject, getPaymentHandler, Currency } from 'marupay';
 import { env } from 'process';
 
 // Load environment variables from a .env file

diff --git a/apps/docs/pages/guide/credit.mdx b/apps/docs/pages/guide/credit.mdx
@@ -15,7 +15,7 @@ app.get('/purchase', async (req, res) => {
         const paymentInfo = await handler.request({
             accountNumber: "6512312341",
             amount: 500,
-            currency: "SLSH",
+            currency: Currency.SLSH,
             description: "Test purchase",
             accountType: 'CUSTOMER'
         });

diff --git a/apps/docs/pages/guide/purchase.mdx b/apps/docs/pages/guide/purchase.mdx
@@ -12,7 +12,7 @@ app.get('/credit', async (req, res) => {
         const paymentInfo = await handler.request({
             accountNumber: "6512312341",
             amount: 500,
-            currency: "SLSH",
+            currency: Currency.SLSH,
             description: "Test purchase",
         });
 

diff --git a/examples/express-ts/index.ts b/examples/express-ts/index.ts
@@ -1,6 +1,6 @@
 import { config } from 'dotenv';
 import express from 'express';
-import { HandlerName, ConfigObject, getPaymentHandler } from 'marupay';
+import { HandlerName, ConfigObject, getPaymentHandler, Currency } from 'marupay';
 import { env } from 'process';
 
 // Load environment variables from a .env file
@@ -37,7 +37,7 @@ app.get('/purchase', async (req, res) => {
         const paymentInfo = await handler.request({
             accountNumber: "6512312341",
             amount: 500,
-            currency: "SLSH",
+            currency: Currency.SLSH,
             description: "Test purchase",
         });
 
@@ -57,7 +57,7 @@ app.get('/credit', async (req, res) => {
         const paymentInfo = await handler.credit({
             accountNumber: "6512312341",
             amount: 1000,
-            currency: "SLSH",
+            currency: Currency.SLSH,
             description: "Test credit",
         });
 

diff --git a/packages/marupay/src/handler.ts b/packages/marupay/src/handler.ts
@@ -1,3 +1,4 @@
+import { Currency } from './handlers/enums';
 import { safeParse } from './utils/safeParser';
 import { z, ZodSchema } from 'zod';
 
@@ -11,9 +12,9 @@ export const baseConfigSchema = z.object({});
 export type BaseConfigOptions = z.infer<typeof baseConfigSchema>;
 
 export const baseRequestSchema = z.object({
-    accountNumber: z.string().regex(new RegExp(/^252\d{9}$/), 'Invalid Account Number'),
+    accountNumber: z.string(),
     amount: z.number(),
-    currency: z.string(),
+    currency: z.nativeEnum(Currency),
     description: z.string().optional(),
 });
 

diff --git a/packages/marupay/src/handlers/enums.ts b/packages/marupay/src/handlers/enums.ts
@@ -0,0 +1,4 @@
+export enum Currency {
+    USD = 'USD',
+    SLSH = 'SLSH'
+};
diff --git a/packages/marupay/src/index.ts b/packages/marupay/src/index.ts
@@ -1,2 +1,3 @@
 export * from './handlers';
-export * from './handlers/config'
+export * from './handlers/config'
+export * from './handlers/enums'