Refactor - split submit finished deck & unfinished

kubk · Nov 6, 2023 · 05b8e9b · 05b8e9b
1 parent f6735b2
commit 05b8e9b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 32 deletions.
diff --git a/src/screens/deck-review/deck-finished.tsx b/src/screens/deck-review/deck-finished.tsx
@@ -33,7 +33,7 @@ export const DeckFinished = observer(() => {
   const reviewStore = useReviewStore();
 
   useMount(() => {
-    reviewStore.submit();
+    reviewStore.submitFinished();
   });
   useMainButton("Go back", () => {
     screenStore.navigateToMain();

diff --git a/src/screens/deck-review/review.tsx b/src/screens/deck-review/review.tsx
@@ -20,7 +20,7 @@ export const Review = observer(() => {
   const [isRotateAnimating, setIsRotateAnimating] = useState(false);
 
   useBackButton(() => {
-    reviewStore.submit();
+    reviewStore.submitUnfinished();
   });
 
   const x = useMotionValue(0);

diff --git a/src/store/review-store.test.ts b/src/store/review-store.test.ts
@@ -180,42 +180,42 @@ describe("card form store", () => {
     expect(reviewStore.nextCard).toBeFalsy();
   });
 
-  it('hit wrong many times', () => {
+  it("hit wrong many times", () => {
     const reviewStore = new ReviewStore();
     reviewStore.startDeckReview(deckCardsMock);
     expect(reviewStore.isFinished).toBeFalsy();
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Forget);
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Forget);
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Forget);
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Forget);
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Forget);
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Forget);
 
-    expect(reviewStore.result.forgotIds).toHaveLength(3)
-    expect(reviewStore.result.rememberIds).toHaveLength(0)
+    expect(reviewStore.result.forgotIds).toHaveLength(3);
+    expect(reviewStore.result.rememberIds).toHaveLength(0);
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Remember);
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Remember);
 
-    reviewStore.open()
+    reviewStore.open();
     reviewStore.changeState(CardState.Remember);
 
-    expect(reviewStore.result.forgotIds).toHaveLength(3)
-    expect(reviewStore.result.rememberIds).toHaveLength(0)
-  })
+    expect(reviewStore.result.forgotIds).toHaveLength(3);
+    expect(reviewStore.result.rememberIds).toHaveLength(0);
+  });
 });
diff --git a/src/store/review-store.ts b/src/store/review-store.ts
@@ -110,15 +110,18 @@ export class ReviewStore {
     return this.result.forgotIds.length || this.result.rememberIds.length;
   }
 
-  async submit() {
+  submitUnfinished() {
+    screenStore.navigateToMain();
+
     if (!this.hasResult) {
-      screenStore.navigateToMain();
       return;
     }
 
-    this.isReviewSending = true;
+    return reviewCardsRequest({ cards: this.cardsToSend });
+  }
 
-    const cards: Array<{ id: number; outcome: ReviewOutcome }> = [
+  get cardsToSend(): Array<{ id: number; outcome: ReviewOutcome }> {
+    return [
       ...this.result.forgotIds.map((forgotId) => ({
         id: forgotId,
         outcome: "wrong" as const,
@@ -128,17 +131,20 @@ export class ReviewStore {
         outcome: "correct" as const,
       })),
     ];
+  }
 
-    return reviewCardsRequest({
-      cards,
-    })
-      .then(() => {
-        deckListStore.load();
-      })
-      .finally(
-        action(() => {
-          this.isReviewSending = false;
-        }),
-      );
+  async submitFinished() {
+    if (!this.hasResult) {
+      screenStore.navigateToMain();
+      return;
+    }
+
+    this.isReviewSending = true;
+
+    return reviewCardsRequest({ cards: this.cardsToSend }).finally(
+      action(() => {
+        this.isReviewSending = false;
+      }),
+    );
   }
 }