From fccd826e3a1212b76d7fabbf6f4283294b56c1e3 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 25 Jan 2024 17:11:15 +0100 Subject: [PATCH] fix: access map value --- common/achievement/get.ts | 5 +++-- common/achievement/template.ts | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/achievement/get.ts b/common/achievement/get.ts index 8ff5c7de1..621a949c8 100644 --- a/common/achievement/get.ts +++ b/common/achievement/get.ts @@ -7,7 +7,7 @@ import { getAchievementState, renderAchievementWithContext, transformPrismaJson import { evaluateAchievement } from './evaluate'; import { getAchievementImageURL } from './util'; -export async function getUserAchievementsWithTemplates(user: User) { +async function getUserAchievementsWithTemplates(user: User) { const userAchievementsWithTemplates = await prisma.user_achievement.findMany({ where: { userId: user.userID, AND: { template: { isActive: true } } }, include: { template: true }, @@ -191,7 +191,7 @@ const assembleAchievementData = async (userAchievements: achievements_with_templ // TODO: create a function to get the course image path for an array given templateIds. If the result of this function is undefined, use the template image. - return { + const res = { id: userAchievements[currentAchievementIndex].id, name: currentAchievementTemplate.name, subtitle: currentAchievementTemplate.subtitle, @@ -226,6 +226,7 @@ const assembleAchievementData = async (userAchievements: achievements_with_templ actionName: currentAchievementTemplate.actionName, actionRedirectLink: currentAchievementTemplate.actionRedirectLink, }; + return res; }; export { getUserAchievements, getFurtherAchievements, getNextStepAchievements, getAchievementById }; diff --git a/common/achievement/template.ts b/common/achievement/template.ts index 3d0ba5833..a02f43ef5 100644 --- a/common/achievement/template.ts +++ b/common/achievement/template.ts @@ -71,9 +71,7 @@ async function getTemplatesByMetrics(metricsForAction: Metric[]) { async function getTemplatesWithCourseRelation(): Promise { const templatesByCourseRelation = await getAchievementTemplates(TemplateSelectEnum.BY_COURSE_RELATION); - const courseTemplates: achievement_template[] = templatesByCourseRelation - ? Array.from(templatesByCourseRelation[achievement_template_for_enum.Course]) - : []; + const courseTemplates: achievement_template[] = templatesByCourseRelation ? templatesByCourseRelation.get(achievement_template_for_enum.Course) : []; return courseTemplates; }