From c574dda176bdc37e42f6dee1a42defd2012996b9 Mon Sep 17 00:00:00 2001 From: June Zhao <60997220+junjun107@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:34:39 -0700 Subject: [PATCH] fix type error (#2050) --- server/app/services/feature-to-login-service.ts | 8 ++++++-- server/types/feature-to-login-types.ts | 8 +++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/server/app/services/feature-to-login-service.ts b/server/app/services/feature-to-login-service.ts index a53dca288..8c022b56d 100644 --- a/server/app/services/feature-to-login-service.ts +++ b/server/app/services/feature-to-login-service.ts @@ -13,6 +13,7 @@ const getLoginsByFeature = async () => { const groupedByFeature = results.reduce((acc, item) => { if (!acc.has(item.feature_id)) { acc.set(item.feature_id, { + ftl_id: item.ftl_id, feature_id: item.feature_id, feature_name: item.feature_name, users: [], @@ -26,13 +27,16 @@ const getLoginsByFeature = async () => { first_name: item.first_name, last_name: item.last_name, email: item.email, - ftl_id: item.ftl_id, + }); } return acc; }, new Map()); - const orderedFeatures = Array.from(groupedByFeature.values()); + const orderedFeatures: FeatureToLogin[] = Array.from( + groupedByFeature.values() + ); + console.log(orderedFeatures); return orderedFeatures; }; diff --git a/server/types/feature-to-login-types.ts b/server/types/feature-to-login-types.ts index 00faf29ca..0e94081c4 100644 --- a/server/types/feature-to-login-types.ts +++ b/server/types/feature-to-login-types.ts @@ -1,5 +1,11 @@ export interface FeatureToLogin { - id: number; + ftl_id: number; feature_id: number; login_id: number; + users: Array<{ + login_id: number; + first_name: string; + last_name: string; + email: string; + }>; }