Merge pull request #1719 from automatisch/AUT-831
refactor: rewrite useSubscription with RQ
This commit is contained in:
@@ -1,17 +0,0 @@
|
||||
import appConfig from '../../config/app.js';
|
||||
|
||||
const getSubscriptionStatus = async (_parent, _params, context) => {
|
||||
if (!appConfig.isCloud) return;
|
||||
|
||||
const currentSubscription = await context.currentUser.$relatedQuery(
|
||||
'currentSubscription'
|
||||
);
|
||||
|
||||
if (!currentSubscription?.cancellationEffectiveDate) return;
|
||||
|
||||
return {
|
||||
cancellationEffectiveDate: currentSubscription.cancellationEffectiveDate,
|
||||
};
|
||||
};
|
||||
|
||||
export default getSubscriptionStatus;
|
@@ -14,7 +14,6 @@ import getPermissionCatalog from './queries/get-permission-catalog.ee.js';
|
||||
import getSamlAuthProviderRoleMappings from './queries/get-saml-auth-provider-role-mappings.ee.js';
|
||||
import getSamlAuthProvider from './queries/get-saml-auth-provider.ee.js';
|
||||
import getStepWithTestExecutions from './queries/get-step-with-test-executions.js';
|
||||
import getSubscriptionStatus from './queries/get-subscription-status.ee.js';
|
||||
import getTrialStatus from './queries/get-trial-status.ee.js';
|
||||
import getUser from './queries/get-user.js';
|
||||
import getUsers from './queries/get-users.js';
|
||||
@@ -38,7 +37,6 @@ const queryResolvers = {
|
||||
getSamlAuthProvider,
|
||||
getSamlAuthProviderRoleMappings,
|
||||
getStepWithTestExecutions,
|
||||
getSubscriptionStatus,
|
||||
getTrialStatus,
|
||||
getUser,
|
||||
getUsers,
|
||||
|
@@ -30,7 +30,6 @@ type Query {
|
||||
getNotifications: [Notification]
|
||||
getSamlAuthProvider: SamlAuthProvider
|
||||
getSamlAuthProviderRoleMappings(id: String!): [SamlAuthProvidersRoleMapping]
|
||||
getSubscriptionStatus: GetSubscriptionStatus
|
||||
getTrialStatus: GetTrialStatus
|
||||
getUser(id: String!): User
|
||||
getUsers(limit: Int!, offset: Int!): UserConnection
|
||||
@@ -609,10 +608,6 @@ type GetTrialStatus {
|
||||
expireAt: String
|
||||
}
|
||||
|
||||
type GetSubscriptionStatus {
|
||||
cancellationEffectiveDate: String
|
||||
}
|
||||
|
||||
type GetBillingAndUsage {
|
||||
subscription: Subscription
|
||||
usage: Usage
|
||||
|
Reference in New Issue
Block a user