diff --git a/rero_ils/modules/acquisition/acq_invoices/api.py b/rero_ils/modules/acquisition/acq_invoices/api.py index 3fe8c661ad..abd1878841 100644 --- a/rero_ils/modules/acquisition/acq_invoices/api.py +++ b/rero_ils/modules/acquisition/acq_invoices/api.py @@ -122,11 +122,6 @@ def _acquisition_invoice_build_org_ref(cls, data): ) data["organisation"] = {"$ref": f"{get_base_url()}/api/organisations/{org_pid}"} - @property - def organisation_pid(self): - """Shortcut for acquisition invoice organisation pid.""" - return extracted_data_from_ref(self.get("organisation")) - @property def library_pid(self): """Shortcut for acquisition order library pid.""" diff --git a/rero_ils/modules/acquisition/acq_orders/api.py b/rero_ils/modules/acquisition/acq_orders/api.py index 0e88776c72..1dd3192115 100644 --- a/rero_ils/modules/acquisition/acq_orders/api.py +++ b/rero_ils/modules/acquisition/acq_orders/api.py @@ -120,8 +120,7 @@ def vendor(self): @property def organisation_pid(self): """Shortcut for acquisition order organisation pid.""" - library = extracted_data_from_ref(self.get("library"), data="record") - return library.organisation_pid + return self.library.organisation_pid @property def library_pid(self): diff --git a/rero_ils/modules/acquisition/acq_receipts/api.py b/rero_ils/modules/acquisition/acq_receipts/api.py index d53344ef19..08db28b7eb 100644 --- a/rero_ils/modules/acquisition/acq_receipts/api.py +++ b/rero_ils/modules/acquisition/acq_receipts/api.py @@ -284,11 +284,6 @@ def library_pid(self): """Shortcut for acquisition receipt library pid.""" return extracted_data_from_ref(self.get("library")) - @property - def organisation_pid(self): - """Shortcut for acquisition receipt organisation pid.""" - return extracted_data_from_ref(self.get("organisation")) - def get_receipt_lines(self, output=None): """Get all receipt lines related to this receipt. diff --git a/rero_ils/modules/holdings/api.py b/rero_ils/modules/holdings/api.py index f7966c8e22..d10b549fb8 100644 --- a/rero_ils/modules/holdings/api.py +++ b/rero_ils/modules/holdings/api.py @@ -264,7 +264,7 @@ def library(self): @property def organisation_pid(self): """Get organisation pid for holding.""" - return Location.get_record_by_pid(self.location_pid).organisation_pid + return self.location.organisation_pid @property def vendor_pid(self): diff --git a/rero_ils/modules/loans/api.py b/rero_ils/modules/loans/api.py index 5620aa1a9a..1c27e579cf 100644 --- a/rero_ils/modules/loans/api.py +++ b/rero_ils/modules/loans/api.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # RERO ILS -# Copyright (C) 2019-2022 RERO +# Copyright (C) 2019-2024 RERO # Copyright (C) 2019-2022 UCLouvain # # This program is free software: you can redistribute it and/or modify @@ -60,7 +60,11 @@ from rero_ils.modules.patron_transactions.api import PatronTransactionsSearch from rero_ils.modules.patron_transactions.models import PatronTransactionStatus from rero_ils.modules.patrons.api import Patron, PatronsSearch -from rero_ils.modules.utils import date_string_to_utc, get_ref_for_pid +from rero_ils.modules.utils import ( + date_string_to_utc, + extracted_data_from_ref, + get_ref_for_pid, +) from .extensions import CheckoutLocationExtension, CirculationDatesExtension from .models import LoanAction, LoanState @@ -640,15 +644,6 @@ def is_active(self): states = current_app.config["CIRCULATION_STATES_LOAN_ACTIVE"] return self.get("state") in states - @property - def organisation_pid(self): - """Get organisation pid for loan.""" - if item := self.item: - return item.organisation_pid - raise IlsRecordError.PidDoesNotExist( - self.provider.pid_type, "organisation_pid:item_pid" - ) - @property def library_pid(self): """Get library PID regarding loan location.""" diff --git a/rero_ils/modules/locations/api.py b/rero_ils/modules/locations/api.py index b819665d26..5e8e9c2713 100644 --- a/rero_ils/modules/locations/api.py +++ b/rero_ils/modules/locations/api.py @@ -213,10 +213,7 @@ def library(self): @property def organisation_pid(self): """Get organisation pid for location.""" - from ..libraries.api import Library - - library = Library.get_record_by_pid(self.library_pid) - return library.organisation_pid + return self.library.organisation_pid @property def restrict_pickup_to(self):