fix: fabric check existence of listener

Signed-off-by: Enrique Lacal <[email protected]>
hyperledger · Jul 23, 2024 · ff764e4 · ff764e4
1 parent 3a2d40c
commit ff764e4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/internal/blockchain/fabric/eventstream.go b/internal/blockchain/fabric/eventstream.go
@@ -167,6 +167,23 @@ func (s *streamManager) getSubscription(ctx context.Context, subID string) (sub
 	return sub, nil
 }
 
+func (s *streamManager) checkSubscriptionExistence(ctx context.Context, subID string) (found bool, err error) {
+	sub := &subscription{}
+	res, err := s.client.R().
+		SetContext(ctx).
+		SetResult(&sub).
+		Get(fmt.Sprintf("/subscriptions/%s", subID))
+
+	if err != nil || !res.IsSuccess() {
+		if res.StatusCode() == 404 {
+			return false, nil
+		}
+		return false, ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgFabconnectRESTErr)
+	}
+
+	return true, nil
+}
+
 func (s *streamManager) getSubscriptionName(ctx context.Context, subID string) (string, error) {
 	if cachedValue := s.cache.GetString("sub:" + subID); cachedValue != "" {
 		return cachedValue, nil

diff --git a/internal/blockchain/fabric/fabric.go b/internal/blockchain/fabric/fabric.go
@@ -998,7 +998,13 @@ func (f *Fabric) DeleteContractListener(ctx context.Context, subscription *core.
 
 func (f *Fabric) GetContractListenerStatus(ctx context.Context, namespace, subID string, okNotFound bool) (bool, interface{}, core.ContractListenerStatus, error) {
 	// Fabconnect does not currently provide any additional status info for listener subscriptions.
-	return true, nil, core.ContractListenerStatusUnknown, nil
+	// But we check for existence of the subscription
+	found, err := f.streams.checkSubscriptionExistence(ctx, subID)
+	if err != nil {
+		return found, nil, core.ContractListenerStatusUnknown, err
+	}
+
+	return found, nil, core.ContractListenerStatusUnknown, nil
 }
 
 func (f *Fabric) GetFFIParamValidator(ctx context.Context) (fftypes.FFIParamValidator, error) {