chore: daily development

canyon-project · Dec 27, 2024 · 621c15f · 621c15f
1 parent 19e9c15
commit 621c15f
Show file tree

Hide file tree

Showing 28 changed files with 66 additions and 544 deletions.
diff --git a/packages/canyon-backend/package.json b/packages/canyon-backend/package.json
@@ -7,7 +7,7 @@
     "do-build": "prisma generate && nest build",
     "start": "nest start",
     "dev-backend": "nest start --watch",
-    "preinstall": "prisma generate && nest build",
+    "preinstall": "prisma generate",
     "format": "prettier --write '**/*.{js,ts,jsx,tsx}'"
   },
   "dependencies": {
@@ -30,7 +30,6 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "dayjs": "^1.11.13",
-    "diff": "^7.0.0",
     "dotenv": "^16.4.7",
     "express": "^4.21.2",
     "graphql": "^16.10.0",

diff --git a/packages/canyon-backend/src/cov/services/common/coverage-final.service.ts b/packages/canyon-backend/src/cov/services/common/coverage-final.service.ts
@@ -1,8 +1,12 @@
 import { Injectable } from "@nestjs/common";
 import { PrismaService } from "src/prisma/prisma.service";
-import { decompressedData } from "../../../utils/zstd";
-import { convertDataFromCoverageMapDatabase } from "../../../utils/coverage";
-import { remapCoverageWithInstrumentCwd } from "canyon-map";
+// import { decompressedData } from "canyon-map";
+// import { convertDataFromCoverageMapDatabase } from "canyon-map";
+import {
+    remapCoverageWithInstrumentCwd,
+    convertDataFromCoverageMapDatabase,
+    decompressedData,
+} from "canyon-map";
 import {
     mergeCoverageMap,
     reorganizeCompleteCoverageObjects,

diff --git a/packages/canyon-backend/src/cov/services/coverage-pre-store.service.ts b/packages/canyon-backend/src/cov/services/coverage-pre-store.service.ts
@@ -1,7 +1,7 @@
 import { HttpException, Injectable } from "@nestjs/common";
 import { PrismaService } from "src/prisma/prisma.service";
 import { CoverageSummaryDataMap } from "canyon-data";
-import { decompressedData } from "../../utils/zstd";
+import { decompressedData } from "canyon-map";
 
 import { CoverageSummaryDto } from "../dto/coverage-summary.dto";
 import { CoverageMapDto } from "../dto/coverage-map.dto";

diff --git a/packages/canyon-backend/src/cov/services/coverage.service.ts b/packages/canyon-backend/src/cov/services/coverage.service.ts
@@ -1,7 +1,7 @@
 import { HttpException, Injectable } from "@nestjs/common";
 import { PrismaService } from "src/prisma/prisma.service";
 import { CoverageSummaryDataMap } from "canyon-data";
-import { decompressedData } from "../../utils/zstd";
+import { decompressedData } from "canyon-map";
 
 // 马上废弃，勿动
 @Injectable()

diff --git a/packages/canyon-backend/src/project/services/get-project-chart-data.service.ts b/packages/canyon-backend/src/project/services/get-project-chart-data.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
 import { PrismaService } from "../../prisma/prisma.service";
-import { percent } from "../../utils/utils";
+import { percent } from "canyon-data";
 
 @Injectable()
 export class GetProjectChartDataService {

diff --git a/packages/canyon-backend/src/project/services/get-project-compartment-data.service.ts b/packages/canyon-backend/src/project/services/get-project-compartment-data.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@nestjs/common";
 import { PrismaService } from "../../prisma/prisma.service";
 import * as dayjs from "dayjs";
-import { percent } from "../../utils/utils";
+import { percent } from "canyon-data";
 
 @Injectable()
 export class GetProjectCompartmentDataService {

diff --git a/packages/canyon-backend/src/project/services/get-project-records.service.ts b/packages/canyon-backend/src/project/services/get-project-records.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@nestjs/common";
 import { PrismaService } from "../../prisma/prisma.service";
 import { getCommits } from "../../adapter/gitlab.adapter";
-import { percent } from "../../utils/utils";
+import { percent } from "canyon-data";
 @Injectable()
 export class GetProjectRecordsService {
     constructor(private readonly prisma: PrismaService) {}

diff --git a/packages/canyon-backend/src/project/services/get-projects.service.ts b/packages/canyon-backend/src/project/services/get-projects.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from "@nestjs/common";
 import { PrismaService } from "../../prisma/prisma.service";
-import { percent, within30days } from "../../utils/utils";
+import { within30days } from "../../utils/utils";
+import { percent } from "canyon-data";
 import * as dayjs from "dayjs";
 
 @Injectable()

diff --git a/packages/canyon-backend/src/utils/coverage.ts b/packages/canyon-backend/src/utils/coverage.ts