Expose trialed and trialUntil (#1144)

pluralsh · Jul 5, 2023 · bdc44c0 · bdc44c0
1 parent c94c04c
commit bdc44c0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/apps/graphql/lib/graphql/schema/account.ex b/apps/graphql/lib/graphql/schema/account.ex
@@ -89,6 +89,7 @@ defmodule GraphQl.Schema.Account do
     field :delinquent_at,        :datetime
     field :grandfathered_until,  :datetime
     field :billing_address,      :address
+    field :trialed,              :boolean
 
     field :icon, :string, resolve: fn
       account, _, _ -> {:ok, Core.Storage.url({account.icon, account}, :original)}

diff --git a/apps/graphql/lib/graphql/schema/payments.ex b/apps/graphql/lib/graphql/schema/payments.ex
@@ -198,9 +198,16 @@ defmodule GraphQl.Schema.Payments do
     field :external_id,    :string
     field :line_items,     list_of(:platform_subscription_line_items)
     field :plan,           :platform_plan, resolve: dataloader(Payments)
+
+    field :trial_until,    :datetime, resolve: fn
+      %{inserted_at: dt}, _, _ -> {:ok, Timex.shift(dt, months: 1)}
+    end
+
     field :latest_invoice, :invoice, resolve: fn
       sub, _, _ -> Payments.latest_invoice(sub)
     end
+
+    timestamps()
   end
 
   object :platform_subscription_line_items do

diff --git a/apps/graphql/test/queries/payments_queries_test.exs b/apps/graphql/test/queries/payments_queries_test.exs
@@ -163,7 +163,10 @@ defmodule GraphQl.PaymentsQueriesTest do
 
       {:ok, %{data: %{"platformSubscription" => found}}} = run_query("""
         query {
-          platformSubscription { id }
+          platformSubscription {
+            id
+            trialUntil
+          }
         }
       """, %{}, %{current_user: user})
 

diff --git a/schema/schema.graphql b/schema/schema.graphql
@@ -427,6 +427,7 @@ type Account {
   delinquentAt: DateTime
   grandfatheredUntil: DateTime
   billingAddress: Address
+  trialed: Boolean
   icon: String
   paymentMethods(after: String, first: Int, before: String, last: Int): PaymentMethodConnection
   rootUser: User
@@ -837,7 +838,10 @@ type PlatformSubscription {
   externalId: String
   lineItems: [PlatformSubscriptionLineItems]
   plan: PlatformPlan
+  trialUntil: DateTime
   latestInvoice: Invoice
+  insertedAt: DateTime
+  updatedAt: DateTime
 }
 
 type PaymentMethodConnection {

diff --git a/www/src/generated/graphql.ts b/www/src/generated/graphql.ts
@@ -46,6 +46,7 @@ export type Account = {
   paymentMethods?: Maybe<PaymentMethodConnection>;
   rootUser?: Maybe<User>;
   subscription?: Maybe<PlatformSubscription>;
+  trialed?: Maybe<Scalars['Boolean']['output']>;
   updatedAt?: Maybe<Scalars['DateTime']['output']>;
   userCount?: Maybe<Scalars['String']['output']>;
   workosConnectionId?: Maybe<Scalars['String']['output']>;
@@ -2051,9 +2052,12 @@ export type PlatformSubscription = {
   __typename?: 'PlatformSubscription';
   externalId?: Maybe<Scalars['String']['output']>;
   id: Scalars['ID']['output'];
+  insertedAt?: Maybe<Scalars['DateTime']['output']>;
   latestInvoice?: Maybe<Invoice>;
   lineItems?: Maybe<Array<Maybe<PlatformSubscriptionLineItems>>>;
   plan?: Maybe<PlatformPlan>;
+  trialUntil?: Maybe<Scalars['DateTime']['output']>;
+  updatedAt?: Maybe<Scalars['DateTime']['output']>;
 };
 
 export type PlatformSubscriptionLineItems = {