From 51dfc81fb22ff7432c3f3026794368619efa79af Mon Sep 17 00:00:00 2001 From: Abraham Rudolf Brahmana Date: Sun, 7 Nov 2021 16:18:35 +0700 Subject: [PATCH 1/2] fix: Add try catch handling --- src/service/firestore/ecosystem/fetchUsers.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/service/firestore/ecosystem/fetchUsers.ts b/src/service/firestore/ecosystem/fetchUsers.ts index e23c153..786b46f 100644 --- a/src/service/firestore/ecosystem/fetchUsers.ts +++ b/src/service/firestore/ecosystem/fetchUsers.ts @@ -48,8 +48,16 @@ export const fetchUsers = async ( const userData = userSnap.data() as IUser; users[i].category = categoryName; - users[i].image = userData.pic; - users[i].name = userData.firstName + " " + userData.lastName; + try { + users[i].image = userData.pic; + } catch (e) { + users[i].image = ""; + } + try { + users[i].name = userData.firstName + " " + userData.lastName; + } catch (e) { + users[i].name = ""; + } }; promises.push(wrap()); } -- GitLab From 5fc8c5a795bc9dd3c4e685a1c15be6bb7676b4f2 Mon Sep 17 00:00:00 2001 From: Abraham Rudolf Brahmana Date: Sun, 7 Nov 2021 17:04:50 +0700 Subject: [PATCH 2/2] refactor: Change the function name from fetchUsers to fetchUserByEcosystemIdAndType --- .../{fetchUsers.ts => fetchUsersByEcosystemIdAndType.ts} | 2 +- src/service/firestore/ecosystem/index.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/service/firestore/ecosystem/{fetchUsers.ts => fetchUsersByEcosystemIdAndType.ts} (97%) diff --git a/src/service/firestore/ecosystem/fetchUsers.ts b/src/service/firestore/ecosystem/fetchUsersByEcosystemIdAndType.ts similarity index 97% rename from src/service/firestore/ecosystem/fetchUsers.ts rename to src/service/firestore/ecosystem/fetchUsersByEcosystemIdAndType.ts index 786b46f..9261831 100644 --- a/src/service/firestore/ecosystem/fetchUsers.ts +++ b/src/service/firestore/ecosystem/fetchUsersByEcosystemIdAndType.ts @@ -5,7 +5,7 @@ import { IEcosystemCategoryMember } from "../../../types/firestore/ecosystemCate import { IUser } from "../../../types/firestore/User"; import { getCategory } from "./getCategory"; -export const fetchUsers = async ( +export const fetchUsersByEcosystemIdAndType = async ( ecosystemId: string, type: string ): Promise => { diff --git a/src/service/firestore/ecosystem/index.ts b/src/service/firestore/ecosystem/index.ts index 18863ef..b5c0a59 100644 --- a/src/service/firestore/ecosystem/index.ts +++ b/src/service/firestore/ecosystem/index.ts @@ -1,4 +1,4 @@ -import { fetchUsers } from "./fetchUsers"; +import { fetchUsersByEcosystemIdAndType } from "./fetchUsersByEcosystemIdAndType"; import { getByCreated } from "./getByCreated"; import { getByMostRecent } from "./getMostRecent"; import { getByPopularity } from "./getByPopularity"; @@ -9,7 +9,7 @@ import { getByFollowed } from "./getByFollowed"; import { inEcosystem } from "./inEcosystem"; const ecosystemService = { - fetchUsers, + fetchUsersByEcosystemIdAndType, getByCreated, getByMostRecent, getByPopularity, -- GitLab