diff --git a/packages/canyon-ut/src/app.controller.ts b/packages/canyon-ut/src/app.controller.ts index b1435dca..046fc358 100755 --- a/packages/canyon-ut/src/app.controller.ts +++ b/packages/canyon-ut/src/app.controller.ts @@ -1,17 +1,35 @@ -import { Controller, Get } from "@nestjs/common"; +import {Controller, Get, Query} from "@nestjs/common"; import {CoverageMapService} from "./services/coverage-map.service"; +import {CoverageSummaryMapService} from "./services/coverage-summary-map.service"; // import { PrismaService } from "./prisma/prisma.service"; // import { convertSystemSettingsFromTheDatabase } from "./utils/sys"; @Controller() export class AppController { - constructor(private readonly coverageMapService: CoverageMapService) {} - @Get("api/coverage/map") - async viHealth() { - return this.coverageMapService.invoke(); - } + constructor( + private readonly coverageMapService: CoverageMapService, + private readonly coverageSummaryMapService: CoverageSummaryMapService + ) {} @Get("vi/health") async viHealth2() { return "230614"; } + @Get("api/coverage/map") + async coverageMap() { + return this.coverageMapService.invoke({ + projectID: "1", + sha: "1", + reportID: "1", + // filepath: " + }); + } + @Get("api/coverage/summary/map") + async coverageSummaryMap(@Query() coverageSummaryDto: any) { + const { projectID, sha, reportID } = coverageSummaryDto; + return this.coverageSummaryMapService.invoke({ projectID, + sha, + // reportID, + } + ); + } } diff --git a/packages/canyon-ut/src/app.module.ts b/packages/canyon-ut/src/app.module.ts index 94f86ac1..3b7eaf2d 100755 --- a/packages/canyon-ut/src/app.module.ts +++ b/packages/canyon-ut/src/app.module.ts @@ -5,6 +5,7 @@ import {join} from "path"; import {CoverageMapService} from "./services/coverage-map.service"; import {TypeOrmModule} from "@nestjs/typeorm"; import {CoverageUtEntity} from "./entity/coverage-ut.entity"; +import {CoverageSummaryMapService} from "./services/coverage-summary-map.service"; function parseDatabaseUrl(url) { const match = url.match(/postgres:\/\/([^:]+):([^@]+)@([^:]+):(\d+)\/([^?]+)\?schema=(.*)/); @@ -46,6 +47,6 @@ console.log(config) }), ], controllers: [AppController], - providers: [CoverageMapService], + providers: [CoverageMapService,CoverageSummaryMapService], }) export class AppModule {} diff --git a/packages/canyon-ut/src/services/coverage-map.service.ts b/packages/canyon-ut/src/services/coverage-map.service.ts index 7eebf903..24d66754 100644 --- a/packages/canyon-ut/src/services/coverage-map.service.ts +++ b/packages/canyon-ut/src/services/coverage-map.service.ts @@ -7,7 +7,11 @@ import {CoverageUtEntity} from "../entity/coverage-ut.entity"; export class CoverageMapService { constructor(@InjectRepository(CoverageUtEntity) private readonly repo: Repository) { } - async invoke() { + async invoke({ + projectID, + sha, + reportID, + }) { const data = await this.repo.find(); console.log(data); return { diff --git a/packages/canyon-ut/src/services/coverage-summary-map.service.ts b/packages/canyon-ut/src/services/coverage-summary-map.service.ts index e69de29b..77733526 100644 --- a/packages/canyon-ut/src/services/coverage-summary-map.service.ts +++ b/packages/canyon-ut/src/services/coverage-summary-map.service.ts @@ -0,0 +1,30 @@ +import {Injectable} from "@nestjs/common"; +import {Repository} from "typeorm"; +import {InjectRepository} from "@nestjs/typeorm"; +import {CoverageUtEntity} from "../entity/coverage-ut.entity"; +import {decompressedData} from "canyon-map"; + +@Injectable() +export class CoverageSummaryMapService { + constructor(@InjectRepository(CoverageUtEntity) private readonly repo: Repository) { } + + async invoke({ + projectID, + sha, + // reportID, + }) { + const data = await this.repo.findOne({ + where:{ + projectID, + sha, + } + }); + // console.log(data); + + // @ts-ignore + const res = (await decompressedData(data.summary)) + + return res + } + +}