Don't return 500 if we cannot unsubscribe from service, just delete it

Author: oliverhaagh

src/main/java/international/dmc/secom_mms_gateway/controllers/management/SubscriptionManagementController.java

@@ -106,10 +106,7 @@ public ResponseEntity<Void> deleteSubscriptionByMrn(@PathVariable String mrn) {
         if (subscription == null) {
             return ResponseEntity.notFound().build();
         }
-        boolean removed = subscriptionService.unsubscribeAndRemoveSubscription(mrn);
-        if (!removed) {
-            return ResponseEntity.internalServerError().build();
-        }
+        subscriptionService.unsubscribeAndRemoveSubscription(mrn);
         return ResponseEntity.ok().build();
     }
 
@@ -122,10 +119,7 @@ public ResponseEntity<Subscription> deleteSubscriptionById(@PathVariable String
         if (subscription == null) {
             return ResponseEntity.notFound().build();
         }
-        boolean removed = subscriptionService.unsubscribeAndRemoveSubscription(subscription.getServiceMrn());
-        if (!removed) {
-            return ResponseEntity.internalServerError().build();
-        }
+        subscriptionService.unsubscribeAndRemoveSubscription(subscription.getServiceMrn());
         return ResponseEntity.ok().build();
     }
 }

src/main/java/international/dmc/secom_mms_gateway/services/SubscriptionService.java

@@ -108,10 +108,11 @@ public Subscription addSubscription(Subscription subscription) throws Subscripti
         return subscription;
     }
 
-    public boolean unsubscribeAndRemoveSubscription(String serviceMrn) {
-        if (!unsubscribeFromService(serviceMrn)) return false;
+    public void unsubscribeAndRemoveSubscription(String serviceMrn) {
+        if (!unsubscribeFromService(serviceMrn)) {
+            log.error("Unsubscribe failed for service mrn = {}, deleting it anyway", serviceMrn);
+        }
         subscriptionRepository.deleteByServiceMrn(serviceMrn);
-        return true;
     }
 
     public void removeSubscription(String serviceMrn) {