MambuPy 2.0.0b46__tar.gz → 2.0.0b48__tar.gz

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy/__init__.py

@@ -35,5 +35,5 @@ TODOS
           to achive TDD when implementing features or correcting bugs.
 """
 
-__version__ = "2.0.0b46"
+__version__ = "2.0.0b48"
 """The version of this module."""

{MambuPy-2.0.0b46/mambupy → MambuPy-2.0.0b48/MambuPy}/api/connector/rest.py

@@ -130,7 +130,7 @@ class MambuConnectorREST(MambuConnector, MambuConnectorReader, MambuConnectorWri
 url %s, params %s, data %s, headers %s",
                 method,
                 url,
-                params,
+                [(k, v) for k, v in params.items() if k not in ["pwd"]],
                 data,
                 [(k, v) for k, v in headers.items() if k != "Authorization"],
             )

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy/api/entities.py

@@ -263,10 +263,13 @@ class MambuEntity(MambuStruct):
         minutes = remainder // 60
         seconds = round(remainder - (minutes * 60), 2)
         if debug:
-            print(
-                "{}-{} ({}) {}:{}:{}".format(
+            if elements:
+                print("{}-{}".format(
                     elements[0].__class__.__name__,
                     elements[0]["id"],
+                ))
+            print(
+                "({}) {}:{}:{}".format(
                     len(elements),
                     int(hours),
                     int(minutes),
@@ -334,7 +337,7 @@ class MambuEntity(MambuStruct):
 
         return instance
 
-    def refresh(self, detailsLevel=""):
+    def refresh(self, detailsLevel="", **kwargs):
         """get again this single entity, identified by its entid.
 
         Updates _attrs with responded data. Loses any change on _attrs that
@@ -343,6 +346,8 @@ class MambuEntity(MambuStruct):
 
         Args:
           detailsLevel (str BASIC/FULL): ask for extra details or not
+          kwargs (dict): keyword arguments for this method.
+                         May include a user, pwd and url to connect to Mambu.
         """
         if not detailsLevel:
             detailsLevel = self._detailsLevel
@@ -673,7 +678,7 @@ class MambuEntityAttachable(MambuStruct, MambuAttachable):
     _attachments = {}
     """dict of attachments of an entity, key is the id"""
 
-    def attach_document(self, filename, title="", notes=""):
+    def attach_document(self, filename, title="", notes="", **kwargs):
         """uploads an attachment to this entity
 
         _attachments dicitionary gets a new entry with the attached document.
@@ -888,7 +893,14 @@ class MambuEntityCF(MambuValueObject):
 
 
 class MambuInstallment(MambuStruct):
-    """Loan Account Installment (aka Repayment)"""
+    """Loan Account Installment (aka Repayment).
+
+    Defaults dueDate to UTC since timezone is not relevant for this entity.
+    """
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self._as_utc = True
 
     def __repr__(self):
         """repr tells the class name, the number, the state and the dueDate"""

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy/api/mambuloan.py

@@ -115,7 +115,7 @@ class MambuLoan(
         except KeyError:
             pass
 
-    def get_schedule(self):
+    def get_schedule(self, **kwargs):
         """Retrieves the installments schedule."""
         resp = self._connector.mambu_loanaccount_getSchedule(self.id)
 
@@ -128,11 +128,11 @@ class MambuLoan(
             installment_entity._convertDict2Attrs()
             self.schedule.append(installment_entity)
 
-    def get_transactions(self):
+    def get_transactions(self, **kwargs):
         """Retrieves the transactions of the loan"""
         self.transactions = MambuTransaction.get_all(self.id)
 
-    def set_state(self, action, notes):
+    def set_state(self, action, notes, **kwargs):
         """Request to change status of a MambuLoan
 
         Args:
@@ -144,7 +144,7 @@ class MambuLoan(
         """
         if action in self._accepted_actions:
             resp = self._connector.mambu_change_state(
-                entid=self.id, prefix=self._prefix, action=action, notes=notes
+                entid=self.id, prefix=self._prefix, action=action, notes=notes,
             )
             resp = json.loads(resp)
             self.accountState = resp["accountState"]
@@ -155,13 +155,13 @@ class MambuLoan(
                 )
             )
 
-    def approve(self, notes):
+    def approve(self, notes, **kwargs):
         """Request to approve a loan account.
 
         Args:
           notes (str): notes to attach to the approval operation.
         """
-        self.set_state("APPROVE", notes)
+        self.set_state("APPROVE", notes, **kwargs)
 
     def disburse(self, notes, firstRepaymentDate=None, disbursementDate=None, **kwargs):
         """Request to disburse a loan account.
@@ -225,23 +225,23 @@ class MambuLoan(
 
         self.refresh()
 
-    def reject(self, notes):
+    def reject(self, notes, **kwargs):
         """Request to reject a loan account.
 
         Args:
           notes (str): notes to attach to the reject operation.
         """
-        self.set_state("REJECT", notes)
+        self.set_state("REJECT", notes, **kwargs)
 
-    def close(self, notes):
+    def close(self, notes, **kwargs):
         """Request to close a loan account.
 
         Args:
           notes (str): notes to attach to the closing operation.
         """
-        self.set_state("CLOSE", notes)
+        self.set_state("CLOSE", notes, **kwargs)
 
-    def writeoff(self, notes):
+    def writeoff(self, notes, **kwargs):
         """Request to writeoff a loan account.
 
         Args:
@@ -282,6 +282,23 @@ class MambuLoan(
 
         self.refresh()
 
+    def adjust_transaction(self, transactionId, notes, **kwargs):
+        """Request to adjust a loan transaction.
+
+        Args:
+          transactionId (str): the id of the transaction to adjust
+          notes (str): notes to attach to the adjusting transaction.
+        """
+        if hasattr(self, "transactions"):
+            if transactionId not in [t.id for t in self.transactions]:
+                raise MambuPyError(
+                    "transactionId '{}' not found in loan transactions".format(
+                        transactionId
+                    )
+                )
+        self._connector.mambu_loantransaction_adjust(transactionId, notes)
+        self.refresh()
+
     def apply_fee(self, amount, installmentNumber, notes, valueDate, **kwargs):
         """Request to apply a fee to a loan account.
 

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy/api/mambuproduct.py

@@ -69,7 +69,7 @@ class MambuProduct(
 
     @classmethod
     def get_all(
-        cls, filters=None, offset=None, limit=None, paginationDetails="OFF", sortBy=None
+        cls, filters=None, offset=None, limit=None, paginationDetails="OFF", sortBy=None, **kwargs
     ):
         """get_all, several entities, filtering allowed
 
@@ -85,6 +85,8 @@ class MambuProduct(
         Returns:
           list of instances of an entity with data from Mambu
         """
+        if "detailsLevel" in kwargs:
+            kwargs.pop("detailsLevel")
         return super().get_all(
-            filters, offset, limit, paginationDetails, detailsLevel="FULL", sortBy=sortBy
+            filters, offset, limit, paginationDetails, detailsLevel="FULL", sortBy=sortBy, **kwargs
         )

{MambuPy-2.0.0b46/mambupy → MambuPy-2.0.0b48/MambuPy}/api/mambustruct.py

@@ -47,6 +47,9 @@ class MambuStruct(MambuMapObj):
         so those fileds get a None TZ info.
     """
 
+    _as_utc = False
+    """When True, all datetimes will be converted as UTC in _convertDict2Attrs."""
+
     _vos = []
     """List of Value Objects in the struct's _attrs.
 
@@ -177,7 +180,7 @@ class MambuStruct(MambuMapObj):
                 return f_data
             except (TypeError, ValueError):
                 try:
-                    return date_format(data)
+                    return date_format(data, as_utc=self._as_utc)
                 except (TypeError, ValueError):
                     return data
 
@@ -195,7 +198,7 @@ class MambuStruct(MambuMapObj):
           - int: an int number
           - float: a floating point number
           - datetime: if the string holds a valid datetime in a date_format
-                      specific format
+                      specific format. Considers UTC if _as_utc is True.
 
         A list of fields that should stay as-they-come (strings) is supported.
         All fields whose name ends with "Key" is also ignored.

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy/api/mambutransaction.py

@@ -28,6 +28,7 @@ class MambuTransaction(MambuEntity, MambuEntitySearchable):
         limit=None,
         paginationDetails="OFF",
         detailsLevel="BASIC",
+        **kwargs,
     ):
         """get_all, several transactions, filtering allowed
 
@@ -41,6 +42,7 @@ class MambuTransaction(MambuEntity, MambuEntitySearchable):
         Returns:
           list of instances of a transaction with data from Mambu
         """
+        kwargs.update({"prefix": "loans/{}/transactions".format(loanAccountId)})
         return super().get_all(
             filters=None,
             offset=offset,
@@ -48,7 +50,7 @@ class MambuTransaction(MambuEntity, MambuEntitySearchable):
             paginationDetails=paginationDetails,
             detailsLevel=detailsLevel,
             sortBy=None,
-            **{"prefix": "loans/{}/transactions".format(loanAccountId)}
+            **kwargs,
         )
 
     def adjust(self, notes):

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy/api/mambuuser.py

@@ -80,6 +80,7 @@ class MambuUser(
         detailsLevel="BASIC",
         sortBy=None,
         branchIdType=None,
+        **kwargs,
     ):
         """get_all, several entities, filtering allowed
 
@@ -106,6 +107,7 @@ class MambuUser(
         params = {}
         if branchIdType:
             params["branchIdType"] = branchIdType
+        params.update(kwargs)
 
         return super().get_all(
             filters, offset, limit, paginationDetails, detailsLevel, sortBy, **params

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy/mambuutil.py

@@ -34,7 +34,7 @@ except NameError:
 import json
 import sys
 
-from datetime import datetime
+from datetime import datetime, timezone
 
 API_RETURN_CODES = {
     "SUCCESS": 0,
@@ -159,7 +159,7 @@ class MambuCommError(MambuError):
 
 
 ### More utility functions follow ###
-def date_format(field, formato=None):
+def date_format(field, formato=None, as_utc=False):
     """Converts a datetime field to a datetime using some specified format.
 
     What this really means is that, if specified format includes only for
@@ -170,6 +170,8 @@ def date_format(field, formato=None):
     A useful format may be %Y%m%d, then the datetime objects effectively
     translates into date objects alone, with no relevant time information.
 
+    When as_utc is True, the datetime object is converted to UTC timezone.
+
     PLEASE BE AWARE, that this may lose useful information for your datetimes
     from Mambu. Read this for why this may be a BAD idea:
     https://julien.danjou.info/blog/2015/python-and-timezones
@@ -184,10 +186,15 @@ def date_format(field, formato=None):
             formato,
         )
     else:
-        return datetime.strptime(
+        field_as_dt = datetime.strptime(
             datetime.fromisoformat(field).strftime(formato),
             formato,
         )
+        if as_utc:
+            field_as_dt = field_as_dt.astimezone(
+                timezone.utc
+            ).replace(tzinfo=None)
+        return field_as_dt
 
 
 def strip_tags(html):

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy/orm/schema_centres.py

@@ -38,6 +38,7 @@ class Centre(Base):
 
     # Relationships
     assignedBranchKey = Column(String, ForeignKey(Branch.encodedKey))
+    loans = relationship("LoanAccount", back_populates="centre")
     branch = relationship(Branch, back_populates="centres")
     groups = relationship("Group", back_populates="centre")
 

{MambuPy-2.0.0b46/mambupy → MambuPy-2.0.0b48/MambuPy}/orm/schema_loans.py

@@ -13,6 +13,7 @@ from sqlalchemy.orm import relationship
 
 from . import schema_orm as orm
 from .schema_branches import Branch
+from .schema_centres import Centre
 from .schema_users import User
 
 dbname = orm.dbname
@@ -89,7 +90,6 @@ class LoanAccount(Base):
     approvedDate = Column(DateTime)
     closedDate = Column(DateTime)
     rescheduledAccountKey = Column(String)
-    assignedCentreKey = Column(String)  # not in API
     lastSetToArrearsDate = Column(DateTime)  # not in API
 
     # Relationships
@@ -99,6 +99,8 @@ class LoanAccount(Base):
     disbursementDetails = relationship("DisbursementDetails")
     assignedBranchKey = Column(String, ForeignKey(Branch.encodedKey))
     branch = relationship("Branch", back_populates="loans")
+    assignedCentreKey = Column(String, ForeignKey(Centre.encodedKey))
+    centre = relationship("Centre", back_populates="loans")
     assignedUserKey = Column(String, ForeignKey(User.encodedKey))
     user = relationship("User", back_populates="loans")
     accountHolderKey = Column(String)

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/MambuPy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MambuPy
-Version: 2.0.0b46
+Version: 2.0.0b48
 Summary: A python lib for using Mambu APIs.
 Home-page: https://mambupydocs.readthedocs.io
 Author: Javier Novoa C.

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MambuPy
-Version: 2.0.0b46
+Version: 2.0.0b48
 Summary: A python lib for using Mambu APIs.
 Home-page: https://mambupydocs.readthedocs.io
 Author: Javier Novoa C.

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/mambupy/__init__.py

@@ -35,5 +35,5 @@ TODOS
           to achive TDD when implementing features or correcting bugs.
 """
 
-__version__ = "2.0.0b46"
+__version__ = "2.0.0b48"
 """The version of this module."""

{MambuPy-2.0.0b46/MambuPy → MambuPy-2.0.0b48/mambupy}/api/connector/rest.py

@@ -130,7 +130,7 @@ class MambuConnectorREST(MambuConnector, MambuConnectorReader, MambuConnectorWri
 url %s, params %s, data %s, headers %s",
                 method,
                 url,
-                params,
+                [(k, v) for k, v in params.items() if k not in ["pwd"]],
                 data,
                 [(k, v) for k, v in headers.items() if k != "Authorization"],
             )

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/mambupy/api/entities.py

@@ -263,10 +263,13 @@ class MambuEntity(MambuStruct):
         minutes = remainder // 60
         seconds = round(remainder - (minutes * 60), 2)
         if debug:
-            print(
-                "{}-{} ({}) {}:{}:{}".format(
+            if elements:
+                print("{}-{}".format(
                     elements[0].__class__.__name__,
                     elements[0]["id"],
+                ))
+            print(
+                "({}) {}:{}:{}".format(
                     len(elements),
                     int(hours),
                     int(minutes),
@@ -334,7 +337,7 @@ class MambuEntity(MambuStruct):
 
         return instance
 
-    def refresh(self, detailsLevel=""):
+    def refresh(self, detailsLevel="", **kwargs):
         """get again this single entity, identified by its entid.
 
         Updates _attrs with responded data. Loses any change on _attrs that
@@ -343,6 +346,8 @@ class MambuEntity(MambuStruct):
 
         Args:
           detailsLevel (str BASIC/FULL): ask for extra details or not
+          kwargs (dict): keyword arguments for this method.
+                         May include a user, pwd and url to connect to Mambu.
         """
         if not detailsLevel:
             detailsLevel = self._detailsLevel
@@ -673,7 +678,7 @@ class MambuEntityAttachable(MambuStruct, MambuAttachable):
     _attachments = {}
     """dict of attachments of an entity, key is the id"""
 
-    def attach_document(self, filename, title="", notes=""):
+    def attach_document(self, filename, title="", notes="", **kwargs):
         """uploads an attachment to this entity
 
         _attachments dicitionary gets a new entry with the attached document.
@@ -888,7 +893,14 @@ class MambuEntityCF(MambuValueObject):
 
 
 class MambuInstallment(MambuStruct):
-    """Loan Account Installment (aka Repayment)"""
+    """Loan Account Installment (aka Repayment).
+
+    Defaults dueDate to UTC since timezone is not relevant for this entity.
+    """
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self._as_utc = True
 
     def __repr__(self):
         """repr tells the class name, the number, the state and the dueDate"""

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/mambupy/api/mambuloan.py

@@ -115,7 +115,7 @@ class MambuLoan(
         except KeyError:
             pass
 
-    def get_schedule(self):
+    def get_schedule(self, **kwargs):
         """Retrieves the installments schedule."""
         resp = self._connector.mambu_loanaccount_getSchedule(self.id)
 
@@ -128,11 +128,11 @@ class MambuLoan(
             installment_entity._convertDict2Attrs()
             self.schedule.append(installment_entity)
 
-    def get_transactions(self):
+    def get_transactions(self, **kwargs):
         """Retrieves the transactions of the loan"""
         self.transactions = MambuTransaction.get_all(self.id)
 
-    def set_state(self, action, notes):
+    def set_state(self, action, notes, **kwargs):
         """Request to change status of a MambuLoan
 
         Args:
@@ -144,7 +144,7 @@ class MambuLoan(
         """
         if action in self._accepted_actions:
             resp = self._connector.mambu_change_state(
-                entid=self.id, prefix=self._prefix, action=action, notes=notes
+                entid=self.id, prefix=self._prefix, action=action, notes=notes,
             )
             resp = json.loads(resp)
             self.accountState = resp["accountState"]
@@ -155,13 +155,13 @@ class MambuLoan(
                 )
             )
 
-    def approve(self, notes):
+    def approve(self, notes, **kwargs):
         """Request to approve a loan account.
 
         Args:
           notes (str): notes to attach to the approval operation.
         """
-        self.set_state("APPROVE", notes)
+        self.set_state("APPROVE", notes, **kwargs)
 
     def disburse(self, notes, firstRepaymentDate=None, disbursementDate=None, **kwargs):
         """Request to disburse a loan account.
@@ -225,23 +225,23 @@ class MambuLoan(
 
         self.refresh()
 
-    def reject(self, notes):
+    def reject(self, notes, **kwargs):
         """Request to reject a loan account.
 
         Args:
           notes (str): notes to attach to the reject operation.
         """
-        self.set_state("REJECT", notes)
+        self.set_state("REJECT", notes, **kwargs)
 
-    def close(self, notes):
+    def close(self, notes, **kwargs):
         """Request to close a loan account.
 
         Args:
           notes (str): notes to attach to the closing operation.
         """
-        self.set_state("CLOSE", notes)
+        self.set_state("CLOSE", notes, **kwargs)
 
-    def writeoff(self, notes):
+    def writeoff(self, notes, **kwargs):
         """Request to writeoff a loan account.
 
         Args:
@@ -282,6 +282,23 @@ class MambuLoan(
 
         self.refresh()
 
+    def adjust_transaction(self, transactionId, notes, **kwargs):
+        """Request to adjust a loan transaction.
+
+        Args:
+          transactionId (str): the id of the transaction to adjust
+          notes (str): notes to attach to the adjusting transaction.
+        """
+        if hasattr(self, "transactions"):
+            if transactionId not in [t.id for t in self.transactions]:
+                raise MambuPyError(
+                    "transactionId '{}' not found in loan transactions".format(
+                        transactionId
+                    )
+                )
+        self._connector.mambu_loantransaction_adjust(transactionId, notes)
+        self.refresh()
+
     def apply_fee(self, amount, installmentNumber, notes, valueDate, **kwargs):
         """Request to apply a fee to a loan account.
 

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/mambupy/api/mambuproduct.py

@@ -69,7 +69,7 @@ class MambuProduct(
 
     @classmethod
     def get_all(
-        cls, filters=None, offset=None, limit=None, paginationDetails="OFF", sortBy=None
+        cls, filters=None, offset=None, limit=None, paginationDetails="OFF", sortBy=None, **kwargs
     ):
         """get_all, several entities, filtering allowed
 
@@ -85,6 +85,8 @@ class MambuProduct(
         Returns:
           list of instances of an entity with data from Mambu
         """
+        if "detailsLevel" in kwargs:
+            kwargs.pop("detailsLevel")
         return super().get_all(
-            filters, offset, limit, paginationDetails, detailsLevel="FULL", sortBy=sortBy
+            filters, offset, limit, paginationDetails, detailsLevel="FULL", sortBy=sortBy, **kwargs
         )

{MambuPy-2.0.0b46/MambuPy → MambuPy-2.0.0b48/mambupy}/api/mambustruct.py

@@ -47,6 +47,9 @@ class MambuStruct(MambuMapObj):
         so those fileds get a None TZ info.
     """
 
+    _as_utc = False
+    """When True, all datetimes will be converted as UTC in _convertDict2Attrs."""
+
     _vos = []
     """List of Value Objects in the struct's _attrs.
 
@@ -177,7 +180,7 @@ class MambuStruct(MambuMapObj):
                 return f_data
             except (TypeError, ValueError):
                 try:
-                    return date_format(data)
+                    return date_format(data, as_utc=self._as_utc)
                 except (TypeError, ValueError):
                     return data
 
@@ -195,7 +198,7 @@ class MambuStruct(MambuMapObj):
           - int: an int number
           - float: a floating point number
           - datetime: if the string holds a valid datetime in a date_format
-                      specific format
+                      specific format. Considers UTC if _as_utc is True.
 
         A list of fields that should stay as-they-come (strings) is supported.
         All fields whose name ends with "Key" is also ignored.

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/mambupy/api/mambutransaction.py

@@ -28,6 +28,7 @@ class MambuTransaction(MambuEntity, MambuEntitySearchable):
         limit=None,
         paginationDetails="OFF",
         detailsLevel="BASIC",
+        **kwargs,
     ):
         """get_all, several transactions, filtering allowed
 
@@ -41,6 +42,7 @@ class MambuTransaction(MambuEntity, MambuEntitySearchable):
         Returns:
           list of instances of a transaction with data from Mambu
         """
+        kwargs.update({"prefix": "loans/{}/transactions".format(loanAccountId)})
         return super().get_all(
             filters=None,
             offset=offset,
@@ -48,7 +50,7 @@ class MambuTransaction(MambuEntity, MambuEntitySearchable):
             paginationDetails=paginationDetails,
             detailsLevel=detailsLevel,
             sortBy=None,
-            **{"prefix": "loans/{}/transactions".format(loanAccountId)}
+            **kwargs,
         )
 
     def adjust(self, notes):

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/mambupy/api/mambuuser.py

@@ -80,6 +80,7 @@ class MambuUser(
         detailsLevel="BASIC",
         sortBy=None,
         branchIdType=None,
+        **kwargs,
     ):
         """get_all, several entities, filtering allowed
 
@@ -106,6 +107,7 @@ class MambuUser(
         params = {}
         if branchIdType:
             params["branchIdType"] = branchIdType
+        params.update(kwargs)
 
         return super().get_all(
             filters, offset, limit, paginationDetails, detailsLevel, sortBy, **params

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/mambupy/mambuutil.py

@@ -34,7 +34,7 @@ except NameError:
 import json
 import sys
 
-from datetime import datetime
+from datetime import datetime, timezone
 
 API_RETURN_CODES = {
     "SUCCESS": 0,
@@ -159,7 +159,7 @@ class MambuCommError(MambuError):
 
 
 ### More utility functions follow ###
-def date_format(field, formato=None):
+def date_format(field, formato=None, as_utc=False):
     """Converts a datetime field to a datetime using some specified format.
 
     What this really means is that, if specified format includes only for
@@ -170,6 +170,8 @@ def date_format(field, formato=None):
     A useful format may be %Y%m%d, then the datetime objects effectively
     translates into date objects alone, with no relevant time information.
 
+    When as_utc is True, the datetime object is converted to UTC timezone.
+
     PLEASE BE AWARE, that this may lose useful information for your datetimes
     from Mambu. Read this for why this may be a BAD idea:
     https://julien.danjou.info/blog/2015/python-and-timezones
@@ -184,10 +186,15 @@ def date_format(field, formato=None):
             formato,
         )
     else:
-        return datetime.strptime(
+        field_as_dt = datetime.strptime(
             datetime.fromisoformat(field).strftime(formato),
             formato,
         )
+        if as_utc:
+            field_as_dt = field_as_dt.astimezone(
+                timezone.utc
+            ).replace(tzinfo=None)
+        return field_as_dt
 
 
 def strip_tags(html):

{MambuPy-2.0.0b46 → MambuPy-2.0.0b48}/mambupy/orm/schema_centres.py

@@ -38,6 +38,7 @@ class Centre(Base):
 
     # Relationships
     assignedBranchKey = Column(String, ForeignKey(Branch.encodedKey))
+    loans = relationship("LoanAccount", back_populates="centre")
     branch = relationship(Branch, back_populates="centres")
     groups = relationship("Group", back_populates="centre")
 

{MambuPy-2.0.0b46/MambuPy → MambuPy-2.0.0b48/mambupy}/orm/schema_loans.py

@@ -13,6 +13,7 @@ from sqlalchemy.orm import relationship
 
 from . import schema_orm as orm
 from .schema_branches import Branch
+from .schema_centres import Centre
 from .schema_users import User
 
 dbname = orm.dbname
@@ -89,7 +90,6 @@ class LoanAccount(Base):
     approvedDate = Column(DateTime)
     closedDate = Column(DateTime)
     rescheduledAccountKey = Column(String)
-    assignedCentreKey = Column(String)  # not in API
     lastSetToArrearsDate = Column(DateTime)  # not in API
 
     # Relationships
@@ -99,6 +99,8 @@ class LoanAccount(Base):
     disbursementDetails = relationship("DisbursementDetails")
     assignedBranchKey = Column(String, ForeignKey(Branch.encodedKey))
     branch = relationship("Branch", back_populates="loans")
+    assignedCentreKey = Column(String, ForeignKey(Centre.encodedKey))
+    centre = relationship("Centre", back_populates="loans")
     assignedUserKey = Column(String, ForeignKey(User.encodedKey))
     user = relationship("User", back_populates="loans")
     accountHolderKey = Column(String)