Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 🐛 error handling when data from api is undefined #1370

Merged
merged 1 commit into from
Oct 20, 2023
Merged

fix: 🐛 error handling when data from api is undefined #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "src",
"version": "0.8.0+60.2",
"version": "0.8.0+61.1",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down Expand Up @@ -81,4 +81,4 @@
"pre-commit": "npm run test && lint-staged"
}
}
}
}
140 changes: 84 additions & 56 deletions src/contexts/market_context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`getTickerStatic error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
}, []);
Expand All @@ -339,10 +342,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// eslint-disable-next-line no-console
console.error(`getTickerLiveStatistics error`, error);
setIsCFDTradable(false);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
}, []);
Expand Down Expand Up @@ -387,10 +393,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`getCFDQuotation error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
}, []);
Expand All @@ -412,10 +421,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`getCFDSuggestion error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
},
Expand Down Expand Up @@ -458,10 +470,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`getGuaranteedStopFeePercentage error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
}, []);
Expand All @@ -485,10 +500,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`listTickers error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
}, []);
Expand All @@ -510,10 +528,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`listTickers error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
}, []);
Expand All @@ -540,10 +561,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`listCurrencies error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
}, []);
Expand Down Expand Up @@ -593,10 +617,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`listMarketTrades error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
},
Expand Down Expand Up @@ -663,18 +690,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// const candlesticks = result.data as IInstCandlestick;
}
} catch (error) {
if (!isCustomError(error)) {
if (result && typeof result === 'object') {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
} else {
result = {
...defaultResultFailed,
code: Code.INTERNAL_SERVER_ERROR,
reason: Reason[Code.INTERNAL_SERVER_ERROR],
};
}
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
return result;
},
Expand Down Expand Up @@ -820,10 +842,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`getWebsiteReserve error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
if (result.success) {
// TODO: 要檢查 string 中的資料是不是 number 樣子的資料 (用 isNumber) (20230914 - Shirley)
Expand Down Expand Up @@ -853,10 +878,13 @@ export const MarketProvider = ({children}: IMarketProvider) => {
// Deprecate: error handle (Tzuhan - 20230321)
// eslint-disable-next-line no-console
console.error(`getTideBitPromotion error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
if (result.success) {
setTidebitPromotion(result.data as ITideBitPromotion);
Expand Down
22 changes: 14 additions & 8 deletions src/contexts/user_context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,13 @@ export const UserProvider = ({children}: IUserProvider) => {
// TODO: error handle (Tzuhan - 20230421)
// eslint-disable-next-line no-console
console.error(`getUserAssets error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
}
return result;
Expand All @@ -498,10 +501,13 @@ export const UserProvider = ({children}: IUserProvider) => {
// TODO: error handle (Tzuhan - 20230421)
// eslint-disable-next-line no-console
console.error(`getBadge error`, error);
if (!isCustomError(error)) {
result.code = Code.INTERNAL_SERVER_ERROR;
result.reason = Reason[result.code];
}
result = {
success: false,
code: isCustomError(error) ? error.code : Code.INTERNAL_SERVER_ERROR,
reason: isCustomError(error)
? Reason[error.code]
: (error as Error)?.message || Reason[Code.INTERNAL_SERVER_ERROR],
};
}
}
return result;
Expand Down