diff --git a/Worker/DataMigrations/AddTelemetryServiceColor.ts b/Worker/DataMigrations/AddTelemetryServiceColor.ts index e304e68604..ac3ec35838 100644 --- a/Worker/DataMigrations/AddTelemetryServiceColor.ts +++ b/Worker/DataMigrations/AddTelemetryServiceColor.ts @@ -2,8 +2,8 @@ import DataMigrationBase from "./DataMigrationBase"; import ArrayUtil from "Common/Utils/Array"; import { BrightColors } from "Common/Types/BrandColors"; import LIMIT_MAX from "Common/Types/Database/LimitMax"; -import TelemetryServiceService from "Common/Server/Services/TelemetryServiceService"; -import TelemetryService from "Common/Models/DatabaseModels/TelemetryService"; +import ServiceService from "Common/Server/Services/ServiceService"; +import Service from "Common/Models/DatabaseModels/Service"; export default class AddTelemetryServiceColor extends DataMigrationBase { public constructor() { @@ -13,8 +13,8 @@ export default class AddTelemetryServiceColor extends DataMigrationBase { public override async migrate(): Promise { // get all the users with email isVerified true. - const services: Array = - await TelemetryServiceService.findBy({ + const services: Array = + await ServiceService.findBy({ query: {}, select: { _id: true, @@ -30,7 +30,7 @@ export default class AddTelemetryServiceColor extends DataMigrationBase { for (const service of services) { if (!service.serviceColor) { service.serviceColor = ArrayUtil.selectItemByRandom(BrightColors); - await TelemetryServiceService.updateOneById({ + await ServiceService.updateOneById({ id: service.id!, data: { serviceColor: service.serviceColor, diff --git a/Worker/DataMigrations/MoveTelemetryServiceTokenToTelemetryIngestionKey.ts b/Worker/DataMigrations/MoveTelemetryServiceTokenToTelemetryIngestionKey.ts index 6554a9407f..6906064bc6 100644 --- a/Worker/DataMigrations/MoveTelemetryServiceTokenToTelemetryIngestionKey.ts +++ b/Worker/DataMigrations/MoveTelemetryServiceTokenToTelemetryIngestionKey.ts @@ -1,9 +1,4 @@ import DataMigrationBase from "./DataMigrationBase"; -import TelemetryServiceService from "Common/Server/Services/TelemetryServiceService"; -import LIMIT_MAX from "Common/Types/Database/LimitMax"; -import TelemetryService from "Common/Models/DatabaseModels/TelemetryService"; -import TelemetryIngestionKey from "Common/Models/DatabaseModels/TelemetryIngestionKey"; -import TelemetryIngestionKeyService from "Common/Server/Services/TelemetryIngestionKeyService"; export default class MoveTelemetryServiceTokenToTelemetryIngestionKey extends DataMigrationBase { public constructor() { @@ -11,39 +6,10 @@ export default class MoveTelemetryServiceTokenToTelemetryIngestionKey extends Da } public override async migrate(): Promise { - // get all telemetry services - - const telemetryService: TelemetryService[] = - await TelemetryServiceService.findBy({ - query: {}, - props: { - isRoot: true, - }, - select: { - projectId: true, - telemetryServiceToken: true, - name: true, - description: true, - }, - limit: LIMIT_MAX, - skip: 0, - }); - - for (const service of telemetryService) { - const telemetryIngestionKey: TelemetryIngestionKey = - new TelemetryIngestionKey(); - telemetryIngestionKey.projectId = service.projectId!; - telemetryIngestionKey.secretKey = service.telemetryServiceToken!; - telemetryIngestionKey.name = service.name!; - telemetryIngestionKey.description = service.description!; - - await TelemetryIngestionKeyService.create({ - data: telemetryIngestionKey, - props: { - isRoot: true, - }, - }); - } + // This migration is no longer needed as the telemetryServiceToken field + // has been removed from the Service model. The migration was used to move + // tokens from TelemetryService to TelemetryIngestionKey. + return; } public override async rollback(): Promise { diff --git a/Worker/package-lock.json b/Worker/package-lock.json index 9c67ea1ea1..3d0e7c2b6e 100644 --- a/Worker/package-lock.json +++ b/Worker/package-lock.json @@ -200,6 +200,7 @@ "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.7", @@ -1641,7 +1642,8 @@ "version": "17.0.45", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@types/prettier": { "version": "2.7.3", @@ -1936,6 +1938,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001646", "electron-to-chromium": "^1.5.4", @@ -5188,6 +5191,7 @@ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "license": "MIT", + "peer": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7",