diff --git a/packages/das/src/api/health.controller.ts b/packages/das/src/api/health.controller.ts index 44c2778..d2c61e7 100644 --- a/packages/das/src/api/health.controller.ts +++ b/packages/das/src/api/health.controller.ts @@ -1,9 +1,4 @@ -import { - Controller, - Get, - HttpException, - HttpStatus, -} from "@nestjs/common"; +import { Controller, Get, HttpException, HttpStatus } from "@nestjs/common"; import { ApiOperation, ApiTags } from "@nestjs/swagger"; import { InjectQueue } from "@nestjs/bullmq"; import { InjectRepository } from "@nestjs/typeorm"; diff --git a/packages/das/src/api/miners/miners.service.ts b/packages/das/src/api/miners/miners.service.ts index 10f1c5c..bb93bc0 100644 --- a/packages/das/src/api/miners/miners.service.ts +++ b/packages/das/src/api/miners/miners.service.ts @@ -201,7 +201,10 @@ export class MinersService { ) AS solving_pr FROM issues i WHERE i.author_github_id = $1 - AND i.created_at >= $2 + AND ( + (i.state = 'OPEN' AND i.created_at >= $2) + OR (i.state = 'CLOSED' AND i.closed_at >= $2) + ) ORDER BY i.created_at DESC `, [githubId, since],