chore: daily development

canyon-project · Feb 13, 2025 · 0255530 · 0255530
1 parent afc697d
commit 0255530
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 0 deletions.
diff --git a/packages/canyon-backend/src/apps/collect/dto/coverage-client.dto.ts b/packages/canyon-backend/src/apps/collect/dto/coverage-client.dto.ts
@@ -45,4 +45,14 @@ export class CoverageClientDto {
   @MinLength(1, { message: "compareTarget长度最小为1" })
   @IsOptional({ message: "compareTarget可以为空" })
   compareTarget: string;
+
+  @IsString()
+  @MinLength(1, { message: "buildID长度最小为1" })
+  @IsOptional({ message: "buildID 可以为空" })
+  buildID: string;
+
+  @IsString()
+  @MinLength(1, { message: "buildProvider长度最小为1" })
+  @IsOptional({ message: "buildProvider 可以为空" })
+  buildProvider: string;
 }
diff --git a/packages/canyon-backend/src/apps/collect/dto/coverage-map-client.dto.ts b/packages/canyon-backend/src/apps/collect/dto/coverage-map-client.dto.ts
@@ -39,4 +39,16 @@ export class CoverageMapClientDto {
   @MinLength(1, { message: "compareTarget长度最小为1" })
   @IsOptional({ message: "compareTarget可以为空" })
   compareTarget: string;
+
+  @IsString()
+  @MinLength(1, { message: "buildID长度最小为1" })
+  @IsOptional({ message: "buildID 可以为空" })
+  buildID: string;
+
+  @IsString()
+  @MinLength(1, { message: "buildProvider长度最小为1" })
+  @IsOptional({ message: "buildProvider 可以为空" })
+  buildProvider: string;
+
+
 }
diff --git a/packages/canyon-backend/src/apps/collect/services/core/consumer-coverage.service.ts b/packages/canyon-backend/src/apps/collect/services/core/consumer-coverage.service.ts
@@ -161,6 +161,8 @@ export class ConsumerCoverageService {
           // TODO 暂时
           updatedAt: new Date(),
           compareTarget: queueDataToBeConsumed.compareTarget,
+          buildID: queueDataToBeConsumed.buildID,
+          buildProvider: queueDataToBeConsumed.buildProvider,
         },
       }); // 更新时间
     } else {
@@ -176,6 +178,8 @@ export class ConsumerCoverageService {
           projectID: queueDataToBeConsumed.projectID,
           reporter: String(queueDataToBeConsumed.reporter),
           reportID: queueDataToBeConsumed.reportID,
+          buildID: queueDataToBeConsumed.buildID,
+          buildProvider: queueDataToBeConsumed.buildProvider,
         },
       });
     }

diff --git a/packages/canyon-backend/src/apps/collect/services/core/coveragedisk.service.ts b/packages/canyon-backend/src/apps/collect/services/core/coveragedisk.service.ts
@@ -21,6 +21,8 @@ export class CoveragediskService {
     coverage: any;
     compareTarget: string;
     reporter: string;
+    buildID: string;
+    buildProvider: string;
   }) {
     return this.coveragediskRepository.insert({
       pid: String(process.pid),

diff --git a/packages/canyon-backend/src/apps/collect/services/coverage-client.service.ts b/packages/canyon-backend/src/apps/collect/services/coverage-client.service.ts
@@ -25,7 +25,11 @@ export class CoverageClientService {
     branch,
     compareTarget,
     reporter,
+    buildID,
+    buildProvider,
   }) {
+    buildID = buildID || "";
+    buildProvider = buildProvider || "gitlab_runner";
     const { repoID } = parseProjectID(projectID);
     const reportID = _reportID || sha;
     // #region == Step x: 解析出上报上来的覆盖率数据
@@ -46,6 +50,8 @@ export class CoverageClientService {
         instrumentCwd,
         branch: branch || "-",
         compareTarget: compareTarget || sha,
+        buildID: buildID,
+        buildProvider: buildProvider,
       });
     }
     const count = await this.prisma.coverageMap.count({
@@ -84,6 +90,8 @@ export class CoverageClientService {
       compareTarget: compareTarget || sha,
       coverage: IstanbulHitMapSchema.parse(coveragewenhao),
       reporter,
+      buildID,
+      buildProvider,
     });
     return {
       msg: "ok",

diff --git a/packages/canyon-backend/src/apps/collect/services/coverage-map-client.service.ts b/packages/canyon-backend/src/apps/collect/services/coverage-map-client.service.ts
@@ -37,7 +37,11 @@ export class CoverageMapClientService {
     instrumentCwd,
     branch,
     compareTarget,
+    buildID,
+    buildProvider,
   }) {
+    buildID = buildID || "";
+    buildProvider = buildProvider || "gitlab_runner";
     const { provider, repoID } = parseProjectID(projectID);
     const coverageFromExternalReport =
       typeof coverage === "string" ? JSON.parse(coverage) : coverage;
@@ -85,6 +89,8 @@ export class CoverageMapClientService {
           reportID: sha,
           compareTarget: compareTarget || sha, // 默认是自己
           reporter: "canyon",
+          buildID,
+          buildProvider,
         },
       })
       .catch(() => {