From 1a269a4b520088bae4efd54438d820a0bcb2ee99 Mon Sep 17 00:00:00 2001 From: darkskygit Date: Tue, 28 May 2024 12:05:49 +0000 Subject: [PATCH] fix: missing quota resolver (#7094) --- .../backend/server/src/core/quota/index.ts | 8 +++++++- .../backend/server/src/core/quota/resolver.ts | 2 +- packages/backend/server/src/schema.gql | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/packages/backend/server/src/core/quota/index.ts b/packages/backend/server/src/core/quota/index.ts index efeaa9caed..80b28f6d80 100644 --- a/packages/backend/server/src/core/quota/index.ts +++ b/packages/backend/server/src/core/quota/index.ts @@ -3,6 +3,7 @@ import { Module } from '@nestjs/common'; import { FeatureModule } from '../features'; import { StorageModule } from '../storage'; import { PermissionService } from '../workspaces/permission'; +import { QuotaManagementResolver } from './resolver'; import { QuotaService } from './service'; import { QuotaManagementService } from './storage'; @@ -14,7 +15,12 @@ import { QuotaManagementService } from './storage'; */ @Module({ imports: [FeatureModule, StorageModule], - providers: [PermissionService, QuotaService, QuotaManagementService], + providers: [ + PermissionService, + QuotaService, + QuotaManagementResolver, + QuotaManagementService, + ], exports: [QuotaService, QuotaManagementService], }) export class QuotaModule {} diff --git a/packages/backend/server/src/core/quota/resolver.ts b/packages/backend/server/src/core/quota/resolver.ts index 9acdc2b823..3006e8b7a6 100644 --- a/packages/backend/server/src/core/quota/resolver.ts +++ b/packages/backend/server/src/core/quota/resolver.ts @@ -56,7 +56,7 @@ class UserQuotaType { } @Resolver(() => UserType) -export class FeatureManagementResolver { +export class QuotaManagementResolver { constructor(private readonly quota: QuotaService) {} @ResolveField(() => UserQuotaType, { name: 'quota', nullable: true }) diff --git a/packages/backend/server/src/schema.gql b/packages/backend/server/src/schema.gql index 34105fd3b0..639f6a71cf 100644 --- a/packages/backend/server/src/schema.gql +++ b/packages/backend/server/src/schema.gql @@ -470,6 +470,23 @@ type UserInvoice { union UserOrLimitedUser = LimitedUserType | UserType +type UserQuota { + blobLimit: SafeInt! + historyPeriod: SafeInt! + humanReadable: UserQuotaHumanReadable! + memberLimit: Int! + name: String! + storageQuota: SafeInt! +} + +type UserQuotaHumanReadable { + blobLimit: String! + historyPeriod: String! + memberLimit: String! + name: String! + storageQuota: String! +} + type UserSubscription { canceledAt: DateTime createdAt: DateTime! @@ -517,6 +534,7 @@ type UserType { """User name""" name: String! + quota: UserQuota subscription(plan: SubscriptionPlan = Pro): UserSubscription @deprecated(reason: "use `UserType.subscriptions`") subscriptions: [UserSubscription!]! token: tokenType! @deprecated(reason: "use [/api/auth/authorize]")