MambuPy 2.0.0b34__tar.gz → 2.0.0b45__tar.gz

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/MambuPy/__init__.py

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

{MambuPy-2.0.0b34/mambupy → MambuPy-2.0.0b45/MambuPy}/api/connector/mambuconnector.py

@@ -177,6 +177,11 @@ class MambuConnectorWriter(ABC):
         """patches certain parts of a mambu entity"""
         raise NotImplementedError
 
+    @abstractmethod
+    def mambu_delete(self, entid, prefix):
+        """deletes a mambu entity"""
+        raise NotImplementedError
+
     @abstractmethod
     def mambu_upload_document(self, owner_type, entid, filename, name, notes):
         """uploads an attachment to this entity
@@ -254,6 +259,23 @@ class MambuConnectorWriter(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def mambu_make_fee(
+        self, loan_id, amount, installmentNumber, notes, valueDate, allowed_fields, **kwargs
+    ):
+        """Make a fee transaction on a loan account.
+
+        Args:
+          loan_id (str): loan account id to apply a fee
+          amount (float): the amount of the fee
+          installmentNumber (int): the installment number to apply the fee
+          notes (str): notes for the fee transaction
+          valueDate (str): entry date for the fee transaction
+          allowed_fields (list): extra fields allowed for the transaction
+          kwargs (dict): key-values of extra fields for the transaction
+        """
+        raise NotImplementedError
+
     @abstractmethod
     def mambu_loanaccount_writeoff(self, loanid, notes):
         """Writesoff a loan account
@@ -263,3 +285,13 @@ class MambuConnectorWriter(ABC):
           notes (str): notes to associate to the writeoff operation in Mambu
         """
         raise NotImplementedError
+
+    @abstractmethod
+    def mambu_loantransaction_adjust(self, transactionid, notes):
+        """Adjust a loan transaction
+
+        Args:
+          transactionid (str): the id or encoded key of the loan transaction
+          notes (str): notes to associate to the transaction adjustment in Mambu
+        """
+        raise NotImplementedError

{MambuPy-2.0.0b34/mambupy → MambuPy-2.0.0b45/MambuPy}/api/connector/rest.py

@@ -105,7 +105,7 @@ class MambuConnectorREST(MambuConnector, MambuConnectorReader, MambuConnectorWri
 
         retry_strategy = Retry(
             total=self._RETRIES,
-            status_forcelist=[429, 500, 502, 503, 504],
+            status_forcelist=[429, 502, 503, 504],
             backoff_factor=1,
             allowed_methods=[
                 "HEAD",
@@ -550,6 +550,12 @@ url %s, params %s, data %s, headers %s",
         if patch_data:
             return self.__request("PATCH", url, data=patch_data)
 
+    def mambu_delete(self, entid, prefix):
+        """deletes a mambu entity"""
+        url = "https://{}/api/{}/{}".format(self._tenant, prefix, entid)
+
+        return self.__request("DELETE", url)
+
     def mambu_upload_document(self, owner_type, entid, filename, name, notes):
         """uploads an attachment to this entity
 
@@ -774,7 +780,9 @@ url %s, params %s, data %s, headers %s",
         return self.__request("POST", url, data=data)
 
     def mambu_make_repayment(
-        self, loan_id, amount, notes, valueDate, allowed_fields, **kwargs
+        self, loan_id, amount, notes, valueDate,
+        allowed_fields, loantransaction_allowed_fields,
+        **kwargs
     ):
         """Make a repayment transaction on a loan account.
 
@@ -784,11 +792,25 @@ url %s, params %s, data %s, headers %s",
           notes (str): notes for the repayment transaction
           valueDate (str): date for the repayment transaction in ISO format
           allowed_fields (list): extra fields allowed for the transaction
+          loantransaction_allowed_fields (list): extra fields allowed for the transaction details
           kwargs (dict): key-values of extra fields for the transaction
+                         allows custom fields in the transaction ONLY when prefixed with '_' and being a dict
         """
+        def _extract_valid_transactionDetails(transactionDetails_dict):
+            transactionDetails = {}
+            for k, v in transactionDetails_dict.items():
+                if k in loantransaction_allowed_fields:
+                    transactionDetails[k] = v
+            return transactionDetails
+
         data = {"amount": amount, "notes": notes, "valueDate": valueDate}
         for k, v in kwargs.items():
             if k in allowed_fields:
+                if k == "transactionDetails":
+                    data[k] = _extract_valid_transactionDetails(v)
+                else:
+                    data[k] = v
+            elif k[0] == "_" and isinstance(v, dict):
                 data[k] = v
 
         url = "https://{}/api/loans/{}/repayment-transactions".format(
@@ -796,3 +818,46 @@ url %s, params %s, data %s, headers %s",
         )
 
         return self.__request("POST", url, data=data)
+
+    def mambu_make_fee(
+        self, loan_id, amount, installmentNumber, notes, valueDate, allowed_fields, **kwargs
+    ):
+        """Make a fee transaction on a loan account.
+
+        Args:
+          loan_id (str): loan account id to apply a fee
+          amount (float): the amount of the fee
+          installmentNumber (int): the installment number to apply the fee
+          notes (str): notes for the fee transaction
+          valueDate (str): entry date for the fee transaction
+          allowed_fields (list): extra fields allowed for the transaction
+          kwargs (dict): key-values of extra fields for the transaction
+        """
+        data = {
+            "amount": amount,
+            "installmentNumber": installmentNumber,
+            "notes": notes,
+            "valueDate": valueDate,
+        }
+        for k, v in kwargs.items():
+            if k in allowed_fields:
+                data[k] = v
+
+        url = "https://{}/api/loans/{}/fee-transactions".format(self._tenant, loan_id)
+
+        return self.__request("POST", url, data=data)
+
+    def mambu_loantransaction_adjust(self, transactionid, notes):
+        """Adjust a loan transaction
+
+        Args:
+          transactionid (str): the id or encoded key of the loan transaction
+          notes (str): notes to associate to the transaction adjustment in Mambu
+        """
+        data = {
+            "notes": notes,
+        }
+
+        url = "https://{}/api/loans/transactions/{}:adjust".format(self._tenant, transactionid)
+
+        return self.__request("POST", url, data=data)

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/MambuPy/api/entities.py

@@ -589,6 +589,36 @@ class MambuEntityWritable(MambuStruct, MambuWritable):
             self._extractCustomFields()
             self._extractVOs()
 
+    def _delete_for_creation(self):
+        """Deletes extra fields from Mambu unusable for entity
+        creation.
+
+        Implement on entities which require further cleaning.
+        """
+
+    def delete(self):
+        """deletes a mambu entity.
+
+        Leaves the object in a supposedly state where you can create
+        it again. Depends on required custom fields to be present in
+        the entity at the moment of deletion.
+
+        TODO: implement some way to ensure schemas are accomplished to
+        make sure we can run creation after deletion.
+        """
+        try:
+            self._connector.mambu_delete(self.id, self._prefix)
+        except MambuError:
+            raise
+
+        # cleaning...
+        for key in ["id", "encodedKey"]:
+            try:
+                del self._attrs[key]
+            except KeyError:
+                pass
+        self._delete_for_creation()
+
 
 class MambuEntitySearchable(MambuStruct, MambuSearchable):
     """A Mambu object with searching capabilities."""

{MambuPy-2.0.0b34/mambupy → MambuPy-2.0.0b45/MambuPy}/api/mambuclient.py

@@ -72,3 +72,11 @@ class MambuClient(
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self._attachments = {}
+
+    def _delete_for_creation(self):
+        """Deletes extra fields from Mambu unusable for entity
+        creation."""
+        try:
+            del self._attrs["approvedDate"]
+        except KeyError:
+            pass

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/MambuPy/api/mambuloan.py

@@ -20,12 +20,15 @@ from .entities import (
     MambuEntityOwnable,
     MambuInstallment,
 )
+
 from MambuPy.api.vos import (
     MambuDisbursementLoanTransactionInput,
+    MambuFeeLoanTransactionInput,
     MambuRepaymentLoanTransactionInput,
+    MambuLoanTransactionDetailsInput,
 )
 from MambuPy.mambuutil import MambuPyError
-
+from .mambutransaction import MambuTransaction
 
 class MambuLoan(
     MambuEntity,
@@ -101,6 +104,17 @@ class MambuLoan(
         super().__init__(**kwargs)
         self._attachments = {}
 
+    def _delete_for_creation(self):
+        """Deletes extra fields from Mambu unusable for entity
+        creation."""
+        try:
+            del self._attrs["currency"]
+            del self._attrs["accountState"]
+            del self._attrs["scheduleSettings"]["hasCustomSchedule"]
+            del self._attrs["interestSettings"]["accrueLateInterest"]
+        except KeyError:
+            pass
+
     def get_schedule(self):
         """Retrieves the installments schedule."""
         resp = self._connector.mambu_loanaccount_getSchedule(self.id)
@@ -114,6 +128,10 @@ class MambuLoan(
             installment_entity._convertDict2Attrs()
             self.schedule.append(installment_entity)
 
+    def get_transactions(self):
+        """Retrieves the transactions of the loan"""
+        self.transactions = MambuTransaction.get_all(self.id)
+
     def set_state(self, action, notes):
         """Request to change status of a MambuLoan
 
@@ -242,7 +260,10 @@ class MambuLoan(
                     operation. If naive datetime, use TZ info from tzattrs.
           kwargs (dict): allowed extra params for the repayment transaction
                  request. :py:obj:`MambuPy.api.vos.MambuRepaymentLoanTransactionInput._schema_fields`
-                 has the allowed fields permitted for this operation
+                 has the allowed fields permitted for this operation.
+                 If transactionDetails is provided, it needs to have the
+                 structure defined at
+                 :py:obj:`MambuPy.api.vos.MambuLoanTransactionDetailsInput._schema_fields`.
         """
         valueDate = datetime.datetime.strptime(
             valueDate.strftime("%Y-%m-%d %H%M%S"), "%Y-%m-%d %H%M%S"
@@ -255,6 +276,37 @@ class MambuLoan(
             notes,
             valueDate,
             MambuRepaymentLoanTransactionInput._schema_fields,
+            MambuLoanTransactionDetailsInput._schema_fields,
+            **kwargs
+        )
+
+        self.refresh()
+
+    def apply_fee(self, amount, installmentNumber, notes, valueDate, **kwargs):
+        """Request to apply a fee to a loan account.
+
+        Args:
+          amount (float): the amount of the fee
+          installmentNumber (int): the installment number to apply the fee
+          notes (str): notes to attach to the fee transaction.
+          valueDate (:py:obj:`datetime`): value date for the fee
+                    transaction. If naive datetime, use TZ info from tzattrs.
+          kwargs (dict): allowed extra params for the fee transaction
+                 request. :py:obj:`MambuPy.api.vos.MambuFeeLoanTransactionInput._schema_fields`
+                 has the allowed fields permitted for this operation
+        """
+        valueDate = datetime.datetime.strptime(
+            valueDate.strftime("%Y-%m-%d %H%M%S"), "%Y-%m-%d %H%M%S"
+        )
+        valueDate = valueDate.astimezone(tzlocal()).isoformat()
+
+        self._connector.mambu_make_fee(
+            self.id,
+            amount,
+            installmentNumber,
+            notes,
+            valueDate,
+            MambuFeeLoanTransactionInput._schema_fields,
             **kwargs
         )
 

{MambuPy-2.0.0b34/mambupy → MambuPy-2.0.0b45/MambuPy}/api/mambustruct.py

@@ -121,10 +121,10 @@ class MambuStruct(MambuMapObj):
                 raise attr_err
 
     def __convert_from_dict_to_basic_types_non_constant_fields(
-        self, k, data_dict, data, tzdata
+        self, k, data_dict, data, tzdata, constantFields
     ):
         try:
-            data_dict[k] = self.__convert_to_basic_types(data[k], tzdata[k])
+            data_dict[k] = self.__convert_to_basic_types(data[k], tzdata[k], constantFields)
             if type(data_dict[k]) not in [dict, list, datetime]:
                 del tzdata[k]
             elif isinstance(data_dict[k], datetime):
@@ -141,14 +141,14 @@ class MambuStruct(MambuMapObj):
                     del tzdata[k]
             else:
                 self.__convert_from_dict_to_basic_types_non_constant_fields(
-                    k, data_dict, data, tzdata
+                    k, data_dict, data, tzdata, constantFields
                 )
         return data_dict
 
     def __convert_from_list_to_basic_types(self, it_list, data, tzdata, constantFields):
         data_list = []
         for num, (e, te) in enumerate(zip(it_list, tzdata)):
-            d = self.__convert_to_basic_types(e, te)
+            d = self.__convert_to_basic_types(e, te, constantFields)
             if type(d) not in [dict, list, datetime]:
                 tzdata[num] = None
             elif isinstance(d, datetime):
@@ -157,8 +157,13 @@ class MambuStruct(MambuMapObj):
         return data_list
 
     def __convert_to_basic_types_base_cases(self, data):
-        if data in ["TRUE", "true", "FALSE", "false"]:
-            return data.lower() == "true"
+        try:
+            if data in ["TRUE", "true", "FALSE", "false"]:
+                return data.lower() == "true"
+        except TypeError:
+            # some data types override __eq__ and may not be compared to str
+            # in such cases continue evaluating down under
+            pass
         try:
             i_data = int(data)
             if (
@@ -211,6 +216,8 @@ class MambuStruct(MambuMapObj):
                 data = self.__convert_from_dict_to_basic_types(
                     it, data, tzdata, constantFields
                 )
+            if isinstance(it, MambuMapObj):
+                it._convertDict2Attrs()
             if isinstance(it, list):
                 data = self.__convert_from_list_to_basic_types(
                     it, data, tzdata, constantFields
@@ -400,6 +407,8 @@ class MambuStruct(MambuMapObj):
                     cfs.append(key + "_" + str(ind))
                 except KeyError:
                     pass
+                except TypeError:
+                    cfs.append(key + "_" + str(ind))
         try:
             self._attrs[attr] = copy.deepcopy(self[attr[1:]])
             cfs.append(attr[1:])
@@ -698,7 +707,7 @@ class MambuStruct(MambuMapObj):
                     getattr(self, proprty)[int(index)][key] = ent_item
                 except ValueError:
                     pass
-            self["_" + new_property] = entity
+            self["" + new_property] = entity
             self[new_property] = ent_item
         except KeyError:
             try:

{MambuPy-2.0.0b34/mambupy → MambuPy-2.0.0b45/MambuPy}/api/mambutransaction.py

@@ -50,3 +50,12 @@ class MambuTransaction(MambuEntity, MambuEntitySearchable):
             sortBy=None,
             **{"prefix": "loans/{}/transactions".format(loanAccountId)}
         )
+
+    def adjust(self, notes):
+        """Request to adjust a loan transaction.
+
+        Args:
+          notes (str): notes to attach to the adjusting transaction.
+        """
+        self._connector.mambu_loantransaction_adjust(self.id, notes)
+        self.refresh()

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/MambuPy/api/vos.py

@@ -82,5 +82,32 @@ class MambuRepaymentLoanTransactionInput(MambuValueObject):
         "originalCurrencyCode",
         "prepaymentRecalculationMethod",
         "valueDate",
+        "transactionDetails",
     ]
     """List of schema fields for a loan repayment transaction."""
+
+
+class MambuLoanTransactionDetailsInput(MambuValueObject):
+    """Loan Transaction Details body"""
+
+    _schema_fields = [
+        "transactionChannelId",
+        "transactionChannelKey",
+    ]
+    """List of schema fields for a loan repayment transaction."""
+
+
+class MambuFeeLoanTransactionInput(MambuValueObject):
+    """Repayment Loan Transaction body"""
+
+    _schema_fields = [
+        "amount",
+        "bookingDate",
+        "externalId",
+        "fisrtRepaymentDate",
+        "installmentNumber",
+        "notes",
+        "predefinedFeeKey",
+        "valueDate",
+    ]
+    """List of schema fields for a loan fee transaction."""

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/MambuPy/mambugeturl.py

@@ -35,6 +35,8 @@ def _get_parameters_url(dict_kwargs):
                 getparams_list.append("fullDetails=false")
         elif key in ["user", "pwd"]:
             continue
+        elif key in ["version"]:
+            continue
         else:
             getparams_list.append(key + '=%s' % dict_kwargs[key])
 

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/MambuPy/mambuutil.py

@@ -344,8 +344,7 @@ def _backup_db_previous_prep(callback, kwargs):
         headers = kwargs["headers"]
     except KeyError:
         headers = {
-            "content-type": "application/json",
-            "Accept": "application/vnd.mambu.v1+zip",
+            "Accept": "application/vnd.mambu.v2+zip",
         }
     list_ret.append(headers)
 
@@ -382,7 +381,7 @@ def _backup_db_request(justbackup, data, user, pwd, verbose=None, log=None):
                 data=json.dumps(data),
                 headers={
                     "content-type": "application/json",
-                    "Accept": "application/vnd.mambu.v1+json",
+                    "Accept": "application/vnd.mambu.v2+json",
                 },
                 auth=(user, pwd),
             )
@@ -419,7 +418,7 @@ def _backup_db_request(justbackup, data, user, pwd, verbose=None, log=None):
             log.close()
         raise MambuError(mess)
 
-    if not justbackup and resp.status_code != 200:
+    if not justbackup and resp.status_code != 202:
         mess = "Error posting request for backup: %s" % resp.content
         if verbose:
             log.write(mess + "\n")

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/MambuPy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MambuPy
-Version: 2.0.0b34
+Version: 2.0.0b45
 Summary: A python lib for using Mambu APIs.
 Home-page: https://mambupydocs.readthedocs.io
 Author: Javier Novoa C.
@@ -10,12 +10,6 @@ Keywords: mambu
 Requires-Python: >=2.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: future
-Requires-Dist: requests==2.31.0
-Requires-Dist: requests_toolbelt==1.0.0
-Requires-Dist: dateutils==0.6.12
-Requires-Dist: SQLAlchemy>=1.3.6
-Requires-Dist: mysqlclient
 
 
 MambuPy

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/MambuPy.egg-info/requires.txt

@@ -2,5 +2,3 @@ future
 requests==2.31.0
 requests_toolbelt==1.0.0
 dateutils==0.6.12
-SQLAlchemy>=1.3.6
-mysqlclient

MambuPy-2.0.0b45/MambuPy.egg-info/top_level.txt

@@ -0,0 +1,6 @@
+MambuPy
+MambuPy/api
+MambuPy/api/connector
+mambupy
+mambupy/api
+mambupy/api/connector

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MambuPy
-Version: 2.0.0b34
+Version: 2.0.0b45
 Summary: A python lib for using Mambu APIs.
 Home-page: https://mambupydocs.readthedocs.io
 Author: Javier Novoa C.
@@ -10,12 +10,6 @@ Keywords: mambu
 Requires-Python: >=2.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: future
-Requires-Dist: requests==2.31.0
-Requires-Dist: requests_toolbelt==1.0.0
-Requires-Dist: dateutils==0.6.12
-Requires-Dist: SQLAlchemy>=1.3.6
-Requires-Dist: mysqlclient
 
 
 MambuPy

{MambuPy-2.0.0b34 → MambuPy-2.0.0b45}/mambupy/__init__.py

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

{MambuPy-2.0.0b34/MambuPy → MambuPy-2.0.0b45/mambupy}/api/connector/mambuconnector.py

@@ -177,6 +177,11 @@ class MambuConnectorWriter(ABC):
         """patches certain parts of a mambu entity"""
         raise NotImplementedError
 
+    @abstractmethod
+    def mambu_delete(self, entid, prefix):
+        """deletes a mambu entity"""
+        raise NotImplementedError
+
     @abstractmethod
     def mambu_upload_document(self, owner_type, entid, filename, name, notes):
         """uploads an attachment to this entity
@@ -254,6 +259,23 @@ class MambuConnectorWriter(ABC):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def mambu_make_fee(
+        self, loan_id, amount, installmentNumber, notes, valueDate, allowed_fields, **kwargs
+    ):
+        """Make a fee transaction on a loan account.
+
+        Args:
+          loan_id (str): loan account id to apply a fee
+          amount (float): the amount of the fee
+          installmentNumber (int): the installment number to apply the fee
+          notes (str): notes for the fee transaction
+          valueDate (str): entry date for the fee transaction
+          allowed_fields (list): extra fields allowed for the transaction
+          kwargs (dict): key-values of extra fields for the transaction
+        """
+        raise NotImplementedError
+
     @abstractmethod
     def mambu_loanaccount_writeoff(self, loanid, notes):
         """Writesoff a loan account
@@ -263,3 +285,13 @@ class MambuConnectorWriter(ABC):
           notes (str): notes to associate to the writeoff operation in Mambu
         """
         raise NotImplementedError
+
+    @abstractmethod
+    def mambu_loantransaction_adjust(self, transactionid, notes):
+        """Adjust a loan transaction
+
+        Args:
+          transactionid (str): the id or encoded key of the loan transaction
+          notes (str): notes to associate to the transaction adjustment in Mambu
+        """
+        raise NotImplementedError