Перепиши на optional java чтобы избавится от двух if CancellerRkmChatMessageEntity created = messageRepository.save(ctx, buildMessageEntity(rpcRequest, auth)); if (Objects.isNull(created)) { throw rkmChatMessageErrorFactory.notSaved(rpcRequest.getRkmId()); } Long messageId = created.getId(); if (!ObjectUtils.isEmpty(attachments)) { bindAttachmentRepository.save(ctx, bindAttachmentMapper.map(attachments, messageId)); }

Optional<CancellerRkmChatMessageEntity> created = Optional.ofNullable(messageRepository.save(ctx, buildMessageEntity(rpcRequest, auth)));

Long messageId = created.map(CancellerRkmChatMessageEntity::getId).orElseThrow(() -> rkmChatMessageErrorFactory.notSaved(rpcRequest.getRkmId()));

created.ifPresent(c -> { if (!ObjectUtils.isEmpty(attachments)) { bindAttachmentRepository.save(ctx, bindAttachmentMapper.map(attachments, messageId)); } });