feat(settings) site setting resolver

stoqey · Apr 10, 2024 · 619fdf4 · 619fdf4
1 parent e7f223c
commit 619fdf4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -32,6 +32,7 @@ import { getSocialResolvers } from "@roadmanjs/social";
 import { mediaRoadman } from './media/media.app';
 import { walletRouter as moneroxWalletRouter } from "@roadmanjs/monerox";
 import { DisputeAdminResolver, DisputesResolver } from './disputes';
+import AdminSettingsResolver from './settings/settings.resolver.admin';
 
 const resolvers = [
  ...getAuthResolvers(),
@@ -48,6 +49,7 @@ const resolvers = [
  CountryResolver,
  VendorResolver,
  SettingsResolver,
+ AdminSettingsResolver,
  TransactionDefaultResolver,
  PgpResolver, UserAuthResolver, UserAuthPwResolver, NotificationResolver, BadgeResolver, DisputeAdminResolver, DisputesResolver
 ];

diff --git a/src/order/order.resolver.ts b/src/order/order.resolver.ts
@@ -231,7 +231,7 @@ export class OrderResolver {
  };
 
  const { price: adPriceUsd } = ad;
- const feePerc = siteSettings.feePrices.checkoutFeePerc;
+ const feePerc = siteSettings.feePrices?.checkoutFeePerc || 0;
  const priceXQtyUsd = adPriceUsd * quantity;
  const feeUsd = (feePerc / 100) * priceXQtyUsd;
  const orderPriceTotalUsd = priceXQtyUsd + feeUsd;

diff --git a/src/settings/settings.model.ts b/src/settings/settings.model.ts
@@ -1,5 +1,6 @@
 import { Field, InputType, Model, ObjectType } from "couchset";
 
+@InputType("WithdrawMinInput")
 @ObjectType()
 class WithdrawMin {
  @Field(() => Number, { nullable: false })
@@ -10,6 +11,7 @@ class WithdrawMin {
 
 };
 
+@InputType("FeePricesInput")
 @ObjectType()
 export class FeePrices {
  @Field(() => WithdrawMin, { nullable: false })
@@ -25,14 +27,15 @@ export class FeePrices {
 @InputType("SiteSettingsInput")
 @ObjectType()
 export class SiteSettings {
- @Field(() => String, { nullable: false })
+ @Field(() => String, { nullable: true })
  id: string = "";
 
- @Field(() => Number, { nullable: false })
+ @Field(() => Number, { nullable: true })
  vendorBond: number = 600;
 
- @Field(() => FeePrices, { nullable: false })
- feePrices: FeePrices = null as any;
+ // @deprecated
+ @Field(() => FeePrices, { nullable: true })
+ feePrices?: FeePrices = null as any;
 
  @Field(() => Number, { nullable: true })
  vendorCount?: number = 0;
@@ -55,6 +58,18 @@ export class SiteSettings {
  @Field(() => String, { nullable: true })
  description?: string = "";
 
+ @Field(() => Number, { nullable: true })
+ WITHDRAW_FEE_PERC?: number = 0;
+
+ @Field(() => Number, { nullable: true })
+ CHECKOUT_FEE_PERC?: number = 0;
+
+ @Field(() => Number, { nullable: true })
+ XMR_WITHDRAW_MIN?: number = 0;
+
+ @Field(() => Number, { nullable: true })
+ BTC_WITHDRAW_MIN?: number = 0.000101;
+
  @Field(() => Boolean, { nullable: true })
  ENABLE_BTC?: boolean = false;
 

diff --git a/src/settings/settings.resolver.ts b/src/settings/settings.resolver.ts
@@ -17,11 +17,12 @@ import { isAuth } from "@roadmanjs/auth";
 @Resolver()
 export class SettingsResolver {
 
+ // @deprecated
  @Query(() => FeePrices, { nullable: false })
  @UseMiddleware(isAuth)
  async getFeePrices(): Promise<FeePrices> {
  const siteSettings = await getSiteSettings(true);
- return siteSettings?.feePrices ? siteSettings.feePrices : initSiteSettings.feePrices;
+ return (siteSettings?.feePrices ? siteSettings.feePrices : initSiteSettings.feePrices) as any;
  }
 
  @Query(() => SiteSettings, { nullable: false })