From d93afb564b513471414e37fe76049f40a2d6e3af Mon Sep 17 00:00:00 2001
From: Shreerang Kale <shreerangkale@gmail.com>
Date: Fri, 7 Feb 2025 10:31:51 +0530
Subject: [PATCH] Use deployer LRN instead of ID in rollback deployment

---
 packages/backend/src/resolvers.ts                           | 6 +++---
 packages/backend/src/service.ts                             | 4 ++--
 .../projects/project/deployments/DeploymentMenu.tsx         | 2 +-
 .../org-slug/projects/id/settings/domains/add/Config.tsx    | 6 ------
 packages/gql-client/src/client.ts                           | 4 ++--
 packages/gql-client/src/mutations.ts                        | 4 ++--
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/backend/src/resolvers.ts b/packages/backend/src/resolvers.ts
index 401f3c67..c07723cc 100644
--- a/packages/backend/src/resolvers.ts
+++ b/packages/backend/src/resolvers.ts
@@ -345,11 +345,11 @@ export const createResolvers = async (service: Service): Promise<any> => {
         {
           projectId,
           deploymentId,
-          deployerId,
-        }: { deploymentId: string; projectId: string, deployerId: string },
+          deployerLrn,
+        }: { deploymentId: string; projectId: string, deployerLrn: string },
       ) => {
         try {
-          return await service.rollbackDeployment(projectId, deploymentId, deployerId);
+          return await service.rollbackDeployment(projectId, deploymentId, deployerLrn);
         } catch (err) {
           log(err);
           return false;
diff --git a/packages/backend/src/service.ts b/packages/backend/src/service.ts
index 4ae6a5b8..7667164a 100644
--- a/packages/backend/src/service.ts
+++ b/packages/backend/src/service.ts
@@ -1193,7 +1193,7 @@ export class Service {
   async rollbackDeployment(
     projectId: string,
     deploymentId: string,
-    deployerId: string,
+    deployerLrn: string,
   ): Promise<boolean> {
     // TODO: Implement transactions
     const oldCurrentDeployment = await this.db.getDeployment({
@@ -1206,7 +1206,7 @@ export class Service {
           id: projectId,
         },
         deployer: {
-          deployerId
+          deployerLrn
         },
         isCurrent: true,
         isCanonical: false,
diff --git a/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx b/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
index fad462ee..5f2428b5 100644
--- a/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
+++ b/packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx
@@ -99,7 +99,7 @@ export const DeploymentMenu = ({
     const isRollbacked = await client.rollbackDeployment(
       project.id,
       deployment.id,
-      deployment.deployer.deployerId
+      deployment.deployer.deployerLrn
     );
     if (isRollbacked.rollbackDeployment) {
       await onUpdate();
diff --git a/packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx b/packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx
index e8e28b7c..75895268 100644
--- a/packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx
@@ -97,17 +97,12 @@ const Config = () => {
       }
 
       setDnsRecordsWithLRN(tempDNSRecords);
-
-      // console.log('DNS RECORD', dnsRecordResponse)
-
-      // setDnsRecord({} as DNSRecordAttributes);
     };
 
     fetchDNSData();
   }, [id, client]);
 
   // TODO: Figure out DNS Provider if possible and update appropriatly
-  // TODO: Handle case where dnsRecords only have one entry and IP address for that record is not availble
   return (
     <ProjectSettingContainer headingText="Setup domain name">
       {dnsRecordsWithLRN.length ? (
@@ -170,7 +165,6 @@ const Config = () => {
       >
         FINISH
       </Button>
-      ;
     </ProjectSettingContainer>
   );
 };
diff --git a/packages/gql-client/src/client.ts b/packages/gql-client/src/client.ts
index 7d272670..7ba014cf 100644
--- a/packages/gql-client/src/client.ts
+++ b/packages/gql-client/src/client.ts
@@ -338,14 +338,14 @@ export class GQLClient {
   async rollbackDeployment(
     projectId: string,
     deploymentId: string,
-    deployerId: string,
+    deployerLrn: string,
   ): Promise<types.RollbackDeploymentResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.rollbackDeployment,
       variables: {
         projectId,
         deploymentId,
-        deployerId,
+        deployerLrn,
       },
     });
 
diff --git a/packages/gql-client/src/mutations.ts b/packages/gql-client/src/mutations.ts
index 876e5611..d87c0f00 100644
--- a/packages/gql-client/src/mutations.ts
+++ b/packages/gql-client/src/mutations.ts
@@ -95,8 +95,8 @@ export const deleteDomain = gql`
 `;
 
 export const rollbackDeployment = gql`
-  mutation ($projectId: String!, $deploymentId: String!) {
-    rollbackDeployment(projectId: $projectId, deploymentId: $deploymentId)
+  mutation ($projectId: String!, $deployerLrn: String!) {
+    rollbackDeployment(projectId: $projectId, deployerLrn: $deployerLrn)
   }
 `;