Merge pull request #3669 from openstax/fix/refund

fix refund api request
openstax · Jun 29, 2021 · 328d467 · 328d467
2 parents 7e78636 + c3d9d1a
commit 328d467
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/shared/src/model/api.ts b/shared/src/model/api.ts
@@ -30,7 +30,7 @@ export class ModelApi {
             }
             return null
         },
-    })) //observable.map<string, ApiError>({}, { deep: false })
+    }))
 
     @readonly requestCounts = observable({
         read: 0,

diff --git a/tutor/specs/models/purchases/purchase.spec.ts b/tutor/specs/models/purchases/purchase.spec.ts
@@ -1,5 +1,5 @@
 import { Purchase, Course } from '../../../src/models'
-import { Factory, hydrateModel } from '../../helpers'
+import { Factory, hydrateModel, ApiMock } from '../../helpers'
 
 describe('Purchase Model', () => {
     let course!:Course
@@ -16,8 +16,11 @@ describe('Purchase Model', () => {
         expect(purchase.course).toBe(course)
     });
 
-    test('#onRefunded', () => {
-        purchase.onRefunded();
+    test('#onRefunded', async () => {
+        ApiMock.mock({
+            [`purchases/${purchase.product_instance_uuid}/refund`]: { ok: true },
+        })
+        await purchase.refund();
         expect(course.userStudentRecord!.is_paid).toBe(false);
         expect(course.userStudentRecord!.prompt_student_to_pay).toBe(true);
     });

diff --git a/tutor/src/models/purchases/purchase.ts b/tutor/src/models/purchases/purchase.ts
@@ -1,8 +1,9 @@
 import { pick, extend } from 'lodash';
-import { BaseModel, field, model, computed, modelize, NEW_ID } from 'shared/model';
+import { BaseModel, field, model, computed, action, modelize, NEW_ID } from 'shared/model';
 import Time from 'shared/model/time';
 import S from '../../helpers/string';
 import { currentCourses } from '../../../src/models'
+import urlFor from '../../api'
 
 class Product extends BaseModel {
     @field uuid = '';
@@ -67,15 +68,16 @@ export class Purchase extends BaseModel {
         return amount;
     }
 
-    refund() {
-        return { item_uuid: this.product_instance_uuid, refund_survey: this.refund_survey };
+    @action async refund() {
+        await this.api.request(urlFor('requestRefund', { itemUUID: this.product_instance_uuid }), {
+            data: { refund_survey: this.refund_survey },
+        })
+        this.onRefunded()
     }
 
-    onRefunded() {
+    @action onRefunded() {
         this.is_refunded = true;
-        if (this.course) {
-            this.course.userStudentRecord?.markRefunded();
-        }
+        this.course?.userStudentRecord?.markRefunded();
     }
 
 }