Merge pull request #289 from traPtitech/refactor/validation

♻️ Repository にあったバリデーションを usecase で行う
traPtitech · Sep 7, 2024 · 6340d93 · 6340d93
2 parents ca982c7 + d17c5da
commit 6340d93
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/src/features/request/repository.ts b/src/features/request/repository.ts
@@ -25,14 +25,6 @@ export const useRequestRepository = () => {
 
 const createRequestRepository = () => ({
   fetchRequests: async (querySeed: RequestQuerySeed): Promise<Request[]> => {
-    const rule = /^2[0-9]{3}-[0-9]{1,2}-[0-9]{1,2}$/
-    if (
-      (querySeed.since && !rule.test(querySeed.since)) ||
-      (querySeed.until && !rule.test(querySeed.until))
-    ) {
-      throw new Error('日付はyyyy-MM-ddの形式で入力してください')
-    }
-
     const { data } = await apis.getRequests(
       querySeed.sort,
       querySeed.currentStatus !== '' ? querySeed.currentStatus : undefined,

diff --git a/src/features/request/usecase.ts b/src/features/request/usecase.ts
@@ -11,9 +11,16 @@ import { createTagIfNotExistUsecase } from '/@/features/tag/usecase'
 
 export const useFetchRequestsUsecase = async () => {
   const repository = useRequestRepository()
-  const { requests, isRequestFetched, filterParams } = storeToRefs(
-    useRequestStore()
-  )
+  const { requests, isRequestFetched, filterParams } =
+    storeToRefs(useRequestStore())
+
+  const rule = /^2[0-9]{3}-[0-9]{1,2}-[0-9]{1,2}$/
+  if (
+    (filterParams.value.since && !rule.test(filterParams.value.since)) ||
+    (filterParams.value.until && !rule.test(filterParams.value.until))
+  ) {
+    throw new Error('日付はyyyy-MM-ddの形式で入力してください')
+  }
 
   try {
     requests.value = await repository.fetchRequests(filterParams.value)

diff --git a/src/features/transaction/repository.ts b/src/features/transaction/repository.ts
@@ -16,14 +16,6 @@ const createTransactionRepository = () => ({
   fetchTransactions: async (
     querySeed: TransactionQuerySeed
   ): Promise<Transaction[]> => {
-    const rule = /^2[0-9]{3}-[0-9]{1,2}-[0-9]{1,2}$/
-    if (
-      (querySeed.since && !rule.test(querySeed.since)) ||
-      (querySeed.until && !rule.test(querySeed.until))
-    ) {
-      throw new Error('日付はyyyy-MM-ddの形式で入力してください')
-    }
-
     const { data } = await apis.getTransactions(
       querySeed.sort,
       querySeed.target,

diff --git a/src/features/transaction/usecase.ts b/src/features/transaction/usecase.ts
@@ -15,6 +15,14 @@ export const useFetchTransactionsUsecase = async () => {
     useTransactionStore()
   )
 
+  const rule = /^2[0-9]{3}-[0-9]{1,2}-[0-9]{1,2}$/
+  if (
+    (filterParams.value.since && !rule.test(filterParams.value.since)) ||
+    (filterParams.value.until && !rule.test(filterParams.value.until))
+  ) {
+    throw new Error('日付はyyyy-MM-ddの形式で入力してください')
+  }
+
   try {
     transactions.value = await repository.fetchTransactions(filterParams.value)
     isTransactionFetched.value = true