From e605983464518398a6c5c11a59243c1aed44094d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20K=C3=B6nig?= <julian.koenig@js-soft.com>
Date: Fri, 19 Jul 2024 10:31:01 +0200
Subject: [PATCH] refactor: update TerminateAndDecomposeRelationship

---
 .../AddTerminateAndDecomposeRelationship.ts   | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/mixins/AddTerminateAndDecomposeRelationship.ts b/src/mixins/AddTerminateAndDecomposeRelationship.ts
index 0460c81..f60aef6 100644
--- a/src/mixins/AddTerminateAndDecomposeRelationship.ts
+++ b/src/mixins/AddTerminateAndDecomposeRelationship.ts
@@ -1,3 +1,4 @@
+import { ConnectorRelationshipStatus } from "@nmshd/connector-sdk"
 import { ConnectorTUIBaseConstructor } from "../ConnectorTUIBase.js"
 
 export function AddTerminateAndDecomposeRelationship<TBase extends ConnectorTUIBaseConstructor>(Base: TBase) {
@@ -8,20 +9,31 @@ export function AddTerminateAndDecomposeRelationship<TBase extends ConnectorTUIB
     }
 
     protected async terminateAndDecomposeRelationship() {
-      const relationship = await this.selectRelationship("Select relationship to terminate and decompose")
+      await this.connectorClient.account.sync()
+
+      const relationship = await this.selectRelationship(
+        "Select relationship to terminate and decompose",
+        ConnectorRelationshipStatus.Active,
+        ConnectorRelationshipStatus.Terminated,
+        ConnectorRelationshipStatus.DeletionProposed
+      )
       if (!relationship) return
 
-      console.log(`Terminating relationship ${relationship.id}`)
-      const terminationResult = await this.connectorClient.relationships.terminateRelationship(relationship.id)
-      if (terminationResult.isError) {
-        console.error(`Failed to terminate relationship ${relationship.id}: ${terminationResult.error}`)
-        return
+      console.log(relationship.status)
+
+      if (relationship.status === ConnectorRelationshipStatus.Active) {
+        console.log(`Terminating relationship ${relationship.id}`)
+        const terminationResult = await this.connectorClient.relationships.terminateRelationship(relationship.id)
+        if (terminationResult.isError) {
+          console.error(`Failed to terminate relationship ${relationship.id}: ${JSON.stringify(terminationResult.error)}`)
+          return
+        }
       }
 
       console.log(`Decomposing relationship ${relationship.id}`)
       const decomposeResult = await this.connectorClient.relationships.decomposeRelationship(relationship.id)
       if (decomposeResult.isError) {
-        console.error(`Failed to terminate relationship ${relationship.id}: ${terminationResult.error}`)
+        console.error(`Failed to terminate relationship ${relationship.id}: ${JSON.stringify(decomposeResult.error)}`)
         return
       }
     }