Merge branch 'develop' of https://github.com/DOAJ/doaj into feature/3…

…689_kafka_fallback

cms/data/ambassadors.yml

@@ -62,13 +62,6 @@
   photo: "ivonne.jpg"
   coi:
     2022: https://drive.google.com/file/d/1HnGhYbvbzL34guWOmIqcthcwAN8NADX1/view?usp=sharing
-
-- name: John G. Dove
-  region: North America
-  bio: "John has had a career in executive management, and is now an independent consultant and open access advocate who works with organisations seeking to accelerate their transition to open access.  He advises both for-profits and non-profits, and has a particular interest in identifying the steps necessary to flip an entire discipline’s scholarly record to open access. His ambassador activities focus on increasing the support to DOAJ from the community. He served for six years on NISO’s <a href='https://www.niso.org/topic-committees/information-discovery-interchange' target='_blank'>Information Discovery and Interchange Topic Committee</a>, and has written for <a href='https://onlinelibrary.wiley.com/doi/10.1002/leap.1086' target='_blank'>Learned Publishing</a>, <a href='https://against-the-grain.com/2011/12/v23-5-atg-interviews-john-g-dove-president-credo-reference/' target='_blank'>Against the Grain</a>, and <a href='https://scholarlykitchen.sspnet.org/2019/11/07/guest-post-transparency-what-can-one-learn-from-a-trove-of-invoices/' target='_blank'>Scholarly Kitchen</a>. John serves on the Board of Trustees of his local public library in Revere, Massachusetts. He has a B.A. in Mathematics from Oberlin College."
-  photo: "johndove.jpg"
-  coi:
-    2022: https://drive.google.com/file/d/1cWijl2xdmVjshsvaGTABOvC_chIIfuVA/view?usp=sharing
 
 - name: Mahmoud Khalifa
   region: Middle East and Persian Gulf

cms/data/team.yml

@@ -6,17 +6,15 @@
   photo: alejandra.png
   bio: 'Alejandra has a Bachelor’s degree in Information Science and a Master’s degree in Digital Media. She has around ten years of experience in information management, knowledge management and scholarly communication at national and international level.'
   coi:
-    2016: https://drive.google.com/file/d/0ByRf6PVViI-mVFhjdkZWaFJZOTQ/view?usp=sharing&resourcekey=0-gMdxxHXyyJB9zFZIuh99QQ
     2018: https://drive.google.com/file/d/0ByRf6PVViI-mRlRYTDBPRlZiWTRxQ3VMTUZpQnZ5ZkwyLVQ4/view?usp=sharing&resourcekey=0-mlQ6rSCEnr6RfpCwh_4SMw
     2020: https://drive.google.com/file/d/1PF7Cc9vGAwWGqpqDo7nRULjxWIF2NR_Q/view?usp=sharing
     2022: https://drive.google.com/file/d/1E45ycyctDfYkh65ZCM8PMtQsYym_eP6L/view?usp=sharing
 
 - name: Cenyu Shen
-  role: Quality Team Lead and Managing Editor
+  role: Deputy Head of Editorial (Quality)
   photo: cenyu.jpg
   bio: 'Cenyu holds a PhD in Information Systems Science at Hanken School of Economics in Finland. She has spent around seven years on Open Access research with a particular focus on gold OA publishing concerning journals and publishers outside the mainstream. She was one of three DOAJ ambassadors for China from 2016 to 2017.'
   coi:
-    2016: https://drive.google.com/file/d/0B0fPCpIPjZlmNHZCQmxpUmN6bUEtYUx2VHZnbjVySS1fRTlr/view?usp=sharing&resourcekey=0-1TRIV1MEQMhdGbmCd7CbOA
     2020: https://drive.google.com/file/d/1rm9fjOF3OHJ9lR9wEUyQBQTO2KdoNQcE/view?usp=sharing
     2022: https://drive.google.com/file/d/1Mn_CR0twKxyFbbHxsLSrgeU984BNOLlS/view?usp=sharing
 
@@ -25,7 +23,6 @@
   photo: clara.jpg
   bio: 'Clara has 10 years experience in the scholarly publishing industry. She worked at Cambridge University Press as an Open Access Project Manager until 2015. She also works in science communication as a freelancer at the University Pompeu Fabra, Barcelona. Clara speaks Spanish, Catalan, English and some German and French. She loves cetaceans, freediving, cycling, and is an enthusiastic cook.'
   coi:
-    2016: https://drive.google.com/file/d/0ByRf6PVViI-mbDFybndLbldEbFE/view?usp=sharing&resourcekey=0-lKZNFwvUNdVAGKatvnKiPg
     2018: https://drive.google.com/file/d/1LHmZSZ6bwf6U71fNvIibJa6R1lquNhfR/view?usp=sharing
     2020: https://drive.google.com/file/d/1v4duxnoTcNo4UbL_GBa5D1T8JtTl7oY1/view?usp=sharing
     2022: https://drive.google.com/file/d/1hevYxG1102llDy-_i-onwKbDuOlBguA_/view?usp=sharing
@@ -35,7 +32,6 @@
   photo: dominic.jpg
   bio: 'Dominic has over 25 years of experience working with publisher and library communities. He is responsible for operations and development of the DOAJ platform. He acts as Committee chair for the Think. Check. Submit. initiative, of which DOAJ is a founding organisation. He represents DOAJ in Project JASPER, a cross-industry project working to ensure that journals are preserved for the long term. He also sits on the OASPA Board of Directors and serves as Secretary. Outside of work, he is reluctantly becoming an expert in the playparks of Stockholm with his twin sons.'
   coi:
-    2016: https://drive.google.com/file/d/0ByRf6PVViI-mWmU0UHZqZm1xcDQ/view?usp=sharing&resourcekey=0-BmQKwWn6Vb9ot73Xie66aA
     2018: https://drive.google.com/file/d/13XX_GUrw2xRmXARjRrTxegULPT8Redka/view?usp=sharing
     2020: https://drive.google.com/file/d/1nxFOuAdXLb8A-LulhNpz9i5vSmr5DBwF/view?usp=sharing
     2022: https://drive.google.com/file/d/1HBF9RLaIt3lFNG6WDcV08fQSMS_C6zwA/view?usp=sharing
@@ -62,12 +58,18 @@
   coi:
     2022: https://drive.google.com/file/d/1-3xzwkHMclREgLhj_XNF5n6Nr4q2_bnw/view?usp=sharing
 
+- name: John G. Dove
+  role: Advisor
+  photo: johndove.jpg
+  bio: "John has had a career in executive management, and is now an independent consultant and open access advocate who works with organisations seeking to accelerate their transition to open access.  He advises both for-profits and non-profits, and has a particular interest in identifying the steps necessary to flip an entire discipline’s scholarly record to open access. His ambassador activities focus on increasing the support to DOAJ from the community. He served for six years on NISO’s <a href='https://www.niso.org/topic-committees/information-discovery-interchange' target='_blank'>Information Discovery and Interchange Topic Committee</a>, and has written for <a href='https://onlinelibrary.wiley.com/doi/10.1002/leap.1086' target='_blank'>Learned Publishing</a>, <a href='https://against-the-grain.com/2011/12/v23-5-atg-interviews-john-g-dove-president-credo-reference/' target='_blank'>Against the Grain</a>, and <a href='https://scholarlykitchen.sspnet.org/2019/11/07/guest-post-transparency-what-can-one-learn-from-a-trove-of-invoices/' target='_blank'>Scholarly Kitchen</a>. John serves on the Board of Trustees of his local public library in Revere, Massachusetts. He has a B.A. in Mathematics from Oberlin College."
+  coi:
+    2022: https://drive.google.com/file/d/1cWijl2xdmVjshsvaGTABOvC_chIIfuVA/view?usp=sharing
+
 - name: Judith Barnsby
   role: Head of Editorial
   photo: judith.jpg
   bio: 'Judith has 25 years of experience in the scholarly publishing industry, working for a range of non-profit society publishers and service providers before joining DOAJ. She has a keen interest in publishing standards and protocols, and has served on the board of CLOCKSS and as chair of the PALS (publisher and library solutions) working group in the UK. Judith loves books, especially detective fiction, and volunteers in her local library.'
   coi:
-    2016: https://drive.google.com/file/d/0B0fPCpIPjZlmb3JmVkFYbjN5aTh1OUhLd2lZaEV0ZlFwbTZV/view?usp=sharing&resourcekey=0-o_PXKLk5UFbPk_-4B61jVA
     2018: https://drive.google.com/file/d/0ByRf6PVViI-mV2lfMjByQjYxUkpMcXhuc2l5Q3ZDWlpiYUtZ/view?usp=sharing&resourcekey=0-6eiGIRal00eXvgJUTeN_lw
     2020: https://drive.google.com/file/d/18MWTsze4cDQQRPHJl2XrYgHQvlxhsPZa/view?usp=sharing
     2023: https://drive.google.com/file/d/1hUsVIY09N6WceSx1edTM-h516CJGkHcu/view?usp=share_link
@@ -77,7 +79,6 @@
   photo: Kamel.jpg
   bio: 'Kamel is Full Professor of Chemistry at the University of Bejaia, Algeria (<a href="https://orcid.org/0000-0002-9099-8040"  target="_blank">ORCID</a>). He gained his PhD in Process Engineering and Chemistry of Materials Science at the University of Setif, Algeria. Kamel joined DOAJ in 2016 as an Ambassador for North Africa. He is currently Creative Commons Algeria Chapter lead, director of the Laboratory of Organic Materials at the University of Bejaia and editor-in-chief of Algerian Journal of Natural Products. His scientific activity is focused on chemistry of Natural Products, scholarly communications and new developments in academic publishing. Father of 3 daughters, he likes travelling, healthy local foods & home-made snacks.'
   coi:
-    2016: https://drive.google.com/file/d/0B0fPCpIPjZlmVEN4X1Q0RDdCams1NXhveW1HQmtMYU56bDE4/view?usp=sharing&resourcekey=0-wA1CGAbjB6FAX33gCDQmrA
     2018: https://drive.google.com/file/d/1JdF2kh-fLXz8kPGN_3ijDt5y9K6s0hOQ/view?usp=sharing
     2020: https://drive.google.com/file/d/1iXrjwLTNBXwKD2TwrPD9ApKL7O6uZ8Z7/view?usp=sharing
     2022: https://drive.google.com/file/d/1cl18h_mYnNogYs8Rk-fhBTW6WKOTC2IF/view?usp=sharing
@@ -94,28 +95,19 @@
   photo: lars.jpg
   bio: 'Lars worked at Danish university libraries for two decades and was Director of Libraries at Lund University, Sweden from 2001 to 2011. He founded the DOAJ in 2003, and was Managing Director from 2013-2021. He has vast experience in change management, re-engineering of academic libraries, and development of information services for research & higher education. For two decades Lars has been a strong advocate of open access and for providing services to the open access movement. He is co-founder of <a href="http://www.opendoar.org/" target="_blank">OpenDOAR</a>, the <a href="https://www.doabooks.org/" target="_blank">Directory of Open Access Books</a> and <a href="https://thinkchecksubmit.org" target="_blank">Think. Check. Submit.</a> Lars lives outside Copenhagen, and is married with 4 children and 4 grandchildren. He enjoys vegetable gardening, growing cacti and succulents, and playing internet chess.'
   coi:
-    2016: https://drive.google.com/file/d/0ByRf6PVViI-mbmo2aU9NWkx5dGs/view?usp=sharing&resourcekey=0-mpdRgVU9UlFjC614-woDvg
     2018: https://drive.google.com/file/d/1mm1a8nbY5MQX9loqIs2ZQuVN-73RfPuN/view?usp=sharing
     2021: https://drive.google.com/file/d/1bNj5sqUsu4sRLmm_YOuh3JCSMERzQ1Ro/view?usp=sharing
     2022: https://drive.google.com/file/d/1fRJtvci2_j4vad0C5N1pfqm2sHZQkFz3/view?usp=sharing
 
 - name: Leena Shah
-  role: Managing Editor and Ambassador
+  role: Deputy Head of Editorial (Workflow) and Ambassador
   photo: leena.jpg
   bio: "Leena joined the DOAJ team in 2016 as an Ambassador for India before becoming a Managing Editor.  Prior to joining DOAJ she worked as a science librarian at Nanyang Technological University, Singapore, where she developed a keen interest in scholarly communication & open science. A recent addition to her interests is artificial intelligence in scholarly communication. Leena holds a Master’s degree in Information Studies and lives in Singapore. She loves watching sci-fi shows and is enthusiastic about travelling to new places."
   coi:
-    2016: https://drive.google.com/file/d/0B0fPCpIPjZlmTHZuaEtMSDNIeUpKT2Fid19jVjVFTkRoUmdj/view?usp=sharing&resourcekey=0-KqvRVa30bQEUfqO-YA1L-g
     2018: https://drive.google.com/file/d/1tifEjAIlU3txBw9DjIcRW9cZL7YG7_nU/view?usp=sharing
     2020: https://drive.google.com/file/d/1zU-lLB5W54E_QUm5uto5tqB6cZl83TAJ/view?usp=sharing
     2022: https://drive.google.com/file/d/19rw-naMJqHkI5T7aDIDPUkwPutBdDpDm/view?usp=sharing
 
-- name: Luis Montilla
-  role: Managing Editor
-  photo: luis.jpeg
-  bio: "Luis is a marine ecologist with a passion for improving the quality of scientific publishing. After finishing his Masters in Venezuela, he spent three years in Italy completing his PhD studying marine microbial symbioses in seagrass beds. In his free time, he enjoys reading and watching movies."
-  coi:
-    2023: https://drive.google.com/file/d/1IJhnV2Ht5t5jilaCAFzpuFdYk7UMOjN3/view?usp=sharing
-
 - name: Mahmoud Khalifa
   role: Managing Editor and Ambassador
   photo: mahmoud-new.jpg
@@ -151,7 +143,6 @@
   photo: Rikard.jpg
   bio: 'Rikard has a Bachelor of Arts degree with a Major in Cultural Sciences and a specialization in publishing. He enjoys reading about philosophy and religion.'
   coi:
-    2016: https://drive.google.com/file/d/0ByRf6PVViI-mdnJPdldOM0hUMFU/view?usp=sharing&resourcekey=0-8dJAtvm2n7vXV9NhqZYckw
     2018: https://drive.google.com/file/d/1tOnW8L6TwolyLpIXwMKTITf9wGh_ukLb/view?usp=sharing
     2020: https://drive.google.com/file/d/14c0RgpyD2Slzyh5s8LGvj5OwWbL4H8NX/view?usp=sharing
     2023: https://drive.google.com/file/d/1HQIh1DlfhEutTWniXDGLYFVa9VxJ4OT9/view?usp=share_link
@@ -161,7 +152,6 @@
   photo: sonja.jpg
   bio: 'Sonja is a former Information Librarian from Lund University Library. She has a B.A. in English, Bulgarian and Russian from Lund University and specialises in applications for journals in the Slavonic languages.'
   coi:
-    2016: https://drive.google.com/file/d/0ByRf6PVViI-mNUFoZWV4YnZ3bDg/view?usp=sharing&resourcekey=0-1JRid_DHRMKbgdzmVYL7NQ
     2018: https://drive.google.com/file/d/1M5AGEDP79uk2olCcmVYjKCsmzL7tG2Vc/view?usp=sharing
     2020: https://drive.google.com/file/d/1-4RJYScTs_zMBeD5zESNvCoIBCWTOWHR/view?usp=sharing
     2022: https://drive.google.com/file/d/1soZtiW6gyVJPl7P_J60j2TL2Fqzl0QAs/view?usp=sharing
@@ -178,7 +168,6 @@
   photo: tom.jpg
   bio: 'Tom has a PhD in molecular microbiology and spent several years in Africa doing research on malaria, sleeping sickness and meningococcal epidemics. He has been actively advocating open access and open science since 2012 when he joined the Open Knowledge community and became a member of the DOAJ advisory board. His current research interests are development of quality systems for the assessment of scholarly journals and articles, and research in the area of soil microbiology in relation to soil health and human health.'
   coi:
-    2016: https://drive.google.com/file/d/0ByRf6PVViI-mYUFZNDRISTZodUU/view?usp=sharing&resourcekey=0-g13FJaUJpdR_t2rMLEyzEQ
     2018: https://drive.google.com/file/d/1x0w-a1TWQdJDKPtQpGhmDZSdA4BhFSpI/view?usp=sharing
     2020: https://drive.google.com/file/d/1VyirUdc6FBNOujl938bHf1JCL1jLNwXV/view?usp=sharing
     2022: https://drive.google.com/file/d/1ww7WHQEg1395bPn20Arb7LJn9lIROdBl/view?usp=sharing

cms/pages/legal/terms.md

@@ -32,7 +32,7 @@ DOAJ uses a variety of licenses for the different parts of its website and the c
   + In our [OAI-PMH feed](/docs/oai-pmh)
   + In the [full data dump of all article metadata](/docs/public-data-dump/).
 
-4. The *open source software* that DOAJ is built with is licensed under [an Apache license Version 2](https://github.com/DOAJ/doaj/blob/a6fc2bee499b5a8a1f24fb098acfb8e10bd72503/portality/static/vendor/select2-3.5.4/LICENSE).
+4. The *open source software* that DOAJ is built with is licensed under [an Apache license Version 2](https://github.com/DOAJ/doaj/blob/develop/LICENSE).
 
 ---
 

deploy/doaj_gunicorn_config.py

@@ -1,7 +1,7 @@
 import multiprocessing
 
 bind = "0.0.0.0:5050"
-workers = multiprocessing.cpu_count() * 8 + 1
+workers = multiprocessing.cpu_count() * 6 + 1
 proc_name = 'doaj'
 max_requests = 1000
 
@@ -13,4 +13,4 @@
 max_requests_jitter = 100
 
 timeout = 40
-graceful_timeout = 40
+graceful_timeout = 40

deploy/lambda/alert_backups_missing.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-""" Steven Eardley 2020-02-07 for DOAJ - uploaded manually (todo: we should upload this in the release script) """
+""" Steven Eardley 2023-09-15 for DOAJ - uploaded manually (todo: we should upload this in the release script) """
 
 # ~~BackupsMissing:Monitoring->Lambda:Technology~~
 
@@ -8,35 +8,39 @@
 import json
 from datetime import datetime, timezone, timedelta
 
-from portality.lib.dates import FMT_DATETIME_STD
-
 s3 = boto3.client('s3')
 
 # Check the doaj elasticsearch snapshot bucket has been updated today (should happen daily at 0600 via background job)
-buckets = ['doaj-index-backups']
+buckets = ['doaj-index-ipt-backups']
+
 
 # Check the doaj-nginx logs bucket has been updated today (should happen daily at 0630 via cron logrotate)
-buckets += ['doaj-nginx-logs']
+# buckets += ['doaj-nginx-logs']
 
 
 def lambda_handler(event, context):
     """ The main function executed by Lambda"""
 
+    start = datetime.utcnow()
     summary = {'success': [], 'fail': []}
     for b in buckets:
 
+        print('Checking bucket {0} was updated today'.format(b))
+
         # First check the bucket actually exists
         try:
             s3.head_bucket(Bucket=b)
         except botocore.exceptions.ClientError as e:
             error_code = int(e.response['Error']['Code'])
             if error_code == 404:
                 send_alert_email(b, last_mod=None)
+            raise
 
         # Then check the expected entry exists in the bucket's objects.
         files = list_bucket_keys(bucket_name=b)
         old_to_new = sorted(files, key=lambda f: f['LastModified'])
         newest = old_to_new[-1]
+        print('Latest backup is', newest)
 
         # If the newest file is older than 1 day old, our backups are not up to date.
         if datetime.now(timezone.utc) - newest['LastModified'] > timedelta(days=1):
@@ -47,6 +51,8 @@ def lambda_handler(event, context):
             summary['success'].append(b)
 
     print(summary)  # For the CloudWatch logs
+    print('Completed in', str(datetime.utcnow() - start))
+
     return str(summary)
 
 
@@ -86,8 +92,8 @@ def send_alert_email(bucket, last_mod):
                 msg = 'AWS backup error: bucket {b} is missing.'.format(b=bucket)
             else:
                 msg = 'AWS backup error: bucket {b} has not been updated today - it was last modified on {t}.' \
-                      '\nYou may wish to check the corresponding logs.'.format(b=bucket,
-                                                                               t=last_mod.strftime(FMT_DATETIME_STD))
+                      '\nYou may wish to check the corresponding logs.'.format(b=bucket, t=last_mod.strftime(
+                    '%Y-%m-%dT%H:%M:%SZ'))
 
             r = botocore.vendored.requests.post('https://api.mailgun.net/v3/doaj.org/messages',
                                                 auth=('api', credentials.get('ERROR_MAIL_API_KEY', '')),

doajtest/matrices/article_create_article/issn_validation_against_journal.matrix.csv

@@ -0,0 +1,17 @@
+test_id,eissn,pissn,validated
+1,eissn_in_doaj,pissn_in_doaj,yes
+2,eissn_in_doaj,eissn_not_in_doaj,
+3,eissn_in_doaj,pissn_not_in_doaj,
+4,eissn_in_doaj,!eissn_in_doaj,
+5,pissn_in_doaj,eissn_in_doaj,
+6,pissn_in_doaj,eissn_not_in_doaj,
+7,pissn_in_doaj,pissn_not_in_doaj,
+8,pissn_in_doaj,!pissn_in_doaj,
+9,eissn_not_in_doaj,eissn_in_doaj,
+10,eissn_not_in_doaj,pissn_in_doaj,
+11,eissn_not_in_doaj,pissn_not_in_doaj,
+12,eissn_not_in_doaj,!eissn_not_in_doaj,
+13,pissn_not_in_doaj,eissn_in_doaj,
+14,pissn_not_in_doaj,pissn_in_doaj,
+15,pissn_not_in_doaj,eissn_not_in_doaj,
+16,pissn_not_in_doaj,!pissn_not_in_doaj,

doajtest/matrices/article_create_article/issn_validation_against_journal.settings.csv

@@ -0,0 +1,19 @@
+field,test_id,eissn,pissn,validated
+type,index,generated,generated,conditional
+deafult,,,,no
+,,,,
+values,,eissn_in_doaj,eissn_in_doaj,yes
+values,,pissn_in_doaj,pissn_in_doaj,no
+values,,eissn_not_in_doaj,eissn_not_in_doaj,
+values,,pissn_not_in_doaj,pissn_not_in_doaj,
+,,,,
+,,,,
+conditional validated,,eissn_in_doaj,pissn_in_doaj,yes
+constraint eissn,,eissn_in_doaj,!eissn_in_doaj,
+constraint eissn,,eissn_not_in_doaj,!eissn_not_in_doaj,
+constraint eissn,,pissn_not_in_doaj,!pissn_not_in_doaj,
+constraint eissn,,pissn_in_doaj,!pissn_in_doaj,
+constraint pissn,,eissn_in_doaj,!eissn_in_doaj,
+constraint pissn,,eissn_not_in_doaj,!eissn_not_in_doaj,
+constraint pissn,,pissn_not_in_doaj,!pissn_not_in_doaj,
+constraint pissn,,pissn_in_doaj,!pissn_in_doaj,