From 495155989134ccbfafebced38d075d49586ce19a Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 28 Sep 2023 10:28:09 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-550=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D0=B4=D0=BE=D0=B2=D0=B5=D1=80=D1=8F=D1=82=D1=8C?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8E=20=D1=83=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D1=81=D0=B2=D0=BE=D0=B9=20userId,=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=BD=D0=B0=20=D0=B1=D1=8D=D0=BA=D0=B5=D0=BD=D0=B4?= =?UTF-8?q?=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cud/registry/NotificationUpdateAction.java | 11 ----------- .../backend-api/src/main/resources/meta/meta.json | 6 +----- .../backend-api/src/main/resources/meta/meta.xml | 3 +-- .../backend-api/src/test/resources/meta.json | 6 +----- .../clearing/utility/service/NotificationService.java | 2 +- .../cud/utilities/NotificationUpdateRequest.java | 11 ----------- 6 files changed, 4 insertions(+), 35 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/NotificationUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/NotificationUpdateAction.java index 824f095c2..9c82a128b 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/NotificationUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/NotificationUpdateAction.java @@ -13,16 +13,12 @@ public class NotificationUpdateAction implements IAction - + @@ -1622,7 +1622,6 @@ - diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index d6d7ba3c1..f38db6df2 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.8.0.56", + "version": "3.8.0.57", "enums": { @@ -7007,10 +7007,6 @@ {"code": "notificationStatus", "type": 12,"name": "Наименование статуса сообщения","shortname": "Статус","link": "notificationStatus","required": true } - , - {"code": "senderId", - "type": 1,"name": "Наименование отправителя","shortname": "Отправитель","visible": false,"required": true - } ] } ] diff --git a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java index d8adb6d2c..ffce5e90c 100644 --- a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java +++ b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java @@ -68,7 +68,7 @@ public class NotificationService extends QueueConsumer implements InitializingBe throw new NullPointerException("Notification by id:{" + id + "} is null!"); } notification.setNotificationStatus(request.getNotificationStatus()); - notification.setSenderId(request.getSenderId()); + notification.setSenderId(notificationUpdateRequestBaseRequest.getUserId()); notification.setUpdated(Instant.now()); notificationMap.update(notification); sendFeedbackString(notification); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationUpdateRequest.java index b2f0a1fd2..3a14578d3 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationUpdateRequest.java @@ -9,9 +9,6 @@ public class NotificationUpdateRequest { @JsonProperty public String notificationStatus; - @JsonProperty - public Long senderId; - public Long getId() { return id; } @@ -27,12 +24,4 @@ public class NotificationUpdateRequest { public void setNotificationStatus(String notificationStatus) { this.notificationStatus = notificationStatus; } - - public Long getSenderId() { - return senderId; - } - - public void setSenderId(Long senderId) { - this.senderId = senderId; - } }