v4.2.0

.env.example

@@ -1,21 +1,24 @@
-SECRET_KEY=ccscscsc
+ALLOWED_HOSTS=127.0.0.1
+ALTCHA_HMAC_KEY=secret_key
+BLUESKY_JDH_ACCOUNT=****.bsky.social
+BLUESKY_JDH_PASSWORD=secret_key
+CORS_ALLOW_CREDENTIALS=True
+CORS_ALLOWED_ORIGINS=http://127.0.0.1
+CSRF_TRUSTED_ORIGINS=http://127.0.0.1
 DATABASE_ENGINE=django.db.backends.sqlite3
 DATABASE_NAME=db.sqlite3
 DATABASE_USER=db
 DATABASE_PASSWORD=pwd
-ALLOWED_HOSTS=127.0.0.1
-CSRF_TRUSTED_ORIGINS=http://127.0.0.1
-EMAIL_HOST=smtp
-EMAIL_PORT=poort
 DRF_RECAPTCHA_SECRET_KEY=secret_key
-NUM_CHARS_FINGERPRINT=10
-JDH_ORCID_API_TOKEN=secret_key
+SECRET_KEY=ccscscsc
+EMAIL_HOST=smtp
+EMAIL_PORT=port
+FACEBOOK_JDH_PAGE_ID=secret_key
+FACEBOOK_JDH_ACCESS_TOKEN=secret_key
 GITHUB_ACCESS_TOKEN=secret_key
-CORS_ALLOW_CREDENTIALS=True
-CORS_ALLOWED_ORIGINS=http://127.0.0.1
+JDH_ORCID_API_TOKEN=secret_key
+NUM_CHARS_FINGERPRINT=10
 SESSION_COOKIE_SAMESITE=None
 SESSION_COOKIE_SECURE=True
-FACEBOOK_JDH_PAGE_ID=secret_key
-FACEBOOK_JDH_ACCESS_TOKEN=secret_key
-BLUESKY_JDH_ACCOUNT=****.bsky.social
-BLUESKY_JDH_PASSWORD=secret_key
+OJS_API_KEY_TOKEN=secret_key
+OJS_API_URL=http://ojs.journalofdigitalhistory.org

.github/workflows/run_unit_tests.yml

@@ -1,4 +1,4 @@
-name: Django CI
+name: Unit Tests Django CI
 
 on:
   pull_request:
@@ -45,6 +45,7 @@ jobs:
 
       - name: Run tests
         env:
+          ALTCHA_HMAC_KEY: ${{ secrets.ALTCHA_HMAC_KEY }}
           SECRET_KEY: default-secret-key-for-testing
           DATABASE_ENGINE: django.db.backends.postgresql_psycopg2
           DATABASE_NAME: test_db
@@ -53,6 +54,7 @@ jobs:
           DATABASE_HOST: localhost
           DATABASE_PORT: 5432
           ALLOWED_HOSTS: localhost
+          CORS_ALLOWED_ORIGINS: http://127.0.0.1
           CSRF_TRUSTED_ORIGINS: http://127.0.0.1
           DRF_RECAPTCHA_SECRET_KEY: default-recaptcha-secret-key
           EMAIL_HOST: smtp.example.com
@@ -66,6 +68,9 @@ jobs:
           BLUESKY_JDH_PASSWORD: ${{ secrets.BLUESKY_JDH_PASSWORD }}
           FACEBOOK_JDH_PAGE_ID: ${{ secrets.FACEBOOK_JDH_PAGE_ID }}
           FACEBOOK_JDH_ACCESS_TOKEN: ${{ secrets.FACEBOOK_JDH_ACCESS_TOKEN }}
+          OJS_API_KEY_TOKEN: default-token
+          OJS_API_URL: https://ojs-api-url-example.com
+          COPY_EDITOR_ADDRESS: copy-editor-address@mail.com
         run: |
           pipenv run ./manage.py test
 

Pipfile

@@ -154,6 +154,8 @@ webcolors = "==24.11.1"
 webencodings = "==0.5.1"
 websocket-client = "==1.8.0"
 zopfli = "==0.2.3.post1"
+altcha = "*"
+django-cors-headers = "*"
 
 [requires]
 python_version = "3.12"

jdh/settings.py

@@ -10,9 +10,10 @@
 https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 
-from pathlib import Path
 import os
 import sys
+from pathlib import Path
+
 from .base import get_env_variable
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -30,18 +31,23 @@
 
 DJANGO_LOG_LEVEL = get_env_variable("DJANGO_LOG_LEVEL", "DEBUG")
 
+CORS_ALLOWED_ORIGINS = get_env_variable("CORS_ALLOWED_ORIGINS", "").split(",")
+
 CSRF_TRUSTED_ORIGINS = get_env_variable("CSRF_TRUSTED_ORIGINS", "").split(",")
 
 ALLOWED_HOSTS = get_env_variable("ALLOWED_HOSTS", "").split(",")
 
+ALTCHA_HMAC_KEY = get_env_variable("ALTCHA_HMAC_KEY", "").split(",")
+
 DRF_RECAPTCHA_SECRET_KEY = get_env_variable(
     "DRF_RECAPTCHA_SECRET_KEY", "default-recaptacha-secret-key"
-)
+).split(",")
 
 
 # Application definition
 
 INSTALLED_APPS = [
+    "corsheaders",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
@@ -79,6 +85,7 @@
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    'corsheaders.middleware.CorsMiddleware',
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
@@ -278,11 +285,16 @@
 DEFAULT_TO_EMAIL = get_env_variable("DEFAULT_TO_EMAIL", "jdh.admin@uni.lu")
 
 # Github API
-
 GITHUB_ACCESS_TOKEN = get_env_variable("GITHUB_ACCESS_TOKEN")
 
 # Social network
 BLUESKY_JDH_ACCOUNT = get_env_variable("BLUESKY_JDH_ACCOUNT")
 BLUESKY_JDH_PASSWORD = get_env_variable("BLUESKY_JDH_PASSWORD")
 FACEBOOK_JDH_PAGE_ID = get_env_variable("FACEBOOK_JDH_PAGE_ID")
 FACEBOOK_JDH_ACCESS_TOKEN = get_env_variable("FACEBOOK_JDH_ACCESS_TOKEN")
+
+# OJS API
+OJS_API_KEY_TOKEN = get_env_variable("OJS_API_KEY_TOKEN", "default")
+OJS_API_URL = get_env_variable("OJS_API_URL", "http://ojs.journalofdigitalhistory.org")
+
+COPY_EDITOR_ADDRESS = get_env_variable("COPY_EDITOR_ADDRESS", "")

jdhapi/admin.py

@@ -11,10 +11,10 @@
 from .tasks import (
     save_article_fingerprint,
     save_article_specific_content,
-    save_citation,
     save_libraries,
     save_references,
 )
+from .utils.articles import save_citation
 from import_export.admin import ExportActionMixin
 from django.utils.html import format_html
 
@@ -37,7 +37,7 @@ def save_notebook_specific_cell(modeladmin, request, queryset):
 
 def save_article_citation(modeladmin, request, queryset):
     for article in queryset:
-        save_citation.delay(article_id=article.pk)
+        save_citation(article_id=article.pk)
 
 
 save_article_citation.short_description = "3: Generate citation"

jdhapi/forms/articleForm.py

@@ -1,7 +1,7 @@
 # import marko
 from django import forms
 from jdhapi.models import Article, Abstract
-from jdhapi.utils.gitup_repository import is_socialmediacover_exist
+from jdhapi.utils.github_repository import is_socialmediacover_exist
 import logging
 import datetime
 from django.http import Http404

jdhapi/migrations/0052_article_ojs_submission_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2026-02-09 16:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jdhapi', '0051_remove_abstract_issue'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='article',
+            name='ojs_submission_id',
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+    ]

jdhapi/migrations/0053_author_linkedin_id_alter_article_status.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.6 on 2026-03-02 11:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jdhapi', '0052_article_ojs_submission_id'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='author',
+            name='linkedin_id',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='article',
+            name='status',
+            field=models.CharField(choices=[('DRAFT', 'Draft'), ('TECHNICAL_REVIEW', 'Technical review'), ('PEER_REVIEW', 'Peer review'), ('DESIGN_REVIEW', 'Design review'), ('COPY_EDITING', 'Copy editing'), ('PUBLISHED', 'Published')], default='DRAFT', max_length=25),
+        ),
+    ]

jdhapi/models/article.py

@@ -1,15 +1,7 @@
 import logging
-import marko
 
-from django.conf import settings
-
-from django.core.mail import EmailMessage
 from django.db import models
-from django.template.loader import render_to_string
-
-from lxml import html
 from model_utils import FieldTracker
-from weasyprint import HTML
 
 logger = logging.getLogger(__name__)
 
@@ -43,7 +35,6 @@ class Article(models.Model):
     Methods:
         get_kernel_language(): Returns the kernel language based on the 'tool' tag.
         __str__(): Returns the title of the abstract.
-        send_email_if_peer_review(): Sends an email with a PDF attachment if the article is in peer review status.
     """
 
     class Status(models.TextChoices):
@@ -63,7 +54,14 @@ class Status(models.TextChoices):
             "DESIGN_REVIEW",
             "Design review",
         )
-        PUBLISHED = "PUBLISHED", "Published"
+        COPY_EDITING = (
+            "COPY_EDITING",
+            "Copy editing",
+        )
+        PUBLISHED = (
+            "PUBLISHED", 
+            "Published",
+        )
 
     class CopyrightType(models.TextChoices):
         DRAFT = (
@@ -138,7 +136,7 @@ class RepositoryType(models.TextChoices):
         blank=True,
         null=True,
         help_text="Url to find here https://data.journalofdigitalhistory.org/",
-    )  # New field for Dataverse URL
+    ) 
     publication_date = models.DateTimeField(blank=True, null=True)
     copyright_type = models.CharField(
         max_length=15,
@@ -162,6 +160,7 @@ class RepositoryType(models.TextChoices):
     )
     tags = models.ManyToManyField("jdhapi.Tag", blank=True)
     authors = models.ManyToManyField("jdhapi.Author", through="Role")
+    ojs_submission_id = models.IntegerField(null=True, blank=True, default=None)
 
     def get_kernel_language(self):
         tool_tags = self.tags.filter(category="tool")
@@ -174,37 +173,3 @@ def get_kernel_language(self):
 
     def __str__(self):
         return self.abstract.title
-
-    def send_email_if_peer_review(self):
-        if self.status == self.Status.PEER_REVIEW:
-            # Render the PDF template
-            template = "jdhseo/peer_review.html"
-            if "title" in self.data:
-                articleTitle = html.fromstring(
-                    marko.convert(self.data["title"][0])
-                ).text_content()
-                context = {"article": self, "articleTitle": articleTitle}
-                html_string = render_to_string(template, context)
-
-                # Generate the PDF
-                pdf_file = HTML(string=html_string).write_pdf()
-                logger.info("Pdf generated")
-                filename = "peer_review_" + self.abstract.pid + ".pdf"
-                # Save the PDF to a file
-                # with open(filename, 'wb') as f:
-                #    f.write(pdf_file)
-                # logger.info("Pdf saved")
-                # Create an email message with the PDF attachment
-                subject = f"{articleTitle} can been sent to peer review!"
-                body = "Please find attached the links useful for the peer review."
-                from_email = settings.DEFAULT_FROM_EMAIL
-                to_email = settings.DEFAULT_TO_EMAIL
-                email = EmailMessage(subject, body, from_email, [to_email])
-                email.attach(filename, pdf_file, "application/pdf")
-
-                # Send the email
-                try:
-                    email.send()
-                    logger.info("Email sent")
-                except Exception as e:
-                    print(f"Error sending email: {str(e)}")

jdhapi/models/author.py

@@ -12,6 +12,7 @@ class Author(models.Model):
     github_id = models.CharField(max_length=39, null=True, blank=True)
     bluesky_id = models.CharField(max_length=255, null=True, blank=True)
     facebook_id = models.CharField(max_length=50, null=True, blank=True)
+    linkedin_id = models.CharField(max_length=100, null=True, blank=True)
     city = models.CharField(max_length=100, null=True, blank=True)
     country = CountryField(blank=True, null=True)
 

jdhapi/serializers/article.py

@@ -38,5 +38,6 @@ class Meta:
             "tags",
             "issue",
             "authors",
+            "ojs_submission_id",
             "fingerprint",
         ]