From 296cbe1619fd83324b14a1628ad725f2bf98d44f Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Thu, 13 Apr 2023 09:32:40 +0000 Subject: [PATCH] Rename repo states DTOs --- .../repo-states-data-types.ts | 12 ------------ .../repo-states-store/repo-states-dto.ts | 12 ++++++++++++ .../repo-states-store/repo-states-store.ts | 4 ++-- .../repo-states-to-data-mapper.ts | 16 ++++++++-------- .../repo-states-to-domain-mapper.ts | 18 +++++++++--------- 5 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-data-types.ts create mode 100644 extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-dto.ts diff --git a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-data-types.ts b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-data-types.ts deleted file mode 100644 index 17d6fc334..000000000 --- a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-data-types.ts +++ /dev/null @@ -1,12 +0,0 @@ -export interface VariantAnalysisScannedRepositoryStateData { - repositoryId: number; - downloadStatus: VariantAnalysisScannedRepositoryDownloadData; - downloadPercentage?: number; -} - -export enum VariantAnalysisScannedRepositoryDownloadData { - Pending = "pending", - InProgress = "inProgress", - Succeeded = "succeeded", - Failed = "failed", -} diff --git a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-dto.ts b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-dto.ts new file mode 100644 index 000000000..4425bf853 --- /dev/null +++ b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-dto.ts @@ -0,0 +1,12 @@ +export interface VariantAnalysisScannedRepositoryStateDto { + repositoryId: number; + downloadStatus: VariantAnalysisScannedRepositoryDownloadDto; + downloadPercentage?: number; +} + +export enum VariantAnalysisScannedRepositoryDownloadDto { + Pending = "pending", + InProgress = "inProgress", + Succeeded = "succeeded", + Failed = "failed", +} diff --git a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-store.ts b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-store.ts index 1477e4387..245cc2c60 100644 --- a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-store.ts +++ b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-store.ts @@ -1,6 +1,6 @@ import { outputJson, readJson } from "fs-extra"; import { VariantAnalysisScannedRepositoryState } from "../shared/variant-analysis"; -import { VariantAnalysisScannedRepositoryStateData } from "./repo-states-data-types"; +import { VariantAnalysisScannedRepositoryStateDto } from "./repo-states-dto"; import { mapRepoStateToData } from "./repo-states-to-data-mapper"; import { mapRepoStateToDomain } from "./repo-states-to-domain-mapper"; @@ -26,7 +26,7 @@ export async function readRepoStates( try { const repoStatesData: Record< number, - VariantAnalysisScannedRepositoryStateData + VariantAnalysisScannedRepositoryStateDto > = await readJson(storagePath); // Map from repoStates Data type to the repoStates Domain type diff --git a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-to-data-mapper.ts b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-to-data-mapper.ts index a6853eeb1..253b4c0be 100644 --- a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-to-data-mapper.ts +++ b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-to-data-mapper.ts @@ -4,13 +4,13 @@ import { VariantAnalysisScannedRepositoryState, } from "../shared/variant-analysis"; import { - VariantAnalysisScannedRepositoryDownloadData, - VariantAnalysisScannedRepositoryStateData, -} from "./repo-states-data-types"; + VariantAnalysisScannedRepositoryDownloadDto, + VariantAnalysisScannedRepositoryStateDto, +} from "./repo-states-dto"; export function mapRepoStateToData( repoState: VariantAnalysisScannedRepositoryState, -): VariantAnalysisScannedRepositoryStateData { +): VariantAnalysisScannedRepositoryStateDto { return { repositoryId: repoState.repositoryId, downloadStatus: processDownloadStatus(repoState.downloadStatus), @@ -23,13 +23,13 @@ function processDownloadStatus( ) { switch (downloadedStatus) { case VariantAnalysisScannedRepositoryDownloadStatus.Pending: - return VariantAnalysisScannedRepositoryDownloadData.Pending; + return VariantAnalysisScannedRepositoryDownloadDto.Pending; case VariantAnalysisScannedRepositoryDownloadStatus.InProgress: - return VariantAnalysisScannedRepositoryDownloadData.InProgress; + return VariantAnalysisScannedRepositoryDownloadDto.InProgress; case VariantAnalysisScannedRepositoryDownloadStatus.Succeeded: - return VariantAnalysisScannedRepositoryDownloadData.Succeeded; + return VariantAnalysisScannedRepositoryDownloadDto.Succeeded; case VariantAnalysisScannedRepositoryDownloadStatus.Failed: - return VariantAnalysisScannedRepositoryDownloadData.Failed; + return VariantAnalysisScannedRepositoryDownloadDto.Failed; default: assertNever(downloadedStatus); } diff --git a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-to-domain-mapper.ts b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-to-domain-mapper.ts index 928d2f9c5..c0b6ca604 100644 --- a/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-to-domain-mapper.ts +++ b/extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-to-domain-mapper.ts @@ -4,12 +4,12 @@ import { VariantAnalysisScannedRepositoryDownloadStatus, } from "../shared/variant-analysis"; import { - VariantAnalysisScannedRepositoryStateData, - VariantAnalysisScannedRepositoryDownloadData, -} from "./repo-states-data-types"; + VariantAnalysisScannedRepositoryStateDto, + VariantAnalysisScannedRepositoryDownloadDto, +} from "./repo-states-dto"; export function mapRepoStateToDomain( - repoState: VariantAnalysisScannedRepositoryStateData, + repoState: VariantAnalysisScannedRepositoryStateDto, ): VariantAnalysisScannedRepositoryState { return { repositoryId: repoState.repositoryId, @@ -19,16 +19,16 @@ export function mapRepoStateToDomain( } function processDownloadStatus( - downloadedStatus: VariantAnalysisScannedRepositoryDownloadData, + downloadedStatus: VariantAnalysisScannedRepositoryDownloadDto, ) { switch (downloadedStatus) { - case VariantAnalysisScannedRepositoryDownloadData.Pending: + case VariantAnalysisScannedRepositoryDownloadDto.Pending: return VariantAnalysisScannedRepositoryDownloadStatus.Pending; - case VariantAnalysisScannedRepositoryDownloadData.InProgress: + case VariantAnalysisScannedRepositoryDownloadDto.InProgress: return VariantAnalysisScannedRepositoryDownloadStatus.InProgress; - case VariantAnalysisScannedRepositoryDownloadData.Succeeded: + case VariantAnalysisScannedRepositoryDownloadDto.Succeeded: return VariantAnalysisScannedRepositoryDownloadStatus.Succeeded; - case VariantAnalysisScannedRepositoryDownloadData.Failed: + case VariantAnalysisScannedRepositoryDownloadDto.Failed: return VariantAnalysisScannedRepositoryDownloadStatus.Failed; default: assertNever(downloadedStatus);