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 daaf6b126..824f095c2 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,12 +13,16 @@ public class NotificationUpdateAction implements IAction - + @@ -1610,18 +1610,19 @@ - - + + - + - + + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 2df744b57..d6d7ba3c1 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.55", + "version": "3.8.0.56", "enums": { @@ -6961,11 +6961,11 @@ } , {"code": "updatedAt", - "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время прочтения записи","shortname": "Прочитано","searchable": true,"sortable": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true } , {"code": "senderId", - "type": 1,"dbname": "Идентификатор компании-отправителя","name": "Наименование компании-отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company","ignore": true + "type": 1,"dbname": "Идентификатор отправителя","name": "Наименование отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"visible": true,"link": "userCls","linkCode": "identifier" } , {"code": "addresseeId", @@ -6981,7 +6981,7 @@ } , {"code": "notificationStatus", - "type": 12,"dbname": "Код статуса сообщения","name": "Наименование статуса сообщения","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "notificationStatus","ignore": true + "type": 12,"dbname": "Код статуса сообщения","name": "Наименование статуса сообщения","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "notificationStatus" } , {"code": "comment", @@ -6997,6 +6997,8 @@ "name": "Изменение статуса сообщения", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.NotificationUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "notification","linkCode": "id","required": true @@ -7005,6 +7007,10 @@ {"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 9585acf82..d8adb6d2c 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,6 +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.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 3a14578d3..b2f0a1fd2 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,6 +9,9 @@ public class NotificationUpdateRequest { @JsonProperty public String notificationStatus; + @JsonProperty + public Long senderId; + public Long getId() { return id; } @@ -24,4 +27,12 @@ public class NotificationUpdateRequest { public void setNotificationStatus(String notificationStatus) { this.notificationStatus = notificationStatus; } + + public Long getSenderId() { + return senderId; + } + + public void setSenderId(Long senderId) { + this.senderId = senderId; + } }