remove softDeleted, wrap in trx

Author: kevinkim-ogp

packages/backend/src/graphql/__tests__/mutations/update-step.itest.ts

@@ -588,12 +588,10 @@ describe('updateStep mutation', () => {
       // Mock FlowConnections query for getConnection validation
       // Since role is 'editor', getConnection will query FlowConnections table
       vi.spyOn(FlowConnections, 'query').mockReturnValue({
-        withSoftDeleted: vi.fn().mockReturnValue({
-          findOne: vi.fn().mockReturnValue({
-            withGraphFetched: vi.fn().mockReturnValue({
-              throwIfNotFound: vi.fn().mockResolvedValue({
-                connection: { id: mockConnectionId, key: 'slack' },
-              }),
+        findOne: vi.fn().mockReturnValue({
+          withGraphFetched: vi.fn().mockReturnValue({
+            throwIfNotFound: vi.fn().mockResolvedValue({
+              connection: { id: mockConnectionId, key: 'slack' },
             }),
           }),
         }),

packages/backend/src/graphql/mutations/delete-connection.ts

@@ -7,20 +7,22 @@ const deleteConnection: MutationResolvers['deleteConnection'] = async (
   params,
   context,
 ) => {
-  await context.currentUser
-    .$relatedQuery('connections')
-    .delete()
-    .findOne({
-      id: params.input.id,
-    })
-    .throwIfNotFound()
+  return await FlowConnections.transaction(async (trx) => {
+    await context.currentUser
+      .$relatedQuery('connections', trx)
+      .delete()
+      .findOne({
+        id: params.input.id,
+      })
+      .throwIfNotFound()
 
-  // also delete the connection from the flow_connections table for flows with collaborators
-  await FlowConnections.query()
-    .delete()
-    .where({ connection_id: params.input.id })
+    // also delete the connection from the flow_connections table for flows with collaborators
+    await FlowConnections.query(trx)
+      .delete()
+      .where({ connection_id: params.input.id })
 
-  return true
+    return true
+  })
 }
 
 export default deleteConnection

packages/backend/src/services/connection.ts

@@ -27,9 +27,6 @@ export const getConnection = async (params: GetConnectionParams) => {
     // 2. the user is the owner of a pipe that has been transferred to them
     //    it should include connections from the flow_connections table as well
     //
-    // NOTE: if the connection was deleted, we don't want to throw an error,
-    // we just want to return null so we can show 'Not connected'
-    //
     // TODO (kevinkim-ogp): phase 2 will allow editors to add their own connections, so owner's connections
     // will need to include connections from the flow_connections table
 
@@ -40,33 +37,23 @@ export const getConnection = async (params: GetConnectionParams) => {
         this.where('connections.user_id', context.currentUser.id).orWhereExists(
           // or accessible via flow_connections table
           FlowConnections.query(trx)
-            .withSoftDeleted()
             .whereColumn('flow_connections.connection_id', 'connections.id')
             .where('flow_connections.flow_id', flowId),
         )
       })
       .throwIfNotFound({ message: 'Connection not found' })
 
-    if (connection?.deletedAt) {
-      return null
-    }
-
     return connection
   }
 
   // NOTE: editor and viewer can only access shared connections from the flow_connections table
   const flowConnection = await FlowConnections.query(trx)
-    .withSoftDeleted()
     .findOne({
       connection_id: connectionId,
       flow_id: flowId,
     })
     .withGraphFetched('connection')
     .throwIfNotFound({ message: 'Connection not found' })
 
-  if (flowConnection?.deletedAt) {
-    return null
-  }
-
   return flowConnection?.connection
 }