Merge pull request #2313 from github/charisk/repo-tasks-store-renaming

Repo tasks store renaming

Author: charisk

extensions/ql-vscode/src/variant-analysis/repo-tasks-store/index.ts

@@ -0,0 +1 @@
+export * from "./repo-tasks-store";

…ysis/store/repo-task-to-domain-mapper.ts …-tasks-store/repo-tasks-domain-mapper.tsextensions/ql-vscode/src/variant-analysis/store/repo-task-to-domain-mapper.ts renamed to extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-domain-mapper.ts extensions/ql-vscode/src/variant-analysis/store/repo-task-to-domain-mapper.ts renamed to extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-domain-mapper.ts

@@ -4,20 +4,22 @@ import {
   VariantAnalysisRepoStatus,
 } from "../shared/variant-analysis";
 import {
-  VariantAnalysisRepositoryTaskData,
-  VariantAnalysisRepoStatusData,
-} from "./repo-task-data-types";
+  VariantAnalysisRepositoryTaskDto,
+  VariantAnalysisRepoStatusDto,
+} from "./repo-tasks-dto";
 
-export function mapRepoTaskToDomain(
-  repoTask: VariantAnalysisRepositoryTaskData,
+export function mapRepoTaskToDomainModel(
+  repoTask: VariantAnalysisRepositoryTaskDto,
 ): VariantAnalysisRepositoryTask {
   return {
     repository: {
       id: repoTask.repository.id,
       fullName: repoTask.repository.fullName,
       private: repoTask.repository.private,
     },
-    analysisStatus: mapRepoTaskAnalysisStatusToDomain(repoTask.analysisStatus),
+    analysisStatus: mapRepoTaskAnalysisStatusToDomainModel(
+      repoTask.analysisStatus,
+    ),
     resultCount: repoTask.resultCount,
     artifactSizeInBytes: repoTask.artifactSizeInBytes,
     failureMessage: repoTask.failureMessage,
@@ -27,21 +29,21 @@ export function mapRepoTaskToDomain(
   };
 }
 
-function mapRepoTaskAnalysisStatusToDomain(
-  analysisStatus: VariantAnalysisRepoStatusData,
+function mapRepoTaskAnalysisStatusToDomainModel(
+  analysisStatus: VariantAnalysisRepoStatusDto,
 ): VariantAnalysisRepoStatus {
   switch (analysisStatus) {
-    case VariantAnalysisRepoStatusData.Pending:
+    case VariantAnalysisRepoStatusDto.Pending:
       return VariantAnalysisRepoStatus.Pending;
-    case VariantAnalysisRepoStatusData.InProgress:
+    case VariantAnalysisRepoStatusDto.InProgress:
       return VariantAnalysisRepoStatus.InProgress;
-    case VariantAnalysisRepoStatusData.Succeeded:
+    case VariantAnalysisRepoStatusDto.Succeeded:
       return VariantAnalysisRepoStatus.Succeeded;
-    case VariantAnalysisRepoStatusData.Failed:
+    case VariantAnalysisRepoStatusDto.Failed:
       return VariantAnalysisRepoStatus.Failed;
-    case VariantAnalysisRepoStatusData.Canceled:
+    case VariantAnalysisRepoStatusDto.Canceled:
       return VariantAnalysisRepoStatus.Canceled;
-    case VariantAnalysisRepoStatusData.TimedOut:
+    case VariantAnalysisRepoStatusDto.TimedOut:
       return VariantAnalysisRepoStatus.TimedOut;
     default:
       assertNever(analysisStatus);

…alysis/store/repo-task-to-data-mapper.ts …epo-tasks-store/repo-tasks-dto-mapper.tsextensions/ql-vscode/src/variant-analysis/store/repo-task-to-data-mapper.ts renamed to extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-dto-mapper.ts extensions/ql-vscode/src/variant-analysis/store/repo-task-to-data-mapper.ts renamed to extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-dto-mapper.ts

@@ -4,20 +4,20 @@ import {
   VariantAnalysisRepoStatus,
 } from "../shared/variant-analysis";
 import {
-  VariantAnalysisRepositoryTaskData,
-  VariantAnalysisRepoStatusData,
-} from "./repo-task-data-types";
+  VariantAnalysisRepositoryTaskDto,
+  VariantAnalysisRepoStatusDto,
+} from "./repo-tasks-dto";
 
-export function mapRepoTaskToData(
+export function mapRepoTaskToDto(
   repoTask: VariantAnalysisRepositoryTask,
-): VariantAnalysisRepositoryTaskData {
+): VariantAnalysisRepositoryTaskDto {
   return {
     repository: {
       id: repoTask.repository.id,
       fullName: repoTask.repository.fullName,
       private: repoTask.repository.private,
     },
-    analysisStatus: mapRepoTaskAnalysisStatusToData(repoTask.analysisStatus),
+    analysisStatus: mapRepoTaskAnalysisStatusToDto(repoTask.analysisStatus),
     resultCount: repoTask.resultCount,
     artifactSizeInBytes: repoTask.artifactSizeInBytes,
     failureMessage: repoTask.failureMessage,
@@ -27,22 +27,22 @@ export function mapRepoTaskToData(
   };
 }
 
-function mapRepoTaskAnalysisStatusToData(
+function mapRepoTaskAnalysisStatusToDto(
   analysisStatus: VariantAnalysisRepoStatus,
-): VariantAnalysisRepoStatusData {
+): VariantAnalysisRepoStatusDto {
   switch (analysisStatus) {
     case VariantAnalysisRepoStatus.Pending:
-      return VariantAnalysisRepoStatusData.Pending;
+      return VariantAnalysisRepoStatusDto.Pending;
     case VariantAnalysisRepoStatus.InProgress:
-      return VariantAnalysisRepoStatusData.InProgress;
+      return VariantAnalysisRepoStatusDto.InProgress;
     case VariantAnalysisRepoStatus.Succeeded:
-      return VariantAnalysisRepoStatusData.Succeeded;
+      return VariantAnalysisRepoStatusDto.Succeeded;
     case VariantAnalysisRepoStatus.Failed:
-      return VariantAnalysisRepoStatusData.Failed;
+      return VariantAnalysisRepoStatusDto.Failed;
     case VariantAnalysisRepoStatus.Canceled:
-      return VariantAnalysisRepoStatusData.Canceled;
+      return VariantAnalysisRepoStatusDto.Canceled;
     case VariantAnalysisRepoStatus.TimedOut:
-      return VariantAnalysisRepoStatusData.TimedOut;
+      return VariantAnalysisRepoStatusDto.TimedOut;
     default:
       assertNever(analysisStatus);
   }

…t-analysis/store/repo-task-data-types.ts …lysis/repo-tasks-store/repo-tasks-dto.tsextensions/ql-vscode/src/variant-analysis/store/repo-task-data-types.ts renamed to extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-dto.ts extensions/ql-vscode/src/variant-analysis/store/repo-task-data-types.ts renamed to extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-dto.ts

@@ -1,6 +1,6 @@
-export interface VariantAnalysisRepositoryTaskData {
-  repository: RepositoryData;
-  analysisStatus: VariantAnalysisRepoStatusData;
+export interface VariantAnalysisRepositoryTaskDto {
+  repository: RepositoryDto;
+  analysisStatus: VariantAnalysisRepoStatusDto;
   resultCount?: number;
   artifactSizeInBytes?: number;
   failureMessage?: string;
@@ -9,13 +9,13 @@ export interface VariantAnalysisRepositoryTaskData {
   artifactUrl?: string;
 }
 
-interface RepositoryData {
+interface RepositoryDto {
   id: number;
   fullName: string;
   private: boolean;
 }
 
-export enum VariantAnalysisRepoStatusData {
+export enum VariantAnalysisRepoStatusDto {
   Pending = "pending",
   InProgress = "inProgress",
   Succeeded = "succeeded",

…ariant-analysis/store/repo-task-store.ts …sis/repo-tasks-store/repo-tasks-store.tsextensions/ql-vscode/src/variant-analysis/store/repo-task-store.ts renamed to extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-store.ts extensions/ql-vscode/src/variant-analysis/store/repo-task-store.ts renamed to extensions/ql-vscode/src/variant-analysis/repo-tasks-store/repo-tasks-store.ts

@@ -1,16 +1,16 @@
 import { outputJson, readJson } from "fs-extra";
 import { join } from "path";
 import { VariantAnalysisRepositoryTask } from "../shared/variant-analysis";
-import { mapRepoTaskToData } from "./repo-task-to-data-mapper";
-import { mapRepoTaskToDomain } from "./repo-task-to-domain-mapper";
+import { mapRepoTaskToDto } from "./repo-tasks-dto-mapper";
+import { mapRepoTaskToDomainModel } from "./repo-tasks-domain-mapper";
 
 export const REPO_TASK_FILENAME = "repo_task.json";
 
 export async function writeRepoTask(
   storageDirectory: string,
   repoTask: VariantAnalysisRepositoryTask,
 ): Promise<void> {
-  const repoTaskData = mapRepoTaskToData(repoTask);
+  const repoTaskData = mapRepoTaskToDto(repoTask);
   await outputJson(join(storageDirectory, REPO_TASK_FILENAME), repoTaskData);
 }
 
@@ -20,5 +20,5 @@ export async function readRepoTask(
   const repoTaskData = await readJson(
     join(storageDirectory, REPO_TASK_FILENAME),
   );
-  return mapRepoTaskToDomain(repoTaskData);
+  return mapRepoTaskToDomainModel(repoTaskData);
 }

extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts

@@ -17,7 +17,7 @@ import {
 import { DisposableObject, DisposeHandler } from "../pure/disposable-object";
 import { EventEmitter } from "vscode";
 import { unzipFile } from "../pure/zip";
-import { readRepoTask, writeRepoTask } from "./store/repo-task-store";
+import { readRepoTask, writeRepoTask } from "./repo-tasks-store";
 
 type CacheKey = `${number}/${string}`;