Feature/3850 link editor groups by name

doajtest/fixtures/editor_groups.py

@@ -0,0 +1,23 @@
+from portality import models
+
+
+def create_editor_group_en():
+    eg = models.EditorGroup()
+    eg.set_name("English")
+    eg.set_id('egid')
+    return eg
+
+
+def create_editor_group_cn():
+    eg = models.EditorGroup()
+    eg.set_name("Chinese")
+    eg.set_id('egid2')
+    return eg
+
+
+def create_editor_group_jp():
+    eg = models.EditorGroup()
+    eg.set_name("Japanese")
+    eg.set_id('egid3')
+    return eg
+

doajtest/fixtures/v2/journals.py

@@ -11,7 +11,7 @@
 
 class JournalFixtureFactory(object):
     @staticmethod
-    def make_journal_source(in_doaj=False):
+    def make_journal_source(in_doaj=False) -> dict:
         template = deepcopy(JOURNAL_SOURCE)
         template['admin']['in_doaj'] = in_doaj
         return template
@@ -37,23 +37,23 @@ def make_many_journal_sources(count=2, in_doaj=False) -> Iterable[dict]:
         return journal_sources
 
     @staticmethod
-    def make_journal_form():
+    def make_journal_form() -> dict:
         return deepcopy(JOURNAL_FORM)
 
     @staticmethod
-    def make_journal_form_info():
+    def make_journal_form_info() -> dict:
         return deepcopy(JOURNAL_FORM_EXPANDED)
 
     @staticmethod
-    def make_bulk_edit_data():
+    def make_bulk_edit_data() -> dict:
         return deepcopy(JOURNAL_BULK_EDIT)
 
     @staticmethod
-    def csv_headers():
+    def csv_headers() -> dict:
         return deepcopy(CSV_HEADERS)
 
     @staticmethod
-    def question_answers():
+    def question_answers() -> dict:
         return deepcopy(JOURNAL_QUESTION_ANSWERS)
 
 

doajtest/testdrive/todo_editor.py

@@ -68,37 +68,37 @@ def build_application(title, lmu_diff, cd_diff, status, editor=None, editor_grou
     return ap
 
 
-def build_applications(un, eg):
+def build_applications(un: str, eg: models.Application):
     w = 7 * 24 * 60 * 60
 
     apps = {}
 
     app = build_application(un + " Stalled Application", 6 * w, 7 * w, constants.APPLICATION_STATUS_IN_PROGRESS,
-                                 editor_group=eg.name)
+                            editor_group=eg.id)
     app.save()
     apps["stalled"] = [{
         "id": app.id,
         "title": un + " Stalled Application"
     }]
 
     app = build_application(un + " Old Application", 8 * w, 8 * w, constants.APPLICATION_STATUS_IN_PROGRESS,
-                                 editor_group=eg.name)
+                            editor_group=eg.id)
     app.save()
     apps["old"] = [{
         "id": app.id,
         "title": un + " Old Application"
     }]
 
     app = build_application(un + " Completed Application", 1 * w, 1 * w, constants.APPLICATION_STATUS_COMPLETED,
-                                 editor_group=eg.name)
+                            editor_group=eg.id)
     app.save()
     apps["completed"] = [{
         "id": app.id,
         "title": un + " Completed Application"
     }]
 
     app = build_application(un + " Pending Application", 1 * w, 1 * w, constants.APPLICATION_STATUS_PENDING,
-                                 editor_group=eg.name)
+                            editor_group=eg.id)
     app.remove_editor()
     app.save()
     apps["pending"] = [{
@@ -107,4 +107,3 @@ def build_applications(un, eg):
     }]
 
     return apps
-

doajtest/testdrive/todo_maned_editor_associate.py

@@ -13,7 +13,8 @@ class TodoManedEditorAssociate(TestDrive):
     def setup(self) -> dict:
         un = self.create_random_str()
         pw = self.create_random_str()
-        admin = models.Account.make_account(un + "@example.com", un, "TodoManedEditorAssociate " + un, ["admin", "editor", constants.ROLE_ASSOCIATE_EDITOR])
+        admin = models.Account.make_account(un + "@example.com", un, "TodoManedEditorAssociate " + un,
+                                            ["admin", "editor", constants.ROLE_ASSOCIATE_EDITOR])
         admin.set_password(pw)
         admin.save()
 
@@ -53,7 +54,6 @@ def setup(self) -> dict:
         eapps = build_editor_applications(un, eg2)
         mapps = build_maned_applications(un, eg1, owner.id, eg3)
 
-
         return {
             "account": {
                 "username": admin.id,
@@ -96,45 +96,47 @@ def teardown(self, params) -> dict:
         return {"status": "success"}
 
 
-def build_maned_applications(un, eg, owner, eponymous_group):
+def build_maned_applications(un: str,
+                             eg: models.EditorGroup, owner,
+                             eponymous_group: models.EditorGroup):
     w = 7 * 24 * 60 * 60
 
     apps = {}
 
     app = build_application(un + " Maned Stalled Application", 8 * w, 9 * w, constants.APPLICATION_STATUS_IN_PROGRESS,
-                            editor_group=eg.name, owner=owner)
+                            editor_group=eg.id, owner=owner)
     app.save()
     apps["stalled"] = [{
         "id": app.id,
         "title": un + " Maned Stalled Application"
     }]
 
     app = build_application(un + " Maned Old Application", 10 * w, 10 * w, constants.APPLICATION_STATUS_IN_PROGRESS,
-                            editor_group=eg.name, owner=owner)
+                            editor_group=eg.id, owner=owner)
     app.save()
     apps["old"] = [{
         "id": app.id,
         "title": un + " Maned Old Application"
     }]
 
     app = build_application(un + " Maned Ready Application", 1 * w, 1 * w, constants.APPLICATION_STATUS_READY,
-                            editor_group=eg.name, owner=owner)
+                            editor_group=eg.id, owner=owner)
     app.save()
     apps["ready"] = [{
         "id": app.id,
         "title": un + " Maned Completed Application"
     }]
 
     app = build_application(un + " Maned Completed Application", 2 * w, 2 * w, constants.APPLICATION_STATUS_COMPLETED,
-                            editor_group=eg.name, owner=owner)
+                            editor_group=eg.id, owner=owner)
     app.save()
     apps["completed"] = [{
         "id": app.id,
         "title": un + " Maned Completed Application"
     }]
 
     app = build_application(un + " Maned Pending Application", 2 * w, 2 * w, constants.APPLICATION_STATUS_PENDING,
-                            editor_group=eg.name, owner=owner)
+                            editor_group=eg.id, owner=owner)
     app.remove_editor()
     app.save()
     apps["pending"] = [{
@@ -144,20 +146,22 @@ def build_maned_applications(un, eg, owner, eponymous_group):
 
     app = build_application(un + " Maned Low Priority Pending Application", 1 * w, 1 * w,
                             constants.APPLICATION_STATUS_PENDING,
-                            editor_group=eponymous_group.name, owner=owner)
+                            editor_group=eponymous_group.id, owner=owner)
     app.remove_editor()
     app.save()
     apps["low_priority_pending"] = [{
         "id": app.id,
         "title": un + " Maned Low Priority Pending Application"
     }]
 
-    lmur = build_application(un + " Last Month Maned Update Request", 5 * w, 5 * w, constants.APPLICATION_STATUS_UPDATE_REQUEST,
-                           editor_group=eponymous_group.name, owner=owner, update_request=True)
+    lmur = build_application(un + " Last Month Maned Update Request", 5 * w, 5 * w,
+                             constants.APPLICATION_STATUS_UPDATE_REQUEST,
+                             editor_group=eponymous_group.id, owner=owner, update_request=True)
     lmur.save()
 
-    tmur = build_application(un + " This Month Maned Update Request", 0, 0, constants.APPLICATION_STATUS_UPDATE_REQUEST,
-                           editor_group=eponymous_group.name, owner=owner, update_request=True)
+    tmur = build_application(un + " This Month Maned Update Request", 0, 0,
+                             constants.APPLICATION_STATUS_UPDATE_REQUEST,
+                             editor_group=eponymous_group.id, owner=owner, update_request=True)
     tmur.save()
 
     apps["update_request"] = [
@@ -174,7 +178,8 @@ def build_maned_applications(un, eg, owner, eponymous_group):
     return apps
 
 
-def build_application(title, lmu_diff, cd_diff, status, editor=None, editor_group=None, owner=None, update_request=False):
+def build_application(title, lmu_diff, cd_diff, status, editor=None, editor_group=None, owner=None,
+                      update_request=False):
     source = ApplicationFixtureFactory.make_application_source()
     ap = models.Application(**source)
     ap.bibjson().title = title

doajtest/unit/application_processors/test_editor_journal_review.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from doajtest.helpers import DoajTestCase
 
 from portality import models
@@ -13,7 +15,7 @@
 #####################################################################
 
 @classmethod
-def editor_group_pull(cls, field, value):
+def editor_group_pull(cls, value):
     eg = models.EditorGroup()
     eg.set_editor("eddie")
     eg.set_associates(["associate", "assan"])
@@ -36,25 +38,13 @@ def mock_lookup_code(code):
 
 class TestEditorJournalReview(DoajTestCase):
 
-    def setUp(self):
-        super(TestEditorJournalReview, self).setUp()
-
-        self.editor_group_pull = models.EditorGroup.pull_by_key
-        models.EditorGroup.pull_by_key = editor_group_pull
-
-        self.old_lookup_code = lcc.lookup_code
-        lcc.lookup_code = mock_lookup_code
-
-    def tearDown(self):
-        super(TestEditorJournalReview, self).tearDown()
-        models.EditorGroup.pull_by_key = self.editor_group_pull
-        lcc.lookup_code = self.old_lookup_code
-
 
     ###########################################################
     # Tests on the publisher's re-journal form
     ###########################################################
 
+    @patch('portality.models.EditorGroup.pull', editor_group_pull)
+    @patch('portality.lcc.lookup_code', mock_lookup_code)
     def test_01_editor_review_success(self):
         """Give the editor's journal form a full workout"""
 

doajtest/unit/application_processors/test_maned_journal_review.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from doajtest.helpers import DoajTestCase
 
 from portality import models
@@ -17,7 +19,7 @@
 #####################################################################
 
 @classmethod
-def editor_group_pull(cls, field, value):
+def editor_group_pull(cls, value):
     eg = models.EditorGroup()
     eg.set_editor("eddie")
     eg.set_associates(["associate", "assan"])
@@ -32,20 +34,8 @@ def mock_lookup_code(code):
 
 class TestManEdJournalReview(DoajTestCase):
 
-    def setUp(self):
-        super(TestManEdJournalReview, self).setUp()
-
-        self.editor_group_pull = models.EditorGroup.pull_by_key
-        models.EditorGroup.pull_by_key = editor_group_pull
-
-        self.old_lookup_code = lcc.lookup_code
-        lcc.lookup_code = mock_lookup_code
-
-    def tearDown(self):
-        super(TestManEdJournalReview, self).tearDown()
-        models.EditorGroup.pull_by_key = self.editor_group_pull
-        lcc.lookup_code = self.old_lookup_code
-
+    @patch('portality.models.EditorGroup.pull', editor_group_pull)
+    @patch('portality.lcc.lookup_code', mock_lookup_code)
     def test_01_maned_review_success(self):
         """Give the Managing Editor's journal form a full workout"""
 

doajtest/unit/event_consumers/test_application_assed_inprogress_notify.py

@@ -42,6 +42,7 @@ def test_consume_success(self):
         acc.save()
 
         eg = models.EditorGroup()
+        eg.set_id(app.editor_group)
         eg.set_name(app.editor_group)
         eg.set_maned(acc.id)
         eg.save(blocking=True)

doajtest/unit/event_consumers/test_application_editor_completed_notify.py

@@ -41,7 +41,8 @@ def test_consume_success(self):
         acc.save()
 
         eg = models.EditorGroup()
-        eg.set_name(app.editor_group)
+        eg.set_name("test group")
+        eg.set_id(app.editor_group)
         eg.set_editor(acc.id)
         eg.save(blocking=True)
 

doajtest/unit/event_consumers/test_application_editor_group_assigned_notify.py

@@ -37,7 +37,8 @@ def test_consume_success(self):
         acc.save()
 
         eg = models.EditorGroup()
-        eg.set_name(app.editor_group)
+        eg.set_name("test group")
+        eg.set_id(app.editor_group)
         eg.set_editor("editor")
         eg.save(blocking=True)
 
@@ -67,7 +68,8 @@ def test_consume_fail(self):
         # app.save(blocking=True)
 
         eg = models.EditorGroup()
-        eg.set_name(app.editor_group)
+        eg.set_name('test group')
+        eg.set_id(app.editor_group)
         eg.save(blocking=True)
 
         event = models.Event(constants.EVENT_APPLICATION_EDITOR_GROUP_ASSIGNED, context={"application": app.data})

doajtest/unit/event_consumers/test_application_editor_inprogress_notify.py

@@ -45,7 +45,8 @@ def test_consume_success(self):
         acc.save()
 
         eg = models.EditorGroup()
-        eg.set_name(app.editor_group)
+        eg.set_name('test group')
+        eg.set_id(app.editor_group)
         eg.set_editor(acc.id)
         eg.save(blocking=True)
 

doajtest/unit/event_consumers/test_application_maned_ready_notify.py

@@ -41,7 +41,8 @@ def test_consume_success(self):
         acc.save()
 
         eg = models.EditorGroup()
-        eg.set_name(app.editor_group)
+        eg.set_name("test group")
+        eg.set_id(app.editor_group)
         eg.set_maned(acc.id)
         eg.save(blocking=True)