Move local query mappers to separate files (#2322)

Author: charisk

extensions/ql-vscode/src/query-history/store/query-history-domain-mapper.ts

@@ -1,25 +1,7 @@
 import { assertNever } from "../../pure/helpers-pure";
-import {
-  LocalQueryInfo,
-  InitialQueryInfo,
-  CompletedQueryInfo,
-} from "../../query-results";
-import { QueryEvaluationInfo } from "../../run-queries-shared";
 import { QueryHistoryInfo } from "../query-history-info";
-import {
-  QueryHistoryLocalQueryDto,
-  InitialQueryInfoDto,
-  QueryEvaluationInfoDto,
-  CompletedQueryInfoDto,
-  SortedResultSetInfoDto,
-  SortDirectionDto,
-} from "./query-history-local-query-dto";
+import { mapLocalQueryInfoToDto } from "./query-history-local-query-domain-mapper";
 import { QueryHistoryItemDto } from "./query-history-dto";
-import {
-  RawResultsSortState,
-  SortDirection,
-  SortedResultSetInfo,
-} from "../../pure/interface-types";
 import { mapQueryHistoryVariantAnalysisToDto } from "./query-history-variant-analysis-domain-mapper";
 
 export function mapQueryHistoryToDto(
@@ -35,105 +17,3 @@ export function mapQueryHistoryToDto(
     }
   });
 }
-
-function mapLocalQueryInfoToDto(
-  query: LocalQueryInfo,
-): QueryHistoryLocalQueryDto {
-  return {
-    initialInfo: mapInitialQueryInfoToDto(query.initialInfo),
-    t: "local",
-    evalLogLocation: query.evalLogLocation,
-    evalLogSummaryLocation: query.evalLogSummaryLocation,
-    jsonEvalLogSummaryLocation: query.jsonEvalLogSummaryLocation,
-    evalLogSummarySymbolsLocation: query.evalLogSummarySymbolsLocation,
-    failureReason: query.failureReason,
-    completedQuery:
-      query.completedQuery && mapCompletedQueryToDto(query.completedQuery),
-  };
-}
-
-function mapCompletedQueryToDto(
-  query: CompletedQueryInfo,
-): CompletedQueryInfoDto {
-  const sortedResults = Object.fromEntries(
-    Object.entries(query.sortedResultsInfo).map(([key, value]) => {
-      return [key, mapSortedResultSetInfoToDto(value)];
-    }),
-  );
-
-  return {
-    query: mapQueryEvaluationInfoToDto(query.query),
-    result: {
-      runId: query.result.runId,
-      queryId: query.result.queryId,
-      resultType: query.result.resultType,
-      evaluationTime: query.result.evaluationTime,
-      message: query.result.message,
-      logFileLocation: query.result.logFileLocation,
-    },
-    logFileLocation: query.logFileLocation,
-    successful: query.successful,
-    message: query.message,
-    resultCount: query.resultCount,
-    sortedResultsInfo: sortedResults,
-  };
-}
-
-function mapSortDirectionToDto(sortDirection: SortDirection): SortDirectionDto {
-  switch (sortDirection) {
-    case SortDirection.asc:
-      return SortDirectionDto.asc;
-    case SortDirection.desc:
-      return SortDirectionDto.desc;
-  }
-}
-
-function mapRawResultsSortStateToDto(
-  sortState: RawResultsSortState,
-): SortedResultSetInfoDto["sortState"] {
-  return {
-    columnIndex: sortState.columnIndex,
-    sortDirection: mapSortDirectionToDto(sortState.sortDirection),
-  };
-}
-
-function mapSortedResultSetInfoToDto(
-  resultSet: SortedResultSetInfo,
-): SortedResultSetInfoDto {
-  return {
-    resultsPath: resultSet.resultsPath,
-    sortState: mapRawResultsSortStateToDto(resultSet.sortState),
-  };
-}
-
-function mapInitialQueryInfoToDto(
-  localQueryInitialInfo: InitialQueryInfo,
-): InitialQueryInfoDto {
-  return {
-    userSpecifiedLabel: localQueryInitialInfo.userSpecifiedLabel,
-    queryText: localQueryInitialInfo.queryText,
-    isQuickQuery: localQueryInitialInfo.isQuickQuery,
-    isQuickEval: localQueryInitialInfo.isQuickEval,
-    quickEvalPosition: localQueryInitialInfo.quickEvalPosition,
-    queryPath: localQueryInitialInfo.queryPath,
-    databaseInfo: {
-      databaseUri: localQueryInitialInfo.databaseInfo.databaseUri,
-      name: localQueryInitialInfo.databaseInfo.name,
-    },
-    start: localQueryInitialInfo.start,
-    id: localQueryInitialInfo.id,
-  };
-}
-
-function mapQueryEvaluationInfoToDto(
-  queryEvaluationInfo: QueryEvaluationInfo,
-): QueryEvaluationInfoDto {
-  return {
-    querySaveDir: queryEvaluationInfo.querySaveDir,
-    dbItemPath: queryEvaluationInfo.dbItemPath,
-    databaseHasMetadataFile: queryEvaluationInfo.databaseHasMetadataFile,
-    quickEvalPosition: queryEvaluationInfo.quickEvalPosition,
-    metadata: queryEvaluationInfo.metadata,
-    resultsPaths: queryEvaluationInfo.resultsPaths,
-  };
-}

extensions/ql-vscode/src/query-history/store/query-history-dto-mapper.ts

@@ -1,28 +1,7 @@
-import {
-  LocalQueryInfo,
-  CompletedQueryInfo,
-  InitialQueryInfo,
-} from "../../query-results";
-import { QueryEvaluationInfo } from "../../run-queries-shared";
 import { QueryHistoryInfo } from "../query-history-info";
-import {
-  CompletedQueryInfoDto,
-  QueryEvaluationInfoDto,
-  InitialQueryInfoDto,
-  QueryHistoryLocalQueryDto,
-  SortDirectionDto,
-  InterpretedResultsSortStateDto,
-  SortedResultSetInfoDto,
-  RawResultsSortStateDto,
-} from "./query-history-local-query-dto";
 import { QueryHistoryItemDto } from "./query-history-dto";
-import {
-  InterpretedResultsSortState,
-  RawResultsSortState,
-  SortDirection,
-  SortedResultSetInfo,
-} from "../../pure/interface-types";
 import { mapQueryHistoryVariantAnalysisToDomainModel } from "./query-history-variant-analysis-dto-mapper";
+import { mapLocalQueryItemToDomainModel } from "./query-history-local-query-dto-mapper";
 
 export function mapQueryHistoryToDomainModel(
   queries: QueryHistoryItemDto[],
@@ -41,122 +20,3 @@ export function mapQueryHistoryToDomainModel(
     );
   });
 }
-
-function mapLocalQueryItemToDomainModel(
-  localQuery: QueryHistoryLocalQueryDto,
-): LocalQueryInfo {
-  return new LocalQueryInfo(
-    mapInitialQueryInfoToDomainModel(localQuery.initialInfo),
-    undefined,
-    localQuery.failureReason,
-    localQuery.completedQuery &&
-      mapCompletedQueryInfoToDomainModel(localQuery.completedQuery),
-    localQuery.evalLogLocation,
-    localQuery.evalLogSummaryLocation,
-    localQuery.jsonEvalLogSummaryLocation,
-    localQuery.evalLogSummarySymbolsLocation,
-  );
-}
-
-function mapCompletedQueryInfoToDomainModel(
-  completedQuery: CompletedQueryInfoDto,
-): CompletedQueryInfo {
-  const sortState =
-    completedQuery.interpretedResultsSortState &&
-    mapSortStateToDomainModel(completedQuery.interpretedResultsSortState);
-
-  const sortedResults = Object.fromEntries(
-    Object.entries(completedQuery.sortedResultsInfo).map(([key, value]) => {
-      return [key, mapSortedResultSetInfoToDomainModel(value)];
-    }),
-  );
-
-  return new CompletedQueryInfo(
-    mapQueryEvaluationInfoToDomainModel(completedQuery.query),
-    {
-      runId: completedQuery.result.runId,
-      queryId: completedQuery.result.queryId,
-      resultType: completedQuery.result.resultType,
-      evaluationTime: completedQuery.result.evaluationTime,
-      message: completedQuery.result.message,
-      logFileLocation: completedQuery.result.logFileLocation,
-    },
-    completedQuery.logFileLocation,
-    completedQuery.successful ?? completedQuery.sucessful,
-    completedQuery.message,
-    sortState,
-    completedQuery.resultCount,
-    sortedResults,
-  );
-}
-
-function mapInitialQueryInfoToDomainModel(
-  initialInfo: InitialQueryInfoDto,
-): InitialQueryInfo {
-  return {
-    userSpecifiedLabel: initialInfo.userSpecifiedLabel,
-    queryText: initialInfo.queryText,
-    isQuickQuery: initialInfo.isQuickQuery,
-    isQuickEval: initialInfo.isQuickEval,
-    quickEvalPosition: initialInfo.quickEvalPosition,
-    queryPath: initialInfo.queryPath,
-    databaseInfo: {
-      databaseUri: initialInfo.databaseInfo.databaseUri,
-      name: initialInfo.databaseInfo.name,
-    },
-    start: new Date(initialInfo.start),
-    id: initialInfo.id,
-  };
-}
-
-function mapQueryEvaluationInfoToDomainModel(
-  evaluationInfo: QueryEvaluationInfoDto,
-): QueryEvaluationInfo {
-  return new QueryEvaluationInfo(
-    evaluationInfo.querySaveDir,
-    evaluationInfo.dbItemPath,
-    evaluationInfo.databaseHasMetadataFile,
-    evaluationInfo.quickEvalPosition,
-    evaluationInfo.metadata,
-  );
-}
-
-function mapSortDirectionToDomainModel(
-  sortDirection: SortDirectionDto,
-): SortDirection {
-  switch (sortDirection) {
-    case SortDirectionDto.asc:
-      return SortDirection.asc;
-    case SortDirectionDto.desc:
-      return SortDirection.desc;
-  }
-}
-
-function mapSortStateToDomainModel(
-  sortState: InterpretedResultsSortStateDto,
-): InterpretedResultsSortState {
-  return {
-    sortBy: sortState.sortBy,
-    sortDirection: mapSortDirectionToDomainModel(sortState.sortDirection),
-  };
-}
-
-function mapSortedResultSetInfoToDomainModel(
-  sortedResultSetInfo: SortedResultSetInfoDto,
-): SortedResultSetInfo {
-  return {
-    resultsPath: sortedResultSetInfo.resultsPath,
-    sortState: mapRawResultsSortStateToDomainModel(
-      sortedResultSetInfo.sortState,
-    ),
-  };
-}
-
-function mapRawResultsSortStateToDomainModel(
-  sortState: RawResultsSortStateDto,
-): RawResultsSortState {
-  return {
-    columnIndex: sortState.columnIndex,
-    sortDirection: mapSortDirectionToDomainModel(sortState.sortDirection),
-  };
-}