feat: add deviceOs parameter message insteadof device and os

tuanngocptn · May 15, 2024 · c2c1f43 · c2c1f43
1 parent ca077b6
commit c2c1f43
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/src/app.d.ts b/src/app.d.ts
@@ -93,5 +93,6 @@ export type HookMessageDataType = {
  mechanism?: string;
  device?: string;
  os?: string;
+ deviceOs?: string;
  detailLink?: string;
 };
diff --git a/src/app.service.ts b/src/app.service.ts
@@ -32,16 +32,35 @@ export class AppService {
  );
  }
  async getIssueDetail(issueId): Promise<HookMessageDataType> {
- const res = await axios({
+ const { data } = await axios({
  method: 'get',
  url: `https://sentry.io/api/0/organizations/${process.env.SENTRY_ORGANIZATION_SLUG}/issues/${issueId}/tags/`,
  headers: {
  Authorization: `Bearer ${process.env.SENTRY_INTEGRATION_TOKEN}`,
  },
  });
- return res?.data?.reduce(
- (cur, nex) => ({ ...cur, [nex.key]: nex?.topValues?.[0]?.value }),
- {},
- );
+
+ const device = data
+ ?.find((item) => item?.key === 'device')
+ ?.topValues?.map((item) => item?.value);
+
+ const os = data
+ ?.find?.((item) => item?.key === 'os')
+ ?.topValues?.map?.((item) => item?.value);
+
+ const deviceOs = device
+ ?.map?.((item, index) => `${item} (${os?.[index]})`)
+ ?.join?.(', ');
+
+ return data?.reduce(
+ (cur, nex) => ({
+ ...cur,
+ [nex.key]: nex?.topValues
+ ?.map?.((item) => item?.value)
+ ?.filter((item) => !!item)
+ ?.join(', '),
+ }),
+ { deviceOs },
+ ) as HookMessageDataType;
  }
 }
diff --git a/src/app.utils.ts b/src/app.utils.ts
@@ -10,7 +10,7 @@ export function generateHookMessageEn(data: HookMessageDataType) {
 \\- *Position:* ${_data.errorPosition || 'none'}
 \\- *Environment:* ${_data.environment || 'none'}
 \\- *Version:* ${_data.release || 'none'}
-\\- *Devices:* ${_data.device || 'none'} \\(${_data.os || 'none'}\\)
+\\- *Devices:* ${_data.deviceOs || 'none'}
 
 *Detail:* [HERE](${_data.detailLink})
  `;
@@ -26,7 +26,7 @@ export function generateHookMessageVi(data: HookMessageDataType) {
 \\- *Lỗi ở:* ${_data.errorPosition || 'none'}
 \\- *Môi trường:* ${_data.environment || 'none'}
 \\- *Phiên bản:* ${_data.release || 'none'}
-\\- *Thiết bị:* ${_data.device || 'none'} \\(${_data.os || 'none'}\\)
+\\- *Thiết bị:* ${_data.deviceOs || 'none'}
 
 *Xem chi tiết:* [TẠI ĐÂY](${_data.detailLink}) 
  `;