diff --git a/process_request/routines.py b/process_request/routines.py index a2eee56..82c0e2c 100644 --- a/process_request/routines.py +++ b/process_request/routines.py @@ -214,22 +214,6 @@ def __init__(self): self.request_defaults = { "AeonForm": "EADRequest", "DocumentType": "Default", - "GroupingIdentifier": "GroupingField", - "GroupingOption_EADNumber": "FirstValue", - "GroupingOption_ItemInfo1": "Concatenate", - "GroupingOption_ItemDate": "Concatenate", - "GroupingOption_ItemTitle": "FirstValue", - "GroupingOption_ItemAuthor": "FirstValue", - "GroupingOption_ItemSubtitle": "FirstValue", - "GroupingOption_ItemVolume": "FirstValue", - "GroupingOption_ItemIssue": "Concatenate", - "GroupingOption_ItemInfo2": "Concatenate", - "GroupingOption_CallNumber": "FirstValue", - "GroupingOption_ItemInfo3": "FirstValue", - "GroupingOption_ItemCitation": "FirstValue", - "GroupingOption_ItemNumber": "FirstValue", - "GroupingOption_Location": "FirstValue", - "GroupingOption_ItemInfo5": "FirstValue", "UserReview": "No", "SubmitButton": "Submit Request", } @@ -274,6 +258,22 @@ def prepare_reading_room_request(self, items, request_data): data: Submission data for Aeon. """ reading_room_defaults = { + "GroupingIdentifier": "GroupingField", + "GroupingOption_EADNumber": "FirstValue", + "GroupingOption_ItemInfo1": "Concatenate", + "GroupingOption_ItemDate": "Concatenate", + "GroupingOption_ItemTitle": "FirstValue", + "GroupingOption_ItemAuthor": "FirstValue", + "GroupingOption_ItemSubtitle": "FirstValue", + "GroupingOption_ItemVolume": "FirstValue", + "GroupingOption_ItemIssue": "Concatenate", + "GroupingOption_ItemInfo2": "Concatenate", + "GroupingOption_CallNumber": "FirstValue", + "GroupingOption_ItemInfo3": "FirstValue", + "GroupingOption_ItemCitation": "FirstValue", + "GroupingOption_ItemNumber": "FirstValue", + "GroupingOption_Location": "FirstValue", + "GroupingOption_ItemInfo5": "FirstValue", "WebRequestForm": "DefaultRequest", "RequestType": "Loan", "ScheduledDate": request_data.get("scheduledDate"), diff --git a/process_request/tests.py b/process_request/tests.py index 126ec7e..5300f15 100644 --- a/process_request/tests.py +++ b/process_request/tests.py @@ -364,10 +364,12 @@ def test_send_aeon_requests(self, mock_get_data): data = {"scheduled_date": date.today().isoformat(), "items": random_list()} delivered = AeonRequester().get_request_data("readingroom", "https://dimes.rockarch.org", **data) self.assertTrue(isinstance(delivered, dict)) + self.assertIn("GroupingIdentifier", delivered) data["format"] = "jpeg" delivered = AeonRequester().get_request_data("duplication", "https://dimes.rockarch.org", **data) self.assertTrue(isinstance(delivered, dict)) + self.assertNotIn("GroupingIdentifier", delivered) request_type = "foo" with self.assertRaises(ValueError, msg="Unknown request type '{}', expected either 'readingroom' or 'duplication'".format(request_type)):