Merge branch 'release/2026-01-15_4080_key_dates'

Author: Steven-Eardley

.circleci/config.yml

@@ -30,6 +30,7 @@ jobs:
           name: Prepare doaj env for unittests
           command: |
             echo "ELASTICSEARCH_HOSTS = [{'host': 'localhost', 'port': 9200}]" > test.cfg
+            echo "DEFAULT_INDEX_SETTINGS = { 'number_of_shards': 1, 'number_of_replicas': 0, 'analysis': { 'analyzer': { 'ascii_folded': { 'tokenizer': 'standard', 'filter': ['lowercase', 'asciifolding'] } } } }" >> test.cfg
             python portality/cms/build_fragments.py
             python portality/cms/build_sass.py
 

data_import_settings/dev_basics.json

@@ -15,7 +15,7 @@
 		"lcc" : {"import" : false, "limit" : -1},
 		"lock" : {"import" : false, "limit" : -1},
 		"news" : {"import" : true, "limit" : -1},
-		"notification" : {"import" : false, "limit" : -1},
+		"notification" : {"import" : true, "limit" : 100},
 		"preserve" : {"import" : false, "limit" : -1},
 		"provenance" : {"import" : false, "limit" : -1},
 		"upload" : {"import" : false, "limit" : -1}

deploy/read_only_routes.csv

@@ -0,0 +1,195 @@
+rule,endpoint,methods
+/static/<path:filename>,static,GET
+/_debug_toolbar/static/<path:filename>,_debug_toolbar.static,GET
+/_debug_toolbar/views/template/<key>,debugtoolbar.template_editor,GET
+/_debug_toolbar/views/template/<key>/save,debugtoolbar.save_template,POST
+/_debug_toolbar/views/template/<key>,debugtoolbar.template_preview,POST
+/_debug_toolbar/views/sqlalchemy/sql_explain,debugtoolbar.sql_select,"GET, POST"
+/_debug_toolbar/views/sqlalchemy/sql_select,debugtoolbar.sql_select,"GET, POST"
+/account/,account.index,GET
+/account/login,account.login,"GET, POST"
+/account/logout,account.logout,GET
+/account/create/,account.create,GET
+/admin/,admin.index,GET
+/admin/journals,admin.journals,GET
+/admin/journal/readonly/<journal_id>,admin.journal_readonly,GET
+/admin/journal/<journal_id>/article-info/,admin.journal_article_info,GET
+/admin/journal/<journal_id>/article-info/admin-site-search,admin.journal_article_info_admin_site_search,GET
+/admin/applications,admin.suggestions,GET
+/admin/update_requests,admin.update_requests,GET
+/admin/admin_site_search,admin.admin_site_search,GET
+/admin/editor_groups,admin.editor_group_search,GET
+/admin/background_jobs,admin.background_jobs_search,GET
+/admin/notifications,admin.global_notifications_search,GET
+/admin/autocomplete/user,admin.user_autocomplete,GET
+/admin/dropdown/eg_associates,admin.eg_associates_dropdown,GET
+/admin/report/<report_id>,admin.get_report,GET
+/admin/reports,admin.reports_search,GET
+/admin/alerts,admin.admin_alerts,GET
+/admin/autoassign,admin.autoassign_search,GET
+/admin/ris,admin.ris_search,GET
+/admin/ris/<id>/<action>,admin.ris_manage,POST
+/publisher/,publisher.index,GET
+/publisher/journal,publisher.journals,GET
+/publisher/application/deleted,publisher.deleted_thanks,GET
+/publisher/view_application/<application_id>,publisher.application_readonly,GET
+/publisher/view_update_request/<application_id>,publisher.update_request_readonly,"GET, POST"
+/publisher/progress,publisher.updates_in_progress,GET
+/publisher/help,publisher.help,GET
+/query/<path:path>,query.query,"GET, POST"
+/admin_query/<path:path>,admin_query.query,"GET, POST"
+/publisher_query/<path:path>,publisher_query.query,"GET, POST"
+/editor_query/<path:path>,editor_query.query,"GET, POST"
+/associate_query/<path:path>,associate_query.query,"GET, POST"
+/dashboard_query/<path:path>,dashboard_query.query,"GET, POST"
+/editor/,editor.index,GET
+/editor/group_applications,editor.group_suggestions,GET
+/editor/your_applications,editor.associate_suggestions,GET
+/editor/journal/readonly/<journal_id>,editor.journal_readonly,GET
+/service/unlocked,doajservices.unlocked,GET
+/service/groupstatus/<group_id>,doajservices.group_status,GET
+/api/v1/,api_v1.api_v1_root,GET
+/api/v1/docs,api_v1.docs,GET
+/api/v1/search/articles/<path:search_query>,api_v1.search_articles,GET
+/api/v1/articles/<article_id>,api_v1.retrieve_article,GET
+/api/v1/journals/<journal_id>,api_v1.retrieve_journal,GET
+/api/v1/applications/<application_id>,api_v1.retrieve_application,GET
+/api/v1/search/applications/<path:search_query>,api_v1.search_applications,GET
+/api/v1/search/journals/<path:search_query>,api_v1.search_journals,GET
+/api/v2/,api_v2.api_v2_root,GET
+/api/v2/docs,api_v2.docs,GET
+/api/v2/search/articles/<path:search_query>,api_v2.search_articles,GET
+/api/v2/articles/<article_id>,api_v2.retrieve_article,GET
+/api/v2/journals/<journal_id>,api_v2.retrieve_journal,GET
+/api/v2/applications/<application_id>,api_v2.retrieve_application,GET
+/api/v2/search/applications/<path:search_query>,api_v2.search_applications,GET
+/api/v2/search/journals/<path:search_query>,api_v2.search_journals,GET
+/api/v3/,api_v3.api_root,GET
+/api/v3/docs,api_v3.docs,GET
+/api/v3/swagger.json,api_v3.api_spec,GET
+/api/v3/<path:invalid_path>,api_v3.missing_resource,"DELETE, GET, PATCH, POST, PUT"
+/api/v3/search/applications/<path:search_query>,api_v3.search_applications,GET
+/api/v3/search/journals/<path:search_query>,api_v3.search_journals,GET
+/api/v3/search/articles/<path:search_query>,api_v3.search_articles,GET
+/api/v3/applications/<application_id>,api_v3.retrieve_application,GET
+/api/v3/articles/<article_id>,api_v3.retrieve_article,GET
+/api/v3/journals/<journal_id>,api_v3.retrieve_journal,GET
+/api/v4/,api_v4.api_root,GET
+/api/v4/docs,api_v4.docs,GET
+/api/v4/swagger.json,api_v4.api_spec,GET
+/api/v4/<path:invalid_path>,api_v4.missing_resource,"DELETE, GET, PATCH, POST, PUT"
+/api/v4/search/applications/<path:search_query>,api_v4.search_applications,GET
+/api/v4/search/journals/<path:search_query>,api_v4.search_journals,GET
+/api/v4/search/articles/<path:search_query>,api_v4.search_articles,GET
+/api/v4/applications/<application_id>,api_v4.retrieve_application,GET
+/api/v4/articles/<article_id>,api_v4.retrieve_article,GET
+/api/v4/journals/<journal_id>,api_v4.retrieve_journal,GET
+/api/v4/bulk/articles/<upload_id>,api_v4.bulk_article_create_status,GET
+/api/,api.api_root,GET
+/api/docs,api.docs,GET
+/api/swagger.json,api.api_spec,GET
+/api/<path:invalid_path>,api.missing_resource,"DELETE, GET, PATCH, POST, PUT"
+/api/search/applications/<path:search_query>,api.search_applications,GET
+/api/search/journals/<path:search_query>,api.search_journals,GET
+/api/search/articles/<path:search_query>,api.search_articles,GET
+/api/applications/<application_id>,api.retrieve_application,GET
+/api/articles/<article_id>,api.retrieve_article,GET
+/api/journals/<journal_id>,api.retrieve_journal,GET
+/api/bulk/articles/<upload_id>,api.bulk_article_create_status,GET
+/status/stats,status.stats,GET
+/status/,status.status,GET
+/_status/stats,_status.stats,GET
+/_status/,_status.status,GET
+/apply/thank-you,apply.application_thanks,GET
+/apply/draft,apply.draft_saved,GET
+/jct/inprogress,jct.inprogress,GET
+/dashboard/,dashboard.top_todo,GET
+/dashboard/top_notifications,dashboard.top_notifications,GET
+/dashboard/notifications,dashboard.notifications,GET
+/tours/<content_id>,tours.tour,GET
+/tours/<content_id>/seen,tours.tour_seen,GET
+/oai.<specified>,oaipmh.oaipmh,"GET, POST"
+/oai,oaipmh.oaipmh,"GET, POST"
+/openurl,openurl.openurl,"GET, POST"
+/openurl/help,openurl.help,GET
+/feed,atom.feed,GET
+/,doaj.home,GET
+/login/,doaj.login,GET
+/dismiss_site_note,doaj.dismiss_site_note,GET
+/news/,doaj.news,GET
+/fqw_hit,doaj.fqw_hit,POST
+/search/journals,doaj.journals_search,GET
+/search/articles,doaj.articles_search,GET
+/search,doaj.search,GET
+/search,doaj.search_post,POST
+/csv,doaj.csv_data,GET
+/sitemap.xml,doaj.sitemap_legacy,GET
+/sitemap_index.xml,doaj.sitemap_index_legacy,GET
+/sitemap<suffix>.xml,doaj.sitemap,GET
+/public-data-dump/<record_type>,doaj.public_data_dump_redirect,GET
+/store/<container>/<dir>/<filename>,doaj.get_from_local_store_dir,GET
+/store/<container>/<filename>,doaj.get_from_local_store,GET
+/autocomplete/<doc_type>/<field_name>,doaj.autocomplete,"GET, POST"
+/toc/<identifier>,doaj.toc,GET
+/toc/articles/<identifier>,doaj.toc_articles_legacy,GET
+/toc/<identifier>/articles,doaj.toc_articles,GET
+/article/<identifier>,doaj.article_page,GET
+/googlebdb21861de30fe30.html,doaj.google_webmaster_tools,GET
+/accessibility/,doaj.accessibility,GET
+/privacy/,doaj.privacy,GET
+/contact/,doaj.contact,GET
+/terms/,doaj.terms,GET
+/code-of-conduct/,doaj.conduct,GET
+/media/,doaj.media,GET
+/support/,doaj.support,GET
+/support/sponsors/,doaj.sponsors,GET
+/support/publisher-supporters/,doaj.publisher_supporters,GET
+/support/supporters/,doaj.supporters,GET
+/support/funders/,doaj.funders,GET
+/support/thank-you/,doaj.application_thanks,GET
+/apply/guide/,doaj.guide,GET
+/apply/transparency/,doaj.transparency,GET
+/apply/why-index/,doaj.why_index,GET
+/apply/publisher-responsibilities/,doaj.publisher_responsibilities,GET
+/apply/copyright-and-licensing/,doaj.copyright_and_licensing,GET
+/docs/oai-pmh/,doaj.oai_pmh,GET
+/docs/api/,doaj.docs,GET
+/docs/xml/,doaj.xml,GET
+/docs/widgets/,doaj.widgets,GET
+/docs/public-data-dump/,doaj.public_data_dump,GET
+/docs/openurl/,doaj.openurl,GET
+/docs/faq/,doaj.faq,GET
+/about/,doaj.about,GET
+/at-20/,doaj.at_20,GET
+/about/ambassadors/,doaj.ambassadors,GET
+/about/advisory-board-council/,doaj.abc,GET
+/about/editorial-policy-advisory-group/,doaj.epag,GET
+/about/volunteers/,doaj.volunteers,GET
+/about/team/,doaj.team,GET
+/preservation/,doaj.preservation,GET
+/subjects,doaj.subjects,GET
+/application/new,doaj.old_application,GET
+/<cc>/editionsavante,doaj.bestpractice,GET
+/<cc>/bestpractice,doaj.bestpractice,GET
+/<cc>/boaspraticas,doaj.bestpractice,GET
+/<cc>/mejorespracticas,doaj.bestpractice,GET
+/oainfo,doaj.bestpractice,GET
+/bestpractice,doaj.bestpractice,GET
+/membership,doaj.membership,GET
+/publishermembers,doaj.old_sponsors,GET
+/members,doaj.members,GET
+/features,doaj.features,GET
+/openurl/help,doaj.old_openurl,GET
+/faq,doaj.old_faq,GET
+/publishers,doaj.publishers,GET
+/password-reset/,doaj.new_password_reset,GET
+/u/<alias>,doaj.shortened_url,GET
+/testdrive/<test_id>,testdrive.testdrive,GET
+/testdrive/<test_id>/teardown,testdrive.teardown,GET
+/assets/<path:filename>,our_static,GET
+/static/<path:filename>,our_static,GET
+/doaj,legacy,GET
+/doaj2csv,another_legacy_csv_route,GET
+/schemas/doajArticles.xsd,legacy_doaj_XML_schema,GET
+/isCrossrefLoaded,is_crossref_loaded,GET
+/api/,api_directory,GET

deploy/write_required_routes.csv

@@ -0,0 +1,91 @@
+rule,endpoint,methods
+/account/<username>,account.username,"DELETE, GET, POST"
+/account/forgot,account.forgot,"GET, POST"
+/account/reset/<reset_token>,account.reset,"GET, POST"
+/account/register,account.register,"GET, POST"
+/admin/journals,admin.journals_list,"DELETE, POST"
+/admin/articles,admin.articles_list,"DELETE, POST"
+/admin/delete/article/<article_id>,admin.article_endpoint,POST
+/admin/article/<article_id>,admin.article_page,"GET, POST"
+/admin/journal/<journal_id>,admin.journal_page,"GET, POST"
+/admin/journal/<journal_id>/activate,admin.journal_activate,"GET, POST"
+/admin/journal/<journal_id>/deactivate,admin.journal_deactivate,"GET, POST"
+/admin/journals/bulk/withdraw,admin.journals_bulk_withdraw,POST
+/admin/journals/bulk/reinstate,admin.journals_bulk_reinstate,POST
+/admin/journal/<journal_id>/continue,admin.journal_continue,"GET, POST"
+/admin/application/<application_id>,admin.application,"GET, POST"
+/admin/application_quick_reject/<application_id>,admin.application_quick_reject,POST
+/admin/editor_group/<group_id>,admin.editor_group,"GET, POST"
+/admin/editor_group,admin.editor_group,"GET, POST"
+/admin/<doaj_type>/bulk/assign_editor_group,admin.bulk_assign_editor_group,POST
+/admin/<doaj_type>/bulk/add_note,admin.bulk_add_note,POST
+/admin/journals/bulk/edit_metadata,admin.bulk_edit_journal_metadata,POST
+/admin/<doaj_type>/bulk/change_status,admin.applications_bulk_change_status,POST
+/admin/journals/bulk/delete,admin.bulk_journals_delete,POST
+/admin/articles/bulk/delete,admin.bulk_articles_delete,POST
+/admin/report,admin.request_report,POST
+/publisher/application/<application_id>/delete,publisher.delete_application,GET
+/publisher/update_request/<journal_id>,publisher.update_request,"DELETE, GET, POST"
+/publisher/uploadfile,publisher.upload_file,"GET, POST"
+/publisher/preservation,publisher.preservation,"GET, POST"
+/publisher/metadata,publisher.metadata,"GET, POST"
+/publisher/journal-csv,publisher.journal_csv,GET
+/publisher/journal-csv/validate,publisher.journal_csv_validate,POST
+/editor/application/<application_id>,editor.application,"GET, POST"
+/service/unlock/<object_type>/<object_id>,doajservices.unlock,POST
+/service/shorten,doajservices.shorten,POST
+/service/export/article/<article_id>/<fmt>,doajservices.export_article_ris,GET
+/service/alerts/<alert_id>/<action>,doajservices.manage_alert,POST
+/api/v1/articles,api_v1.create_article,POST
+/api/v1/articles/<article_id>,api_v1.update_article,PUT
+/api/v1/articles/<article_id>,api_v1.delete_article,DELETE
+/api/v1/bulk/articles,api_v1.bulk_article_create,POST
+/api/v1/bulk/articles,api_v1.bulk_article_delete,DELETE
+/api/v1/bulk/applications,api_v1.bulk_application_create,POST
+/api/v1/bulk/applications,api_v1.bulk_application_delete,DELETE
+/api/v1/applications,api_v1.create_application,POST
+/api/v1/applications/<application_id>,api_v1.update_application,PUT
+/api/v1/applications/<application_id>,api_v1.delete_application,DELETE
+/api/v2/articles,api_v2.create_article,POST
+/api/v2/articles/<article_id>,api_v2.update_article,PUT
+/api/v2/articles/<article_id>,api_v2.delete_article,DELETE
+/api/v2/bulk/articles,api_v2.bulk_article_create,POST
+/api/v2/bulk/articles,api_v2.bulk_article_delete,DELETE
+/api/v2/bulk/applications,api_v2.bulk_application_create,POST
+/api/v2/bulk/applications,api_v2.bulk_application_delete,DELETE
+/api/v2/applications,api_v2.create_application,POST
+/api/v2/applications/<application_id>,api_v2.update_application,PUT
+/api/v2/applications/<application_id>,api_v2.delete_application,DELETE
+/api/v3/applications,api_v3.create_application,POST
+/api/v3/applications/<application_id>,api_v3.update_application,PUT
+/api/v3/applications/<application_id>,api_v3.delete_application,DELETE
+/api/v3/articles,api_v3.create_article,POST
+/api/v3/articles/<article_id>,api_v3.update_article,PUT
+/api/v3/articles/<article_id>,api_v3.delete_article,DELETE
+/api/v3/bulk/applications,api_v3.bulk_application_create,POST
+/api/v3/bulk/applications,api_v3.bulk_application_delete,DELETE
+/api/v3/bulk/articles,api_v3.bulk_article_create,POST
+/api/v3/bulk/articles,api_v3.bulk_article_delete,DELETE
+/api/v4/applications,api_v4.create_application,POST
+/api/v4/applications/<application_id>,api_v4.update_application,PUT
+/api/v4/applications/<application_id>,api_v4.delete_application,DELETE
+/api/v4/articles,api_v4.create_article,POST
+/api/v4/articles/<article_id>,api_v4.update_article,PUT
+/api/v4/articles/<article_id>,api_v4.delete_article,DELETE
+/api/v4/bulk/applications,api_v4.bulk_application_create,POST
+/api/v4/bulk/applications,api_v4.bulk_application_delete,DELETE
+/api/v4/bulk/articles,api_v4.bulk_article_create,POST
+/api/v4/bulk/articles,api_v4.bulk_article_delete,DELETE
+/api/applications,api.create_application,POST
+/api/applications/<application_id>,api.update_application,PUT
+/api/applications/<application_id>,api.delete_application,DELETE
+/api/articles,api.create_article,POST
+/api/articles/<article_id>,api.update_article,PUT
+/api/articles/<article_id>,api.delete_article,DELETE
+/api/bulk/applications,api.bulk_application_create,POST
+/api/bulk/applications,api.bulk_application_delete,DELETE
+/api/bulk/articles,api.bulk_article_create,POST
+/api/bulk/articles,api.bulk_article_delete,DELETE
+/apply/<draft_id>,apply.public_application,"GET, POST"
+/apply/,apply.public_application,"GET, POST"
+/dashboard/notifications/<notification_id>/seen,dashboard.notification_seen,POST

doajtest/UI/pages/login_page.py

@@ -1,6 +1,3 @@
-from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
-
 class DoajLoginPage:
     URL = 'localhost:5004/account/login'
 

doajtest/UI/pages/main_page.py

@@ -1,4 +1,3 @@
-from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 
 

doajtest/fixtures/article.py

@@ -1,4 +1,3 @@
-import datetime
 import random
 from copy import deepcopy
 from typing import Dict, Iterable

doajtest/fixtures/issn_org.py

@@ -1,4 +1,3 @@
-from copy import deepcopy
 from portality.lib import paths
 
 class IssnOrgFixtureFactory(object):

doajtest/fixtures/v2/applications.py

@@ -148,7 +148,8 @@ def make_application_spread(cls, desired_output, period):
         ],
         "owner" : "publisher",
         "related_journal" : "987654321123456789",
-        "date_applied" : "2003-01-01T00:00:00Z"
+        "date_applied" : "2003-01-01T00:00:00Z",
+        "date_rejected" : "2004-01-01T00:00:00Z",
     },
     "bibjson" : JOURNAL_LIKE_BIBJSON
 }

doajtest/fixtures/v2/common.py

@@ -51,6 +51,14 @@ def build_flags_form_expanded(assignee=None, deadline="", setter=None, created_d
     "editor": "associate"
 }
 
+LAST_REVIEW_FORM_EXPANDED = {
+    "last_full_review": "2025-01-01"
+}
+
+FLAGS_FORM_EXPANDED = {
+    'flags': []
+}
+
 JOURNAL_LIKE_BIBJSON = {
     "alternative_title": "Alternative Title",
     "apc": {