From 00b3726407ef034782a509d390ab2a5eeb48993c Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Mon, 8 May 2023 21:29:00 +0100 Subject: [PATCH] refactor paths --- Probe/Jobs/Monitor/FetchList.ts | 2 +- Probe/Tests/Utils/PingMonitor.test.ts | 2 +- Probe/Utils/{ => Monitors}/Monitor.ts | 6 +++--- Probe/Utils/{ => Monitors/MonitorTypes}/ApiMonitor.ts | 0 Probe/Utils/{ => Monitors/MonitorTypes}/PingMonitor.ts | 0 Probe/Utils/{ => Monitors/MonitorTypes}/SslMonitor.ts | 0 Probe/Utils/{ => Monitors/MonitorTypes}/WebsiteMonitor.ts | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename Probe/Utils/{ => Monitors}/Monitor.ts (93%) rename Probe/Utils/{ => Monitors/MonitorTypes}/ApiMonitor.ts (100%) rename Probe/Utils/{ => Monitors/MonitorTypes}/PingMonitor.ts (100%) rename Probe/Utils/{ => Monitors/MonitorTypes}/SslMonitor.ts (100%) rename Probe/Utils/{ => Monitors/MonitorTypes}/WebsiteMonitor.ts (100%) diff --git a/Probe/Jobs/Monitor/FetchList.ts b/Probe/Jobs/Monitor/FetchList.ts index 85c56d87ed..50832b470b 100644 --- a/Probe/Jobs/Monitor/FetchList.ts +++ b/Probe/Jobs/Monitor/FetchList.ts @@ -8,7 +8,7 @@ import HTTPErrorResponse from 'Common/Types/API/HTTPErrorResponse'; import Monitor from 'Model/Models/Monitor'; import HTTPMethod from 'Common/Types/API/HTTPMethod'; import ProbeAPIRequest from '../../Utils/ProbeAPIRequest'; -import MonitorUtil from '../../Utils/Monitor'; +import MonitorUtil from '../../Utils/Monitors/Monitor'; import logger from 'CommonServer/Utils/Logger'; RunCron( diff --git a/Probe/Tests/Utils/PingMonitor.test.ts b/Probe/Tests/Utils/PingMonitor.test.ts index 6c24c4e54e..76a0a6a928 100644 --- a/Probe/Tests/Utils/PingMonitor.test.ts +++ b/Probe/Tests/Utils/PingMonitor.test.ts @@ -1,7 +1,7 @@ import Hostname from 'Common/Types/API/Hostname'; import IPv4 from 'Common/Types/IP/IPv4'; import PositiveNumber from 'Common/Types/PositiveNumber'; -import Ping, { PingResponse } from '../../Utils/PingMonitor'; +import Ping, { PingResponse } from '../../Utils/Monitors/MonitorTypes/PingMonitor'; describe('Ping', () => { jest.setTimeout(10000); diff --git a/Probe/Utils/Monitor.ts b/Probe/Utils/Monitors/Monitor.ts similarity index 93% rename from Probe/Utils/Monitor.ts rename to Probe/Utils/Monitors/Monitor.ts index 20feb9951e..c77fbd380a 100644 --- a/Probe/Utils/Monitor.ts +++ b/Probe/Utils/Monitors/Monitor.ts @@ -2,12 +2,12 @@ import MonitorStep from 'Common/Types/Monitor/MonitorStep'; import MonitorType from 'Common/Types/Monitor/MonitorType'; import ProbeMonitorResponse from 'Common/Types/Probe/ProbeMonitorResponse'; import Monitor from 'Model/Models/Monitor'; -import PingMonitor, { PingResponse } from './PingMonitor'; +import PingMonitor, { PingResponse } from './MonitorTypes/PingMonitor'; import API from 'Common/Utils/API'; import HTTPMethod from 'Common/Types/API/HTTPMethod'; import URL from 'Common/Types/API/URL'; -import { PROBE_API_URL } from '../Config'; -import ProbeAPIRequest from './ProbeAPIRequest'; +import { PROBE_API_URL } from '../../Config'; +import ProbeAPIRequest from '../ProbeAPIRequest'; import { JSONObject } from 'Common/Types/JSON'; export default class MonitorUtil { diff --git a/Probe/Utils/ApiMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts similarity index 100% rename from Probe/Utils/ApiMonitor.ts rename to Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts diff --git a/Probe/Utils/PingMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts similarity index 100% rename from Probe/Utils/PingMonitor.ts rename to Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts diff --git a/Probe/Utils/SslMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts similarity index 100% rename from Probe/Utils/SslMonitor.ts rename to Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts diff --git a/Probe/Utils/WebsiteMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts similarity index 100% rename from Probe/Utils/WebsiteMonitor.ts rename to Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts