diff --git a/functions/src/data/place/get/places/GetPlacesRepository.ts b/functions/src/data/place/get/places/GetPlacesRepository.ts index 0ae0471..6eaabbd 100644 --- a/functions/src/data/place/get/places/GetPlacesRepository.ts +++ b/functions/src/data/place/get/places/GetPlacesRepository.ts @@ -129,9 +129,7 @@ async function _GetPlacesFromGoogle( } - const data = await response.json() - - throw new Error(data) + throw new Error(response.statusText) } catch (error) { throw error diff --git a/functions/src/domain/place/get/places/GetPlacesUsecase.ts b/functions/src/domain/place/get/places/GetPlacesUsecase.ts index 55a859d..a2ae659 100644 --- a/functions/src/domain/place/get/places/GetPlacesUsecase.ts +++ b/functions/src/domain/place/get/places/GetPlacesUsecase.ts @@ -78,8 +78,9 @@ export async function GetPlacesUsecase(request: GetPlacesUsecaseRequest | string try { - const resultSurcharges = await GetSurchargesRepository(resultPlaceIds) - const franchisesNames = await GetFranchiseRepository() + const [resultSurcharges, franchisesNames] = await Promise.all( + [GetSurchargesRepository(resultPlaceIds), GetFranchiseRepository()] + ) const placesWithSurcharges = resultPlaces.places.map((place) => { diff --git a/functions/src/interface/place/get/places/getPlacesInterface.ts b/functions/src/interface/place/get/places/getPlacesInterface.ts index b946055..d57182e 100644 --- a/functions/src/interface/place/get/places/getPlacesInterface.ts +++ b/functions/src/interface/place/get/places/getPlacesInterface.ts @@ -52,12 +52,15 @@ export const getPlacesInterface = async (request: express.Request, response: Res }) } catch (error: unknown) { + if (error instanceof Error) { if (error.message === "User location is out of New Zealand") { response.status(403).send({ message: error.message }) return } } - response.status(500).send({ message: error }) + + response.status(404).send() + } } \ No newline at end of file