Skip to content

Commit 2f7158a

Browse files
Fixes #13111: drop messaging service (#13160)
1 parent ac29273 commit 2f7158a

32 files changed

+2
-1234
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ workflows:
104104
codecov_name: smoke_tests
105105
load_docker_cache: false
106106
save_docker_cache: false
107-
test_suite: ./tests/test.sh geonode.tests.smoke geonode.tests.test_message_notifications geonode.tests.test_rest_api geonode.tests.test_search geonode.tests.test_utils geonode.tests.test_headers
107+
test_suite: ./tests/test.sh geonode.tests.smoke geonode.tests.test_rest_api geonode.tests.test_search geonode.tests.test_utils geonode.tests.test_headers
108108
- build:
109109
name: geonode_test_suite
110110
codecov_name: main_tests

geonode/base/views.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import ast
2222

2323
from dal import views, autocomplete
24-
from user_messages.models import Message
2524
from guardian.shortcuts import get_objects_for_user
2625

2726
from django.conf import settings
@@ -322,24 +321,6 @@ def post(self, request, *args, **kwargs):
322321
notice_type_label = "request_resource_edit"
323322
recipients = OwnerRightsRequestViewUtils.get_message_recipients(self.resource.owner)
324323

325-
Message.objects.new_message(
326-
from_user=request.user,
327-
to_users=recipients,
328-
subject=_("System message: A request to modify resource"),
329-
content=_("The resource owner has requested to modify the resource") + ".\n"
330-
" " + _("Resource title") + ": " + self.resource.title + ".\n"
331-
" "
332-
+ _("Reason for the request")
333-
+ ': "'
334-
+ reason
335-
+ '".\n'
336-
+ " "
337-
+ _(
338-
'To allow the change, set the resource to not "Approved" under the metadata settings'
339-
+ "and write message to the owner to notify him"
340-
)
341-
+ ".",
342-
)
343324
send_notification(
344325
recipients,
345326
notice_type_label,

geonode/layers/models.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,6 @@ def view_count_up(self, user, do_local=False):
379379
"""
380380
if user == self.owner or user.is_superuser:
381381
return
382-
if not do_local:
383-
from geonode.messaging import producer
384-
385-
producer.viewing_dataset(str(user), str(self.owner), self.id)
386-
387382
else:
388383
Dataset.objects.filter(id=self.id).update(popular_count=models.F("popular_count") + 1)
389384

geonode/messaging/__init__.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

geonode/messaging/apps.py

Lines changed: 0 additions & 66 deletions
This file was deleted.

geonode/messaging/consumer.py

Lines changed: 0 additions & 187 deletions
This file was deleted.

geonode/messaging/management/__init__.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

geonode/messaging/management/commands/__init__.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)