From 7c9c72713589fb54ed80ace9801fd7e019bda6b5 Mon Sep 17 00:00:00 2001 From: HosokawaR Date: Sat, 1 Apr 2023 15:49:15 +0000 Subject: [PATCH 1/3] Fix bug in schedule conflict check in adding courses --- src/ui/pages/add/search.vue | 13 ++++++------- src/utils.ts | 8 ++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/ui/pages/add/search.vue b/src/ui/pages/add/search.vue index df2178a1..abadc239 100644 --- a/src/ui/pages/add/search.vue +++ b/src/ui/pages/add/search.vue @@ -287,7 +287,7 @@ import ToggleButton from "~/ui/components/ToggleButton.vue"; import { useSwitch } from "~/ui/hooks/useSwitch"; import { addCoursesByCodes } from "~/ui/store/course"; import { getApplicableYear } from "~/ui/store/year"; -import { deleteElementInArray } from "~/utils"; +import { asyncFilter, deleteElementInArray } from "~/utils"; import type { Schedule } from "~/domain/schedule"; import type { DisplayCourse } from "~/presentation/viewmodels/course"; @@ -472,12 +472,11 @@ const buttonState = computed(() => const duplicateCourses = ref([]); const addCourses = async (warning = true) => { - duplicateCourses.value = ( - await Promise.all( - selectedSearchResults.filter( - ({ schedules }) => - !Usecase.checkScheduleDuplicate(ports)(year.value, schedules) - ) + duplicateCourses.value = await ( + await asyncFilter( + selectedSearchResults, + async ({ schedules }) => + !(await Usecase.checkScheduleDuplicate(ports)(year.value, schedules)) ) ).map(({ course }) => course); diff --git a/src/utils.ts b/src/utils.ts index 611f7616..1ff06ac0 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -133,3 +133,11 @@ export const hasProperty =

( ): obj is { [key in P]: T } => { return hasUnknownProperty(obj, prop) && clarifyPropertyType(obj, prop, fn); }; + +export const asyncFilter = async ( + array: T[], + asyncCallback: (arg: T) => Promise +) => { + const mask = await Promise.all(array.map(asyncCallback)); + return array.filter((_, i) => Boolean(mask[i])); +}; From 45fb9e3069ca5e2b92d86021ef6216af73e3b606 Mon Sep 17 00:00:00 2001 From: HosokawaR Date: Sun, 2 Apr 2023 02:44:55 +0000 Subject: [PATCH 2/3] Add toast to notify error when the already registered course has been added --- src/ui/pages/add/search.vue | 33 ++++++++++++++++++++++++++++++--- src/ui/store/toast.ts | 2 +- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/ui/pages/add/search.vue b/src/ui/pages/add/search.vue index abadc239..3d3826fb 100644 --- a/src/ui/pages/add/search.vue +++ b/src/ui/pages/add/search.vue @@ -194,7 +194,7 @@

@@ -286,6 +286,7 @@ import TextFieldSingleLine from "~/ui/components/TextFieldSingleLine.vue"; import ToggleButton from "~/ui/components/ToggleButton.vue"; import { useSwitch } from "~/ui/hooks/useSwitch"; import { addCoursesByCodes } from "~/ui/store/course"; +import { displayToast } from "~/ui/store/toast"; import { getApplicableYear } from "~/ui/store/year"; import { asyncFilter, deleteElementInArray } from "~/utils"; import type { Schedule } from "~/domain/schedule"; @@ -469,10 +470,36 @@ const buttonState = computed(() => selectedSearchResults.length > 0 ? "default" : "disabled" ); -const duplicateCourses = ref([]); +const duplicatedScheduleCourses = ref([]); const addCourses = async (warning = true) => { + const registeredCourse = await Usecase.getRegisteredCoursesByYear(ports)( + year.value + ); + + if (isResultError(registeredCourse)) throw registeredCourse; + + const duplicatedCourses = selectedSearchResults + .filter(({ course: { code: selectedCourseCode } }) => { + return registeredCourse.some( + ({ code: registeredCourseCode }) => + registeredCourseCode === selectedCourseCode + ); + }) + .map(({ course }) => course); + + if (duplicatedCourses.length > 0) { + const text = + `以下のコースはすでに登録されているため追加できません。\n` + + duplicatedCourses + .map(({ code, name }) => `【${code}】${name}`) + .join("\n"); + displayToast(text, { type: "danger" }); duplicateCourses.value = await ( + return; + } + + duplicatedScheduleCourses.value = await ( await asyncFilter( selectedSearchResults, async ({ schedules }) => @@ -480,7 +507,7 @@ const addCourses = async (warning = true) => { ) ).map(({ course }) => course); - if (warning && duplicateCourses.value.length > 0) { + if (warning && duplicatedScheduleCourses.value.length > 0) { openDuplicateModal(); return; } diff --git a/src/ui/store/toast.ts b/src/ui/store/toast.ts index f4ebca35..acfe4545 100644 --- a/src/ui/store/toast.ts +++ b/src/ui/store/toast.ts @@ -21,7 +21,7 @@ export const displayToast = ( option?: { displayPeriod?: number; type?: ToastType } ) => { const id = createId(); - const displayPeriod = option?.displayPeriod ?? 3000; + const displayPeriod = option?.displayPeriod ?? text.length * 240; // 250 characters per minute reading speed const type = option?.type ?? "danger"; toasts.push({ id, text, type }); From 75b20cb41a6134bae07f9a4bb3e66835328d48d8 Mon Sep 17 00:00:00 2001 From: HosokawaR Date: Sun, 2 Apr 2023 02:45:06 +0000 Subject: [PATCH 3/3] Add tracking evnet to count duplicated courses error --- src/ui/pages/add/search.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/pages/add/search.vue b/src/ui/pages/add/search.vue index 3d3826fb..add60148 100644 --- a/src/ui/pages/add/search.vue +++ b/src/ui/pages/add/search.vue @@ -495,7 +495,7 @@ const addCourses = async (warning = true) => { .map(({ code, name }) => `【${code}】${name}`) .join("\n"); displayToast(text, { type: "danger" }); - duplicateCourses.value = await ( + gtm?.trackEvent({ event: "duplicated-courses-error" }); return; }