Feature/pbs 26 19

admin/nodes/views.py

@@ -517,6 +517,7 @@ class EmbargoReportView(PermissionRequiredMixin, TemplateView):
     - pending embargoes that should have been activated
     - active embargoes that are past their end date
     - upcoming active embargoes
+    - embargoes marked completed whose registration never actually went public
     """
 
     template_name = 'nodes/embargo_report.html'
@@ -562,6 +563,11 @@ def get_context_data(self, **kwargs):
                 self._embargo_report_queryset(Embargo.objects.active_past_end_date()),
                 'overdue_page',
             ),
+            'stuck_completed_page': self.paginate_embargo_report(
+                request,
+                self._embargo_report_queryset(Embargo.objects.stuck_completed()),
+                'stuck_completed_page',
+            ),
         })
         return context
 

admin/templates/nodes/embargo_report.html

@@ -161,4 +161,52 @@ <h2>Active Embargoes Past Pending Window</h2>
     </tbody>
 </table>
 
+<h2>Completed Embargoes Stuck Private</h2>
+<p>These embargoes are marked completed, but the registration never actually went public. This usually means an error occurred while making the registration public (e.g. a spam flag) after the embargo had already been marked complete.</p>
+<table class="table table-striped table-bordered table-hover">
+    <thead>
+        <tr>
+            <th>Registration</th>
+            <th>Embargo ID</th>
+            <th>State</th>
+            <th>Embargo End</th>
+            <th>Initiated By</th>
+        </tr>
+    </thead>
+    {% if stuck_completed_page.paginator.num_pages > 1 %}
+        {% include "util/pagination.html" with items=stuck_completed_page page_param="stuck_completed_page" status='' pagin=False order='' %}
+    {% endif %}
+    <tbody>
+        {% for embargo in stuck_completed_page %}
+            {% with registration=embargo.registrations.all.0 %}
+                {% if registration %}
+                <tr>
+                    <td>
+                        <a href="{{ registration | reverse_node }}">
+                            {{ registration.title | truncatechars:30 }}
+                        </a>
+                    </td>
+                    <td>{{ embargo.id }}</td>
+                    <td>{{ embargo.state }}</td>
+                    <td>{{ embargo.end_date|date:"F j, Y P" }}</td>
+                    <td>
+                        {% if embargo.initiated_by %}
+                            <a href="{{ embargo.initiated_by | reverse_user }}">
+                                {{ embargo.initiated_by.fullname }}
+                            </a>
+                        {% else %}
+                            &mdash;
+                        {% endif %}
+                    </td>
+                </tr>
+                {% endif %}
+            {% endwith %}
+        {% empty %}
+        <tr>
+            <td colspan="5">No completed embargoes stuck private.</td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
 {% endblock %}

admin/templates/notifications/notification_campaigns_detail.html

@@ -299,9 +299,18 @@ <h4>Recipient Filters</h4>
                 </table>
             {% endif %}
 
+            {% if metadata.filters.exclude_non_contributors %}
+                <table class="table table-bordered">
+                    <tr>
+                        <th style="width:250px;">Exclude non-contributors</th>
+                        <td>Only contributors on at least one project or component</td>
+                    </tr>
+                </table>
+            {% endif %}
+
             {% if metadata.filters.manual %}
                 {% include "notifications/campaign_filter_group.html" with group=metadata.filters.manual is_root=True %}
-            {% elif not "predefined" in metadata.filters %}
+            {% elif not "predefined" in metadata.filters and not metadata.filters.exclude_non_contributors %}
                 <p class="text-muted">No filters configured.</p>
             {% endif %}
 

admin/templates/notifications/notification_campaing_create.html

@@ -167,17 +167,32 @@ <h4>Recipient Filters</h4>
                     <label>
                         <input
                             type="checkbox"
-                            id="exclude-unconfirmed"
+                            id="exclude-unconfirmed-and-disabled-and-deactivation-requested"
                             checked
                         >
-                        Exclude unconfirmed accounts
+                        Exclude unconfirmed, disabled, and deactivation requested users
                     </label>
                     <p class="help-block">
-                        When enabled, users who have not confirmed their accounts
+                        When enabled, users who have not confirmed their accounts or are disabled or have requested deactivation
                         are excluded from the recipient list.
                     </p>
                 </div>
 
+                <div class="form-group" style="margin-top:15px;">
+                    <label>
+                        <input
+                            type="checkbox"
+                            id="exclude-non-contributors"
+                        >
+                        Exclude non-contributors
+                    </label>
+                    <p class="help-block">
+                        When enabled, only users who are contributors on at least one
+                        project or component (at any nesting level) are kept in the
+                        recipient list. Registrations and preprints do not count.
+                    </p>
+                </div>
+
                 <input
                     type="hidden"
                     id="filters-input"
@@ -460,25 +475,39 @@ <h4>Execution</h4>
         filters = {"manual": serializeGroup(root)};
     }
 
-    if (document.getElementById("exclude-unconfirmed").checked) {
+    if (document.getElementById("exclude-unconfirmed-and-disabled-and-deactivation-requested").checked) {
         const confirmed = {
             field: "date_confirmed",
             lookup: "isnull",
             value: false,
         };
+        const not_disabled = {
+            field: "date_disabled",
+            lookup: "isnull",
+            value: true,
+        };
+        const has_not_requested_deactivation = {
+            field: "requested_deactivation",
+            lookup: "exact",
+            value: false,
+        };
         if (filters.manual) {
             filters.manual = {
                 operator: "AND",
-                children: [filters.manual, confirmed],
+                children: [filters.manual, confirmed, not_disabled, has_not_requested_deactivation],
             };
         } else {
             filters.manual = {
                 operator: "AND",
-                children: [confirmed],
+                children: [confirmed, not_disabled, has_not_requested_deactivation],
             };
         }
     }
 
+    if (document.getElementById("exclude-non-contributors").checked) {
+        filters.exclude_non_contributors = true;
+    }
+
     return filters;
 }
 

admin_tests/nodes/test_views.py

@@ -1307,3 +1307,32 @@ def test_deleted_registration_embargo_excluded(self):
 
         context = self.view.get_context_data()
         assert embargo not in context['overdue_page']
+
+    def test_stuck_completed_in_report(self):
+        embargo = EmbargoFactory(
+            approve=True,
+            end_date=timezone.now() - timezone.timedelta(days=1),
+        )
+        embargo.state = Sanction.COMPLETED
+        embargo.save()
+        registration = embargo.registrations.first()
+        registration.is_public = False
+        registration.save()
+
+        context = self.view.get_context_data()
+        assert embargo in context['stuck_completed_page']
+        assert embargo not in context['overdue_page']
+
+    def test_public_completed_embargo_excluded_from_stuck_completed(self):
+        embargo = EmbargoFactory(
+            approve=True,
+            end_date=timezone.now() - timezone.timedelta(days=1),
+        )
+        embargo.state = Sanction.COMPLETED
+        embargo.save()
+        registration = embargo.registrations.first()
+        registration.is_public = True
+        registration.save()
+
+        context = self.view.get_context_data()
+        assert embargo not in context['stuck_completed_page']

admin_tests/notifications/test_campaigns.py

@@ -15,6 +15,7 @@
     NotificationCampaignCreateView,
     NotificationCampaignDetail,
     NotificationCampaignsList,
+    NotificationCampaignsRecipientsPreview,
     StartNotificationCampaign,
     DeleteNotificationCampaign,
 )
@@ -23,7 +24,7 @@
 from osf.models.notification_campaign import (
     NotificationCampaign,
 )
-from osf_tests.factories import AuthUserFactory
+from osf_tests.factories import AuthUserFactory, ProjectFactory
 from tests.base import AdminTestCase
 from website import settings
 
@@ -270,17 +271,14 @@ def test_form_valid_persists_execution_metadata(self):
         )
         request.user = self.user
         patch_messages(request)
-
         form = NotificationCampaignCreateForm(data=request.POST)
         assert form.is_valid()
-
         view = setup_form_view(
             NotificationCampaignCreateView(),
             request,
             form,
         )
         view.form_valid(form)
-
         campaign = NotificationCampaign.objects.get(name='My Campaign')
         assert campaign.created_by == self.user
         assert campaign.metadata['execution'] == {
@@ -295,6 +293,29 @@ def test_form_valid_persists_execution_metadata(self):
         assert campaign.metadata['filters'] == {'predefined': 'active'}
         assert campaign.metadata['context'] == {'greeting': 'hi'}
 
+    def test_form_valid_persists_exclude_non_contributors_in_filters(self):
+        request = RequestFactory().post(
+            reverse('notifications:notification_campaigns_create'),
+            data=_valid_form_data(
+                self.notification_type,
+                filters=json.dumps({
+                    'predefined': 'active',
+                    'exclude_non_contributors': True,
+                }),
+            ),
+        )
+        request.user = self.user
+        patch_messages(request)
+        form = NotificationCampaignCreateForm(data=request.POST)
+        assert form.is_valid()
+        view = setup_form_view(NotificationCampaignCreateView(), request, form)
+        view.form_valid(form)
+        campaign = NotificationCampaign.objects.get(name='My Campaign')
+        assert campaign.metadata['filters'] == {
+            'predefined': 'active',
+            'exclude_non_contributors': True,
+        }
+
     @mock.patch('admin.notifications.views._render_email_html', side_effect=Exception('bad template'))
     def test_form_valid_rejects_unrenderable_context(self, mock_render):
         request = RequestFactory().post(
@@ -321,6 +342,40 @@ def test_form_valid_rejects_unrenderable_context(self, mock_render):
         assert not NotificationCampaign.objects.filter(name='My Campaign').exists()
 
 
+class TestNotificationCampaignsRecipientsPreview(AdminTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.user = AuthUserFactory()
+        grant_permission(self.user, 'view_osfuser')
+        self.contributor = AuthUserFactory()
+        self.non_contributor = AuthUserFactory()
+        ProjectFactory(creator=self.contributor)
+
+    def test_preview_excludes_non_contributors_when_the_option_is_on(self):
+        filters = {
+            'manual': {
+                'operator': 'AND',
+                'children': [
+                    {
+                        'field': 'id',
+                        'lookup': 'in',
+                        'value': f'{self.contributor.id},{self.non_contributor.id}',
+                    },
+                ],
+            },
+            'exclude_non_contributors': True,
+        }
+        request = RequestFactory().get(
+            reverse('notifications:notification_campaigns_recipients_preview'),
+            data={'filters': json.dumps(filters)},
+        )
+        request.user = self.user
+        view = NotificationCampaignsRecipientsPreview()
+        view.setup(request)
+        assert list(view.get_queryset().values_list('id', flat=True)) == [self.contributor.id]
+
+
 class TestNotificationCampaignAdminPermissions(AdminTestCase):
 
     def setUp(self):

api/nodes/views.py

@@ -1198,7 +1198,7 @@ class NodeFilesList(JSONAPIBaseView, generics.ListAPIView, WaterButlerMixin, Lis
         ExcludeWithdrawals,
     )
 
-    ordering = ('_materialized_path',)  # default ordering
+    ordering = ('_materialized_path', 'id')  # default ordering
 
     required_read_scopes = [CoreScopes.NODE_FILE_READ]
     required_write_scopes = [CoreScopes.NODE_FILE_WRITE]

api/users/serializers.py

@@ -258,7 +258,7 @@ def get_default_region_id(self, obj):
         return region_id
 
     def get_accepted_terms_of_service(self, obj):
-        return bool(obj.accepted_terms_of_service)
+        return obj.has_accepted_current_terms_of_service
 
     def get_merged_by_absolute_url(self, obj):
         if obj.merged_by:
@@ -292,7 +292,7 @@ def update(self, instance, validated_data):
                 for key, val in value.items():
                     instance.social[key] = val
             elif 'accepted_terms_of_service' == attr:
-                if value and not instance.accepted_terms_of_service:
+                if value and not instance.has_accepted_current_terms_of_service:
                     instance.accepted_terms_of_service = timezone.now()
             elif 'default_region' == attr:
                 user_settings = instance._settings_model('osfstorage').objects.get(owner=instance)
@@ -458,6 +458,11 @@ class UserResetPasswordSerializer(BaseAPISerializer):
     class Meta:
         type_ = 'user_reset_password'
 
+class UserResendConfirmationSerializer(BaseAPISerializer):
+    email = ser.CharField(write_only=True, required=True)
+
+    class Meta:
+        type_ = 'user_resend_confirmation'
 
 class ConfirmEmailTokenSerializer(BaseAPISerializer):
     uid = ser.CharField(write_only=True, required=True)

api/users/urls.py

@@ -5,6 +5,7 @@
 
 urlpatterns = [
     re_path(r'^reset_password/$', views.ResetPassword.as_view(), name=views.ResetPassword.view_name),
+    re_path(r'^resend_confirmation/$', views.ResendConfirmation.as_view(), name=views.ResendConfirmation.view_name),
     re_path(r'^external_login_comfirm_email/$', views.ExternalLoginConfirmEmailView.as_view(), name=views.ExternalLoginConfirmEmailView.view_name),
     re_path(r'^external_login/$', views.ExternalLogin.as_view(), name=views.ExternalLogin.view_name),
     re_path(r'^$', views.UserList.as_view(), name=views.UserList.view_name),