File tree Expand file tree Collapse file tree 8 files changed +29
-24
lines changed
packages/api/src/tasks/checkAlerts Expand file tree Collapse file tree 8 files changed +29
-24
lines changed Original file line number Diff line number Diff line change @@ -27,15 +27,19 @@ import {
2727 getPreviousAlertHistories ,
2828 processAlert ,
2929} from '@/tasks/checkAlerts' ;
30- import { AlertDetails , AlertTaskType , loadProvider } from '@/tasks/providers' ;
30+ import {
31+ AlertDetails ,
32+ AlertTaskType ,
33+ loadProvider ,
34+ } from '@/tasks/checkAlerts/providers' ;
3135import {
3236 AlertMessageTemplateDefaultView ,
3337 buildAlertMessageTemplateHdxLink ,
3438 buildAlertMessageTemplateTitle ,
3539 getDefaultExternalAction ,
3640 renderAlertTemplate ,
3741 translateExternalActionsToInternal ,
38- } from '@/tasks/template' ;
42+ } from '@/tasks/checkAlerts/ template' ;
3943import * as slack from '@/utils/slack' ;
4044
4145// Create provider instance for tests
Original file line number Diff line number Diff line change @@ -6,20 +6,19 @@ import { ObjectId } from '@/models';
66import { AlertSource , AlertThresholdType , IAlert } from '@/models/alert' ;
77import { ISource } from '@/models/source' ;
88import { IWebhook } from '@/models/webhook' ;
9- import CheckAlertTask from '@/tasks/checkAlerts' ;
109import * as checkAlerts from '@/tasks/checkAlerts' ;
10+ import CheckAlertTask from '@/tasks/checkAlerts' ;
1111import {
1212 AlertDetails ,
1313 AlertProvider ,
1414 AlertTaskType ,
1515 loadProvider ,
16- } from '@/tasks/providers' ;
17-
18- import { CheckAlertsTaskArgs } from '../types' ;
16+ } from '@/tasks/checkAlerts/providers' ;
17+ import { CheckAlertsTaskArgs } from '@/tasks/types' ;
1918
20- jest . mock ( '@/tasks/providers' , ( ) => {
19+ jest . mock ( '@/tasks/checkAlerts/ providers' , ( ) => {
2120 return {
22- ...jest . requireActual ( '@/tasks/providers' ) ,
21+ ...jest . requireActual ( '@/tasks/checkAlerts/ providers' ) ,
2322 loadProvider : jest . fn ( ) ,
2423 } ;
2524} ) ;
Original file line number Diff line number Diff line change @@ -15,7 +15,11 @@ import { SavedSearch } from '@/models/savedSearch';
1515import { Source } from '@/models/source' ;
1616import Webhook from '@/models/webhook' ;
1717import { processAlert } from '@/tasks/checkAlerts' ;
18- import { AlertDetails , AlertTaskType , loadProvider } from '@/tasks/providers' ;
18+ import {
19+ AlertDetails ,
20+ AlertTaskType ,
21+ loadProvider ,
22+ } from '@/tasks/checkAlerts/providers' ;
1923import * as slack from '@/utils/slack' ;
2024
2125describe ( 'Single Invocation Alert Test' , ( ) => {
Original file line number Diff line number Diff line change @@ -28,13 +28,14 @@ import {
2828 AlertTask ,
2929 AlertTaskType ,
3030 loadProvider ,
31- } from '@/tasks/providers' ;
31+ } from '@/tasks/checkAlerts/ providers' ;
3232import {
3333 AlertMessageTemplateDefaultView ,
3434 buildAlertMessageTemplateTitle ,
3535 handleSendGenericWebhook ,
3636 renderAlertTemplate ,
37- } from '@/tasks/template' ;
37+ } from '@/tasks/checkAlerts/template' ;
38+ import { tasksTracer } from '@/tasks/tracer' ;
3839import { CheckAlertsTaskArgs , HdxTask } from '@/tasks/types' ;
3940import {
4041 calcAlertDateRange ,
@@ -43,8 +44,6 @@ import {
4344} from '@/tasks/util' ;
4445import logger from '@/utils/logger' ;
4546
46- import { tasksTracer } from './tracer' ;
47-
4847export const doesExceedThreshold = (
4948 thresholdType : AlertThresholdType ,
5049 threshold : number ,
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ import {
1212 AlertProvider ,
1313 AlertTaskType ,
1414 loadProvider ,
15- } from '@/tasks/providers/index ' ;
15+ } from '@/tasks/checkAlerts/providers ' ;
1616
1717const MOCK_SAVED_SEARCH : any = {
1818 id : 'fake-saved-search-id' ,
Original file line number Diff line number Diff line change @@ -19,15 +19,12 @@ import {
1919 type AlertProvider ,
2020 type AlertTask ,
2121 AlertTaskType ,
22- } from '@/tasks/providers' ;
22+ } from '@/tasks/checkAlerts/providers' ;
23+ import { MappedOmit } from '@/tasks/types' ;
2324import { convertMsToGranularityString } from '@/utils/common' ;
2425import logger from '@/utils/logger' ;
2526
26- import {
27- AggregatedAlertHistory ,
28- getPreviousAlertHistories ,
29- } from '../checkAlerts' ;
30- import { MappedOmit } from '../types' ;
27+ import { AggregatedAlertHistory , getPreviousAlertHistories } from '..' ;
3128
3229type PartialAlertDetails = MappedOmit < AlertDetails , 'previous' > ;
3330
Original file line number Diff line number Diff line change @@ -10,11 +10,10 @@ import { IDashboard } from '@/models/dashboard';
1010import { ISavedSearch } from '@/models/savedSearch' ;
1111import { ISource } from '@/models/source' ;
1212import { IWebhook } from '@/models/webhook' ;
13- import DefaultAlertProvider from '@/tasks/providers/default' ;
13+ import DefaultAlertProvider from '@/tasks/checkAlerts/ providers/default' ;
1414import logger from '@/utils/logger' ;
1515
16- import { AggregatedAlertHistory } from '../checkAlerts' ;
17- import { CheckAlertsTaskArgs } from '../types' ;
16+ import { AggregatedAlertHistory } from '..' ;
1817
1918export enum AlertTaskType {
2019 SAVED_SEARCH ,
Original file line number Diff line number Diff line change @@ -24,7 +24,10 @@ import { ISavedSearch } from '@/models/savedSearch';
2424import { ISource } from '@/models/source' ;
2525import { IWebhook } from '@/models/webhook' ;
2626import { doesExceedThreshold } from '@/tasks/checkAlerts' ;
27- import { AlertProvider , PopulatedAlertChannel } from '@/tasks/providers' ;
27+ import {
28+ AlertProvider ,
29+ PopulatedAlertChannel ,
30+ } from '@/tasks/checkAlerts/providers' ;
2831import { escapeJsonString , unflattenObject } from '@/tasks/util' ;
2932import { truncateString } from '@/utils/common' ;
3033import logger from '@/utils/logger' ;
You can’t perform that action at this time.
0 commit comments