python-terminusgps 36.1.3__tar.gz → 36.3.0__tar.gz

{python_terminusgps-36.1.3 → python_terminusgps-36.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-terminusgps
-Version: 36.1.3
+Version: 36.3.0
 Summary: Provides abstractions/utilities for working with Wialon API, Authorize.NET API, AWS API, and more.
 Project-URL: Documentation, https://docs.terminusgps.com
 Project-URL: Repository, https://github.com/terminusgps/python-terminusgps

{python_terminusgps-36.1.3 → python_terminusgps-36.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-terminusgps"
-version = "36.1.3"
+version = "36.3.0"
 description = "Provides abstractions/utilities for working with Wialon API, Authorize.NET API, AWS API, and more."
 readme = "README.md"
 authors = [ {name = "Blake Nall", email = "blake@terminusgps.com" } ]

{python_terminusgps-36.1.3 → python_terminusgps-36.3.0}/terminusgps/authorizenet/profiles/customers.py

@@ -11,7 +11,7 @@ class CustomerProfile(AuthorizenetProfileBase):
     def __init__(
         self,
         id: int | str | None = None,
-        merchant_id: int | str | None = None,
+        merchant_id: str | None = None,
         email: str | None = None,
         desc: str | None = None,
     ) -> None:
@@ -23,117 +23,106 @@ class CustomerProfile(AuthorizenetProfileBase):
 
         """
         super().__init__(id=id)
-        self._merchantCustomerId = str(merchant_id) if merchant_id else None
+        self._merchant_id = merchant_id
         self._email = email
         self._desc = desc
 
-        if not self.id and self.merchantCustomerId or self.email:
+        if not self.id:
             try:
-                response = self._authorizenet_get_customer_profile(issuer_info=False)
-                self.id = response.profile.customerProfileId
+                response = self._authorizenet_get_customer_profile()
+                self.id = int(response.profile.customerProfileId)
             except AuthorizenetControllerExecutionError:
                 self.id = self.create()
 
     @property
-    def validationMode(self) -> str:
+    def merchant_id(self) -> str:
         """
-        The current Authorizenet validation mode.
+        A merchant designated id.
 
         :type: :py:obj:`str`
 
         """
-        return get_validation_mode()
-
-    @property
-    def merchantCustomerId(self) -> str | None:
-        """
-        A merchant designated customer id.
-
-        :type: :py:obj:`str` | :py:obj:`None`
-
-        """
-        if self.id and not self._merchantCustomerId:
-            response = self._authorizenet_get_customer_profile(issuer_info=False)
-            self._merchantCustomerId: str | None = (
-                str(response.profile.merchantCustomerId)
+        if self.id and not self._merchant_id:
+            response = self._authorizenet_get_customer_profile()
+            self._merchant_id = (
+                response.profile.merchantCustomerId
                 if response is not None
                 and hasattr(response.profile, "merchantCustomerId")
                 else None
             )
-        return self._merchantCustomerId
+        return str(self._merchant_id)
 
-    @merchantCustomerId.setter
-    def merchantCustomerId(self, other: int | str | None) -> None:
-        """Sets :py:attr:`merchantCustomerId` to ``other``."""
-        updated: bool = other is not None and str(other) != str(
-            self._merchantCustomerId
-        )
-        self._merchantCustomerId = str(other) if other else None
-        if updated and self.id is not None:
-            self._authorizenet_update_customer_profile()
+    @merchant_id.setter
+    def merchant_id(self, other: str | int) -> None:
+        self._merchant_id = other
+        self._authorizenet_update_customer_profile()
 
     @property
-    def email(self) -> str | None:
+    def email(self) -> str:
         """
         A customer email address.
 
-        :type: :py:obj:`str` | :py:obj:`None`
+        :type: :py:obj:`str`
 
         """
-        if self.id and self._email is None:
-            response = self._authorizenet_get_customer_profile(issuer_info=False)
-            self._email: str | None = (
-                str(response.profile.email)
+        if self.id and not self._email:
+            response = self._authorizenet_get_customer_profile()
+            self._email = (
+                response.profile.email
                 if response is not None and hasattr(response.profile, "email")
                 else None
             )
-        return self._email
+        return str(self._email)
 
     @email.setter
-    def email(self, other: str | None) -> None:
-        """Sets :py:attr:`email` to ``other``."""
-        updated: bool = other is not None and other != self.email
+    def email(self, other: str) -> None:
         self._email = other
-        if updated and self.id is not None:
-            self._authorizenet_update_customer_profile()
+        self._authorizenet_update_customer_profile()
 
     @property
-    def desc(self) -> str | None:
+    def desc(self) -> str:
         """
-        A customer description.
+        A customer profile description.
 
-        :type: :py:obj:`str` | :py:obj:`None`
+        :type: :py:obj:`str`
 
         """
-        if self.id and self._desc is None:
-            response = self._authorizenet_get_customer_profile(issuer_info=False)
-            self._desc: str | None = (
-                str(response.profile.description)
+        if self.id and not self._desc:
+            response = self._authorizenet_get_customer_profile()
+            self._desc = (
+                response.profile.description
                 if response is not None and hasattr(response.profile, "description")
                 else None
             )
-        return self._desc
+        return str(self._desc)
 
     @desc.setter
-    def desc(self, other: str | None) -> None:
-        """Sets :py:attr:`desc` to ``other``."""
-        updated: bool = other is not None and other != self.desc
+    def desc(self, other: str) -> None:
         self._desc = other
-        if updated and self.id is not None:
-            self._authorizenet_update_customer_profile()
+        self._authorizenet_update_customer_profile()
+
+    @property
+    def validationMode(self) -> str:
+        """
+        The current Authorizenet validation mode.
+
+        :type: :py:obj:`str`
+
+        """
+        return get_validation_mode()
 
     def create(self) -> int:
         """
         Creates the customer profile in Authorizenet.
 
-        :raises AssertionError: If neither :py:attr:`merchantCustomerId` nor :py:attr:`email` were set.
+        :raises AssertionError: If neither :py:attr:`merchant_id` nor :py:attr:`email` were set.
         :raises AuthorizenetControllerExecutionError: If something goes wrong during an Authorizenet API call.
         :returns: An id for the new customer profile.
         :rtype: :py:obj:`int`
 
         """
-        assert self.merchantCustomerId or self.email, (
-            "Neither 'merchantCustomerId' nor 'email' were set."
+        assert self.merchant_id or self.email, (
+            "Neither 'merchant_id' nor 'email' were set."
         )
         return int(self._authorizenet_create_customer_profile().customerProfileId)
 
@@ -169,12 +158,12 @@ class CustomerProfile(AuthorizenetProfileBase):
 
         """
         response = self._authorizenet_get_customer_profile()
-        if response is not None:
+        if response is not None and hasattr(response.profile, "paymentProfiles"):
             return [
                 int(p.customerPaymentProfileId)
                 for p in response.profile.paymentProfiles
-                if hasattr(response.profile, "paymentProfiles")
             ]
+        return []
 
     def get_address_profile_ids(self) -> list[int]:
         """
@@ -185,12 +174,9 @@ class CustomerProfile(AuthorizenetProfileBase):
 
         """
         response = self._authorizenet_get_customer_profile()
-        if response is not None:
-            return [
-                int(p.customerAddressId)
-                for p in response.profile.shipToList
-                if hasattr(response.profile, "shipToList")
-            ]
+        if response is not None and hasattr(response.profile, "shipToList"):
+            return [int(p.customerAddressId) for p in response.profile.shipToList]
+        return []
 
     def _generate_customer_profile_ex_type(
         self,
@@ -202,18 +188,18 @@ class CustomerProfile(AuthorizenetProfileBase):
         :rtype: :py:obj:`~authorizenet.apicontractsv1.customerProfileExType`
 
         """
-        cprofile = apicontractsv1.customerProfileExType()
+        cprofile_obj = apicontractsv1.customerProfileExType()
 
-        if self.id is not None:
-            cprofile.customerProfileId = self.id
-        if self.merchantCustomerId is not None:
-            cprofile.merchantCustomerId = self.merchantCustomerId
-        if self.email is not None:
-            cprofile.email = self.email
-        if self.desc is not None:
-            cprofile.description = self.desc
+        if self.id:
+            cprofile_obj.customerProfileId = self.id
+        if self.merchant_id:
+            cprofile_obj.merchantCustomerId = self.merchant_id
+        if self.email:
+            cprofile_obj.email = self.email
+        if self.desc:
+            cprofile_obj.description = self.desc
 
-        return cprofile
+        return cprofile_obj
 
     def _generate_customer_profile_type(self) -> apicontractsv1.customerProfileType:
         """
@@ -223,16 +209,16 @@ class CustomerProfile(AuthorizenetProfileBase):
         :rtype: :py:obj:`~authorizenet.apicontractsv1.customerProfileType`
 
         """
-        cprofile = apicontractsv1.customerProfileType()
+        cprofile_obj = apicontractsv1.customerProfileType()
 
-        if self.merchantCustomerId is not None:
-            cprofile.merchantCustomerId = self.merchantCustomerId
-        if self.email is not None:
-            cprofile.email = self.email
-        if self.desc is not None:
-            cprofile.description = self.desc
+        if self.merchant_id:
+            cprofile_obj.merchantCustomerId = self.merchant_id
+        if self.email:
+            cprofile_obj.email = self.email
+        if self.desc:
+            cprofile_obj.description = self.desc
 
-        return cprofile
+        return cprofile_obj
 
     def _authorizenet_get_customer_profile(
         self, issuer_info: bool = True
@@ -256,12 +242,10 @@ class CustomerProfile(AuthorizenetProfileBase):
 
         if self.id:
             request.customerProfileId = self.id
-        elif self.merchantCustomerId:
-            request.merchantCustomerId = self.merchantCustomerId
-        elif self.email:
+        if self.merchant_id:
+            request.merchantCustomerId = self.merchant_id
+        if self.email:
             request.email = self.email
-        else:
-            return
 
         controller = apicontrollers.getCustomerProfileController(request)
         return self.execute_controller(controller)
@@ -282,8 +266,8 @@ class CustomerProfile(AuthorizenetProfileBase):
         :rtype: :py:obj:`dict` | :py:obj:`None`
 
         """
-        assert self.merchantCustomerId or self.email, (
-            "Neither 'merchantCustomerId' nor 'email' were set."
+        assert self.merchant_id or self.email, (
+            "Neither 'merchant_id' nor 'email' were set."
         )
 
         request = apicontractsv1.createCustomerProfileRequest(

{python_terminusgps-36.1.3 → python_terminusgps-36.3.0}/uv.lock

@@ -964,7 +964,7 @@ wheels = [
 
 [[package]]
 name = "python-terminusgps"
-version = "36.1.3"
+version = "36.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "aiobotocore" },