Merge pull request #23263 from overleaf/ii-flexible-licensing-subscription-group-handler

[web] FL check subscription existence

GitOrigin-RevId: b564d681245137955a8f1e7367b9bd1a6b404268

services/web/test/unit/src/Subscription/SubscriptionGroupControllerTests.mjs

@@ -331,7 +331,7 @@ describe('SubscriptionGroupController', function () {
       const res = {
         render: (page, props) => {
           this.SubscriptionGroupHandler.promises.getUsersGroupSubscriptionDetails
-            .calledWith(this.req)
+            .calledWith(this.req.session.user._id)
             .should.equal(true)
           this.SubscriptionGroupHandler.promises.ensureFlexibleLicensingEnabled
             .calledWith(this.plan)
@@ -379,10 +379,12 @@ describe('SubscriptionGroupController', function () {
 
   describe('previewAddSeatsSubscriptionChange', function () {
     it('should preview "add seats" change', function (done) {
+      this.req.body = { adding: 2 }
+
       const res = {
         json: data => {
           this.SubscriptionGroupHandler.promises.previewAddSeatsSubscriptionChange
-            .calledWith(this.req)
+            .calledWith(this.req.session.user._id, this.req.body.adding)
             .should.equal(true)
           data.should.deep.equal(this.previewSubscriptionChangeData)
           done()
@@ -414,10 +416,12 @@ describe('SubscriptionGroupController', function () {
 
   describe('createAddSeatsSubscriptionChange', function () {
     it('should apply "add seats" change', function (done) {
+      this.req.body = { adding: 2 }
+
       const res = {
         json: data => {
           this.SubscriptionGroupHandler.promises.createAddSeatsSubscriptionChange
-            .calledWith(this.req)
+            .calledWith(this.req.session.user._id, this.req.body.adding)
             .should.equal(true)
           data.should.deep.equal(this.createSubscriptionChangeData)
           done()

services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js

@@ -290,13 +290,15 @@ describe('SubscriptionGroupHandler', function () {
         .resolves({ groupPlan: false })
 
       await expect(
-        this.Handler.promises.getUsersGroupSubscriptionDetails(this.req)
+        this.Handler.promises.getUsersGroupSubscriptionDetails(
+          this.adminUser_id
+        )
       ).to.be.rejectedWith('User subscription is not a group plan')
     })
 
     it('should return users group subscription details', async function () {
       const data = await this.Handler.promises.getUsersGroupSubscriptionDetails(
-        this.req
+        this.adminUser_id
       )
 
       expect(data).to.deep.equal({
@@ -355,10 +357,11 @@ describe('SubscriptionGroupHandler', function () {
         it('should return the subscription change preview', async function () {
           const preview =
             await this.Handler.promises.previewAddSeatsSubscriptionChange(
-              this.req
+              this.adminUser_id,
+              this.adding
             )
           this.RecurlyClient.promises.getPaymentMethod
-            .calledWith(this.user_id)
+            .calledWith(this.adminUser_id)
             .should.equal(true)
           this.RecurlyClient.promises.previewSubscriptionChange
             .calledWith(this.changeRequest)
@@ -386,14 +389,18 @@ describe('SubscriptionGroupHandler', function () {
         it('should change the subscription', async function () {
           const result =
             await this.Handler.promises.createAddSeatsSubscriptionChange(
-              this.req
+              this.adminUser_id,
+              this.adding
             )
 
           this.RecurlyClient.promises.applySubscriptionChangeRequest
             .calledWith(this.changeRequest)
             .should.equal(true)
           this.SubscriptionHandler.promises.syncSubscription
-            .calledWith({ uuid: this.recurlySubscription.id }, this.user_id)
+            .calledWith(
+              { uuid: this.recurlySubscription.id },
+              this.adminUser_id
+            )
             .should.equal(true)
           expect(result).to.deep.equal({
             adding: this.req.body.adding,
@@ -430,7 +437,7 @@ describe('SubscriptionGroupHandler', function () {
 
         afterEach(function () {
           this.RecurlyClient.promises.getPaymentMethod
-            .calledWith(this.user_id)
+            .calledWith(this.adminUser_id)
             .should.equal(true)
           this.RecurlyClient.promises.previewSubscriptionChange
             .calledWith(this.changeRequest)
@@ -458,7 +465,8 @@ describe('SubscriptionGroupHandler', function () {
 
           preview =
             await this.Handler.promises.previewAddSeatsSubscriptionChange(
-              this.req
+              this.adminUser_id,
+              this.adding
             )
           this.recurlySubscription.getRequestForAddOnPurchase
             .calledWithExactly(
@@ -475,7 +483,8 @@ describe('SubscriptionGroupHandler', function () {
 
           preview =
             await this.Handler.promises.previewAddSeatsSubscriptionChange(
-              this.req
+              this.adminUser_id,
+              this.adding
             )
           this.recurlySubscription.getRequestForAddOnPurchase
             .calledWithExactly(