From fc62392c83fb6a0ba4d40dd701a26b1be5496452 Mon Sep 17 00:00:00 2001
From: Shreerang Kale <shreerangkale@gmail.com>
Date: Fri, 31 Jan 2025 17:37:00 +0530
Subject: [PATCH] Update methods for using stored DNS deployments in UI

---
 packages/backend/src/database.ts | 27 ++++++++++++++++++++++++---
 packages/backend/src/service.ts  |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/database.ts b/packages/backend/src/database.ts
index fa8b1c99..d81a47d1 100644
--- a/packages/backend/src/database.ts
+++ b/packages/backend/src/database.ts
@@ -158,7 +158,7 @@ export class Database {
       .leftJoinAndSelect(
         'project.deployments',
         'deployments',
-        'deployments.isCurrent = true'
+        'deployments.isCurrent = true AND deployments.isDNS = true'
       )
       .leftJoinAndSelect('deployments.createdBy', 'user')
       .leftJoinAndSelect('deployments.domain', 'domain')
@@ -203,7 +203,7 @@ export class Database {
       .leftJoinAndSelect(
         'project.deployments',
         'deployments',
-        'deployments.isCurrent = true'
+        'deployments.isCurrent = true AND deployments.isDNS = true'
       )
       .leftJoinAndSelect('deployments.domain', 'domain')
       .leftJoin('project.projectMembers', 'projectMembers')
@@ -251,6 +251,26 @@ export class Database {
     });
   }
 
+  async getCommitDeploymentsByProjectId(projectId: string): Promise<Deployment[]> {
+    return this.getDeployments({
+      relations: {
+        project: true,
+        domain: true,
+        createdBy: true,
+        deployer: true,
+      },
+      where: {
+        project: {
+          id: projectId
+        },
+        isDNS: false
+      },
+      order: {
+        createdAt: 'DESC'
+      }
+    });
+  }
+
   async getDeployment(
     options: FindOneOptions<Deployment>
   ): Promise<Deployment | null> {
@@ -632,7 +652,8 @@ export class Database {
         project: {
           id: projectId,
         },
-        status: DeploymentStatus.Ready
+        status: DeploymentStatus.Ready,
+        isDNS: true
       }, order: {
         createdAt: "DESC",
       },
diff --git a/packages/backend/src/service.ts b/packages/backend/src/service.ts
index 34700fc4..cc9f669a 100644
--- a/packages/backend/src/service.ts
+++ b/packages/backend/src/service.ts
@@ -457,7 +457,7 @@ export class Service {
   }
 
   async getDeploymentsByProjectId(projectId: string): Promise<Deployment[]> {
-    const dbDeployments = await this.db.getDeploymentsByProjectId(projectId);
+    const dbDeployments = await this.db.getCommitDeploymentsByProjectId(projectId);
     return dbDeployments;
   }