From b5d84470ffa5d3b601c8724bd674a6de4b5adb03 Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Thu, 6 Feb 2025 19:02:57 +0530
Subject: [PATCH] Remove check for deployer version number

---
 packages/backend/src/database.ts |  5 ++++-
 packages/backend/src/service.ts  | 15 ++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/database.ts b/packages/backend/src/database.ts
index 7b9a0b25..7df7a7fa 100644
--- a/packages/backend/src/database.ts
+++ b/packages/backend/src/database.ts
@@ -613,7 +613,10 @@ export class Database {
           id: projectId
         },
         ...filter
-      }
+      },
+      order: {
+        createdAt: 'DESC',
+      },
     });
 
     return domains;
diff --git a/packages/backend/src/service.ts b/packages/backend/src/service.ts
index 0b1a2086..75da9159 100644
--- a/packages/backend/src/service.ts
+++ b/packages/backend/src/service.ts
@@ -262,6 +262,7 @@ export class Service {
           const previousDnsSet = new Set(
             previousDnsList.split(',').map((item) => item.trim()),
           );
+
           const newDnsSet = new Set(
             newDnsList.split(',').map((item) => item.trim()),
           );
@@ -756,7 +757,7 @@ export class Service {
         true,
       );
 
-      const dns = await this.getDnsForDeployerByProjectId(data.project.id!, deployer!.version, canonicalDeployment.project.name)
+      const dns = await this.getDnsForDeployerByProjectId(data.project.id!, deployer!.version, canonicalDeployment.project.name);
 
       // On deleting deployment later, project canonical deployment is also deleted
       // So publish project canonical deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later
@@ -854,6 +855,7 @@ export class Service {
       applicationRecordData,
       false,
     );
+
     const address = await this.getAddress();
 
     const environmentVariablesObj = await this.getEnvVariables(project!.id!);
@@ -867,12 +869,10 @@ export class Service {
         applicationRecordData,
         true,
       );
+
       // If a custom domain is present then use that as the DNS in the deployment request
-      const customDomains = await this.db.getDomainsByProjectId(project!.id!);
-      const dns =
-        customDomains.length > 0
-          ? customDomains.map((d) => d.name).join(',')
-          : `${canonicalDeployment.project.name}`;
+      const dns = await this.getDnsForDeployerByProjectId(project.id!, deployer.version, project.name!);
+
       // On deleting deployment later, project canonical deployment is also deleted
       // So publish project canonical deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later
       const {
@@ -1748,7 +1748,8 @@ export class Service {
     let dns;
     // If a custom domain is present then use that as the DNS in the deployment request
     // Only deployers with version > 1 support multiple custom domains
-    if (deployerVersion && Number(deployerVersion) >= 1) {
+    // TODO: Check version number
+    if (deployerVersion) {
       const customDomains = await this.db.getDomainsByProjectId(
         projectId,
       );