github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

Update import statements and remove unused code

Browse Source
This commit is contained in:
Simon Larsen
2023-12-22 17:15:14 +00:00
parent e08d2bb8eb
commit fdb64c5cd9
4 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CommonServer/Services/MonitorService.ts
View File

@@ -16,7 +16,6 @@ import MonitorProbe from 'Model/Models/MonitorProbe';
import MonitorProbeService from './MonitorProbeService';
import MonitorType from 'Common/Types/Monitor/MonitorType';
import Probe from 'Model/Models/Probe';
import ActiveMonitoringMeteredPlan from '../Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan';
import { IsBillingEnabled } from '../EnvironmentConfig';
import MonitorOwnerUserService from './MonitorOwnerUserService';
import MonitorOwnerUser from 'Model/Models/MonitorOwnerUser';
@@ -29,6 +28,7 @@ import URL from 'Common/Types/API/URL';
import { JSONObject } from 'Common/Types/JSON';
import SortOrder from 'Common/Types/BaseDatabase/SortOrder';
import DatabaseConfig from '../DatabaseConfig';
import { ActiveMonitoringMeteredPlan } from '../Types/Billing/MeteredPlan/AllMeteredPlans';
export class Service extends DatabaseService<Model> {
public constructor(postgresDatabase?: PostgresDatabase) {

32
CommonServer/Tests/Services/BillingService.test.ts
View File

@@ -33,6 +33,7 @@ import {
PaymentMethodsResponse,
Subscription,
} from '../TestingUtils/Services/Types';
import { ActiveMonitoringMeteredPlan } from '../../Types/Billing/MeteredPlan/AllMeteredPlans';
describe('BillingService', () => {
let billingService: BillingService;
@@ -639,20 +640,13 @@ describe('BillingService', () => {
const quantity: number = 10;
it('should throw if billing is not enabled', async () => {
const subscriptionItem: SubscriptionItem | undefined =
mockSubscription.items.data[0];
const meteredPlan: MeteredPlan = new MeteredPlan({
priceId: subscriptionItem?.price?.id || '',
pricePerUnitInUSD: 100,
unitName: 'unit'
});
billingService = mockIsBillingEnabled(false);
await expect(
billingService.addOrUpdateMeteredPricingOnSubscription(
mockSubscription.id,
meteredPlan,
ActiveMonitoringMeteredPlan,
quantity
)
).rejects.toThrow(Errors.BillingService.BILLING_NOT_ENABLED);
@@ -681,7 +675,7 @@ describe('BillingService', () => {
await billingService.addOrUpdateMeteredPricingOnSubscription(
mockSubscription.id,
meteredPlan,
ActiveMonitoringMeteredPlan,
quantity
);
@@ -702,11 +696,6 @@ describe('BillingService', () => {
it('should successfully update existing metered pricing on a subscription', async () => {
const subscriptionItem: SubscriptionItem | undefined =
mockSubscription.items.data[0];
const meteredPlan: MeteredPlan = new MeteredPlan({
priceId: subscriptionItem?.price?.id || '',
pricePerUnitInUSD: 100,
unitName: 'unit'
});
mockStripe.subscriptions.retrieve = jest
.fn()
@@ -717,7 +706,7 @@ describe('BillingService', () => {
await billingService.addOrUpdateMeteredPricingOnSubscription(
mockSubscription.id,
meteredPlan,
ActiveMonitoringMeteredPlan,
quantity
);
@@ -732,13 +721,8 @@ describe('BillingService', () => {
});
it('should handle non-existent subscription', async () => {
const subscriptionItem: SubscriptionItem | undefined =
mockSubscription.items.data[0];
const meteredPlan: MeteredPlan = new MeteredPlan({
priceId: subscriptionItem?.price?.id || '',
pricePerUnitInUSD: 100,
unitName: 'unit'
});
const subscriptionId: string = 'sub_nonexistent';
mockStripe.subscriptions.retrieve = jest
@@ -748,7 +732,7 @@ describe('BillingService', () => {
await expect(
billingService.addOrUpdateMeteredPricingOnSubscription(
subscriptionId,
meteredPlan,
ActiveMonitoringMeteredPlan,
quantity
)
).rejects.toThrow(Errors.BillingService.SUBSCRIPTION_NOT_FOUND);

17
CommonServer/Types/Billing/MeteredPlan/AllMeteredPlans.ts
View File

@@ -1,13 +1,18 @@
import ActiveMonitoringMeteredPlan from './ActiveMonitoringMeteredPlan';
import ActiveMonitoringMeteredPlanType from './ActiveMonitoringMeteredPlan';
import ServerMeteredPlan from './ServerMeteredPlan';
import TelemetryMeteredPlan from './TelemetryMeteredPlan';
import TelemetryMeteredPlanType from './TelemetryMeteredPlan';
import { ProductType } from 'Model/Models/UsageBilling';
export const ActiveMonitoringMeteredPlan:ActiveMonitoringMeteredPlanType = new ActiveMonitoringMeteredPlanType();
export const LogDataIngestMeteredPlan:TelemetryMeteredPlanType = new TelemetryMeteredPlanType(ProductType.Logs);
export const MetricsDataIngestMeteredPlan: TelemetryMeteredPlanType = new TelemetryMeteredPlanType(ProductType.Metrics);
export const TracesDataIngestMetredPlan: TelemetryMeteredPlanType = new TelemetryMeteredPlanType(ProductType.Traces);
const AllMeteredPlans: Array<ServerMeteredPlan> = [
new ActiveMonitoringMeteredPlan(),
new TelemetryMeteredPlan(ProductType.Logs),
new TelemetryMeteredPlan(ProductType.Metrics),
new TelemetryMeteredPlan(ProductType.Traces),
ActiveMonitoringMeteredPlan,
LogDataIngestMeteredPlan,
MetricsDataIngestMeteredPlan,
TracesDataIngestMetredPlan
];
export default AllMeteredPlans;

2
CommonServer/Types/Billing/MeteredPlan/ServerMeteredPlan.ts
View File

@@ -9,7 +9,7 @@ export default class ServerMeteredPlan {
throw new NotImplementedException();
}
public getMeteredPlan(projectId: ObjectID): MeteredPlan {
public getMeteredPlan(_projectId: ObjectID): MeteredPlan {
throw new NotImplementedException();
}