add: getCoursesByCode suppressNotFoundError

twin-te · Mar 24, 2021 · ebebeac · ebebeac
1 parent 81f8afd
commit ebebeac
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/__tests__/usecase/getCoursesByCode.test.ts b/__tests__/usecase/getCoursesByCode.test.ts
@@ -38,7 +38,7 @@ test('重複したid', () =>
     ])
   ).rejects.toThrow(InvalidArgumentError))
 
-test('存在しないidの情報は帰らない', () => {
+test('見つからない条件がある場合はエラーになる', () => {
   return expect(
     getCoursesByCodeUseCase([
       { year: 2020, code: 'FOO' },
@@ -47,6 +47,28 @@ test('存在しないidの情報は帰らない', () => {
   ).rejects.toThrow(NotFoundError)
 })
 
+test('NotFoundErrorを抑制', async () => {
+  const res = await getCoursesByCodeUseCase(
+    [
+      { year: 2020, code: 'FOO' },
+      { year: 2020, code: initialData[1].code },
+    ],
+    true
+  )
+  expect(res.length).toBe(1)
+})
+
+test('NotFoundErrorを抑制', async () => {
+  const res = await getCoursesByCodeUseCase(
+    [
+      { year: 2020, code: 'FOO' },
+      { year: 2021, code: initialData[1].code },
+    ],
+    true
+  )
+  expect(res.length).toBe(0)
+})
+
 afterAll(() => {
   disconnectDatabase()
 })
diff --git a/protos/CourseService.proto b/protos/CourseService.proto
@@ -99,6 +99,8 @@ message GetCoursesByCodeRequestCondition {
 
 message GetCoursesByCodeRequest {
   repeated GetCoursesByCodeRequestCondition conditions = 1;
+  /* 一部の講義が見つからない場合でもエラーにせず、見つかった分だけ返す */
+  bool suppressNotFoundError = 2;
 }
 
 message GetCoursesByCodeResponse {

diff --git a/src/grpc/course.service.ts b/src/grpc/course.service.ts
@@ -87,7 +87,8 @@ export const courseService: GrpcServer<CourseService> = applyLogger({
     try {
       const conditions = request.conditions
       const courses = await getCoursesByCodeUseCase(
-        conditions.map((cc) => ({ year: cc.year, code: cc.code }))
+        conditions.map((cc) => ({ year: cc.year, code: cc.code })),
+        request.suppressNotFoundError
       )
 
       callback(

diff --git a/src/usecase/getCoursesByCode.ts b/src/usecase/getCoursesByCode.ts
@@ -10,9 +10,11 @@ type GetCoursesByCodeUseCaseProps = {
 /**
  * 指定された年度と科目番号から情報を取得する
  * @param props 条件
+ * @param suppressNotFoundError 一部の講義が見つからなくてもエラーにしない
  */
 export async function getCoursesByCodeUseCase(
-  props: GetCoursesByCodeUseCaseProps
+  props: GetCoursesByCodeUseCaseProps,
+  suppressNotFoundError: boolean = false
 ): Promise<Course[]> {
   if (
     props.length !==
@@ -26,7 +28,7 @@ export async function getCoursesByCodeUseCase(
     where: props,
     relations: ['recommendedGrades', 'methods', 'schedules'],
   })
-  if (res.length !== props.length)
+  if (res.length !== props.length && !suppressNotFoundError)
     throw new NotFoundError(
       '指定されたidのコースが見つかりませんでした',
       undefined,