From 2db285774a6374ec410d9aecb1f3ceef5b301376 Mon Sep 17 00:00:00 2001
From: Fagor <oleg-veber@mail.ru>
Date: Tue, 7 Nov 2023 21:50:49 +0700
Subject: [PATCH] Always saves notification for user

---
 .../userservice/service/NotificationServiceImpl.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/nsu/fit/directors/userservice/service/NotificationServiceImpl.java b/src/main/java/ru/nsu/fit/directors/userservice/service/NotificationServiceImpl.java
index d03085e..e786dd0 100644
--- a/src/main/java/ru/nsu/fit/directors/userservice/service/NotificationServiceImpl.java
+++ b/src/main/java/ru/nsu/fit/directors/userservice/service/NotificationServiceImpl.java
@@ -32,16 +32,15 @@ public class NotificationServiceImpl implements NotificationService {
     @Override
     public void handleOrderNotification(OrderNotificationEvent event) {
         User user = userRepository.findById(event.userId()).orElseThrow();
-        if (user.getVkUserId() != null) {
-            try {
+        try {
+            if (user.getVkUserId() != null) {
                 vkApi.sendNotification(
                     new RequestVkNotification(event.message(), vkServiceKey, String.valueOf(user.getVkUserId()))
                 );
-            } catch (Exception e) {
-                saveNotification(event, user);
-                log.error(e.getMessage());
             }
-        } else {
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        } finally {
             saveNotification(event, user);
         }
     }