Merge pull request #2977 from codecrafters-io/feat/replacement-currentPeriodEnd-cancelAt

feat(subscription): replace currentPeriodEnd with cancelAt

Author: rohitpaulk

app/components/settings/billing-page/membership-section.hbs

@@ -4,10 +4,10 @@
       Membership active
     </Settings::BillingPage::StatusPill>
     <div class="prose prose-sm prose-compact dark:prose-invert">
-      {{#if (and @user.isVip (gt @user.vipStatusExpiresAt @user.activeSubscription.currentPeriodEnd))}}
+      {{#if (and @user.isVip (gt @user.vipStatusExpiresAt @user.activeSubscription.cancelAt))}}
         <p class="line-through">
           You have access to all CodeCrafters content, valid until
-          <strong>{{date-format @user.activeSubscription.currentPeriodEnd format="PPPp"}}</strong>.
+          <strong>{{date-format @user.activeSubscription.cancelAt format="PPPp"}}</strong>.
         </p>
         <p>
           🎉 You have VIP access to all CodeCrafters content, valid until
@@ -16,7 +16,7 @@
       {{else}}
         <p>
           You have access to all CodeCrafters content, valid until
-          <strong>{{date-format @user.activeSubscription.currentPeriodEnd format="PPPp"}}</strong>.
+          <strong>{{date-format @user.activeSubscription.cancelAt format="PPPp"}}</strong>.
         </p>
       {{/if}}
     </div>

app/models/subscription.ts

@@ -3,7 +3,6 @@ import type UserModel from 'codecrafters-frontend/models/user';
 
 export default class SubscriptionModel extends Model {
   @attr('date') declare cancelAt: Date;
-  @attr('date') declare currentPeriodEnd: Date;
   @attr('date') declare endedAt: Date | null;
   @attr('date') declare startDate: Date;
 

mirage/handlers/subscriptions.js

@@ -8,18 +8,4 @@ export default function (server) {
   server.post('/sessions/logout', function () {
     return new Response(200, {}, {});
   });
-
-  server.post('/subscriptions/:id/cancel-trial', function (schema, request) {
-    const subscription = schema.subscriptions.find(request.params.id);
-    subscription.update({ endedAt: new Date() });
-
-    return subscription;
-  });
-
-  server.post('/subscriptions/:id/cancel', function (schema, request) {
-    const subscription = schema.subscriptions.find(request.params.id);
-    subscription.update({ cancelAt: subscription.currentPeriodEnd });
-
-    return subscription;
-  });
 }

tests/acceptance/settings-page/billing-test.js

@@ -16,7 +16,7 @@ module('Acceptance | settings-page | billing-test', function (hooks) {
     testScenario(this.server);
     signInAsSubscriber(this.owner, this.server);
     const subscription = this.server.schema.subscriptions.first();
-    subscription.update('currentPeriodEnd', new Date('2035-07-31T01:00:00Z'));
+    subscription.update('cancelAt', new Date('2035-07-31T01:00:00Z'));
 
     await billingPage.visit();
 
@@ -37,7 +37,7 @@ module('Acceptance | settings-page | billing-test', function (hooks) {
     user.update('isVip', true);
     user.update('vipStatusExpiresAt', new Date('2035-08-31T01:00:00Z'));
     const subscription = this.server.schema.subscriptions.first();
-    subscription.update('currentPeriodEnd', new Date('2035-07-31T01:00:00Z'));
+    subscription.update('cancelAt', new Date('2035-07-31T01:00:00Z'));
 
     await billingPage.visit();
 

tests/support/authentication-helpers.js

@@ -52,8 +52,8 @@ export function signInAsSubscriber(owner, server, user) {
   user = user || server.schema.users.find('63c51e91-e448-4ea9-821b-a80415f266d3');
 
   server.create('subscription', {
+    cancelAt: new Date(new Date().getTime() + 24 * 60 * 60 * 1000),
     user: user,
-    currentPeriodEnd: new Date(new Date().getTime() + 24 * 60 * 60 * 1000),
   });
 
   return signIn(owner, server, user);