feat: migrate projectID to repoID

canyon-project · Dec 30, 2024 · 70fc7cf · 70fc7cf
1 parent c0d9207
commit 70fc7cf
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 36 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",
+    "preinstall": "prisma generate && nest build",
     "format": "prettier --write '**/*.{js,ts,jsx,tsx}'"
   },
   "dependencies": {

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,7 +1,5 @@
 import { Injectable } from "@nestjs/common";
 import { PrismaService } from "src/prisma/prisma.service";
-// import { decompressedData } from "canyon-map";
-// import { convertDataFromCoverageMapDatabase } from "canyon-map";
 import {
     remapCoverageWithInstrumentCwd,
     convertDataFromCoverageMapDatabase,
@@ -35,29 +33,14 @@ export class CoverageFinalService {
         },
         hit?: { [key: string]: object },
     ) {
-        const coverages = await this.prisma.coverage.findMany({
-            where: {
-                sha,
-                projectID,
-                reportID: reportID
-                    ? {
-                          in: reportID.split(","),
-                      }
-                    : undefined,
-                covType: reportID ? "agg" : "all",
-            },
-        });
-
-        let hitBox = {};
-        for (let i = 0; i < coverages.length; i++) {
-            hitBox = mergeCoverageMap(
-                hitBox,
-                await decompressedData(coverages[i].hit),
-            );
-        }
-
         // 如果外部传入了hit，就不再从数据库中获取hit
-        hit = hit || hitBox;
+        hit =
+            hit ||
+            (await this.getHitByProjectIDShaReportID({
+                projectID,
+                sha,
+                reportID,
+            }));
 
         // 无论是外部hit，还是查询到的hit，都为空对象，直接返回空对象
         if (Object.keys(hit).length === 0) {
@@ -67,7 +50,7 @@ export class CoverageFinalService {
         const coverageMaps = await this.prisma.coverageMap.findMany({
             where: {
                 sha,
-                projectID,
+                repoID: projectID.split("-")[1],
                 path: filepath,
             },
         });
@@ -77,15 +60,42 @@ export class CoverageFinalService {
             return {};
         }
 
-        const { map, instrumentCwd } =
-            await convertDataFromCoverageMapDatabase(coverageMaps);
+        // 等会删掉
+        const { map, instrumentCwd } = await convertDataFromCoverageMapDatabase(
+            coverageMaps.map((i) => ({
+                ...i,
+                projectID: "11",
+            })),
+        );
 
         const reMapMap = await remapCoverageWithInstrumentCwd(
             resetCoverageDataMap(map),
             instrumentCwd,
         );
-
-        // console.log("reMapMap", reMapMap);
         return reorganizeCompleteCoverageObjects(reMapMap, hit);
     }
+
+    private async getHitByProjectIDShaReportID({ projectID, sha, reportID }) {
+        const coverages = await this.prisma.coverage.findMany({
+            where: {
+                sha,
+                projectID,
+                reportID: reportID
+                    ? {
+                          in: reportID.split(","),
+                      }
+                    : undefined,
+                covType: reportID ? "agg" : "all",
+            },
+        });
+
+        let hitBox = {};
+        for (let i = 0; i < coverages.length; i++) {
+            hitBox = mergeCoverageMap(
+                hitBox,
+                await decompressedData(coverages[i].hit),
+            );
+        }
+        return hitBox;
+    }
 }
diff --git a/packages/canyon-map/package.json b/packages/canyon-map/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canyon-map",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "description": "",
   "type": "module",
   "exports": {

diff --git a/packages/canyon-map/src/util.ts b/packages/canyon-map/src/util.ts
@@ -2,8 +2,8 @@ import {decompressedData} from "./compress.ts";
 
 export const convertDataFromCoverageMapDatabase = async (
     coverageMaps: {
-        projectID: string;
-        sha: string;
+        // projectID: string;
+        // sha: string;
         // path: string;
         instrumentCwd: string;
         map: Buffer;

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -74,7 +74,7 @@ model Coverage {
 
 model CoverageMap {
   id            String @id @default(cuid())
-  projectID     String @map("project_id")
+  repoID        String @map("repo_id")
   sha           String @map("sha")
   path          String
   map           Bytes
@@ -83,7 +83,7 @@ model CoverageMap {
 
   // 再添加一个path索引
   @@index(fields: [path])
-  @@index([projectID, sha]) // 联合索引
+  @@index([repoID, sha]) // 联合索引
   @@map("canyon3_coverage_map")
 }
 
@@ -106,7 +106,7 @@ model Project {
 
 model Codechange {
   id            String   @id @default(cuid())
-  projectID     String   @map("project_id")
+  repoID        String   @map("repo_id")
   compareTarget String   @map("compare_target")
   sha           String   @map("sha")
   path          String