[#noissue] change json error res format

pinpoint-apm · Jul 12, 2022 · 375c3a2 · 375c3a2
1 parent c756bd1
commit 375c3a2
Show file tree

Hide file tree

Showing 69 changed files with 329 additions and 403 deletions.
diff --git a/.../angular/src/app/core/components/agent-event-view/agent-event-view-container.component.ts b/.../angular/src/app/core/components/agent-event-view/agent-event-view-container.component.ts
@@ -41,7 +41,7 @@ export class AgentEventViewContainerComponent implements OnInit, OnDestroy {
         this.messageQueueService.receiveMessage(this.unsubscribe, MESSAGE_TO.TIMELINE_SELECTED_EVENT_STATUS).pipe(
             switchMap((eventSegment: ITimelineEventSegment) => {
                 return this.agentEventsDataService.getData(eventSegment.startTimestamp, eventSegment.endTimestamp).pipe(
-                    catchError((error: IServerErrorFormat) => {
+                    catchError((error: IServerError) => {
                         this.dynamicPopupService.openPopup({
                             data: {
                                 title: 'Error',

diff --git a/web/src/main/angular/src/app/core/components/agent-info/agent-info-container.component.ts b/web/src/main/angular/src/app/core/components/agent-info/agent-info-container.component.ts
@@ -88,7 +88,7 @@ export class AgentInfoContainerComponent implements OnInit, OnDestroy {
             this.agentData = agentData;
             this.dataRequestSuccess = true;
             this.completed();
-        }, (_: IServerErrorFormat) => {
+        }, (_: IServerError) => {
             this.dataRequestSuccess = false;
             this.completed();
         });

diff --git a/...in/angular/src/app/core/components/alarm-rule-list/alarm-rule-list-container.component.ts b/...in/angular/src/app/core/components/alarm-rule-list/alarm-rule-list-container.component.ts
@@ -80,22 +80,18 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
     }
 
     private loadCheckerList(): void {
-        this.alarmRuleDataService.getCheckerList().subscribe((result: string[] | IServerErrorShortFormat) => {
-            isThatType<IServerErrorShortFormat>(result, 'errorCode', 'errorMessage')
-                ? this.errorMessage = result.errorMessage
-                : this.checkerList = result as string[];
-        }, (error: IServerErrorFormat) => {
-            this.errorMessage = error.exception.message;
+        this.alarmRuleDataService.getCheckerList().subscribe((result: string[]) => {
+            this.checkerList = result as string[];
+        }, (error: IServerError) => {
+            this.errorMessage = error.message;
         });
     }
 
     private loadUserGroupList(): void {
-        this.userGroupDataSerivce.retrieve().subscribe((result: IUserGroup[] | IServerErrorShortFormat) => {
-            isThatType<IServerErrorShortFormat>(result, 'errorCode', 'errorMessage')
-                ? this.errorMessage = result.errorMessage
-                : this.userGroupList = result.map((userGroup: IUserGroup) => userGroup.id);
-        }, (error: IServerErrorFormat) => {
-            this.errorMessage = error.exception.message;
+        this.userGroupDataSerivce.retrieve().subscribe((result: IUserGroup[]) => {
+            this.userGroupList = result.map((userGroup: IUserGroup) => userGroup.id);
+        }, (error: IServerError) => {
+            this.errorMessage = error.message;
         });
     }
 
@@ -145,14 +141,12 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
 
     private getAlarmData(): void {
         this.showProcessing();
-        this.alarmRuleDataService.retrieve(this.selectedApplication.getApplicationName()).subscribe((result: IAlarmRule[] | IServerErrorShortFormat) => {
-            isThatType<IServerErrorShortFormat>(result, 'errorCode', 'errorMessage')
-                ? this.errorMessage = result.errorMessage
-                : this.alarmRuleList = result;
+        this.alarmRuleDataService.retrieve(this.selectedApplication.getApplicationName()).subscribe((result: IAlarmRule[]) => {
+            this.alarmRuleList = result;
             this.hideProcessing();
-        }, (error: IServerErrorFormat) => {
+        }, (error: IServerError) => {
             this.hideProcessing();
-            this.errorMessage = error.exception.message;
+            this.errorMessage = error.message;
         });
     }
 
@@ -169,32 +163,22 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
             forkJoin(
                 this.webhookDataService.getWebhookListByAppId(this.selectedApplication.applicationName),
                 this.webhookDataService.getWebhookListByAlarmId(this.editAlarm.ruleId),
-            ).subscribe(([webhookList, checkedWebhookList]: IWebhook[][] | IServerErrorShortFormat[]) => {
-                if (isThatType<IServerErrorShortFormat>(webhookList, 'errorCode', 'errorMessage')) {
-                    this.errorMessage = webhookList.errorMessage;
-                } else if (isThatType<IServerErrorShortFormat>(checkedWebhookList, 'errorCode', 'errorMessage')) {
-                    this.errorMessage = checkedWebhookList.errorMessage;
-                } else {
-                    this.webhookList = webhookList;
-                    this.checkedWebhookList = checkedWebhookList.map(({webhookId}) => webhookId);
-                }
+            ).subscribe(([webhookList, checkedWebhookList]: IWebhook[][]) => {
+                this.webhookList = webhookList;
+                this.checkedWebhookList = checkedWebhookList.map(({webhookId}) => webhookId);
 
                 blockWebhook(false);
-            }, (error: IServerErrorFormat) => {
-                this.errorMessage = error.exception.message;
+            }, (error: IServerError) => {
+                this.errorMessage = error.message;
                 blockWebhook(false);
             });
         } else {
-            this.webhookDataService.getWebhookListByAppId(this.selectedApplication.applicationName).subscribe((result: IWebhook[] | IServerErrorShortFormat) => {
-                if (isThatType<IServerErrorShortFormat>(result, 'errorCode', 'errorMessage')) {
-                    this.errorMessage = result.errorMessage;
-                } else {
-                    this.webhookList = result;
-                }
+            this.webhookDataService.getWebhookListByAppId(this.selectedApplication.applicationName).subscribe((result: IWebhook[]) => {
+                this.webhookList = result;
 
                 blockWebhook(false);
-            }, (error: IServerErrorFormat) => {
-                this.errorMessage = error.exception.message;
+            }, (error: IServerError) => {
+                this.errorMessage = error.message;
                 blockWebhook(false);
             });
         }
@@ -221,17 +205,12 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
             ? this.alarmRuleDataService.createWithWebhook(param as IAlarmWithWebhook)
             : this.alarmRuleDataService.create(param);
 
-        postAlarmRule.subscribe((response: IAlarmRuleCreated | IServerErrorShortFormat) => {
-            if (isThatType<IServerErrorShortFormat>(response, 'errorCode', 'errorMessage')) {
-                this.errorMessage = response.errorMessage;
-                this.hideProcessing();
-            } else {
-                this.getAlarmData();
-                this.analyticsService.trackEvent(TRACKED_EVENT_LIST.CREATE_ALARM);
-            }
-        }, (error: IServerErrorFormat) => {
+        postAlarmRule.subscribe((response: IAlarmRuleCreated) => {
+            this.getAlarmData();
+            this.analyticsService.trackEvent(TRACKED_EVENT_LIST.CREATE_ALARM);
+        }, (error: IServerError) => {
             this.hideProcessing();
-            this.errorMessage = error.exception.message;
+            this.errorMessage = error.message;
         });
     }
 
@@ -259,17 +238,12 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
             ? this.alarmRuleDataService.updateWithWebhook(param as IAlarmWithWebhook)
             : this.alarmRuleDataService.update(param as IAlarmRule);
 
-        putAlarmRule.subscribe((response: IAlarmRuleResponse | IServerErrorShortFormat) => {
-            if (isThatType<IServerErrorShortFormat>(response, 'errorCode', 'errorMessage')) {
-                this.errorMessage = (response as IServerErrorShortFormat).errorMessage;
-                this.hideProcessing();
-            } else {
-                this.getAlarmData();
-                this.analyticsService.trackEvent(TRACKED_EVENT_LIST.UPDATE_ALARM);
-            }
-        }, (error: IServerErrorFormat) => {
+        putAlarmRule.subscribe((response: IAlarmRuleResponse) => {
+            this.getAlarmData();
+            this.analyticsService.trackEvent(TRACKED_EVENT_LIST.UPDATE_ALARM);
+        }, (error: IServerError) => {
             this.hideProcessing();
-            this.errorMessage = error.exception.message;
+            this.errorMessage = error.message;
         });
     }
 
@@ -300,17 +274,12 @@ export class AlarmRuleListContainerComponent implements OnInit, OnDestroy {
             applicationId: this.selectedApplication.getApplicationName(),
         };
 
-        this.alarmRuleDataService.remove(params).subscribe((response: IAlarmRuleResponse | IServerErrorShortFormat) => {
-            if (isThatType<IServerErrorShortFormat>(response, 'errorCode', 'errorMessage')) {
-                this.errorMessage = (response as IServerErrorShortFormat).errorMessage;
-                this.hideProcessing();
-            } else {
-                this.getAlarmData();
-                this.analyticsService.trackEvent(TRACKED_EVENT_LIST.REMOVE_ALARM);
-            }
-        }, (error: IServerErrorFormat) => {
+        this.alarmRuleDataService.remove(params).subscribe((response: IAlarmRuleResponse) => {
+            this.getAlarmData();
+            this.analyticsService.trackEvent(TRACKED_EVENT_LIST.REMOVE_ALARM);
+        }, (error: IServerError) => {
             this.hideProcessing();
-            this.errorMessage = error.exception.message;
+            this.errorMessage = error.message;
         });
     }
 

diff --git a/.../components/application-list/application-list-for-agent-management-container.component.ts b/.../components/application-list/application-list-for-agent-management-container.component.ts
@@ -102,7 +102,7 @@ export class ApplicationListForAgentManagementContainerComponent implements OnIn
 
         this.storeHelperService.getApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {

diff --git a/...mponents/application-list/application-list-for-configuration-alarm-container.component.ts b/...mponents/application-list/application-list-for-configuration-alarm-container.component.ts
@@ -87,7 +87,7 @@ export class ApplicationListForConfigurationAlarmContainerComponent implements O
 
         this.storeHelperService.getApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {

diff --git a/...ore/components/application-list/application-list-for-configuration-container.component.ts b/...ore/components/application-list/application-list-for-configuration-container.component.ts
@@ -95,7 +95,7 @@ export class ApplicationListForConfigurationContainerComponent implements OnInit
 
         this.storeHelperService.getApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {
@@ -114,7 +114,7 @@ export class ApplicationListForConfigurationContainerComponent implements OnInit
 
         this.storeHelperService.getFavoriteApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {
@@ -133,7 +133,7 @@ export class ApplicationListForConfigurationContainerComponent implements OnInit
 
         this.storeHelperService.getFavoriteApplicationAddError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {

diff --git a/...onents/application-list/application-list-for-configuration-webhook-container.component.ts b/...onents/application-list/application-list-for-configuration-webhook-container.component.ts
@@ -88,7 +88,7 @@ export class ApplicationListForConfigurationWebhookContainerComponent implements
 
         this.storeHelperService.getApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {

diff --git a/...c/app/core/components/application-list/application-list-for-header-container.component.ts b/...c/app/core/components/application-list/application-list-for-header-container.component.ts
@@ -125,7 +125,7 @@ export class ApplicationListForHeaderContainerComponent implements OnInit, After
 
         this.storeHelperService.getApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {
@@ -144,7 +144,7 @@ export class ApplicationListForHeaderContainerComponent implements OnInit, After
 
         this.storeHelperService.getFavoriteApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {

diff --git a/...nents/application-list/favorite-application-list-for-configuration-container.component.ts b/...nents/application-list/favorite-application-list-for-configuration-container.component.ts
@@ -92,19 +92,19 @@ export class FavoriteApplicationListForConfigurationContainerComponent implement
 
         this.storeHelperService.getApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
         });
 
         this.storeHelperService.getFavoriteApplicationListError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
         });
 
         this.storeHelperService.getFavoriteApplicationRemoveError().pipe(
             takeUntil(this.unsubscribe)
-        ).subscribe((error: IServerErrorFormat) => {
+        ).subscribe((error: IServerError) => {
             this.hideProcessing();
             this.dynamicPopupService.openPopup({
                 data: {

diff --git a/...onents/configuration-agent-statistic/configuration-agent-statistic-container.component.ts b/...onents/configuration-agent-statistic/configuration-agent-statistic-container.component.ts
@@ -81,7 +81,7 @@ export class ConfigurationAgentStatisticContainerComponent implements OnInit, On
         this.agentStatisticDataService.getData().subscribe((agentList: IAgentList) => {
             this.storeHelperService.dispatch(new Actions.UpdateAdminAgentList(agentList));
             this.hideProcessing();
-        }, (error: IServerErrorFormat) => {
+        }, (error: IServerError) => {
             this.dynamicPopupService.openPopup({
                 data: {
                     title: 'Error',

diff --git a/...tion-inspector-chart-manager/configuration-inspector-chart-manager-container.component.ts b/...tion-inspector-chart-manager/configuration-inspector-chart-manager-container.component.ts
@@ -22,7 +22,7 @@ export class ConfigurationInspectorChartManagerContainerComponent implements OnI
             takeUntil(this.unsubscribe)
         ).subscribe((applicationData: {[key: string]: IChartLayoutInfo[]}) => {
             this.storeHelperService.dispatch(new Actions.UpdateApplicationInspectorChartLayout(applicationData));
-        }, (error: IServerErrorFormat) => {
+        }, (error: IServerError) => {
             this.storeHelperService.dispatch(new Actions.UpdateApplicationInspectorChartLayout({
                 applicationInspectorChart: []
             }));
@@ -31,7 +31,7 @@ export class ConfigurationInspectorChartManagerContainerComponent implements OnI
             takeUntil(this.unsubscribe)
         ).subscribe((agentData: {[key: string]: IChartLayoutInfo[]}) => {
             this.storeHelperService.dispatch(new Actions.UpdateAgentInspectorChartLayout(agentData));
-        }, (error: IServerErrorFormat) => {
+        }, (error: IServerError) => {
             this.storeHelperService.dispatch(new Actions.UpdateAgentInspectorChartLayout({
                 applicationInspectorChart: []
             }));

diff --git a/...e/components/configuration-installation/configuration-installation-container.component.ts b/...e/components/configuration-installation/configuration-installation-container.component.ts
@@ -48,7 +48,7 @@ export class ConfigurationInstallationContainerComponent implements OnInit {
                     return data.code === 0;
                 }),
                 pluck('message'),
-                catchError((error: IServerErrorFormat) => {
+                catchError((error: IServerError) => {
                     this.dynamicPopupService.openPopup({
                         data: {
                             title: 'Error',

diff --git a/...c/app/core/components/duplication-check/agent-id-duplication-check-container.component.ts b/...c/app/core/components/duplication-check/agent-id-duplication-check-container.component.ts
@@ -67,8 +67,8 @@ export class AgentIdDuplicationCheckContainerComponent implements OnInit {
             pluck('value')
         ).subscribe((value: string) => {
             this.onCheckSuccess(value, '');
-        }, (error: IServerErrorFormat) => {
-            this.onCheckFail(error.exception.message);
+        }, (error: IServerError) => {
+            this.onCheckFail(error.message);
         });
         this.analyticsService.trackEvent(TRACKED_EVENT_LIST.CHECK_AGENT_NAME_DUPLICATION);
     }

diff --git a/...re/components/duplication-check/application-name-duplication-check-container.component.ts b/...re/components/duplication-check/application-name-duplication-check-container.component.ts
@@ -67,8 +67,8 @@ export class ApplicationNameDuplicationCheckContainerComponent implements OnInit
             pluck('value')
         ).subscribe((value: string) => {
             this.onCheckSuccess(value, '');
-        }, (error: IServerErrorFormat) => {
-            this.onCheckFail(error.exception.message);
+        }, (error: IServerError) => {
+            this.onCheckFail(error.message);
         });
         this.analyticsService.trackEvent(TRACKED_EVENT_LIST.CHECK_APPLICATION_NAME_DUPLICATION);
     }