From 853a1024b37cf1ff3b2dd48170484144cb6d4517 Mon Sep 17 00:00:00 2001 From: IshaVenikar Date: Mon, 7 Oct 2024 18:04:02 +0530 Subject: [PATCH] Check for auction if deployment request id is not present --- packages/backend/src/registry.ts | 30 +++++++++++++------- packages/backend/src/service.ts | 47 +++++++++++++++++--------------- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/packages/backend/src/registry.ts b/packages/backend/src/registry.ts index 671daec9..ac53f170 100644 --- a/packages/backend/src/registry.ts +++ b/packages/backend/src/registry.ts @@ -256,6 +256,8 @@ export class Registry { this.registryConfig.privateKey, fee ); + + log(`Application deployment auction created: ${auctionResult.auction.id}`); log(`Application deployment auction record published: ${result.id}`); log('Application deployment auction data:', applicationDeploymentAuction); @@ -337,18 +339,22 @@ export class Registry { const auctionResult = records[0]; let deployerLrns = []; - const { winnerAddresses } = auctionResult.auction; + const { winnerAddresses } = auctionResult; for (const auctionWinner of winnerAddresses) { - const deployerRecord = await this.registry.queryRecords( + const deployerRecords = await this.registry.queryRecords( { paymentAddress: auctionWinner, }, true ); - const lrn = deployerRecord.names.length > 0 ? deployerRecord.names[0] : null; - deployerLrns.push(lrn); + for (const record of deployerRecords) { + if (record.names && record.names.length > 0) { + deployerLrns.push(record.names[0]); + break; + } + } } return deployerLrns; @@ -449,14 +455,18 @@ export class Registry { }; } - async getCompletedAuctionIds(auctionIds: string[] | null | undefined): Promise { - if(auctionIds === null || auctionIds === undefined) { - return []; + async getCompletedAuctionIds(auctionIds: (string | null | undefined)[]): Promise { + const validAuctionIds = auctionIds.filter((id): id is string => id !== null && id !== undefined); + + if (!validAuctionIds.length) { + return null; } - const auctions = await this.registry.getAuctionsByIds(auctionIds); + + const auctions = await this.registry.getAuctionsByIds(validAuctionIds); + const completedAuctions = auctions - .filter((auction: Auction) => auction.status === 'completed') - .map((auction: Auction) => auction.id); + .filter((auction: Auction) => auction.status === 'completed') + .map((auction: Auction) => auction.id); return completedAuctions; } diff --git a/packages/backend/src/service.ts b/packages/backend/src/service.ts index 7461ac3a..dc0a91f5 100644 --- a/packages/backend/src/service.ts +++ b/packages/backend/src/service.ts @@ -61,6 +61,8 @@ export class Service { this.checkDeployRecordsAndUpdate(); // Start check for ApplicationDeploymentRemovalRecords asynchronously this.checkDeploymentRemovalRecordsAndUpdate(); + // Start check for Deployment Auctions asynchronously + this.checkAuctionStatus(); } /** @@ -267,26 +269,26 @@ export class Service { * Checks for auction status for all ongoing auctions * Calls the createDeploymentFromAuction method for deployments with completed auctions */ - async checkAuctionStatus( - ): Promise { - // Deployment should be in building state and should not have domain. + async checkAuctionStatus(): Promise { const projects = await this.db.getProjects({ where: { - deployerLrn: IsNull() + deployments: { + applicationDeploymentRequestId: IsNull() + } }, }); - const auctionIds = projects - .map(project => project.auctionId) as string[]; - // Get all the auctions for those ids with auction status completed + const auctionIds = projects.map((project) => project.auctionId); const completedAuctionIds = await this.registry.getCompletedAuctionIds(auctionIds); - // If the deplyer lrn array is empty then call createDeploymentFromAuction - const auctionProjects = projects.filter(project => - completedAuctionIds.includes(project.auctionId!) - ); - for (const project of auctionProjects) { - await this.createDeploymentFromAuction(project); + if (completedAuctionIds) { + const auctionProjects = projects.filter((project) => + completedAuctionIds.includes(project.auctionId!) + ); + + for (const project of auctionProjects) { + await this.createDeploymentFromAuction(project); + } } this.deployRecordCheckTimeout = setTimeout(() => { @@ -692,8 +694,7 @@ export class Service { await this.db.updateProjectById(project.id!, { deployerLrn: deployerLrns }) - - const octokit = await this.getOctokit(project.owner!.id!); + const octokit = await this.getOctokit(project.ownerId!); const [owner, repo] = project.repository!.split('/'); const repoUrl = ( @@ -739,7 +740,7 @@ export class Service { applicationRecordData, domain: deploymentData.domain, createdBy: Object.assign(new User(), { - id: project.owner!.id!, + id: project.ownerId!, }), }); @@ -767,7 +768,7 @@ export class Service { // So publish project DNS deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later await this.registry.createApplicationDeploymentRequest({ deployment: newDeployment, - appName: project.name!, + appName: repo, repository: repoUrl, environmentVariables: environmentVariablesObj, dns: `${newDeployment.project.name}`, @@ -778,7 +779,7 @@ export class Service { // Create requests for all the deployers await this.registry.createApplicationDeploymentRequest({ deployment: newDeployment, - appName: project.name!, + appName: repo, repository: repoUrl, auctionId: project.auctionId!, lrn: deployer, @@ -882,10 +883,12 @@ export class Service { commitMessage: latestCommit.commit.message, }; - await (auctionData - ? this.registry.createApplicationDeploymentAuction(repo, octokit, auctionData!, deploymentData) - : this.createDeployment(user.id, octokit, deploymentData, lrn) - ); + if (auctionData) { + const { applicationDeploymentAuctionId } = await this.registry.createApplicationDeploymentAuction(repo, octokit, auctionData!, deploymentData); + await this.updateProject(project.id, { auctionId: applicationDeploymentAuctionId }) + } else { + await this.createDeployment(user.id, octokit, deploymentData, lrn); + } await this.createRepoHook(octokit, project);