Fixed more tests and mypy errors.

api/admin/controller/analytics_services.py

@@ -6,7 +6,7 @@
 from api.google_analytics_provider import GoogleAnalyticsProvider
 from api.s3_analytics_provider import S3AnalyticsProvider
 from core.local_analytics_provider import LocalAnalyticsProvider
-from core.model import ExternalIntegration, ExternalIntegrationLink
+from core.model import ExternalIntegration
 from core.util import first_or_default
 from core.util.problem_detail import ProblemDetail
 
@@ -95,14 +95,6 @@ def process_post(self):
 
         service.name = name
 
-        external_integration_link = self._set_storage_external_integration_link(
-            service,
-            ExternalIntegrationLink.ANALYTICS,
-            S3UploaderConfiguration.ANALYTICS_BUCKET_KEY,
-        )
-        if isinstance(external_integration_link, ProblemDetail):
-            return external_integration_link
-
         if is_new:
             return Response(str(service.id), 201)
         else:

api/admin/controller/catalog_services.py

@@ -6,14 +6,12 @@
 from api.admin.problem_details import (
     CANNOT_CHANGE_PROTOCOL,
     INTEGRATION_NAME_ALREADY_IN_USE,
-    MISSING_INTEGRATION,
     MISSING_SERVICE,
     MULTIPLE_SERVICES_FOR_LIBRARY,
     UNKNOWN_PROTOCOL,
 )
 from core.marc import MARCExporter
-from core.model import ExternalIntegration, get_one, get_one_or_create
-from core.model.configuration import ExternalIntegrationLink
+from core.model import ExternalIntegration, get_one
 from core.util.problem_detail import ProblemDetail
 
 
@@ -85,10 +83,6 @@ def process_post(self):
         if isinstance(result, ProblemDetail):
             return result
 
-        external_integration_link = self._set_external_integration_link(service)
-        if isinstance(external_integration_link, ProblemDetail):
-            return external_integration_link
-
         library_error = self.check_libraries(service)
         if library_error:
             self._db.rollback()
@@ -99,39 +93,6 @@ def process_post(self):
         else:
             return Response(str(service.id), 200)
 
-    def _set_external_integration_link(self, service):
-        """Either set or delete the external integration link between the
-        service and the storage integration.
-        """
-        mirror_integration_id = flask.request.form.get("mirror_integration_id")
-
-        # If no storage integration was selected, then delete the existing
-        # external integration link.
-        current_integration_link, ignore = get_one_or_create(
-            self._db,
-            ExternalIntegrationLink,
-            library_id=None,
-            external_integration_id=service.id,
-            purpose=ExternalIntegrationLink.MARC,
-        )
-
-        if mirror_integration_id == self.NO_MIRROR_INTEGRATION:
-            if current_integration_link:
-                self._db.delete(current_integration_link)
-        else:
-            storage_integration = get_one(
-                self._db, ExternalIntegration, id=mirror_integration_id
-            )
-            # Only get storage integrations that have a MARC file option set
-            if (
-                not storage_integration
-                or not storage_integration.setting(
-                    S3UploaderConfiguration.MARC_BUCKET_KEY
-                ).value
-            ):
-                return MISSING_INTEGRATION
-            current_integration_link.other_integration_id = storage_integration.id
-
     def validate_form_fields(self, protocol):
         """Verify that the protocol which the user has selected is in the list
         of recognized protocol options."""

api/controller.py

@@ -299,7 +299,7 @@ def load_settings(self):
         interface.
         """
         LogConfiguration.initialize(self._db)
-        self.analytics = Analytics(self._db, refresh=True, services=self.services)
+        self.analytics = Analytics(self._db, refresh=True)
 
         with elapsed_time_logging(
             log_method=self.log.debug,

api/discovery/registration_script.py

@@ -67,7 +67,7 @@ def do_run(
         # Set up an application context so we have access to url_for.
         from api.app import app
 
-        app.manager = manager or CirculationManager(self._db)
+        app.manager = manager or CirculationManager(self._db, self.services)
         base_url = ConfigurationSetting.sitewide(
             self._db, Configuration.BASE_URL_KEY
         ).value

core/scripts.py

@@ -115,7 +115,7 @@ def parse_time(cls, time_string):
                     continue
         raise ValueError("Could not parse time: %s" % time_string)
 
-    def __init__(self, _db=None, *args, **kwargs):
+    def __init__(self, _db=None, services: Optional[Services] = None, *args, **kwargs):
         """Basic constructor.
 
         :_db: A database session to be used instead of
@@ -124,7 +124,9 @@ def __init__(self, _db=None, *args, **kwargs):
         if _db:
             self._session = _db
 
-        self._services = create_container()
+        if services is None:
+            services = create_container()
+        self._services = services
 
     def run(self):
         DataSource.well_known_sources(self._db)

core/service/storage/container.py

@@ -7,6 +7,9 @@
 
 class Storage(DeclarativeContainer):
 
+    # See https://python-dependency-injector.ets-labs.org/wiring.html
+    # This lists modules that contain markers that will be used to wire up
+    # dependencies from this container automatically.
     wiring_config = WiringConfiguration(
         modules=[
             "api.s3_analytics_provider",

scripts.py

@@ -651,7 +651,7 @@ def process_lane(self, lane, exporter=None):
             return
 
         # Find the storage service
-        storage_service = self.container.storage.public()
+        storage_service = self.services.storage.public()
         if not storage_service:
             self.log.info("No storage service was found.")
             return

tests/api/admin/controller/test_catalog_services.py

@@ -8,7 +8,6 @@
 from api.admin.problem_details import (
     CANNOT_CHANGE_PROTOCOL,
     INTEGRATION_NAME_ALREADY_IN_USE,
-    MISSING_INTEGRATION,
     MISSING_SERVICE,
     MULTIPLE_SERVICES_FOR_LIBRARY,
     UNKNOWN_PROTOCOL,
@@ -21,7 +20,6 @@
     create,
     get_one,
 )
-from core.model.configuration import ExternalIntegrationLink
 from tests.fixtures.api_admin import SettingsControllerFixture
 
 
@@ -158,63 +156,8 @@ def test_catalog_services_post_errors(
             goal=ExternalIntegration.CATALOG_GOAL,
         )
 
-        # Attempt to set an S3 mirror external integration but it does not exist!
-        with settings_ctrl_fixture.request_context_with_admin("/", method="POST"):
-            ME = MARCExporter
-            flask.request.form = ImmutableMultiDict(
-                [
-                    ("name", "exporter name"),
-                    ("id", str(service.id)),
-                    ("protocol", ME.NAME),
-                    ("mirror_integration_id", "1234"),
-                ]
-            )
-            response = (
-                settings_ctrl_fixture.manager.admin_catalog_services_controller.process_catalog_services()
-            )
-            assert response.uri == MISSING_INTEGRATION.uri
-
-        s3, ignore = create(
-            settings_ctrl_fixture.ctrl.db.session,
-            ExternalIntegration,
-            protocol=ExternalIntegration.S3,
-            goal=ExternalIntegration.STORAGE_GOAL,
-        )
-
-        # Now an S3 integration exists, but it has no MARC bucket configured.
-        with settings_ctrl_fixture.request_context_with_admin("/", method="POST"):
-            ME = MARCExporter
-            flask.request.form = ImmutableMultiDict(
-                [
-                    ("name", "exporter name"),
-                    ("id", str(service.id)),
-                    ("protocol", ME.NAME),
-                    ("mirror_integration_id", str(s3.id)),
-                ]
-            )
-            response = (
-                settings_ctrl_fixture.manager.admin_catalog_services_controller.process_catalog_services()
-            )
-            assert response.uri == MISSING_INTEGRATION.uri
-
-        settings_ctrl_fixture.admin.remove_role(AdminRole.SYSTEM_ADMIN)
-        settings_ctrl_fixture.ctrl.db.session.flush()
-        with settings_ctrl_fixture.request_context_with_admin("/", method="POST"):
-            flask.request.form = ImmutableMultiDict(
-                [
-                    ("name", "new name"),
-                    ("protocol", ME.NAME),
-                    ("mirror_integration_id", str(s3.id)),
-                ]
-            )
-            pytest.raises(
-                AdminNotAuthorized,
-                settings_ctrl_fixture.manager.admin_catalog_services_controller.process_catalog_services,
-            )
-
         # This should be the last test to check since rolling back database
         # changes in the test can cause it to crash.
-        s3.setting(S3UploaderConfiguration.MARC_BUCKET_KEY).value = "marc-files"
         service.libraries += [settings_ctrl_fixture.ctrl.db.default_library()]
         settings_ctrl_fixture.admin.add_role(AdminRole.SYSTEM_ADMIN)
 
@@ -224,7 +167,6 @@ def test_catalog_services_post_errors(
                 [
                     ("name", "new name"),
                     ("protocol", ME.NAME),
-                    ("mirror_integration_id", str(s3.id)),
                     (
                         "libraries",
                         json.dumps(
@@ -249,20 +191,11 @@ def test_catalog_services_post_create(
     ):
         ME = MARCExporter
 
-        s3, ignore = create(
-            settings_ctrl_fixture.ctrl.db.session,
-            ExternalIntegration,
-            protocol=ExternalIntegration.S3,
-            goal=ExternalIntegration.STORAGE_GOAL,
-        )
-        s3.setting(S3UploaderConfiguration.MARC_BUCKET_KEY).value = "marc-files"
-
         with settings_ctrl_fixture.request_context_with_admin("/", method="POST"):
             flask.request.form = ImmutableMultiDict(
                 [
                     ("name", "exporter name"),
                     ("protocol", ME.NAME),
-                    ("mirror_integration_id", str(s3.id)),
                     (
                         "libraries",
                         json.dumps(
@@ -288,24 +221,11 @@ def test_catalog_services_post_create(
             goal=ExternalIntegration.CATALOG_GOAL,
         )
         assert isinstance(service, ExternalIntegration)
-        # There was one S3 integration and it was selected. The service has an
-        # External Integration Link to the storage integration that is created
-        # in a POST with purpose of ExternalIntegrationLink.MARC.
-        integration_link = get_one(
-            settings_ctrl_fixture.ctrl.db.session,
-            ExternalIntegrationLink,
-            external_integration_id=service.id,
-            purpose=ExternalIntegrationLink.MARC,
-        )
-        assert isinstance(integration_link, ExternalIntegrationLink)
 
         assert service.id == int(response.get_data())
         assert ME.NAME == service.protocol
         assert "exporter name" == service.name
         assert [settings_ctrl_fixture.ctrl.db.default_library()] == service.libraries
-        # We expect the Catalog external integration to have a link to the
-        # S3 storage external integration
-        assert s3.id == integration_link.other_integration_id
         assert (
             "false"
             == ConfigurationSetting.for_library_and_externalintegration(
@@ -330,14 +250,6 @@ def test_catalog_services_post_edit(
     ):
         ME = MARCExporter
 
-        s3, ignore = create(
-            settings_ctrl_fixture.ctrl.db.session,
-            ExternalIntegration,
-            protocol=ExternalIntegration.S3,
-            goal=ExternalIntegration.STORAGE_GOAL,
-        )
-        s3.setting(S3UploaderConfiguration.MARC_BUCKET_KEY).value = "marc-files"
-
         service, ignore = create(
             settings_ctrl_fixture.ctrl.db.session,
             ExternalIntegration,
@@ -352,7 +264,6 @@ def test_catalog_services_post_edit(
                     ("name", "exporter name"),
                     ("id", str(service.id)),
                     ("protocol", ME.NAME),
-                    ("mirror_integration_id", str(s3.id)),
                     (
                         "libraries",
                         json.dumps(
@@ -372,17 +283,9 @@ def test_catalog_services_post_edit(
             )
             assert response.status_code == 200
 
-        integration_link = get_one(
-            settings_ctrl_fixture.ctrl.db.session,
-            ExternalIntegrationLink,
-            external_integration_id=service.id,
-            purpose=ExternalIntegrationLink.MARC,
-        )
-        assert isinstance(integration_link, ExternalIntegrationLink)
         assert service.id == int(response.get_data())
         assert ME.NAME == service.protocol
         assert "exporter name" == service.name
-        assert s3.id == integration_link.other_integration_id
         assert [settings_ctrl_fixture.ctrl.db.default_library()] == service.libraries
         assert (
             "false"

tests/api/mockapi/circulation.py

@@ -1,12 +1,17 @@
 import logging
 from abc import ABC
 from collections import defaultdict
+from typing import Optional
+from unittest.mock import MagicMock
+
+from sqlalchemy.orm import Session
 
 from api.circulation import BaseCirculationAPI, CirculationAPI, HoldInfo, LoanInfo
 from api.controller import CirculationManager
 from core.external_search import MockExternalSearchIndex
 from core.integration.settings import BaseSettings
 from core.model import DataSource, Hold, Loan
+from core.service.container import Services
 
 
 class MockBaseCirculationAPI(BaseCirculationAPI, ABC):
@@ -165,6 +170,11 @@ def api_for_license_pool(self, licensepool):
 class MockCirculationManager(CirculationManager):
     d_circulation: MockCirculationAPI
 
+    def __init__(self, db: Session, services: Optional[Services] = None):
+        if services is None:
+            services = MagicMock(spec=Services)
+        super().__init__(db, services)
+
     def setup_search(self):
         """Set up a search client."""
         return MockExternalSearchIndex()

tests/api/test_controller_cm.py

@@ -151,7 +151,7 @@ class BadSearch(CirculationManager):
             def setup_search(self):
                 raise Exception("doomed!")
 
-        circulation = BadSearch(circulation_fixture.db.session)
+        circulation = BadSearch(circulation_fixture.db.session, MagicMock())
 
         # We didn't get a search object.
         assert None == circulation.external_search

tests/api/test_controller_opdsfeed.py

@@ -671,7 +671,7 @@ class BadSearch(CirculationManager):
             def setup_search(self):
                 raise Exception("doomed!")
 
-        circulation = BadSearch(circulation_fixture.db.session)
+        circulation = BadSearch(circulation_fixture.db.session, MagicMock())
 
         # An attempt to call FeedController.search() will return a
         # problem detail.

tests/api/test_opds2.py

@@ -1,6 +1,6 @@
 import io
 import json
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 from urllib.parse import parse_qs, quote, urlparse
 
 import pytest
@@ -312,7 +312,7 @@ def test_opds2_with_authentication_tokens(
         work = works[0]
         identifier = work.presentation_edition.primary_identifier
 
-        manager = CirculationManager(controller_fixture.db.session)
+        manager = CirculationManager(controller_fixture.db.session, MagicMock())
         patron = controller_fixture.db.patron()
 
         # Borrow the book from the library